* 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>
81 lines
1.9 KiB
TypeScript
81 lines
1.9 KiB
TypeScript
import CommandArgOptionInput from './CommandArgOptionInput'
|
|
import CommandBarBasicInput from './CommandBarBasicInput'
|
|
import CommandBarSelectionInput from './CommandBarSelectionInput'
|
|
import { CommandArgument } from 'lib/commandTypes'
|
|
import { useCommandsContext } from 'hooks/useCommandsContext'
|
|
import CommandBarHeader from './CommandBarHeader'
|
|
|
|
function CommandBarArgument({ stepBack }: { stepBack: () => void }) {
|
|
const { commandBarState, commandBarSend } = useCommandsContext()
|
|
const {
|
|
context: { currentArgument },
|
|
} = commandBarState
|
|
|
|
function onSubmit(data: unknown) {
|
|
if (!currentArgument) return
|
|
|
|
commandBarSend({
|
|
type: 'Submit argument',
|
|
data: {
|
|
[currentArgument.name]:
|
|
currentArgument.inputType === 'number'
|
|
? parseFloat((data as string) || '0')
|
|
: data,
|
|
},
|
|
})
|
|
}
|
|
|
|
return (
|
|
currentArgument && (
|
|
<CommandBarHeader>
|
|
<ArgumentInput
|
|
arg={currentArgument}
|
|
stepBack={stepBack}
|
|
onSubmit={onSubmit}
|
|
/>
|
|
</CommandBarHeader>
|
|
)
|
|
)
|
|
}
|
|
|
|
export default CommandBarArgument
|
|
|
|
function ArgumentInput({
|
|
arg,
|
|
stepBack,
|
|
onSubmit,
|
|
}: {
|
|
arg: CommandArgument<unknown> & { name: string }
|
|
stepBack: () => void
|
|
onSubmit: (event: any) => void
|
|
}) {
|
|
switch (arg.inputType) {
|
|
case 'options':
|
|
return (
|
|
<CommandArgOptionInput
|
|
options={arg.options}
|
|
argName={arg.name}
|
|
stepBack={stepBack}
|
|
onSubmit={onSubmit}
|
|
placeholder="Select an option"
|
|
/>
|
|
)
|
|
case 'selection':
|
|
return (
|
|
<CommandBarSelectionInput
|
|
arg={arg}
|
|
stepBack={stepBack}
|
|
onSubmit={onSubmit}
|
|
/>
|
|
)
|
|
default:
|
|
return (
|
|
<CommandBarBasicInput
|
|
arg={arg}
|
|
stepBack={stepBack}
|
|
onSubmit={onSubmit}
|
|
/>
|
|
)
|
|
}
|
|
}
|