Index children by UID

gfx/prop/children.lua

@@ -1,7 +1,7 @@
 local Prop = require("gfx.prop")
 local Element = require("gfx.element")
 local Event = require("gfx.event")
-local Children = Prop:new{ defaultState = {} }
+local Children = Prop:new{ defaultState = {}, uid = "CHILDREN" }
 
 function Children:with(elementType)
   local propSelf = self

gfx/prop/init.lua

@@ -2,11 +2,15 @@ local Prop = {}
 Prop.__index = Prop
 
 function Prop:getState(element)
-  return element[self]
+  return element[self:getId()]
 end
 
 function Prop:setState(element, state)
-  element[self] = state
+  element[self:getId()] = state
+end
+
+function Prop:getId()
+  return self.uid
 end
 
 function Prop.attach(elementType, prop, defaultState)
@@ -15,10 +19,12 @@ function Prop.attach(elementType, prop, defaultState)
 end
 
 function Prop:new(o)
-  local obj = o or {}
-  setmetatable(obj, Prop)
-  obj.__index = obj
-  return obj
+  if o.uid == nil then
+    error("Property must carry a unique identifier")
+  end
+  setmetatable(o, Prop)
+  o.__index = o
+  return o
 end
 
 return Prop

gfx/prop/orientation.lua

@@ -1,5 +1,5 @@
 local Prop = require("gfx.prop")
-local Orientation = Prop:new{ defaultState = false }
+local Orientation = Prop:new{ defaultState = false, uid = "ORIENTATION" }
 
 function Orientation:with(elementType)
   local propSelf = self

itemcontroller.lua

@@ -6,6 +6,7 @@ local List = require("gfx.list")
 local Event = require("gfx.event")
 local Padding = require("gfx.padding")
 local Container = require("gfx.container")
+local Children = require("gfx.prop.children")
 
 
 local CACHE_FILE = "/.storage.cache"
@@ -125,7 +126,7 @@ local function itemList(groups, wBudget, hBudget, savedState, onClick, setPage,
   }
 
   local tabLine = List:new{
-    children = {
+    [Children:getId()] = {
       btnPrev,
       padImport,
       padNext
@@ -173,7 +174,7 @@ local function itemList(groups, wBudget, hBudget, savedState, onClick, setPage,
     }
 
     local list = List:new{
-      children = {
+      [Children:getId()] = {
         paddedText,
         countLabel
       },
@@ -193,7 +194,7 @@ local function itemList(groups, wBudget, hBudget, savedState, onClick, setPage,
   table.insert(entries, tabLinePad)
 
   return List:new{
-    children = entries,
+    [Children:getId()] = entries,
     vertical = true
   }, state
 end
@@ -310,7 +311,7 @@ local PAGES = {
     }
     
     local stuffContainer = Container:new{
-      children = {
+      [Children:getId()] = {
         paddedTitle
       },
       width = state.width,