Another attempt using a component property within the config
This commit is contained in:
@@ -21,7 +21,7 @@ const AllShortcutsModal = () => {
|
|||||||
<Dialog open={open} onClose={() => setOpen(false)} className={classes.root}>
|
<Dialog open={open} onClose={() => setOpen(false)} className={classes.root}>
|
||||||
<div className="bg-ch-gray-700 font-fira-sans max-w-7xl rounded shadow-lg text-ch-gray-300 p-4">
|
<div className="bg-ch-gray-700 font-fira-sans max-w-7xl rounded shadow-lg text-ch-gray-300 p-4">
|
||||||
<h2 className="text-2xl mb-4">All Shortcuts</h2>
|
<h2 className="text-2xl mb-4">All Shortcuts</h2>
|
||||||
{ editorMenuConfig.map(menu => menu.items.length ? (
|
{ editorMenuConfig.filter(menu => menu.items.length).map(menu =>
|
||||||
<section key={"allshortcuts-"+menu.name}
|
<section key={"allshortcuts-"+menu.name}
|
||||||
className="my-6">
|
className="my-6">
|
||||||
<h3 className="text-xl border-b-2 pb-2 mb-2">{ menu.label }</h3>
|
<h3 className="text-xl border-b-2 pb-2 mb-2">{ menu.label }</h3>
|
||||||
@@ -32,7 +32,7 @@ const AllShortcutsModal = () => {
|
|||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</section>
|
</section>
|
||||||
) : <></>)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
)
|
)
|
||||||
|
|||||||
49
app/web/src/components/EditorMenu/Dropdowns.tsx
Normal file
49
app/web/src/components/EditorMenu/Dropdowns.tsx
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
import { Menu } from '@headlessui/react'
|
||||||
|
import { useHotkeys } from 'react-hotkeys-hook';
|
||||||
|
|
||||||
|
export function DropdownItem({ config, state, thunkDispatch }) {
|
||||||
|
console.log({ name: config.label, shortcut: config.shortcut, callback: handleClick})
|
||||||
|
useHotkeys(config.shortcut, handleClick)
|
||||||
|
|
||||||
|
function handleClick(e) {
|
||||||
|
console.log(e, config)
|
||||||
|
e.preventDefault()
|
||||||
|
config.callback(e, {state, thunkDispatch})
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<Menu.Item>
|
||||||
|
{({ active }) => (
|
||||||
|
<button
|
||||||
|
className={`${active && 'bg-gray-600'} px-2 py-1 text-left`}
|
||||||
|
onClick={handleClick}
|
||||||
|
>
|
||||||
|
{config.label}
|
||||||
|
{config.shortcutLabel && <span className="text-gray-400 pl-4">{ config.shortcutLabel }</span> }
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</Menu.Item>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function Dropdown({
|
||||||
|
label,
|
||||||
|
disabled,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
label: string,
|
||||||
|
disabled: boolean,
|
||||||
|
children: React.ReactNode,
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<div className="relative">
|
||||||
|
<Menu>
|
||||||
|
<Menu.Button className={"text-gray-100" + (disabled ? " text-gray-400 cursor-not-allowed" : "")} disabled={disabled}>{label}</Menu.Button>
|
||||||
|
{ children &&
|
||||||
|
<Menu.Items className="absolute flex flex-col mt-4 bg-ch-gray-760 rounded text-gray-100 overflow-hidden whitespace-nowrap border border-ch-gray-700">
|
||||||
|
{children}
|
||||||
|
</Menu.Items>
|
||||||
|
}
|
||||||
|
</Menu>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,31 +1,12 @@
|
|||||||
import { Menu } from '@headlessui/react'
|
|
||||||
import { useHotkeys } from 'react-hotkeys-hook';
|
|
||||||
import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
|
import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
|
||||||
import Svg from 'src/components/Svg/Svg'
|
import Svg from 'src/components/Svg/Svg'
|
||||||
import { useRender } from 'src/components/IdeWrapper/useRender'
|
|
||||||
import { makeStlDownloadHandler, PullTitleFromFirstLine } from './helpers'
|
|
||||||
import { useSaveCode } from 'src/components/IdeWrapper/useSaveCode'
|
|
||||||
import CadPackage from 'src/components/CadPackage/CadPackage'
|
import CadPackage from 'src/components/CadPackage/CadPackage'
|
||||||
import { EditorMenuConfig, EditorMenuItemConfig, editorMenuConfig } from './menuConfig'
|
import { editorMenuConfig } from './menuConfig'
|
||||||
import AllShortcutsModal from './AllShortcutsModal'
|
import AllShortcutsModal from './AllShortcutsModal'
|
||||||
|
import { Dropdown } from './Dropdowns';
|
||||||
|
|
||||||
const EditorMenu = () => {
|
const EditorMenu = () => {
|
||||||
const handleRender = useRender()
|
|
||||||
const saveCode = useSaveCode()
|
|
||||||
const { state, thunkDispatch } = useIdeContext()
|
const { state, thunkDispatch } = useIdeContext()
|
||||||
const handleStlDownload = makeStlDownloadHandler({
|
|
||||||
type: state.objectData?.type,
|
|
||||||
ideType: state.ideType,
|
|
||||||
geometry: state.objectData?.data,
|
|
||||||
quality: state.objectData?.quality,
|
|
||||||
fileName: PullTitleFromFirstLine(state.code || ''),
|
|
||||||
thunkDispatch,
|
|
||||||
})
|
|
||||||
|
|
||||||
editorMenuConfig.forEach(menu =>
|
|
||||||
menu.items.forEach(({shortcut, callback}) =>
|
|
||||||
useHotkeys(shortcut, callback), [state])
|
|
||||||
)
|
|
||||||
|
|
||||||
return (<>
|
return (<>
|
||||||
<div className="flex justify-between bg-ch-gray-760 text-gray-100">
|
<div className="flex justify-between bg-ch-gray-760 text-gray-100">
|
||||||
@@ -36,8 +17,12 @@ const EditorMenu = () => {
|
|||||||
<div className="grid grid-flow-col-dense gap-6 px-5">
|
<div className="grid grid-flow-col-dense gap-6 px-5">
|
||||||
{ editorMenuConfig.map(menu => (
|
{ editorMenuConfig.map(menu => (
|
||||||
<Dropdown label={menu.label} disabled={menu.disabled} key={menu.label +"-dropdown"}>
|
<Dropdown label={menu.label} disabled={menu.disabled} key={menu.label +"-dropdown"}>
|
||||||
{ menu.items.map(itemConfig => (
|
{ menu.items.map(itemConfig =>
|
||||||
<DropdownItem config={itemConfig} key={ menu.label +"-"+ itemConfig.label} />)
|
<itemConfig.component
|
||||||
|
state={state}
|
||||||
|
thunkDispatch={thunkDispatch}
|
||||||
|
config={itemConfig}
|
||||||
|
key={menu.label +"-"+ itemConfig.label } />
|
||||||
) }
|
) }
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
)) }
|
)) }
|
||||||
@@ -57,42 +42,3 @@ const EditorMenu = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default EditorMenu
|
export default EditorMenu
|
||||||
|
|
||||||
function DropdownItem({ config }) {
|
|
||||||
return (
|
|
||||||
<Menu.Item>
|
|
||||||
{({ active }) => (
|
|
||||||
<button
|
|
||||||
className={`${active && 'bg-gray-600'} px-2 py-1 text-left`}
|
|
||||||
onClick={config.callback}
|
|
||||||
>
|
|
||||||
{config.label}
|
|
||||||
{config.shortcutLabel && <span className="text-gray-400 pl-4">{ config.shortcutLabel }</span> }
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</Menu.Item>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function Dropdown({
|
|
||||||
label,
|
|
||||||
disabled,
|
|
||||||
children,
|
|
||||||
}: {
|
|
||||||
label: string,
|
|
||||||
disabled: boolean,
|
|
||||||
children: React.ReactNode,
|
|
||||||
}) {
|
|
||||||
return (
|
|
||||||
<div className="relative">
|
|
||||||
<Menu>
|
|
||||||
<Menu.Button className={"text-gray-100" + (disabled ? " text-gray-400 cursor-not-allowed" : "")} disabled={disabled}>{label}</Menu.Button>
|
|
||||||
{ children &&
|
|
||||||
<Menu.Items className="absolute flex flex-col mt-4 bg-ch-gray-760 rounded text-gray-100 overflow-hidden whitespace-nowrap border border-ch-gray-700">
|
|
||||||
{children}
|
|
||||||
</Menu.Items>
|
|
||||||
}
|
|
||||||
</Menu>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import { useIdeContext } from 'src/helpers/hooks/useIdeContext'
|
|
||||||
import { useRender } from 'src/components/IdeWrapper/useRender'
|
import { useRender } from 'src/components/IdeWrapper/useRender'
|
||||||
import { makeStlDownloadHandler, PullTitleFromFirstLine } from './helpers'
|
import { makeStlDownloadHandler, PullTitleFromFirstLine } from './helpers'
|
||||||
import { useSaveCode } from 'src/components/IdeWrapper/useSaveCode'
|
import { useSaveCode } from 'src/components/IdeWrapper/useSaveCode'
|
||||||
import Svg from 'src/components/Svg/Svg'
|
import { DropdownItem } from './Dropdowns'
|
||||||
|
|
||||||
|
export function cmdOrCtrl() {
|
||||||
|
return /(Mac|iPhone|iPod|iPad)/i.test(navigator.platform) ? '⌘' : 'Ctrl'
|
||||||
|
}
|
||||||
|
|
||||||
const fileMenuConfig = {
|
const fileMenuConfig = {
|
||||||
name: 'file',
|
name: 'file',
|
||||||
@@ -14,30 +16,51 @@ const fileMenuConfig = {
|
|||||||
{
|
{
|
||||||
label: 'Save & Render',
|
label: 'Save & Render',
|
||||||
shortcut: 'ctrl+s, command+s',
|
shortcut: 'ctrl+s, command+s',
|
||||||
shortcutLabel: <><CmdOrCtrl/> S</>,
|
shortcutLabel: cmdOrCtrl() + ' S',
|
||||||
// This is my main issue. How do I pass in a callback that relies on the hooks and state within the component?
|
component: (props) => {
|
||||||
// Put another way, how do I make the state and hooks used within a component configurable from outside the component itself?
|
const { state, config } = props
|
||||||
callback: (e, /* { options } */) => {
|
const handleRender = useRender()
|
||||||
// These do not work
|
const saveCode = useSaveCode()
|
||||||
// const handleRender = useRender()
|
function onRender(e) {
|
||||||
// const saveCode = useSaveCode()
|
e.preventDefault()
|
||||||
// handleRender()
|
handleRender()
|
||||||
// saveCode({ code: state.code })
|
saveCode({ code: state.code })
|
||||||
e.preventDefault()
|
}
|
||||||
alert('Saving & Rendering!')
|
|
||||||
|
config.callback = onRender
|
||||||
|
|
||||||
|
return <DropdownItem {...props} />
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Download STL',
|
label: 'Download STL',
|
||||||
shortcut: 'ctrl+shift+d, command+shift+d',
|
shortcut: 'ctrl+shift+d, command+shift+d',
|
||||||
shortcutLabel: <><CmdOrCtrl/> Shift D</>,
|
shortcutLabel: cmdOrCtrl() + ' Shift D',
|
||||||
callback: () => alert('Downloading STL!'),
|
component: (props) => {
|
||||||
|
const { state, thunkDispatch, config } = props
|
||||||
|
const handleStlDownload = makeStlDownloadHandler({
|
||||||
|
type: state.objectData?.type,
|
||||||
|
ideType: state.ideType,
|
||||||
|
geometry: state.objectData?.data,
|
||||||
|
quality: state.objectData?.quality,
|
||||||
|
fileName: PullTitleFromFirstLine(state.code || ''),
|
||||||
|
thunkDispatch,
|
||||||
|
})
|
||||||
|
|
||||||
|
config.callback = handleStlDownload
|
||||||
|
|
||||||
|
return <DropdownItem {...props} />
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'Cook Donut',
|
label: 'Cook Donut',
|
||||||
shortcut: 'ctrl+d, command+d',
|
shortcut: 'ctrl+os+d',
|
||||||
shortcutLabel: <><CmdOrCtrl/> D</>,
|
shortcutLabel: cmdOrCtrl() + ' D',
|
||||||
callback: () => alert('Donut is cooked!'),
|
component: (props) => {
|
||||||
|
const { config } = props
|
||||||
|
config.callback = () => alert('Donut is cooked!')
|
||||||
|
return <DropdownItem {...props} />
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -57,8 +80,12 @@ const viewMenuConfig = {
|
|||||||
{
|
{
|
||||||
label: 'Reset layout',
|
label: 'Reset layout',
|
||||||
shortcut: 'ctrl+alt+r, command+alt+r',
|
shortcut: 'ctrl+alt+r, command+alt+r',
|
||||||
shortcutLabel: <><CmdOrCtrl/> Alt R</>,
|
shortcutLabel: cmdOrCtrl() + ' Alt R',
|
||||||
callback: () => alert('Resetting the layout!'),
|
component: (props) => {
|
||||||
|
const { config, thunkDispatch } = props
|
||||||
|
config.callback = () => thunkDispatch({ type: 'resetLayout' })
|
||||||
|
return <DropdownItem {...props } />
|
||||||
|
}
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
@@ -83,7 +110,3 @@ export interface EditorMenuConfig {
|
|||||||
disabled: boolean,
|
disabled: boolean,
|
||||||
items: Array<EditorMenuItemConfig>,
|
items: Array<EditorMenuItemConfig>,
|
||||||
}
|
}
|
||||||
|
|
||||||
function CmdOrCtrl() {
|
|
||||||
return <span> { /(Mac|iPhone|iPod|iPad)/i.test(navigator.platform) ? '⌘' : 'Ctrl' }</span>
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user