Remove unnecessary props from StyleInfoFactory context param (#6634)

## Problem `metadata` and `elementPathTree` are required by the context param of `StylePlugin.styleInfoFactory`, but they weren't used by the plugins. Because of this, having to pass `metadata` and `elementPathTree` in the context param created unnecessary boilerplate ## Fix Remove `metadata` and `elementPathTree` from the context param of `StylePlugin.styleInfoFactory`, but keep the context param itself so other data can be added to the context later on.
concrete-utopia · Nov 13, 2024 · f196d14 · f196d14
1 parent 9e34bde
commit f196d14
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 16 deletions.
diff --git a/editor/src/components/canvas/canvas-strategies/canvas-strategies.tsx b/editor/src/components/canvas/canvas-strategies/canvas-strategies.tsx
@@ -225,8 +225,6 @@ export function pickCanvasStateFromEditorState(
     propertyControlsInfo: editorState.propertyControlsInfo,
     styleInfoReader: activePlugin.styleInfoFactory({
       projectContents: editorState.projectContents,
-      metadata: editorState.jsxMetadata,
-      elementPathTree: editorState.elementPathTree,
     }),
   }
 }
@@ -254,8 +252,6 @@ export function pickCanvasStateFromEditorStateWithMetadata(
     propertyControlsInfo: editorState.propertyControlsInfo,
     styleInfoReader: activePlugin.styleInfoFactory({
       projectContents: editorState.projectContents,
-      metadata: metadata,
-      elementPathTree: editorState.elementPathTree,
     }),
   }
 }

diff --git a/editor/src/components/canvas/canvas-strategies/canvas-strategy-types.ts b/editor/src/components/canvas/canvas-strategies/canvas-strategy-types.ts
@@ -110,8 +110,6 @@ export type StyleInfoReader = (elementPath: ElementPath) => StyleInfo | null
 
 export type StyleInfoFactory = (context: {
   projectContents: ProjectContentTreeRoot
-  metadata: ElementInstanceMetadataMap
-  elementPathTree: ElementPathTrees
 }) => StyleInfoReader
 
 export interface InteractionCanvasState {

diff --git a/editor/src/components/canvas/commands/adjust-css-length-command.ts b/editor/src/components/canvas/commands/adjust-css-length-command.ts
@@ -78,8 +78,6 @@ export const runAdjustCssLengthProperties = (
 
   const styleInfoReader = getActivePlugin(withConflictingPropertiesRemoved).styleInfoFactory({
     projectContents: withConflictingPropertiesRemoved.projectContents,
-    metadata: withConflictingPropertiesRemoved.jsxMetadata,
-    elementPathTree: withConflictingPropertiesRemoved.elementPathTree,
   })
 
   const styleInfo = styleInfoReader(command.target)

diff --git a/editor/src/components/canvas/controls/select-mode/flex-gap-control.tsx b/editor/src/components/canvas/controls/select-mode/flex-gap-control.tsx
@@ -139,8 +139,6 @@ export const FlexGapControl = controlForStrategyMemoized<FlexGapControlProps>((p
       maybeFlexGapData(
         getActivePlugin(store.editor).styleInfoFactory({
           projectContents: store.editor.projectContents,
-          metadata: metadata,
-          elementPathTree: store.editor.elementPathTree,
         })(selectedElement),
         MetadataUtils.findElementByElementPath(store.editor.jsxMetadata, selectedElement),
       ),

diff --git a/editor/src/components/canvas/controls/select-mode/subdued-flex-gap-controls.tsx b/editor/src/components/canvas/controls/select-mode/subdued-flex-gap-controls.tsx
@@ -43,8 +43,6 @@ export const SubduedFlexGapControl = React.memo<SubduedFlexGapControlProps>((pro
       maybeFlexGapData(
         getActivePlugin(store.editor).styleInfoFactory({
           projectContents: store.editor.projectContents,
-          metadata: store.editor.jsxMetadata,
-          elementPathTree: store.editor.elementPathTree,
         })(selectedElement),
         MetadataUtils.findElementByElementPath(store.editor.jsxMetadata, selectedElement),
       ),

diff --git a/editor/src/components/canvas/plugins/inline-style-plugin.spec.ts b/editor/src/components/canvas/plugins/inline-style-plugin.spec.ts
@@ -96,9 +96,7 @@ function getStyleInfoFromInlineStyle(editor: EditorRenderResult) {
   const { jsxMetadata, projectContents, elementPathTree } = editor.getEditorState().editor
 
   const styleInfoReader = InlineStylePlugin.styleInfoFactory({
-    metadata: jsxMetadata,
     projectContents: projectContents,
-    elementPathTree: elementPathTree,
   })
   const styleInfo = styleInfoReader(EP.fromString('sb/scene/div'))
   return styleInfo

diff --git a/editor/src/components/canvas/plugins/style-plugins.ts b/editor/src/components/canvas/plugins/style-plugins.ts
@@ -192,8 +192,6 @@ function getPropertiesToZero(
 export function patchRemovedProperties(editorState: EditorState): EditorState {
   const styleInfoReader = getActivePlugin(editorState).styleInfoFactory({
     projectContents: editorState.projectContents,
-    metadata: editorState.jsxMetadata,
-    elementPathTree: editorState.elementPathTree,
   })
 
   const propertiesUpdatedDuringInteraction = getPropertiesUpdatedDuringInteraction(editorState)