* Start implementing a "prepareToEdit" callback for extrude
* Start of generic edit flow for operations
* Actually invoking command bar send generically on double-click
* Refactor: break out non-React hook helper to calculate Kcl expression value
* Add unit tests, fmt
* Integrate helper to get calculated KclExpression
* Clean up unused imports, simplify use of `programMemoryFromVariables`
* Implement basic extrude editing
* Refactor: move DefaultPlanesStr to its own lib file
* Add support for editing offset planes
* Add Edit right-click menu option
* Turn off edit flow for sketch for now
* Add e2e tests for sketch and offset plane editing, fix bug found with offset plane editing
* Add failing e2e extrude edit test
* Remove action version of extrude AST mod
* Fix behavior when adding a constant while editing operation, fixing e2e test
* Patch in changes from 61b02b5703
* Remove shell's prepareToEdit
* Add other Surface types to `artifactIsPlaneWithPaths`
* refactor: rename `item` to `operation`
* Allow `prepareToEdit` to fail with a toast, signal sketch-on-offset is unimplemented
* Rework sketch e2e test to test several working and failing cases
* Fix tsc errors related to making `codeRef` optional
* Make basic error messages more friendly
* fmt
* Reset modifyAst.ts to main
* Fix broken artifactGraph unit test
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* Remove unused import
* Look at this (photo)Graph *in the voice of Nickelback*
* Make the offset plane insert at the end, not one before
* Fix bug caught by e2e test failure with "Command needs review" logic
* Update src/machines/modelingMachine.ts
Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com>
* Remove console logs per @pierremtb
* Update src/components/CommandBar/CommandBarHeader.tsx
Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
* Use better programMemory init thanks @jtran
* Fix tsc post merge of #5068
* Fix logic for `artifactIsPlaneWithPaths` post-merge
* Need to disable the sketch-on-face case now that artifactGraph is in Rust. Will active in a future PR (cc @jtran)
* Re-run CI after snapshots
* Update FeatureTreePane to not use `useCommandsContext`, missed during merge
* Fix merge issue, import location change on edited file
* fix click test step, which I believe is waiting for context scripts to load
* Convert toolbarFixture.exeIndicator to getter
We need to convert all these selectors on fixtures to getters, because
they can go stale if called on the fixture constructor.
* Missed a dumb little thing in toolbarFixture.ts
* Fix goof with merge
* fmt
* Another dumb missed thing during merge
I gotta get used to the LazyGit merge tool I'm not good at it yet
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* Conver sceneFixture's exeIndicator to a getter
Locators on fixtures will be frozen from the time of the fixture's
initialization, I'm increasingly convinced
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* Post-kwargs E2E test cleanup
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
* A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com>
Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
229 lines
8.2 KiB
TypeScript
229 lines
8.2 KiB
TypeScript
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'
|
|
import { KclCommandValue, KclExpressionWithVariable } from 'lib/commandTypes'
|
|
import Tooltip from 'components/Tooltip'
|
|
import { roundOff } from 'lib/utils'
|
|
import { commandBarActor, useCommandBarState } from 'machines/commandBarMachine'
|
|
|
|
function CommandBarHeader({ children }: React.PropsWithChildren<{}>) {
|
|
const commandBarState = useCommandBarState()
|
|
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]
|
|
if (!argName || !arg) return
|
|
commandBarActor.send({
|
|
type: 'Change current argument',
|
|
data: { arg: { ...arg, name: argName } },
|
|
})
|
|
}
|
|
},
|
|
{ keyup: true, enableOnFormTags: true, enableOnContentEditable: true },
|
|
[argumentsToSubmit, selectedCommand]
|
|
)
|
|
|
|
return (
|
|
selectedCommand &&
|
|
argumentsToSubmit && (
|
|
<>
|
|
<div className="group 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" />
|
|
)}
|
|
<span data-testid="command-name">
|
|
{selectedCommand.displayName || selectedCommand.name}
|
|
</span>
|
|
</p>
|
|
{Object.entries(selectedCommand?.args || {})
|
|
.filter(([_, argConfig]) =>
|
|
typeof argConfig.required === 'function'
|
|
? argConfig.required(commandBarState.context)
|
|
: argConfig.required
|
|
)
|
|
.map(([argName, arg], i) => {
|
|
const argValue =
|
|
(typeof argumentsToSubmit[argName] === 'function'
|
|
? (argumentsToSubmit[argName] as Function)(
|
|
commandBarState.context
|
|
)
|
|
: argumentsToSubmit[argName]) || ''
|
|
|
|
return (
|
|
<button
|
|
data-testid="cmd-bar-input-tab"
|
|
data-is-current-arg={
|
|
argName === currentArgument?.name ? 'true' : 'false'
|
|
}
|
|
disabled={!isReviewing && currentArgument?.name === argName}
|
|
onClick={() => {
|
|
commandBarActor.send({
|
|
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-primary/10 dark:disabled:bg-primary/20 disabled:border-primary dark:disabled:border-primary 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'
|
|
}`}
|
|
>
|
|
<span
|
|
data-testid={`arg-name-${argName.toLowerCase()}`}
|
|
data-test-name="arg-name"
|
|
className="capitalize"
|
|
>
|
|
{argName}
|
|
</span>
|
|
<span className="sr-only">: </span>
|
|
<span data-testid="header-arg-value">
|
|
{argValue ? (
|
|
arg.inputType === 'selection' ? (
|
|
getSelectionTypeDisplayText(argValue as Selections)
|
|
) : arg.inputType === 'kcl' ? (
|
|
roundOff(
|
|
Number(
|
|
(argValue as KclCommandValue).valueCalculated
|
|
),
|
|
4
|
|
)
|
|
) : typeof argValue === 'object' ? (
|
|
arg.valueSummary ? (
|
|
arg.valueSummary(argValue)
|
|
) : (
|
|
JSON.stringify(argValue)
|
|
)
|
|
) : (
|
|
<em>
|
|
{arg.valueSummary
|
|
? arg.valueSummary(argValue)
|
|
: argValue}
|
|
</em>
|
|
)
|
|
) : null}
|
|
</span>
|
|
{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-primary dark:text-chalkboard-100">
|
|
<span className="sr-only">Hotkey: </span>
|
|
{i + 1}
|
|
</small>
|
|
)}
|
|
{arg.inputType === 'kcl' &&
|
|
!!argValue &&
|
|
typeof argValue === 'object' &&
|
|
'variableName' in (argValue as KclCommandValue) && (
|
|
<>
|
|
<CustomIcon
|
|
name="make-variable"
|
|
className="w-4 h-4"
|
|
/>
|
|
<Tooltip position="bottom">
|
|
New variable:{' '}
|
|
{
|
|
(
|
|
argumentsToSubmit[
|
|
argName
|
|
] as KclExpressionWithVariable
|
|
).variableName
|
|
}
|
|
</Tooltip>
|
|
</>
|
|
)}
|
|
</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 hover:shadow"
|
|
iconStart={{
|
|
icon: 'checkmark',
|
|
bgClassName: 'p-1 rounded-sm !bg-primary hover:brightness-110',
|
|
iconClassName: '!text-chalkboard-10',
|
|
}}
|
|
>
|
|
<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 hover:shadow"
|
|
iconStart={{
|
|
icon: 'arrowRight',
|
|
bgClassName: 'p-1 rounded-sm !bg-primary hover:brightness-110',
|
|
iconClassName: '!text-chalkboard-10',
|
|
}}
|
|
>
|
|
<span className="sr-only">Continue</span>
|
|
</ActionButton>
|
|
)
|
|
}
|
|
|
|
export default CommandBarHeader
|