* Rename useCalc * Move CommandBar so it has access to settings and kcl * Create codemirror variable mention extension * Make project path a dep of TextEditor useMemo * Add incomplete KCL input for CommandBar to replace current number arg type * Add previous variables autocompletion to kcl input * Fix missed typos from merge * Working AST mods, not working variable additions * Add ability to create a new variable * Add icon and tooltip to command arg tag if a variable is added * Polish variable naming logic, preserve when going back * Allow stepping back from KCL input * Don't prevent keydown of enter, it's used by autocomplete * Round the variable value in cmd bar header * Add Playwright test * Formatting, polish TS types * More type wrangling * Needed to fmt after above type wrangling * Update snapshot tests to account for new variable name autogeneration * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * Merge branch 'main' into cmd-bar-make-variable * Update all test instances of var name with number index after merge with main * Partial revert of "Polish variable naming logic, preserve when going back" This reverts commitdddcb13c36
. * Revert "Update all test instances of var name with number index after merge with main" This reverts commit8c4b63b523
. * Revert "Update snapshot tests to account for new variable name autogeneration" This reverts commit11bfce3832
. * Retry a refactoring of findUniqueName * minor feedback from @jgomez720 - better highlighting of kcl input - consistent hotkeys - disallow invalid var names * Polish stepping back state logic * Fix tests now that keyboard shortcut changed * Remove unused imports * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * Fix tests * Trigger CI * Update src/components/ProjectSidebarMenu.test.tsx * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * re-trigger CI --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch>
96 lines
3.2 KiB
TypeScript
96 lines
3.2 KiB
TypeScript
import { Dialog, Transition } from '@headlessui/react'
|
|
import { Fragment } from 'react'
|
|
import { CreateNewVariable } from './AvailableVarsHelpers'
|
|
import { ActionButton } from './ActionButton'
|
|
import { faPlus } from '@fortawesome/free-solid-svg-icons'
|
|
import { toast } from 'react-hot-toast'
|
|
import { type InstanceProps, create } from 'react-modal-promise'
|
|
import { useCalculateKclExpression } from 'lib/useCalculateKclExpression'
|
|
|
|
type ModalResolve = { variableName: string }
|
|
type ModalReject = boolean
|
|
type SetVarNameModalProps = InstanceProps<ModalResolve, ModalReject> & {
|
|
valueName: string
|
|
}
|
|
|
|
export const createSetVarNameModal = create<
|
|
SetVarNameModalProps,
|
|
ModalResolve,
|
|
ModalReject
|
|
>
|
|
|
|
export const SetVarNameModal = ({
|
|
isOpen,
|
|
onResolve,
|
|
onReject,
|
|
valueName,
|
|
}: SetVarNameModalProps) => {
|
|
const { isNewVariableNameUnique, newVariableName, setNewVariableName } =
|
|
useCalculateKclExpression({ value: '', initialVariableName: valueName })
|
|
|
|
return (
|
|
<Transition appear show={isOpen} as={Fragment}>
|
|
<Dialog
|
|
as="div"
|
|
className="fixed inset-0 z-40 overflow-y-auto p-4 pt-[25vh]"
|
|
onClose={onReject}
|
|
>
|
|
<Transition.Child
|
|
as={Fragment}
|
|
enter="ease-out duration-300"
|
|
enterFrom="opacity-0 translate-y-4"
|
|
enterTo="opacity-100 translate-y-0"
|
|
leave="ease-in duration-75"
|
|
leaveFrom="opacity-100"
|
|
leaveTo="opacity-0"
|
|
>
|
|
<Dialog.Overlay className="fixed inset-0 bg-chalkboard-10/70 dark:bg-chalkboard-110/50" />
|
|
</Transition.Child>
|
|
|
|
<Transition.Child
|
|
as={Fragment}
|
|
enter="ease-out duration-300"
|
|
enterFrom="opacity-0 scale-95"
|
|
enterTo="opacity-100 scale-100"
|
|
leave="ease-in duration-200"
|
|
leaveFrom="opacity-100 scale-100"
|
|
leaveTo="opacity-0 scale-95"
|
|
>
|
|
<Dialog.Panel className="rounded relative mx-auto px-4 py-8 bg-chalkboard-10 dark:bg-chalkboard-100 border dark:border-chalkboard-70 max-w-xl w-full shadow-lg">
|
|
<form
|
|
onSubmit={(e) => {
|
|
e.preventDefault()
|
|
onResolve({
|
|
variableName: newVariableName,
|
|
})
|
|
toast.success(`Added variable ${newVariableName}`)
|
|
}}
|
|
>
|
|
<CreateNewVariable
|
|
setNewVariableName={setNewVariableName}
|
|
newVariableName={newVariableName}
|
|
isNewVariableNameUnique={isNewVariableNameUnique}
|
|
shouldCreateVariable={true}
|
|
showCheckbox={false}
|
|
/>
|
|
<div className="mt-8 flex justify-between">
|
|
<ActionButton
|
|
Element="button"
|
|
type="submit"
|
|
disabled={!isNewVariableNameUnique}
|
|
icon={{ icon: faPlus }}
|
|
>
|
|
Add variable
|
|
</ActionButton>
|
|
<ActionButton Element="button" onClick={() => onReject(false)}>
|
|
Cancel
|
|
</ActionButton>
|
|
</div>
|
|
</form>
|
|
</Dialog.Panel>
|
|
</Transition.Child>
|
|
</Dialog>
|
|
</Transition>
|
|
)
|
|
}
|