From 9da8d589a1e078658163090e5569b55b9bf95e89 Mon Sep 17 00:00:00 2001
From: Michael Freno <michaelt.freno@gmail.com>
Date: Thu, 13 Nov 2025 21:01:04 -0500
Subject: [PATCH] fixed

---
 modules/Element.lua      | 66 ++++++++++++++++++++++------------------
 modules/LayoutEngine.lua |  2 +-
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/modules/Element.lua b/modules/Element.lua
index 0e3577e..4cd2c97 100644
--- a/modules/Element.lua
+++ b/modules/Element.lua
@@ -521,6 +521,28 @@ function Element.new(props)
   self.prevGameSize = { width = gw, height = gh }
   self.autosizing = { width = false, height = false }
 
+  -- Initialize LayoutEngine early with default values for auto-sizing calculations
+  -- It will be re-configured later with actual layout properties
+  self._layoutEngine = LayoutEngine.new({
+    positioning = Positioning.RELATIVE,
+    flexDirection = FlexDirection.HORIZONTAL,
+    flexWrap = FlexWrap.NOWRAP,
+    justifyContent = JustifyContent.FLEX_START,
+    alignItems = AlignItems.STRETCH,
+    alignContent = AlignContent.STRETCH,
+    gap = 0,
+    gridRows = 1,
+    gridColumns = 1,
+    columnGap = 0,
+    rowGap = 0,
+  }, {
+    utils = utils,
+    Grid = Grid,
+    Units = Units,
+    Context = Context,
+  })
+  self._layoutEngine:initialize(self)
+
   -- Store unit specifications for responsive behavior
   self.units = {
     width = { value = nil, unit = "px" },
@@ -1219,27 +1241,19 @@ function Element.new(props)
 
   self.alignSelf = props.alignSelf or AlignSelf.AUTO
 
-  -- Initialize LayoutEngine for layout calculations
-  self._layoutEngine = LayoutEngine.new({
-    positioning = self.positioning,
-    flexDirection = self.flexDirection,
-    flexWrap = self.flexWrap,
-    justifyContent = self.justifyContent,
-    alignItems = self.alignItems,
-    alignContent = self.alignContent,
-    gap = self.gap,
-    gridRows = self.gridRows,
-    gridColumns = self.gridColumns,
-    columnGap = self.columnGap,
-    rowGap = self.rowGap,
-  }, {
-    utils = utils,
-    Grid = Grid,
-    Units = Units,
-    Context = Context,
-  })
-  -- Initialize immediately so it can be used for auto-sizing calculations
-  self._layoutEngine:initialize(self)
+  -- Update the LayoutEngine with actual layout properties
+  -- (it was initialized early with defaults for auto-sizing calculations)
+  self._layoutEngine.positioning = self.positioning
+  if self.flexDirection then self._layoutEngine.flexDirection = self.flexDirection end
+  if self.flexWrap then self._layoutEngine.flexWrap = self.flexWrap end
+  if self.justifyContent then self._layoutEngine.justifyContent = self.justifyContent end
+  if self.alignItems then self._layoutEngine.alignItems = self.alignItems end
+  if self.alignContent then self._layoutEngine.alignContent = self.alignContent end
+  if self.gap then self._layoutEngine.gap = self.gap end
+  if self.gridRows then self._layoutEngine.gridRows = self.gridRows end
+  if self.gridColumns then self._layoutEngine.gridColumns = self.gridColumns end
+  if self.columnGap then self._layoutEngine.columnGap = self.columnGap end
+  if self.rowGap then self._layoutEngine.rowGap = self.rowGap end
 
   ---animation
   self.transform = props.transform or {}
@@ -2094,14 +2108,10 @@ function Element:update(dt)
   end
 end
 
---- Recalculate units based on new viewport dimensions (for vw, vh, % units)
 ---@param newViewportWidth number
 ---@param newViewportHeight number
 function Element:recalculateUnits(newViewportWidth, newViewportHeight)
-  -- Delegate to LayoutEngine
-  if self._layoutEngine then
-    self._layoutEngine:recalculateUnits(newViewportWidth, newViewportHeight)
-  end
+  self._layoutEngine:recalculateUnits(newViewportWidth, newViewportHeight)
 end
 
 --- Resize element and its children based on game window size change
@@ -2272,10 +2282,6 @@ end
 
 --- Calculate auto height based on children
 function Element:calculateAutoHeight()
-  if not self._layoutEngine then
-    return self:calculateTextHeight()
-  end
-  -- Delegate to LayoutEngine
   return self._layoutEngine:calculateAutoHeight()
 end
 
diff --git a/modules/LayoutEngine.lua b/modules/LayoutEngine.lua
index f40a91d..0b793d6 100644
--- a/modules/LayoutEngine.lua
+++ b/modules/LayoutEngine.lua
@@ -443,7 +443,7 @@ function LayoutEngine:layoutChildren()
         -- Horizontal layout: main axis is X, cross axis is Y
         -- Position child at border box (x, y represents top-left including padding)
         -- Add reservedMainStart and left margin to account for absolutely positioned siblings and margins
-        child.x = element.x + element.padding.left + reservedMainStart + currentMainPos + child.margin.left
+        child.x = self.element.x + self.element.padding.left + reservedMainStart + currentMainPos + child.margin.left
 
         -- BORDER-BOX MODEL: Use border-box dimensions for alignment calculations
         local childBorderBoxHeight = child:getBorderBoxHeight()