factor out isDynamicGridTemplate

concrete-utopia · Oct 8, 2024 · bee4923 · bee4923
1 parent 9cc1134
commit bee4923
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/editor/src/components/canvas/dom-walker.ts b/editor/src/components/canvas/dom-walker.ts
@@ -931,16 +931,8 @@ function getSpecialMeasurements(
 
   const containerGridPropertiesFromProps = getGridContainerProperties(element.style)
   const containerGridProperties = getGridContainerProperties(elementStyle, {
-    dynamicCols:
-      containerGridPropertiesFromProps.gridTemplateColumns?.type === 'DIMENSIONS' &&
-      containerGridPropertiesFromProps.gridTemplateColumns.dimensions.some((d) =>
-        isDynamicGridRepeat(d),
-      ),
-    dynamicRows:
-      containerGridPropertiesFromProps.gridTemplateRows?.type === 'DIMENSIONS' &&
-      containerGridPropertiesFromProps.gridTemplateRows.dimensions.some((d) =>
-        isDynamicGridRepeat(d),
-      ),
+    dynamicCols: isDynamicGridTemplate(containerGridPropertiesFromProps.gridTemplateColumns),
+    dynamicRows: isDynamicGridTemplate(containerGridPropertiesFromProps.gridTemplateRows),
   })
 
   const containerElementPropertiesFromProps = getGridElementProperties(
@@ -1009,6 +1001,10 @@ function getSpecialMeasurements(
   )
 }
 
+function isDynamicGridTemplate(template: GridAutoOrTemplateBase | null) {
+  return template?.type === 'DIMENSIONS' && template.dimensions.some((d) => isDynamicGridRepeat(d))
+}
+
 function elementContainsOnlyText(element: HTMLElement): boolean {
   if (element.childNodes.length === 0) {
     return false