qpuiq 0.18__tar.gz → 0.19__tar.gz

{qpuiq-0.18/qpuiq.egg-info → qpuiq-0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qpuiq
-Version: 0.18
+Version: 0.19
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu

{qpuiq-0.18 → qpuiq-0.19}/PUI/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.18"
+__version__ = "0.19"
 
 from .node import *
 from .view import *

{qpuiq-0.18 → qpuiq-0.19}/PUI/dom.py

@@ -17,6 +17,8 @@ def sortGridDOMInPlace(dom):
     dom.sort(key=lambda c:(c.grid_row, c.grid_column, c.grid_rowspan, c.grid_columnspan))
 
 def dom_remove_node(dom_parent, dom_offset, child):
+    if DEBUG:
+        print(f"dom_remove_node key={child.key} virtual={child.pui_virtual} children={len(child.children)} dom_parent={dom_parent.key} dom_offset={dom_offset}")
     if child.pui_virtual:
         ret = [child]
         for c in child.children:
@@ -59,17 +61,20 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
             oldOrdered.reverse()
             newOrdered.reverse()
 
-        oldVDOM = oldOrdered + oldOutOfOrdered
-        newVDOM = newOrdered + newOutOfOrdered
+        oldVDOM.clear()
+        oldVDOM.extend(oldOrdered + oldOutOfOrdered)
+        newVDOM.clear()
+        newVDOM.extend(newOrdered + newOutOfOrdered)
 
     if DEBUG:
         print(f"{(depth+1)*'    '}===OLD===")
         for c in oldVDOM:
-            print(f"{(depth+1)*'    '}{c.key} virtual={c.pui_virtual} ui={c.ui}")
+            print(f"{(depth+1)*'    '}{c.key} virtual={c.pui_virtual} children={len(c.children)} ui={c.ui}")
 
         print(f"{(depth+1)*'    '}===NEW===")
         for c in newVDOM:
-            print(f"{(depth+1)*'    '}{c.key} virtual={c.pui_virtual}")
+            print(f"{(depth+1)*'    '}{c.key} virtual={c.pui_virtual} children={len(c.children)}")
+        print(f"{(depth+1)*'    '}=========")
 
     oldVMap = [x.key for x in oldVDOM]
     newVMap = [x.key for x in newVDOM]
@@ -225,13 +230,18 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
             break # finish
 
     # Step 4. trim removed trail
+    if DEBUG:
+        print(f"{(depth+1)*'    '}S4. TRIM")
     nl = len(newVDOM)
+    if DEBUG:
+        print(f"{(depth+1)*'    '}S4. TRIM", f"dom_offset={dom_offset}", len(oldVDOM), "=>", len(newVDOM))
     while len(oldVDOM) > nl:
         old = oldVDOM.pop(nl)
+        print(f"{(depth+2)*'    '}", f"key={old.key} virtual={old.pui_virtual} children={len(old.children)}")
         oldVMap.pop(nl)
         nodes = dom_remove_node(dom_parent, dom_offset + nl, old)
         dom_children_num -= len([n for n in nodes if not n.pui_virtual and not n.pui_outoforder])
-        toBeDeleted.extend(nodes)
+        toBeDeleted.append(old)
 
     for c in newVDOM:
         c.postUpdate()

{qpuiq-0.18 → qpuiq-0.19/qpuiq.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qpuiq
-Version: 0.18
+Version: 0.19
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu