wip

concrete-utopia · Oct 10, 2024 · c17162f · c17162f
1 parent 2873981
commit c17162f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/...components/canvas/canvas-strategies/strategies/grid-reparent-strategies.spec.browser2.tsx b/...components/canvas/canvas-strategies/strategies/grid-reparent-strategies.spec.browser2.tsx
@@ -23,6 +23,7 @@ import {
   renderTestEditorWithCode,
 } from '../../ui-jsx.test-utils'
 
+// describe.only('grid reparent strategies', () => {
 describe('grid reparent strategies', () => {
   describe('reparent into a grid', () => {
     it('from the storyboard', async () => {

diff --git a/...rc/components/canvas/canvas-strategies/strategies/set-flex-gap-strategy.spec.browser2.tsx b/...rc/components/canvas/canvas-strategies/strategies/set-flex-gap-strategy.spec.browser2.tsx
@@ -32,6 +32,7 @@ import { TailwindConfigPath } from '../../../../core/tailwind/tailwind-config'
 
 const DivTestId = 'mydiv'
 
+// describe.only('Flex gap strategy', () => {
 describe('Flex gap strategy', () => {
   it('gap controls are not present when element has no children', async () => {
     const editor = await renderTestEditorWithCode(

diff --git a/editor/src/components/canvas/canvas-strategies/strategies/set-flex-gap-strategy.tsx b/editor/src/components/canvas/canvas-strategies/strategies/set-flex-gap-strategy.tsx
@@ -177,7 +177,7 @@ export const setFlexGapStrategy: CanvasStrategyFactory = (
 
       if (shouldTearOffGap) {
         return strategyApplicationResult(
-          [deleteProperties('always', selectedElement, [StyleGapProp])],
+          [deleteProperties('always', selectedElement, [StyleGapProp], 'note-unset-properties')],
           selectedElements,
         )
       }

diff --git a/editor/src/components/canvas/commands/delete-properties-command.ts b/editor/src/components/canvas/commands/delete-properties-command.ts
@@ -23,18 +23,21 @@ export interface DeleteProperties extends BaseCommand {
   type: 'DELETE_PROPERTIES'
   element: ElementPath
   properties: Array<PropertyPath>
+  propertiesToUnsetBehaviour: 'note-unset-properties' | 'remove-properties'
 }
 
 export function deleteProperties(
   whenToRun: WhenToRun,
   element: ElementPath,
   properties: Array<PropertyPath>,
+  propertiesToUnsetBehaviour: 'note-unset-properties' | 'remove-properties' = 'remove-properties',
 ): DeleteProperties {
   return {
     type: 'DELETE_PROPERTIES',
     whenToRun: whenToRun,
     element: element,
     properties: properties,
+    propertiesToUnsetBehaviour: propertiesToUnsetBehaviour,
   }
 }
 
@@ -71,7 +74,10 @@ function getPropertiesToUnsetPatches(
   editorState: EditorState,
   command: DeleteProperties,
 ): EditorStatePatch[] {
-  if (command.whenToRun === 'on-complete') {
+  if (
+    command.whenToRun === 'on-complete' ||
+    command.propertiesToUnsetBehaviour === 'remove-properties'
+  ) {
     return []
   }
 

diff --git a/editor/src/components/canvas/gap-utils.ts b/editor/src/components/canvas/gap-utils.ts
@@ -18,10 +18,7 @@ import type { ElementPath } from '../../core/shared/project-file-types'
 import { assertNever } from '../../core/shared/utils'
 import type { StyleInfo } from './canvas-types'
 import { CSSCursor } from './canvas-types'
-import {
-  cssNumberWithRenderedValue,
-  type CSSNumberWithRenderedValue,
-} from './controls/select-mode/controls-common'
+import type { CSSNumberWithRenderedValue } from './controls/select-mode/controls-common'
 import type { CSSNumber, FlexDirection } from '../inspector/common/css-utils'
 import type { Sides } from 'utopia-api/core'
 import { sides } from 'utopia-api/core'

diff --git a/editor/src/components/canvas/plugins/inline-style-plugin.ts b/editor/src/components/canvas/plugins/inline-style-plugin.ts
@@ -42,6 +42,7 @@ export const InlineStylePlugin: StylePlugin = {
       }
     },
   normalizeFromInlineStyle: (editor, elementsToNormalize) => {
+    return editor
     return foldAndApplyCommandsSimple(
       editor,
       elementsToNormalize.map((element) =>