Clean up node width height

Author: bernaferrari

packages/backend/src/common/nodeWidthHeight.ts

@@ -1,6 +1,6 @@
 import { Size } from "types";
 
-export const nodeSize = (node: SceneNode, optimizeLayout: boolean): Size => {
+export const nodeSize = (node: SceneNode): Size => {
   if ("layoutSizingHorizontal" in node && "layoutSizingVertical" in node) {
     const width =
       node.layoutSizingHorizontal === "FILL"
@@ -19,52 +19,5 @@ export const nodeSize = (node: SceneNode, optimizeLayout: boolean): Size => {
     return { width, height };
   }
 
-  const nodeAuto =
-    (optimizeLayout && "inferredAutoLayout" in node
-      ? node.inferredAutoLayout
-      : null) ?? node;
-
-  if (
-    nodeAuto &&
-    typeof nodeAuto === "object" &&
-    "layoutMode" in nodeAuto &&
-    nodeAuto.layoutMode === "NONE"
-  ) {
-    return { width: node.width, height: node.height };
-  }
-
-  const hasLayout =
-    "layoutAlign" in node && node.parent && "layoutMode" in node.parent;
-
-  if (!hasLayout) {
-    return { width: node.width, height: node.height };
-  }
-
   return { width: node.width, height: node.height };
-
-  // const isWidthFill =
-  //   (parentLayoutMode === "HORIZONTAL" && nodeAuto.layoutGrow === 1) ||
-  //   (parentLayoutMode === "VERTICAL" && nodeAuto.layoutAlign === "STRETCH");
-  // const isHeightFill =
-  //   (parentLayoutMode === "HORIZONTAL" && nodeAuto.layoutAlign === "STRETCH") ||
-  //   (parentLayoutMode === "VERTICAL" && nodeAuto.layoutGrow === 1);
-  // const modesSwapped = parentLayoutMode === "HORIZONTAL";
-  // const primaryAxisMode = modesSwapped
-  //   ? "counterAxisSizingMode"
-  //   : "primaryAxisSizingMode";
-  // const counterAxisMode = modesSwapped
-  //   ? "primaryAxisSizingMode"
-  //   : "counterAxisSizingMode";
-
-  // return {
-  //   width: isWidthFill
-  //     ? "fill"
-  //     : "layoutMode" in nodeAuto && nodeAuto[primaryAxisMode] === "AUTO"
-  //       ? null
-  //       : node.width,
-  //   height: isHeightFill
-  //     ? "fill"
-  //     : "layoutMode" in nodeAuto && nodeAuto[counterAxisMode] === "AUTO"
-  //       ? null
-  //       : node.height,
 };

packages/backend/src/flutter/builderImpl/flutterSize.ts

@@ -12,7 +12,7 @@ export const flutterSize = (
   node: SceneNode,
   optimizeLayout: boolean,
 ): { width: string; height: string; isExpanded: boolean; constraints: Record<string, string> } => {
-  const size = nodeSize(node, optimizeLayout);
+  const size = nodeSize(node);
   let isExpanded: boolean = false;
 
   const nodeParent =

packages/backend/src/html/builderImpl/htmlSize.ts

@@ -15,7 +15,7 @@ export const htmlSizePartial = (
     };
   }
 
-  const size = nodeSize(node, optimizeLayout);
+  const size = nodeSize(node);
   console.log("size", size);
   const nodeParent =
     (node.parent && optimizeLayout && "inferredAutoLayout" in node.parent

packages/backend/src/swiftui/builderImpl/swiftuiSize.ts

@@ -3,9 +3,8 @@ import { numberToFixedString } from "../../common/numToAutoFixed";
 
 export const swiftuiSize = (
   node: SceneNode,
-  optimize: boolean = false,
 ): { width: string; height: string; constraints: string[] } => {
-  const size = nodeSize(node, optimize);
+  const size = nodeSize(node);
 
   const constraintProps: string[] = [];
   let width = "";

packages/backend/src/swiftui/swiftuiDefaultBuilder.ts

@@ -138,8 +138,8 @@ export class SwiftuiDefaultBuilder {
     return this;
   }
 
-  size(node: SceneNode, optimize: boolean): this {
-    const { width, height, constraints } = swiftuiSize(node, optimize);
+  size(node: SceneNode): this {
+    const { width, height, constraints } = swiftuiSize(node);
     if (width || height) {
       this.pushModifier([`frame`, [width, height].filter(Boolean).join(", ")]);
     }

packages/backend/src/swiftui/swiftuiMain.ts

@@ -127,7 +127,7 @@ export const swiftuiContainer = (
   const result = new SwiftuiDefaultBuilder(kind)
     .shapeForeground(node)
     .autoLayoutPadding(node, localSettings.optimizeLayout)
-    .size(node, localSettings.optimizeLayout)
+    .size(node)
     .shapeBackground(node)
     .cornerRadius(node)
     .shapeBorder(node)

packages/backend/src/tailwind/builderImpl/tailwindSize.ts

@@ -33,7 +33,7 @@ export const tailwindSizePartial = (
   optimizeLayout: boolean,
   settings?: TailwindSettings,
 ): { width: string; height: string; constraints: string } => {
-  const size = nodeSize(node, optimizeLayout);
+  const size = nodeSize(node);
   const nodeParent =
     (node.parent && optimizeLayout && "inferredAutoLayout" in node.parent
       ? node.parent.inferredAutoLayout