diff --git a/editor/src/components/canvas/canvas-strategies/strategies/absolute-resize-bounding-box-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/absolute-resize-bounding-box-strategy.tsx index 25fef072f5bb..8942da7ab335 100644 --- a/editor/src/components/canvas/canvas-strategies/strategies/absolute-resize-bounding-box-strategy.tsx +++ b/editor/src/components/canvas/canvas-strategies/strategies/absolute-resize-bounding-box-strategy.tsx @@ -120,6 +120,7 @@ export function absoluteResizeBoundingBoxStrategy( props: { targets: originalTargets, pathsWereReplaced: pathsWereReplaced }, key: 'absolute-resize-control', show: 'visible-except-when-other-strategy-is-active', + priority: 'top', }), controlWithProps({ control: ZeroSizeResizeControlWrapper, diff --git a/editor/src/components/canvas/canvas-strategies/strategies/basic-resize-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/basic-resize-strategy.tsx index 5135bee92379..1ea457c5036a 100644 --- a/editor/src/components/canvas/canvas-strategies/strategies/basic-resize-strategy.tsx +++ b/editor/src/components/canvas/canvas-strategies/strategies/basic-resize-strategy.tsx @@ -102,6 +102,7 @@ export function basicResizeStrategy( props: { targets: selectedElements, pathsWereReplaced: false }, key: 'absolute-resize-control', show: 'always-visible', + priority: 'top', }), controlWithProps({ control: ZeroSizeResizeControlWrapper, diff --git a/editor/src/components/canvas/canvas-strategies/strategies/flex-resize-basic-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/flex-resize-basic-strategy.tsx index 12b843038f08..1ecb3e442b9e 100644 --- a/editor/src/components/canvas/canvas-strategies/strategies/flex-resize-basic-strategy.tsx +++ b/editor/src/components/canvas/canvas-strategies/strategies/flex-resize-basic-strategy.tsx @@ -107,6 +107,7 @@ export function flexResizeBasicStrategy( props: { targets: selectedElements, pathsWereReplaced: false }, key: 'absolute-resize-control', show: 'always-visible', + priority: 'top', }), controlWithProps({ control: ZeroSizeResizeControlWrapper, diff --git a/editor/src/components/canvas/canvas-strategies/strategies/flex-resize-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/flex-resize-strategy.tsx index 1197e3c9fe62..b8d0f8860531 100644 --- a/editor/src/components/canvas/canvas-strategies/strategies/flex-resize-strategy.tsx +++ b/editor/src/components/canvas/canvas-strategies/strategies/flex-resize-strategy.tsx @@ -127,6 +127,7 @@ export function flexResizeStrategy( props: { targets: selectedElements, pathsWereReplaced: false }, key: 'absolute-resize-control', show: 'always-visible', + priority: 'top', }), controlWithProps({ control: ZeroSizeResizeControlWrapper, diff --git a/editor/src/components/canvas/canvas-strategies/strategies/keyboard-absolute-resize-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/keyboard-absolute-resize-strategy.tsx index 70f8b5e5a474..b1ebec5d2fe6 100644 --- a/editor/src/components/canvas/canvas-strategies/strategies/keyboard-absolute-resize-strategy.tsx +++ b/editor/src/components/canvas/canvas-strategies/strategies/keyboard-absolute-resize-strategy.tsx @@ -166,6 +166,7 @@ export function keyboardAbsoluteResizeStrategy( props: { targets: selectedElements, pathsWereReplaced: pathsWereReplaced }, key: 'absolute-resize-control', show: 'visible-except-when-other-strategy-is-active', + priority: 'top', }), ], fitness: getFitness(interactionSession), diff --git a/editor/src/components/canvas/canvas-strategies/strategies/resize-grid-strategy.ts b/editor/src/components/canvas/canvas-strategies/strategies/resize-grid-strategy.ts index c3ba580f450c..a2f66e3a36af 100644 --- a/editor/src/components/canvas/canvas-strategies/strategies/resize-grid-strategy.ts +++ b/editor/src/components/canvas/canvas-strategies/strategies/resize-grid-strategy.ts @@ -75,7 +75,6 @@ export const resizeGridStrategy: CanvasStrategyFactory = ( props: { target: gridPath }, key: `grid-row-col-resize-controls-${EP.toString(gridPath)}`, show: 'always-visible', - priority: 'top', }, controlsForGridPlaceholders(gridPath), ], diff --git a/editor/src/core/performance/__snapshots__/performance-regression-tests.spec.tsx.snap b/editor/src/core/performance/__snapshots__/performance-regression-tests.spec.tsx.snap index cb4873639caa..d563c0adb06c 100644 --- a/editor/src/core/performance/__snapshots__/performance-regression-tests.spec.tsx.snap +++ b/editor/src/core/performance/__snapshots__/performance-regression-tests.spec.tsx.snap @@ -58,6 +58,8 @@ Array [ "/UtopiaSpiedExoticType(Symbol(react.fragment))/UtopiaSpiedExoticType(Symbol(react.fragment))/GridMeasurementHelpers/Symbol(react.memo)()", "/UtopiaSpiedExoticType(Symbol(react.fragment))/GridMeasurementHelpers//div", "/null/Symbol(react.memo)()//Symbol(react.memo)()", + "/Symbol(react.memo)()///UtopiaSpiedExoticType(Symbol(react.fragment))", + "/null/Symbol(react.memo)()//Symbol(react.memo)()", "/Symbol(react.memo)()///Symbol(react.memo)(Symbol(react.forward_ref)(ResizeEdge))", "/Symbol(react.memo)()///Symbol(react.memo)(Symbol(react.forward_ref)(ResizeEdge))", "/Symbol(react.memo)()///Symbol(react.memo)(Symbol(react.forward_ref)(ResizeEdge))", @@ -88,8 +90,6 @@ Array [ "/div/Symbol(react.memo)(Symbol(react.forward_ref)(ResizePoint))/Symbol(react.forward_ref)(ResizePoint)/div", "/div/Symbol(react.memo)(Symbol(react.forward_ref)(SizeLabel))/Symbol(react.forward_ref)(SizeLabel)/div:data-testid='SizeLabelTestId'", "/div/Symbol(react.memo)(Symbol(react.forward_ref)(SizeLabel))/Symbol(react.forward_ref)(SizeLabel)/div:data-testid='parent-resize-label'", - "/null/Symbol(react.memo)()//Symbol(react.memo)()", - "/Symbol(react.memo)()///UtopiaSpiedExoticType(Symbol(react.fragment))", "/Symbol(react.forward_ref)(Styled(div))/div/Symbol(react.forward_ref)(Styled(div))/div", "/UtopiaSpiedFunctionComponent(SimpleFlexColumn)/div/ElementsOutsideVisibleAreaIndicator/Symbol(react.memo)(IndicatorArrow)", "/div/div/NavigatorComponent/Symbol(react.memo)()", @@ -842,6 +842,8 @@ Array [ "/UtopiaSpiedExoticType(Symbol(react.fragment))/UtopiaSpiedExoticType(Symbol(react.fragment))/GridMeasurementHelpers/Symbol(react.memo)()", "/UtopiaSpiedExoticType(Symbol(react.fragment))/GridMeasurementHelpers//div", "/null/Symbol(react.memo)()//Symbol(react.memo)()", + "/Symbol(react.memo)()///UtopiaSpiedExoticType(Symbol(react.fragment))", + "/null/Symbol(react.memo)()//Symbol(react.memo)()", "/Symbol(react.memo)()///Symbol(react.memo)(Symbol(react.forward_ref)(ResizeEdge))", "/Symbol(react.memo)()///Symbol(react.memo)(Symbol(react.forward_ref)(ResizeEdge))", "/Symbol(react.memo)()///Symbol(react.memo)(Symbol(react.forward_ref)(ResizeEdge))", @@ -872,8 +874,6 @@ Array [ "/div/Symbol(react.memo)(Symbol(react.forward_ref)(ResizePoint))/Symbol(react.forward_ref)(ResizePoint)/div", "/div/Symbol(react.memo)(Symbol(react.forward_ref)(SizeLabel))/Symbol(react.forward_ref)(SizeLabel)/div:data-testid='SizeLabelTestId'", "/div/Symbol(react.memo)(Symbol(react.forward_ref)(SizeLabel))/Symbol(react.forward_ref)(SizeLabel)/div:data-testid='parent-resize-label'", - "/null/Symbol(react.memo)()//Symbol(react.memo)()", - "/Symbol(react.memo)()///UtopiaSpiedExoticType(Symbol(react.fragment))", "/Symbol(react.forward_ref)(Styled(div))/div/Symbol(react.forward_ref)(Styled(div))/div", "/UtopiaSpiedFunctionComponent(SimpleFlexColumn)/div/ElementsOutsideVisibleAreaIndicator/Symbol(react.memo)(IndicatorArrow)", "/div/div/NavigatorComponent/Symbol(react.memo)()",