revert previous

Author: CWood-sdf

lua/banana/nml/ast.lua

@@ -34,8 +34,8 @@ M.padNames = { "left", "top", "right", "bottom" }
 ---@field left number
 ---@field top number
 ---@field z number
----@field width number
----@field height number
+-- ---@field width number
+-- ---@field height number
 
 local astId = 0
 

lua/banana/nml/render/main.lua

@@ -217,8 +217,8 @@ return function (self, ast, box, parentHl,
             end
             table.insert(root.relativeBoxes, {
                 image = image,
-                width = ast:getWidth() + ast:marginLeft() + ast:marginRight(),
-                height = ast:getHeight() + ast:marginBottom() + ast:marginTop(),
+                -- width = ast:getWidth() + ast:marginLeft() + ast:marginRight(),
+                -- height = ast:getHeight() + ast:marginBottom() + ast:marginTop(),
                 left = ast.boundBox.leftX - ast:marginLeft() - 1,
                 top = ast.boundBox.topY - ast:marginTop() - 1,
                 z = ast:_firstStyleValue("z-index", 0)
@@ -265,8 +265,8 @@ return function (self, ast, box, parentHl,
             local actualImage = lb.box_image_clone(pr.ctx, ctx, img)
             table.insert(root.relativeBoxes, {
                 image = actualImage,
-                width = width,
-                height = height,
+                -- width = width,
+                -- height = height,
                 left = posX,
                 top = posY,
                 z = v:_firstStyleValue("z-index", 0)
@@ -284,14 +284,14 @@ return function (self, ast, box, parentHl,
         pr:render()
         for _, data in ipairs(ast.relativeBoxes) do
             lb.box_image_render_over(pr.ctx, data.image, data.left, data.top)
-            local newWidth = data.left + data.width - box:getOffsetX() + 1
-            local newHeight = data.top + data.height - box:getOffsetY() + 1
-            if newWidth > box:getWidth() then
-                box:setWidth(newWidth)
-            end
-            if newHeight > box:getHeight() then
-                box:setWidth(newHeight)
-            end
+            --     local newWidth = data.left + data.width - box:getOffsetX() + 1
+            --     local newHeight = data.top + data.height - box:getOffsetY() + 1
+            --     if newWidth > box:getWidth() then
+            --         box:setWidth(newWidth)
+            --     end
+            --     if newHeight > box:getHeight() then
+            --         box:setWidth(newHeight)
+            --     end
         end
         pr = p.noopPartialRendered()
     end

tests/nml/absolute_spec.lua

@@ -72,21 +72,22 @@ describe("Div rendering", function ()
         local expectedMap = {
             "     ",
             " a~~ ",
-            " ~~b!!",
-            " ~~!!!",
+            " ~~bcd",
+            " ~~bcd",
             "   !!!",
         }
         local a = inst:getElementById("a")
         a:setStyleValue("z-index", "1")
         local b = inst:getElementById("b")
+        b:setTextContent("bcdbcd")
         b:setStyleValue("z-index", "2")
         b:setStyleValue("left", "3ch")
         inst:forceRerender()
         h.assertBgMapsMatch(h.bufToBgMap(inst.bufnr), expectedMap)
         h.assertGridBoundsMatch(expectedMap, inst, "~",
             function (k, v) if k == "a" then return v end end)
-        h.assertGridBoundsMatch(expectedMap, inst, "!",
-            function (k, v) if k == "b" then return v end end)
+        -- h.assertGridBoundsMatch(expectedMap, inst, "!",
+        --     function (k, v) if k == "b" then return v end end)
     end)
     it("z-index 2", function ()
         local inst = require("banana.instance").emptyInstance()