Merge branch 'master' of https://github.com/concrete-utopia/utopia in…

…to fix/remove-grid-area-on-adjust
concrete-utopia · Jul 25, 2024 · 7ace1bc · 7ace1bc
2 parents 3c6ab52 + 7116c50
commit 7ace1bc
Show file tree

Hide file tree

Showing 4 changed files with 472 additions and 9 deletions.
diff --git a/editor/src/components/canvas/canvas-strategies/strategies/grid-helpers.ts b/editor/src/components/canvas/canvas-strategies/strategies/grid-helpers.ts
@@ -381,7 +381,7 @@ function asMaybeNamedAreaOrValue(
   value: number | string | null,
 ): string | number {
   if (value == null) {
-    return 0
+    return 1
   } else if (typeof value === 'number') {
     const template = axis === 'row' ? grid.gridTemplateRows : grid.gridTemplateColumns
     if (template?.type === 'DIMENSIONS') {
@@ -390,6 +390,7 @@ function asMaybeNamedAreaOrValue(
         return maybeAreaStart.areaName
       }
     }
+    return value === 0 ? 1 : value
   }
   return value
 }