* Tweak toaster look and feel * Add icons, tweak plus icon names * Rename commandBarMeta to commandBarConfig * Refactor command bar, add support for icons * Create a tailwind plugin for aria-pressed button state * Remove overlay from behind command bar * Clean up toolbar * Button and other style tweaks * Icon tweaks follow-up: make old icons work with new sizing * Delete unused static icons * More CSS tweaks * Small CSS tweak to project sidebar * Add command bar E2E test * fumpt * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * fix typo in a comment * Fix icon padding (built version only) * Update onboarding and warning banner icons padding * Misc minor style fixes * Get Extrude opening and canceling from command bar * Iconography tweaks * Get extrude kind of working * Refactor command bar config types and organization * Move command bar configs to be co-located with each other * Start building a state machine for the command bar * Start converting command bar to state machine * Add support for multiple args, confirmation step * Submission behavior, hotkeys, code organization * Add new test for extruding from command bar * Polish step back and selection hotkeys, CSS tweaks * Loading style tweaks * Validate selection inputs, polish UX of args re-editing * Prevent submission with multiple selection on singlular arg * Remove stray console logs * Tweak test, CSS nit, remove extrude "result" argument * Fix linting warnings * Show Ctrl+/ instead of ⌘K on all platforms but Mac * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * Add "Enter sketch" to command bar * fix command bar test * Fix flaky cmd bar extrude test by waiting for engine select response * Cover both button labels '⌘K' and 'Ctrl+/' in test --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
167 lines
5.0 KiB
TypeScript
167 lines
5.0 KiB
TypeScript
import { Dialog, Popover, Transition } from '@headlessui/react'
|
|
import { Fragment, createContext, useEffect } from 'react'
|
|
import { useHotkeys } from 'react-hotkeys-hook'
|
|
import { useCommandsContext } from 'hooks/useCommandsContext'
|
|
import { useMachine } from '@xstate/react'
|
|
import { commandBarMachine } from 'machines/commandBarMachine'
|
|
import { EventFrom, StateFrom } from 'xstate'
|
|
import CommandBarArgument from './CommandBarArgument'
|
|
import CommandComboBox from '../CommandComboBox'
|
|
import { useLocation } from 'react-router-dom'
|
|
import CommandBarReview from './CommandBarReview'
|
|
|
|
type CommandsContextType = {
|
|
commandBarState: StateFrom<typeof commandBarMachine>
|
|
commandBarSend: (event: EventFrom<typeof commandBarMachine>) => void
|
|
}
|
|
|
|
export const CommandsContext = createContext<CommandsContextType>({
|
|
commandBarState: commandBarMachine.initialState,
|
|
commandBarSend: () => {},
|
|
})
|
|
|
|
export const CommandBarProvider = ({
|
|
children,
|
|
}: {
|
|
children: React.ReactNode
|
|
}) => {
|
|
const { pathname } = useLocation()
|
|
const [commandBarState, commandBarSend] = useMachine(commandBarMachine, {
|
|
guards: {
|
|
'Arguments are ready': (context, _) => {
|
|
return context.selectedCommand?.args
|
|
? context.argumentsToSubmit.length ===
|
|
Object.keys(context.selectedCommand.args)?.length
|
|
: false
|
|
},
|
|
'Command has no arguments': (context, _event) => {
|
|
return (
|
|
!context.selectedCommand?.args ||
|
|
Object.keys(context.selectedCommand?.args).length === 0
|
|
)
|
|
},
|
|
},
|
|
})
|
|
|
|
// Close the command bar when navigating
|
|
useEffect(() => {
|
|
commandBarSend({ type: 'Close' })
|
|
}, [pathname])
|
|
|
|
return (
|
|
<CommandsContext.Provider
|
|
value={{
|
|
commandBarState,
|
|
commandBarSend,
|
|
}}
|
|
>
|
|
{children}
|
|
<CommandBar />
|
|
</CommandsContext.Provider>
|
|
)
|
|
}
|
|
|
|
const CommandBar = () => {
|
|
const { commandBarState, commandBarSend } = useCommandsContext()
|
|
const {
|
|
context: { selectedCommand, currentArgument, commands },
|
|
} = commandBarState
|
|
const isSelectionArgument = currentArgument?.inputType === 'selection'
|
|
const WrapperComponent = isSelectionArgument ? Popover : Dialog
|
|
|
|
useHotkeys(['mod+k', 'mod+/'], () => {
|
|
if (commandBarState.context.commands.length === 0) return
|
|
if (commandBarState.matches('Closed')) {
|
|
commandBarSend({ type: 'Open' })
|
|
} else {
|
|
commandBarSend({ type: 'Close' })
|
|
}
|
|
})
|
|
|
|
function stepBack() {
|
|
if (!currentArgument) {
|
|
if (commandBarState.matches('Review')) {
|
|
const entries = Object.entries(selectedCommand?.args || {})
|
|
|
|
commandBarSend({
|
|
type: commandBarState.matches('Review')
|
|
? 'Edit argument'
|
|
: 'Change current argument',
|
|
data: {
|
|
arg: {
|
|
name: entries[entries.length - 1][0],
|
|
...entries[entries.length - 1][1],
|
|
},
|
|
},
|
|
})
|
|
} else {
|
|
commandBarSend({ type: 'Deselect command' })
|
|
}
|
|
} else {
|
|
const entries = Object.entries(selectedCommand?.args || {})
|
|
const index = entries.findIndex(
|
|
([key, _]) => key === currentArgument.name
|
|
)
|
|
|
|
if (index === 0) {
|
|
commandBarSend({ type: 'Deselect command' })
|
|
} else {
|
|
commandBarSend({
|
|
type: 'Change current argument',
|
|
data: {
|
|
arg: { name: entries[index - 1][0], ...entries[index - 1][1] },
|
|
},
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Transition.Root
|
|
show={!commandBarState.matches('Closed') || false}
|
|
afterLeave={() => {
|
|
if (selectedCommand?.onCancel) selectedCommand.onCancel()
|
|
commandBarSend({ type: 'Clear' })
|
|
}}
|
|
as={Fragment}
|
|
>
|
|
<WrapperComponent
|
|
open={!commandBarState.matches('Closed') || isSelectionArgument}
|
|
onClose={() => {
|
|
commandBarSend({ type: 'Close' })
|
|
}}
|
|
className={
|
|
'fixed inset-0 z-50 overflow-y-auto pb-4 pt-1 ' +
|
|
(isSelectionArgument ? 'pointer-events-none' : '')
|
|
}
|
|
>
|
|
<Transition.Child
|
|
enter="duration-100 ease-out"
|
|
enterFrom="opacity-0 scale-95"
|
|
enterTo="opacity-100 scale-100"
|
|
leave="duration-75 ease-in"
|
|
leaveFrom="opacity-100 scale-100"
|
|
leaveTo="opacity-0 scale-95"
|
|
>
|
|
<WrapperComponent.Panel
|
|
className="relative z-50 pointer-events-auto w-full max-w-xl py-2 mx-auto border rounded shadow-lg bg-chalkboard-10 dark:bg-chalkboard-100 dark:border-chalkboard-70"
|
|
as="div"
|
|
>
|
|
{commandBarState.matches('Selecting command') ? (
|
|
<CommandComboBox options={commands} />
|
|
) : commandBarState.matches('Gathering arguments') ? (
|
|
<CommandBarArgument stepBack={stepBack} />
|
|
) : (
|
|
commandBarState.matches('Review') && (
|
|
<CommandBarReview stepBack={stepBack} />
|
|
)
|
|
)}
|
|
</WrapperComponent.Panel>
|
|
</Transition.Child>
|
|
</WrapperComponent>
|
|
</Transition.Root>
|
|
)
|
|
}
|
|
|
|
export default CommandBarProvider
|