From 716debd419ce846d18fe95e65996fbd4557b70aa Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Sun, 28 May 2023 17:47:06 +1000
Subject: [PATCH] Fix (#90)

---
 Basalt/plugins/reactiveXml.lua | 64 +++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/Basalt/plugins/reactiveXml.lua b/Basalt/plugins/reactiveXml.lua
index 9c2dc81..8331c4e 100644
--- a/Basalt/plugins/reactiveXml.lua
+++ b/Basalt/plugins/reactiveXml.lua
@@ -36,37 +36,6 @@ end
 
 return {
     basalt = function(basalt)
-        local createObjectsFromXMLNode = function(node, env)
-            local layout = env[node.tag]
-            if (layout ~= nil) then
-                local props = {}
-                for prop, expression in pairs(node.attributes) do
-                    props[prop] = load("return " .. expression, nil, "t", env)
-                end
-                return basalt.createObjectsFromLayout(layout, props)
-            end
-        
-            local objectName = node.tag:gsub("^%l", string.upper)
-            local object = basalt:createObject(objectName, node.attributes["id"])
-            for attribute, expression in pairs(node.attributes) do
-                if (attribute:sub(1, 2) == "on") then
-                    registerFunctionEvent(object, object[attribute], expression .. "()", env)
-                else
-                    Reactive.effect(function()
-                        local value = load("return " .. expression, nil, "t", env)()
-                        object:setProperty(attribute, value)
-                    end)
-                end
-            end
-            for _, child in ipairs(node.children) do
-                local childObjects = basalt.createObjectsFromXMLNode(child, env)
-                for _, childObject in ipairs(childObjects) do
-                    object:addChild(childObject)
-                end
-            end
-            return {object}
-        end
-
         local object = {
             observable = Reactive.observable,
             derived = Reactive.derived,
@@ -84,6 +53,37 @@ return {
                 return Layout.fromXML(text)
             end,
 
+            createObjectsFromXMLNode = function(node, env)
+                local layout = env[node.tag]
+                if (layout ~= nil) then
+                    local props = {}
+                    for prop, expression in pairs(node.attributes) do
+                        props[prop] = load("return " .. expression, nil, "t", env)
+                    end
+                    return basalt.createObjectsFromLayout(layout, props)
+                end
+            
+                local objectName = node.tag:gsub("^%l", string.upper)
+                local object = basalt:createObject(objectName, node.attributes["id"])
+                for attribute, expression in pairs(node.attributes) do
+                    if (attribute:sub(1, 2) == "on") then
+                        registerFunctionEvent(object, object[attribute], expression .. "()", env)
+                    else
+                        Reactive.effect(function()
+                            local value = load("return " .. expression, nil, "t", env)()
+                            object:setProperty(attribute, value)
+                        end)
+                    end
+                end
+                for _, child in ipairs(node.children) do
+                    local childObjects = basalt.createObjectsFromXMLNode(child, env)
+                    for _, childObject in ipairs(childObjects) do
+                        object:addChild(childObject)
+                    end
+                end
+                return {object}
+            end,
+
             createObjectsFromLayout = function(layout, props)
                 local env = _ENV
                 env.props = {}
@@ -105,7 +105,7 @@ return {
                 end
                 local objects = {}
                 for _, node in ipairs(layout.nodes) do
-                    local _objects = createObjectsFromXMLNode(node, env)
+                    local _objects = basalt.createObjectsFromXMLNode(node, env)
                     for _, object in ipairs(_objects) do
                         table.insert(objects, object)
                     end