Remove unnecessary DerivedState from commands (#4335)

concrete-utopia · Oct 6, 2023 · 6b17499 · 6b17499
1 parent f37dc8a
commit 6b17499
Show file tree

Hide file tree

Showing 68 changed files with 155 additions and 462 deletions.
diff --git a/editor/src/components/canvas/canvas-strategies/canvas-strategies.spec.browser2.tsx b/editor/src/components/canvas/canvas-strategies/canvas-strategies.spec.browser2.tsx
@@ -175,7 +175,6 @@ describe('Strategy Fitness', () => {
       RegisteredCanvasStrategies,
       pickCanvasStateFromEditorState(
         renderResult.getEditorState().editor,
-        renderResult.getEditorState().derived,
         renderResult.getEditorState().builtInDependencies,
       ),
       interactionSession,
@@ -225,7 +224,6 @@ describe('Strategy Fitness', () => {
       RegisteredCanvasStrategies,
       pickCanvasStateFromEditorState(
         renderResult.getEditorState().editor,
-        renderResult.getEditorState().derived,
         renderResult.getEditorState().builtInDependencies,
       ),
       interactionSession,
@@ -316,7 +314,6 @@ describe('Strategy Fitness', () => {
       RegisteredCanvasStrategies,
       pickCanvasStateFromEditorState(
         renderResult.getEditorState().editor,
-        renderResult.getEditorState().derived,
         renderResult.getEditorState().builtInDependencies,
       ),
       interactionSession,
@@ -366,7 +363,6 @@ describe('Strategy Fitness', () => {
       RegisteredCanvasStrategies,
       pickCanvasStateFromEditorState(
         renderResult.getEditorState().editor,
-        renderResult.getEditorState().derived,
         renderResult.getEditorState().builtInDependencies,
       ),
       interactionSession,
@@ -416,7 +412,6 @@ describe('Strategy Fitness', () => {
       RegisteredCanvasStrategies,
       pickCanvasStateFromEditorState(
         renderResult.getEditorState().editor,
-        renderResult.getEditorState().derived,
         renderResult.getEditorState().builtInDependencies,
       ),
       interactionSession,

diff --git a/editor/src/components/canvas/canvas-strategies/canvas-strategies.tsx b/editor/src/components/canvas/canvas-strategies/canvas-strategies.tsx
@@ -170,15 +170,13 @@ export const RegisteredCanvasStrategies: Array<MetaCanvasStrategy> = [
 
 export function pickCanvasStateFromEditorState(
   editorState: EditorState,
-  derivedState: DerivedState,
   builtInDependencies: BuiltInDependencies,
 ): InteractionCanvasState {
   return {
     builtInDependencies: builtInDependencies,
     interactionTarget: getInteractionTargetFromEditorState(editorState),
     projectContents: editorState.projectContents,
     nodeModules: editorState.nodeModules.files,
-    remixRoutingTable: derivedState.remixData?.routingTable ?? null,
     openFile: editorState.canvas.openFile?.filename,
     scale: editorState.canvas.scale,
     canvasOffset: editorState.canvas.roundedCanvasOffset,
@@ -190,7 +188,6 @@ export function pickCanvasStateFromEditorState(
 
 export function pickCanvasStateFromEditorStateWithMetadata(
   editorState: EditorState,
-  derivedState: DerivedState,
   builtInDependencies: BuiltInDependencies,
   metadata: ElementInstanceMetadataMap,
   allElementProps?: AllElementProps,
@@ -200,7 +197,6 @@ export function pickCanvasStateFromEditorStateWithMetadata(
     interactionTarget: getInteractionTargetFromEditorState(editorState),
     projectContents: editorState.projectContents,
     nodeModules: editorState.nodeModules.files,
-    remixRoutingTable: derivedState.remixData?.routingTable ?? null,
     openFile: editorState.canvas.openFile?.filename,
     scale: editorState.canvas.scale,
     canvasOffset: editorState.canvas.roundedCanvasOffset,
@@ -267,7 +263,7 @@ const getApplicableStrategiesSelector = createSelector(
       store.strategyState.sortedApplicableStrategies,
     ),
   (store: EditorStorePatched): InteractionCanvasState => {
-    return pickCanvasStateFromEditorState(store.editor, store.derived, store.builtInDependencies)
+    return pickCanvasStateFromEditorState(store.editor, store.builtInDependencies)
   },
   (store: EditorStorePatched) => store.editor.canvas.interactionSession,
   (store: EditorStorePatched) => store.strategyState.customStrategyState,

diff --git a/editor/src/components/canvas/canvas-strategies/canvas-strategy-types.ts b/editor/src/components/canvas/canvas-strategies/canvas-strategy-types.ts
@@ -90,7 +90,6 @@ export interface InteractionCanvasState {
   interactionTarget: InteractionTarget
   projectContents: ProjectContentTreeRoot
   nodeModules: NodeModules
-  remixRoutingTable: RemixRoutingTable | null
   builtInDependencies: BuiltInDependencies
   openFile: string | null | undefined
   scale: number

diff --git a/editor/src/components/canvas/canvas-strategies/post-action-options/navigator-reparent.ts b/editor/src/components/canvas/canvas-strategies/post-action-options/navigator-reparent.ts
@@ -43,7 +43,6 @@ import { staticReparentAndUpdatePosition } from './post-action-paste'
 function getNavigatorReparentCommands(
   data: NavigatorReparentPostActionMenuData,
   editor: EditorState,
-  derivedState: DerivedState,
   builtInDependencies: BuiltInDependencies,
 ): Array<CanvasCommand> | null {
   const wrapperUID = generateUidWithExistingComponents(editor.projectContents)
@@ -121,7 +120,6 @@ function getNavigatorReparentCommands(
       openFile: editor.canvas.openFile?.filename ?? null,
       pasteTargetsToIgnore: [],
       projectContents: editor.projectContents,
-      remixRoutingTable: derivedState.remixData?.routingTable ?? null,
       startingMetadata: editor.jsxMetadata,
       startingElementPathTrees: editor.elementPathTree,
       startingAllElementProps: editor.allElementProps,
@@ -153,7 +151,7 @@ export const PropsPreservedNavigatorReparentPostActionChoice = (
   name: 'Reparent with variables preserved',
   id: PropsPreservedNavigatorReparentPostActionChoiceId,
   run: (editor, derived, builtInDependencies) =>
-    getNavigatorReparentCommands(data, editor, derived, builtInDependencies),
+    getNavigatorReparentCommands(data, editor, builtInDependencies),
 })
 
 export const PropsReplacedNavigatorReparentPostActionChoiceId =
@@ -188,12 +186,7 @@ export const PropsReplacedNavigatorReparentPostActionChoice = (
     name: 'Reparent with variables replaced',
     id: PropsReplacedNavigatorReparentPostActionChoiceId,
     run: (editor, derived, builtInDependencies) => {
-      const reparentCommands = getNavigatorReparentCommands(
-        data,
-        editor,
-        derived,
-        builtInDependencies,
-      )
+      const reparentCommands = getNavigatorReparentCommands(data, editor, builtInDependencies)
       if (reparentCommands == null) {
         return null
       }

diff --git a/editor/src/components/canvas/canvas-strategies/post-action-options/post-action-paste.ts b/editor/src/components/canvas/canvas-strategies/post-action-options/post-action-paste.ts
@@ -72,7 +72,6 @@ import type { PostActionChoice } from './post-action-options'
 interface EditorStateContext {
   projectContents: ProjectContentTreeRoot
   nodeModules: NodeModules
-  remixRoutingTable: RemixRoutingTable | null
   openFile: string | null
   pasteTargetsToIgnore: Array<ElementPath>
   builtInDependencies: BuiltInDependencies
@@ -267,7 +266,7 @@ export function staticReparentAndUpdatePosition(
 
   const commands = elementsToInsert.flatMap((elementToInsert) => {
     return [
-      updateFunctionCommand('always', (editor, derivedState, commandLifecycle) => {
+      updateFunctionCommand('always', (editor, commandLifecycle) => {
         const newPath = oldPathToNewPathMapping[EP.toString(elementToInsert.elementPath)]
 
         if (newPath == null) {
@@ -316,7 +315,6 @@ export function staticReparentAndUpdatePosition(
 
         return foldAndApplyCommandsInner(
           editor,
-          derivedState,
           [],
           [...propertyCommands, updateSelectedViews('always', [...editor.selectedViews, newPath])],
           commandLifecycle,
@@ -370,7 +368,6 @@ export const PropsPreservedPastePostActionChoice = (
         openFile: store.canvas.openFile?.filename ?? null,
         pasteTargetsToIgnore: postActionMenuData.pasteTargetsToIgnore,
         projectContents: store.projectContents,
-        remixRoutingTable: derived.remixData?.routingTable ?? null,
         startingMetadata: store.jsxMetadata,
         startingElementPathTrees: store.elementPathTree,
         startingAllElementProps: store.allElementProps,
@@ -411,7 +408,6 @@ export const PropsReplacedPastePostActionChoice = (
           openFile: store.canvas.openFile?.filename ?? null,
           pasteTargetsToIgnore: postActionMenuData.pasteTargetsToIgnore,
           projectContents: store.projectContents,
-          remixRoutingTable: derived.remixData?.routingTable ?? null,
           startingMetadata: store.jsxMetadata,
           startingElementPathTrees: store.elementPathTree,
           startingAllElementProps: store.allElementProps,
@@ -469,7 +465,6 @@ export const PropsPreservedPasteHerePostActionChoice = (
         openFile: editor.canvas.openFile?.filename ?? null,
         pasteTargetsToIgnore: [],
         projectContents: editor.projectContents,
-        remixRoutingTable: derived.remixData?.routingTable ?? null,
         startingMetadata: editor.jsxMetadata,
         startingElementPathTrees: editor.elementPathTree,
         startingAllElementProps: editor.allElementProps,
@@ -537,7 +532,6 @@ export const PropsReplacedPasteHerePostActionChoice = (
           openFile: editor.canvas.openFile?.filename ?? null,
           pasteTargetsToIgnore: [],
           projectContents: editor.projectContents,
-          remixRoutingTable: derived.remixData?.routingTable ?? null,
           startingMetadata: editor.jsxMetadata,
           startingElementPathTrees: editor.elementPathTree,
           startingAllElementProps: editor.allElementProps,
@@ -698,7 +692,7 @@ function pasteToReplaceCommands(
 
   const pasteCommands = targets.flatMap((target) => {
     return [
-      updateFunctionCommand('always', (updatedEditor, updatedDerivedState, commandLifecycle) => {
+      updateFunctionCommand('always', (updatedEditor, commandLifecycle) => {
         const element = MetadataUtils.findElementByElementPath(editor.jsxMetadata, target)
         const position = MetadataUtils.getFrameOrZeroRectInCanvasCoords(target, editor.jsxMetadata)
         const strategy = MetadataUtils.isPositionAbsolute(element)
@@ -735,7 +729,6 @@ function pasteToReplaceCommands(
             openFile: editor.canvas.openFile?.filename ?? null,
             pasteTargetsToIgnore: [],
             projectContents: updatedEditor.projectContents,
-            remixRoutingTable: updatedDerivedState.remixData?.routingTable ?? null,
             startingMetadata: editor.jsxMetadata,
             startingElementPathTrees: editor.elementPathTree,
             startingAllElementProps: editor.allElementProps,
@@ -757,13 +750,7 @@ function pasteToReplaceCommands(
         if (commands == null) {
           return []
         }
-        return foldAndApplyCommandsInner(
-          updatedEditor,
-          updatedDerivedState,
-          [],
-          commands,
-          commandLifecycle,
-        ).statePatches
+        return foldAndApplyCommandsInner(updatedEditor, [], commands, commandLifecycle).statePatches
       }),
     ]
   }, [] as Array<CanvasCommand>)

diff --git a/...r/src/components/canvas/canvas-strategies/strategies/absolute-duplicate-strategy.spec.tsx b/...r/src/components/canvas/canvas-strategies/strategies/absolute-duplicate-strategy.spec.tsx
@@ -1,5 +1,4 @@
 import type { EditorState } from '../../../editor/store/editor-state'
-import { emptyDerivedState } from '../../../editor/store/editor-state'
 import { elementPath } from '../../../../core/shared/element-path'
 import type { ElementPath } from '../../../../core/shared/project-file-types'
 import { getEditorState, makeTestProjectCodeWithSnippet } from '../../ui-jsx.test-utils'
@@ -13,10 +12,7 @@ import type { CanvasVector } from '../../../../core/shared/math-utils'
 import { canvasPoint, canvasRectangle, localRectangle } from '../../../../core/shared/math-utils'
 import type { Modifiers } from '../../../../utils/modifiers'
 import { altModifier } from '../../../../utils/modifiers'
-import {
-  pickCanvasStateFromEditorState,
-  pickCanvasStateFromEditorStateWithMetadata,
-} from '../canvas-strategies'
+import { pickCanvasStateFromEditorStateWithMetadata } from '../canvas-strategies'
 import type { InteractionSession } from '../interaction-state'
 import { boundingArea } from '../interaction-state'
 import { createMouseInteractionForTests } from '../interaction-state.test-utils'
@@ -79,7 +75,6 @@ function dragByPixelsIsApplicable(
     absoluteDuplicateStrategy(
       pickCanvasStateFromEditorStateWithMetadata(
         editorState,
-        emptyDerivedState(editorState),
         createBuiltInDependenciesList(null),
         metadata,
       ),

diff --git a/editor/src/components/canvas/canvas-strategies/strategies/absolute-duplicate-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/absolute-duplicate-strategy.tsx
@@ -129,11 +129,10 @@ export function absoluteDuplicateStrategy(
             ...maybeAddContainLayoutCommand(commonParentPath),
             setElementsToRerenderCommand([...selectedElements, ...newPaths]),
             updateSelectedViews('always', selectedElements),
-            updateFunctionCommand('always', (editorState, derivedState, commandLifecycle) =>
+            updateFunctionCommand('always', (editorState, commandLifecycle) =>
               runMoveStrategy(
                 canvasState,
                 editorState,
-                derivedState,
                 interactionSession,
                 commandLifecycle,
                 strategyLifecycle,
@@ -156,7 +155,6 @@ export function absoluteDuplicateStrategy(
 function runMoveStrategy(
   canvasState: InteractionCanvasState,
   editorState: EditorState,
-  derivedState: DerivedState,
   interactionSession: InteractionSession,
   commandLifecycle: InteractionLifecycle,
   strategyLifecycle: InteractionLifecycle,
@@ -169,8 +167,7 @@ function runMoveStrategy(
       'do-not-run-applicability-check',
     )?.strategy.apply(strategyLifecycle).commands ?? []
 
-  return foldAndApplyCommandsInner(editorState, derivedState, [], moveCommands, commandLifecycle)
-    .statePatches
+  return foldAndApplyCommandsInner(editorState, [], moveCommands, commandLifecycle).statePatches
 }
 
 type IsAbsoluteMoveApplicableResult =

diff --git a/...components/canvas/canvas-strategies/strategies/absolute-reparent-strategy-canvas.spec.tsx b/...components/canvas/canvas-strategies/strategies/absolute-reparent-strategy-canvas.spec.tsx
@@ -21,7 +21,6 @@ import {
 import type { CanvasPoint } from '../../../../core/shared/math-utils'
 import { canvasPoint, canvasRectangle } from '../../../../core/shared/math-utils'
 import type { EditorState } from '../../../editor/store/editor-state'
-import { emptyDerivedState } from '../../../editor/store/editor-state'
 import { foldAndApplyCommands } from '../../commands/commands'
 import {
   getEditorStateWithSelectedViews,
@@ -134,7 +133,6 @@ function reparentElement(
 
   const canvasState = pickCanvasStateFromEditorStateWithMetadata(
     editorState,
-    emptyDerivedState(editorState),
     createBuiltInDependenciesList(null),
     startingMetadata,
   )
@@ -164,7 +162,6 @@ function reparentElement(
 
   const finalEditor = foldAndApplyCommands(
     editorState,
-    emptyDerivedState(editorState),
     editorState,
     [],
     strategyResult.commands,

diff --git a/...ponents/canvas/canvas-strategies/strategies/absolute-reparent-strategy-only-move.spec.tsx b/...ponents/canvas/canvas-strategies/strategies/absolute-reparent-strategy-only-move.spec.tsx
@@ -5,26 +5,22 @@ import type {
   SpecialSizeMeasurements,
 } from '../../../../core/shared/element-template'
 import type { CanvasVector } from '../../../../core/shared/math-utils'
-import { CanvasPoint, canvasPoint, canvasRectangle } from '../../../../core/shared/math-utils'
+import { canvasPoint, canvasRectangle } from '../../../../core/shared/math-utils'
 import type { ElementPath } from '../../../../core/shared/project-file-types'
 import type { Modifiers } from '../../../../utils/modifiers'
 import { cmdModifier } from '../../../../utils/modifiers'
 import type { AllElementProps, EditorState } from '../../../editor/store/editor-state'
-import { emptyDerivedState } from '../../../editor/store/editor-state'
 import { foldAndApplyCommands } from '../../commands/commands'
 import {
   getEditorState,
   makeTestProjectCodeWithSnippet,
   testPrintCodeFromEditorState,
 } from '../../ui-jsx.test-utils'
 import { absoluteMoveStrategy } from './absolute-move-strategy'
-import {
-  pickCanvasStateFromEditorState,
-  pickCanvasStateFromEditorStateWithMetadata,
-} from '../canvas-strategies'
+import { pickCanvasStateFromEditorStateWithMetadata } from '../canvas-strategies'
 import { defaultCustomStrategyState } from '../canvas-strategy-types'
 import type { InteractionSession } from '../interaction-state'
-import { boundingArea, StrategyState } from '../interaction-state'
+import { boundingArea } from '../interaction-state'
 import { createMouseInteractionForTests } from '../interaction-state.test-utils'
 
 jest.mock('../../canvas-utils', () => ({
@@ -104,7 +100,6 @@ function dragByPixels(
   const strategyResult = absoluteMoveStrategy(
     pickCanvasStateFromEditorStateWithMetadata(
       editorState,
-      emptyDerivedState(editorState),
       createBuiltInDependenciesList(null),
       startingMetadata,
       startingAllElementProps,
@@ -118,7 +113,6 @@ function dragByPixels(
 
   const finalEditor = foldAndApplyCommands(
     editorState,
-    emptyDerivedState(editorState),
     editorState,
     [],
     strategyResult.commands,

diff --git a/...or/src/components/canvas/canvas-strategies/strategies/absolute-reparent-strategy.spec.tsx b/...or/src/components/canvas/canvas-strategies/strategies/absolute-reparent-strategy.spec.tsx
@@ -15,7 +15,7 @@ import {
 import type { CanvasPoint } from '../../../../core/shared/math-utils'
 import { canvasPoint, canvasRectangle } from '../../../../core/shared/math-utils'
 import type { EditorState } from '../../../editor/store/editor-state'
-import { deriveState, emptyDerivedState } from '../../../editor/store/editor-state'
+import { deriveState } from '../../../editor/store/editor-state'
 import { patchedCreateRemixDerivedDataMemo } from '../../../editor/store/remix-derived-data'
 import { foldAndApplyCommands } from '../../commands/commands'
 import {
@@ -202,7 +202,6 @@ function reparentElement(
 
   const canvasState = pickCanvasStateFromEditorStateWithMetadata(
     editorState,
-    deriveState(editorState, null, 'patched', patchedCreateRemixDerivedDataMemo),
     createBuiltInDependenciesList(null),
     startingMetadata,
   )
@@ -234,7 +233,6 @@ function reparentElement(
 
     return foldAndApplyCommands(
       editorState,
-      emptyDerivedState(editorState),
       editorState,
       [],
       strategyResult.commands,