-
- {sortProject(fileContext.project?.children || []).map((fileOrDir) => (
- {
- // Reset modeling state when navigating to a new file
- modelingSend({ type: 'Cancel' })
- onNavigateToFile?.()
- }}
- key={fileOrDir.path}
- />
- ))}
-
+
+
+
+ {showNewTreeEntry && (
+
+
+ )}
+ {sortFilesAndDirectories(fileContext.project?.children || []).map(
+ (fileOrDir) => (
+
+
)
}
diff --git a/src/components/LowerRightControls.tsx b/src/components/LowerRightControls.tsx
index ad3ddb8082..41531ef42f 100644
--- a/src/components/LowerRightControls.tsx
+++ b/src/components/LowerRightControls.tsx
@@ -96,6 +96,23 @@ export function LowerRightControls({
Report a bug
+
+
+
Telemetry
+
+ Telemetry
+
+
{
editorManager.setCopilotEnabled(true)
},
- 'sketch exit execute': ({ context: { store } }) => {
- ;(async () => {
- // When cancelling the sketch mode we should disable sketch mode within the engine.
- await engineCommandManager.sendSceneCommand({
- type: 'modeling_cmd_req',
- cmd_id: uuidv4(),
- cmd: { type: 'sketch_mode_disable' },
- })
+ // tsc reports this typing as perfectly fine, but eslint is complaining.
+ // It's actually nonsensical, so I'm quieting.
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
+ 'sketch exit execute': async ({
+ context: { store },
+ }): Promise
=> {
+ // When cancelling the sketch mode we should disable sketch mode within the engine.
+ await engineCommandManager.sendSceneCommand({
+ type: 'modeling_cmd_req',
+ cmd_id: uuidv4(),
+ cmd: { type: 'sketch_mode_disable' },
+ })
- sceneInfra.camControls.syncDirection = 'clientToEngine'
+ sceneInfra.camControls.syncDirection = 'clientToEngine'
- if (cameraProjection.current === 'perspective') {
- await sceneInfra.camControls.snapToPerspectiveBeforeHandingBackControlToEngine()
- }
+ if (cameraProjection.current === 'perspective') {
+ await sceneInfra.camControls.snapToPerspectiveBeforeHandingBackControlToEngine()
+ }
- sceneInfra.camControls.syncDirection = 'engineToClient'
+ sceneInfra.camControls.syncDirection = 'engineToClient'
- store.videoElement?.pause()
+ store.videoElement?.pause()
- kclManager
- .executeCode()
- .then(() => {
- if (engineCommandManager.engineConnection?.idleMode) return
+ return kclManager
+ .executeCode()
+ .then(() => {
+ if (engineCommandManager.engineConnection?.idleMode) return
- store.videoElement?.play().catch((e) => {
- console.warn('Video playing was prevented', e)
- })
+ store.videoElement?.play().catch((e) => {
+ console.warn('Video playing was prevented', e)
})
- .catch(reportRejection)
- })().catch(reportRejection)
+ })
+ .catch(reportRejection)
},
'Set mouse state': assign(({ context, event }) => {
if (event.type !== 'Set mouse state') return {}
diff --git a/src/components/ModelingSidebar/ModelingPane.tsx b/src/components/ModelingSidebar/ModelingPane.tsx
index a5ffc079f5..2f959b4192 100644
--- a/src/components/ModelingSidebar/ModelingPane.tsx
+++ b/src/components/ModelingSidebar/ModelingPane.tsx
@@ -48,7 +48,7 @@ export const ModelingPaneHeader = ({
bgClassName: 'bg-transparent dark:bg-transparent',
}}
className="!p-0 !bg-transparent hover:text-primary border-transparent dark:!border-transparent hover:!border-primary dark:hover:!border-chalkboard-70 !outline-none"
- onClick={onClose}
+ onClick={() => onClose()}
>
Close
@@ -59,14 +59,12 @@ export const ModelingPaneHeader = ({
}
export const ModelingPane = ({
- title,
- icon,
id,
children,
className,
- Menu,
detailsTestId,
onClose,
+ title,
...props
}: ModelingPaneProps) => {
const { settings } = useSettingsAuthContext()
@@ -78,6 +76,7 @@ export const ModelingPane = ({
return (
- {children}
+ {children}
)
}
diff --git a/src/components/ModelingSidebar/ModelingPanes/DebugPane.tsx b/src/components/ModelingSidebar/ModelingPanes/DebugPane.tsx
index f96cb9ef69..c98810ded6 100644
--- a/src/components/ModelingSidebar/ModelingPanes/DebugPane.tsx
+++ b/src/components/ModelingSidebar/ModelingPanes/DebugPane.tsx
@@ -5,16 +5,18 @@ import { CamDebugSettings } from 'clientSideScene/ClientSideSceneComp'
export const DebugPane = () => {
return (
-
+
)
}
diff --git a/src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx b/src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx
index f27f412267..e43132958d 100644
--- a/src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx
+++ b/src/components/ModelingSidebar/ModelingPanes/KclEditorPane.tsx
@@ -4,7 +4,7 @@ import { Themes, getSystemTheme } from 'lib/theme'
import { useMemo, useRef } from 'react'
import { highlightSelectionMatches, searchKeymap } from '@codemirror/search'
import { lineHighlightField } from 'editor/highlightextension'
-import { roundOff } from 'lib/utils'
+import { onMouseDragMakeANewNumber, onMouseDragRegex } from 'lib/utils'
import {
lineNumbers,
rectangularSelection,
@@ -129,7 +129,9 @@ export const KclEditorPane = () => {
closeBrackets(),
highlightActiveLine(),
highlightSelectionMatches(),
- syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
+ syntaxHighlighting(defaultHighlightStyle, {
+ fallback: true,
+ }),
rectangularSelection(),
dropCursor(),
interact({
@@ -137,29 +139,12 @@ export const KclEditorPane = () => {
// a rule for a number dragger
{
// the regexp matching the value
- regexp: /-?\b\d+\.?\d*\b/g,
+ regexp: onMouseDragRegex,
// set cursor to "ew-resize" on hover
cursor: 'ew-resize',
// change number value based on mouse X movement on drag
onDrag: (text, setText, e) => {
- const multiplier =
- e.shiftKey && e.metaKey
- ? 0.01
- : e.metaKey
- ? 0.1
- : e.shiftKey
- ? 10
- : 1
-
- const delta = e.movementX * multiplier
-
- const newVal = roundOff(
- Number(text) + delta,
- multiplier === 0.01 ? 2 : multiplier === 0.1 ? 1 : 0
- )
-
- if (isNaN(newVal)) return
- setText(newVal.toString())
+ onMouseDragMakeANewNumber(text, setText, e)
},
},
],
@@ -174,27 +159,31 @@ export const KclEditorPane = () => {
const initialCode = useRef(codeManager.code)
return (
-
-
{
- if (_editorView === null) return
+
+
+ {
+ if (_editorView === null) return
- editorManager.setEditorView(_editorView)
+ editorManager.setEditorView(_editorView)
- // On first load of this component, ensure we show the current errors
- // in the editor.
- // Make sure we don't add them twice.
- if (diagnosticCount(_editorView.state) === 0) {
- kclManager.setDiagnosticsForCurrentErrors()
- }
- }}
- />
+ // On first load of this component, ensure we show the current errors
+ // in the editor.
+ // Make sure we don't add them twice.
+ if (diagnosticCount(_editorView.state) === 0) {
+ kclManager.setDiagnosticsForCurrentErrors()
+ }
+ }}
+ />
+
createFile({ dryRun: true })}
+ onCreateFolder={() => createFolder({ dryRun: true })}
+ />
+ }
+ onClose={props.onClose}
+ />
+ createFile({ dryRun: false, name })}
+ onCreateFolder={(name: string) =>
+ createFolder({ dryRun: false, name })
+ }
+ newTreeEntry={newTreeEntry}
+ />
+
+ )
+ },
keybinding: 'Shift + F',
- Menu: FileTreeMenu,
hide: ({ platform }) => platform === 'web',
},
{
id: 'variables',
- title: 'Variables',
icon: 'make-variable',
- Content: MemoryPane,
- Menu: MemoryPaneMenu,
+ sidebarName: 'Variables',
+ Content: (props: { id: SidebarType; onClose: () => void }) => {
+ return (
+ <>
+