* 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>
172 lines
5.8 KiB
TypeScript
172 lines
5.8 KiB
TypeScript
import { useCommandsContext } from 'hooks/useCommandsContext'
|
|
import { CustomIcon } from '../CustomIcon'
|
|
import React, { useState } from 'react'
|
|
import { ActionButton } from '../ActionButton'
|
|
import { Selections, getSelectionTypeDisplayText } from 'lib/selections'
|
|
import { useHotkeys } from 'react-hotkeys-hook'
|
|
|
|
function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
|
|
const { commandBarState, commandBarSend } = useCommandsContext()
|
|
const {
|
|
context: { selectedCommand, currentArgument, argumentsToSubmit },
|
|
} = commandBarState
|
|
const isReviewing = commandBarState.matches('Review')
|
|
const [showShortcuts, setShowShortcuts] = useState(false)
|
|
|
|
useHotkeys(
|
|
'alt',
|
|
() => setShowShortcuts(true),
|
|
{ enableOnFormTags: true, enableOnContentEditable: true },
|
|
[showShortcuts]
|
|
)
|
|
useHotkeys(
|
|
'alt',
|
|
() => setShowShortcuts(false),
|
|
{ keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
|
|
[showShortcuts]
|
|
)
|
|
useHotkeys(
|
|
[
|
|
'alt+1',
|
|
'alt+2',
|
|
'alt+3',
|
|
'alt+4',
|
|
'alt+5',
|
|
'alt+6',
|
|
'alt+7',
|
|
'alt+8',
|
|
'alt+9',
|
|
'alt+0',
|
|
],
|
|
(_, b) => {
|
|
if (b.keys && !Number.isNaN(parseInt(b.keys[0], 10))) {
|
|
if (!selectedCommand?.args) return
|
|
const argName = Object.keys(selectedCommand.args)[
|
|
parseInt(b.keys[0], 10) - 1
|
|
]
|
|
const arg = selectedCommand?.args[argName]
|
|
commandBarSend({
|
|
type: 'Change current argument',
|
|
data: { arg: { ...arg, name: argName } },
|
|
})
|
|
}
|
|
},
|
|
{ keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
|
|
[argumentsToSubmit, selectedCommand]
|
|
)
|
|
|
|
return (
|
|
selectedCommand &&
|
|
argumentsToSubmit && (
|
|
<>
|
|
<div className="px-4 text-sm flex gap-4 items-start">
|
|
<div className="flex flex-1 flex-wrap gap-2">
|
|
<p
|
|
data-command-name={selectedCommand?.name}
|
|
className="pr-4 flex gap-2 items-center"
|
|
>
|
|
{selectedCommand &&
|
|
'icon' in selectedCommand &&
|
|
selectedCommand.icon && (
|
|
<CustomIcon name={selectedCommand.icon} className="w-5 h-5" />
|
|
)}
|
|
{selectedCommand?.name}
|
|
</p>
|
|
{Object.entries(selectedCommand?.args || {}).map(
|
|
([argName, arg], i) => (
|
|
<button
|
|
disabled={!isReviewing && currentArgument?.name === argName}
|
|
onClick={() => {
|
|
commandBarSend({
|
|
type: isReviewing
|
|
? 'Edit argument'
|
|
: 'Change current argument',
|
|
data: { arg: { ...arg, name: argName } },
|
|
})
|
|
}}
|
|
key={argName}
|
|
className={`relative w-fit px-2 py-1 rounded-sm flex gap-2 items-center border ${
|
|
argName === currentArgument?.name
|
|
? 'disabled:bg-energy-10/50 dark:disabled:bg-energy-10/20 disabled:border-energy-10 dark:disabled:border-energy-10 disabled:text-chalkboard-100 dark:disabled:text-chalkboard-10'
|
|
: 'bg-chalkboard-20/50 dark:bg-chalkboard-80/50 border-chalkboard-20 dark:border-chalkboard-80'
|
|
}`}
|
|
>
|
|
{argumentsToSubmit[argName] ? (
|
|
arg.inputType === 'selection' ? (
|
|
getSelectionTypeDisplayText(
|
|
argumentsToSubmit[argName] as Selections
|
|
)
|
|
) : typeof argumentsToSubmit[argName] === 'object' ? (
|
|
JSON.stringify(argumentsToSubmit[argName])
|
|
) : (
|
|
argumentsToSubmit[argName]
|
|
)
|
|
) : arg.payload ? (
|
|
arg.inputType === 'selection' ? (
|
|
getSelectionTypeDisplayText(arg.payload as Selections)
|
|
) : typeof arg.payload === 'object' ? (
|
|
JSON.stringify(arg.payload)
|
|
) : (
|
|
arg.payload
|
|
)
|
|
) : (
|
|
<em>{argName}</em>
|
|
)}
|
|
{showShortcuts && (
|
|
<small className="absolute -top-[1px] right-full translate-x-1/2 px-0.5 rounded-sm bg-chalkboard-80 text-chalkboard-10 dark:bg-energy-10 dark:text-chalkboard-100">
|
|
<span className="sr-only">Hotkey: </span>
|
|
{i + 1}
|
|
</small>
|
|
)}
|
|
</button>
|
|
)
|
|
)}
|
|
</div>
|
|
{isReviewing ? <ReviewingButton /> : <GatheringArgsButton />}
|
|
</div>
|
|
<div className="block w-full my-2 h-[1px] bg-chalkboard-20 dark:bg-chalkboard-80" />
|
|
{children}
|
|
</>
|
|
)
|
|
)
|
|
}
|
|
|
|
function ReviewingButton() {
|
|
return (
|
|
<ActionButton
|
|
Element="button"
|
|
autoFocus
|
|
type="submit"
|
|
form="review-form"
|
|
className="w-fit !p-0 rounded-sm border !border-chalkboard-100 dark:!border-energy-10 hover:shadow"
|
|
icon={{
|
|
icon: 'checkmark',
|
|
bgClassName:
|
|
'p-1 rounded-sm !bg-chalkboard-100 hover:!bg-chalkboard-110 dark:!bg-energy-20 dark:hover:!bg-energy-10',
|
|
iconClassName: '!text-energy-10 dark:!text-chalkboard-100',
|
|
}}
|
|
>
|
|
<span className="sr-only">Submit command</span>
|
|
</ActionButton>
|
|
)
|
|
}
|
|
|
|
function GatheringArgsButton() {
|
|
return (
|
|
<ActionButton
|
|
Element="button"
|
|
type="submit"
|
|
form="arg-form"
|
|
className="w-fit !p-0 rounded-sm"
|
|
icon={{
|
|
icon: 'arrowRight',
|
|
bgClassName: 'p-1 rounded-sm',
|
|
}}
|
|
>
|
|
<span className="sr-only">Continue</span>
|
|
</ActionButton>
|
|
)
|
|
}
|
|
|
|
export default CommandBarHeader
|