Specify elements to rerender in reparent & move strategies (#6448)

## Description Fill out `StrategyApplicationResult.elementsToRerender` with the element path of the affected elements in some reparent, insert and drag strategies
concrete-utopia · Oct 2, 2024 · 2706fcf · 2706fcf
1 parent 167ff05
commit 2706fcf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 29 deletions.
diff --git a/editor/src/components/canvas/canvas-strategies/strategies/absolute-reparent-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/absolute-reparent-strategy.tsx
@@ -231,12 +231,12 @@ export function applyAbsoluteReparent(
             },
           )
         } else {
-          const moveCommands =
+          return (
             absoluteMoveStrategy(canvasState, interactionSession, {
               ...defaultCustomStrategyState(),
               action: 'reparent',
-            })?.strategy.apply(strategyLifecycle).commands ?? []
-          return strategyApplicationResult(moveCommands, 'rerender-all-elements')
+            })?.strategy.apply(strategyLifecycle) ?? emptyStrategyApplicationResult
+          )
         }
       },
     )

diff --git a/.../components/canvas/canvas-strategies/strategies/convert-to-absolute-and-move-strategy.tsx b/.../components/canvas/canvas-strategies/strategies/convert-to-absolute-and-move-strategy.tsx
@@ -280,10 +280,7 @@ function convertToAbsoluteAndMoveStrategyFactory(setHuggingParentToFixed: SetHug
 
           return strategyApplicationResult(
             [...absoluteMoveApplyResult.commands, strategyIndicatorCommand],
-            // FIXME: This was added as a default value in https://github.com/concrete-utopia/utopia/pull/6408
-            // This was to maintain the existing behaviour, but it should be replaced with a more specific value
-            // appropriate to this particular case.
-            'rerender-all-elements',
+            absoluteMoveApplyResult.elementsToRerender,
           )
         }
         // Fallback for when the checks above are not satisfied.

diff --git a/editor/src/components/canvas/canvas-strategies/strategies/drag-to-insert-metastrategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/drag-to-insert-metastrategy.tsx
@@ -281,10 +281,7 @@ function dragToInsertStrategyFactory(
               reparentCommand,
               ...optionalWrappingCommand,
             ],
-            // FIXME: This was added as a default value in https://github.com/concrete-utopia/utopia/pull/6408
-            // This was to maintain the existing behaviour, but it should be replaced with a more specific value
-            // appropriate to this particular case.
-            'rerender-all-elements',
+            [targetParent.intendedParentPath],
             {
               strategyGeneratedUidsCache: {
                 [insertionSubjects[0].uid]: maybeWrapperWithUid?.uid,

diff --git a/editor/src/components/canvas/canvas-strategies/strategies/draw-to-insert-metastrategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/draw-to-insert-metastrategy.tsx
@@ -303,10 +303,7 @@ export function drawToInsertStrategyFactory(
                   resizeCommand,
                   ...optionalWrappingCommand,
                 ],
-                // FIXME: This was added as a default value in https://github.com/concrete-utopia/utopia/pull/6408
-                // This was to maintain the existing behaviour, but it should be replaced with a more specific value
-                // appropriate to this particular case.
-                'rerender-all-elements',
+                [targetParent.intendedParentPath],
                 {
                   strategyGeneratedUidsCache: {
                     [insertionSubject.uid]: maybeWrapperWithUid?.uid,
@@ -352,10 +349,7 @@ export function drawToInsertStrategyFactory(
 
               return strategyApplicationResult(
                 [insertionCommand.command, reparentCommand, ...optionalWrappingCommand],
-                // FIXME: This was added as a default value in https://github.com/concrete-utopia/utopia/pull/6408
-                // This was to maintain the existing behaviour, but it should be replaced with a more specific value
-                // appropriate to this particular case.
-                'rerender-all-elements',
+                [targetParent.intendedParentPath],
                 {
                   strategyGeneratedUidsCache: {
                     [insertionSubject.uid]: maybeWrapperWithUid?.uid,

diff --git a/editor/src/components/canvas/canvas-strategies/strategies/draw-to-insert-text-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/draw-to-insert-text-strategy.tsx
@@ -126,10 +126,7 @@ export const drawToInsertTextMetaStrategy: MetaCanvasStrategy = (
                 },
               }),
             ],
-            // FIXME: This was added as a default value in https://github.com/concrete-utopia/utopia/pull/6408
-            // This was to maintain the existing behaviour, but it should be replaced with a more specific value
-            // appropriate to this particular case.
-            'rerender-all-elements',
+            [targetParent.intendedParentPath],
           )
         }
 

diff --git a/...r/src/components/canvas/canvas-strategies/strategies/reparent-helpers/reparent-helpers.ts b/...r/src/components/canvas/canvas-strategies/strategies/reparent-helpers/reparent-helpers.ts
@@ -249,12 +249,7 @@ export function ifAllowedToReparent(
   if (allowed) {
     return ifAllowed()
   } else {
-    return strategyApplicationResult(
-      [setCursorCommand(CSSCursor.NotPermitted)],
-      'rerender-all-elements',
-      {},
-      'failure',
-    )
+    return strategyApplicationResult([setCursorCommand(CSSCursor.NotPermitted)], [], {}, 'failure')
   }
 }