From 37e5be8a6a38e1ca8e937f79c8f1a836dce1b441 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 01:32:16 +1000
Subject: [PATCH 1/2] Add createObject()

---
 Basalt/main.lua | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Basalt/main.lua b/Basalt/main.lua
index 40d9ab5..ff25cc6 100644
--- a/Basalt/main.lua
+++ b/Basalt/main.lua
@@ -70,6 +70,18 @@ local getVariable = function(name)
     return variables[name]
 end
 
+local getObjects = function()
+    return moddedObjects
+end
+
+local getObject = function(id)
+    return getObjects()[id]
+end
+
+local createObject = function(objectName, id, basalt)
+    return getObject(objectName)(id, basalt)
+end
+
 local bInstance = {
     getDynamicValueEventSetting = function()
         return basalt.dynamicValueEvents
@@ -127,14 +139,12 @@ local bInstance = {
     stop = stop,
     debug = basalt.debug,
     log = basalt.log,
+    
+    getObjects = getObjects,
 
-    getObjects = function()
-        return moddedObjects
-    end,
+    getObject = getObject,
 
-    getObject = function(id)
-        return moddedObjects[id]
-    end,
+    createObject = createObject,
 
     getDirectory = function()
         return projectDirectory
-- 
2.49.1


From e8748638db9693ca58c96273395163895fe38b68 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 01:38:46 +1000
Subject: [PATCH 2/2] Minor refactor

---
 Basalt/objects/Container.lua | 6 +++---
 Basalt/objects/Flexbox.lua   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Basalt/objects/Container.lua b/Basalt/objects/Container.lua
index a1d509b..2e7cc4c 100644
--- a/Basalt/objects/Container.lua
+++ b/Basalt/objects/Container.lua
@@ -384,9 +384,9 @@ return function(name, basalt)
         end
     end
 
-    for k,v in pairs(basalt.getObjects())do
-        container["add"..k] = function(self, name)
-            return addObject(self, v(name, basalt))
+    for objectName, _ in pairs(basalt.getObjects()) do
+        container["add" .. objectName] = function(self, id)
+            return addObject(self, basalt.createObject(objectName, id, basalt))
         end
     end
 
diff --git a/Basalt/objects/Flexbox.lua b/Basalt/objects/Flexbox.lua
index c0415c3..f7a97a8 100644
--- a/Basalt/objects/Flexbox.lua
+++ b/Basalt/objects/Flexbox.lua
@@ -101,9 +101,9 @@ return function(name, basalt)
         end,
     }
 
-    for k,v in pairs(basalt.getObjects())do
-        object["add"..k] = function(self, name)
-            local obj = base["add"..k](self, name)
+    for objectName, _ in pairs(basalt.getObjects()) do
+        object["add" .. objectName] = function(self, id)
+            local obj = base["add" .. objectName](self, id)
             applyLayout(base)
             return obj
         end
-- 
2.49.1