qpuiq 0.14__tar.gz → 0.24__tar.gz

{qpuiq-0.14/qpuiq.egg-info → qpuiq-0.24}/PKG-INFO

@@ -1,19 +1,12 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: qpuiq
-Version: 0.14
+Version: 0.24
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu
 Author-email: buganini@b612.tw
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: summary
 
 # What is PUI
 PUI is a reactive/declarative UI framework with two-way data binding.
@@ -213,38 +206,29 @@ Then PUI will take care of view update [(code)](https://github.com/buganini/PUI/
     * no canvas
 
 # Documents
-* [Components Reference](REFERENCE.md)
-* [Sizing Strategy](https://html-preview.github.io/?url=https://github.com/buganini/PUI/blob/main/doc/Sizing.html)
+* [Components Reference](https://buganini.github.io/PUI/doc/Reference.html)
+* [Layout Strategy](https://buganini.github.io/PUI/doc/Layout.html)
 
 # Used by
-* https://github.com/buganini/kikit-ui
+* https://github.com/buganini/Kikakuka
 * https://github.com/solvcon/modmesh
 
 # TODO
-* Merge node and view
 * Dump with layout parameters and add test cases
 * [Toga](https://beeware.org/project/projects/libraries/toga/)
-* [ISSUE] textual layout sizing (cookbook scroll example)
 * [ISSUE] flet layout sizing (cookbook scroll example)
 * nested state trigger
     * set state in PUIView __init__
     * set state in setup() ?
 * Tabs(`tabposition`)
 * Lazy List
-* StateObject decorator
 * UI Flow
     * Navigation Stack
     * View Router
     * Model Window/Dialog
 * Layout
-    * ZBox
     * SwiftUI style overlay ??
 * Canvas
-    * Rect
     * Arc
-    * Image
     * ...
-* Table
-* Tree
-* Dialog
 * State with Pydantic support?

{qpuiq-0.14 → qpuiq-0.24}/PUI/PySide6/base.py

@@ -132,17 +132,17 @@ class QtBaseWidget(PUINode):
 
     def handleDragEnterEvent(self, event):
         if self._onDragEntered:
-            self._onDragEntered[0](event, *self._onDragEntered[1], **self._onDragEntered[2])
+            return self._onDragEntered[0](event, *self._onDragEntered[1], **self._onDragEntered[2])
         else:
-            event.setDropAction(QtCore.Qt.CopyAction)
-            event.accept()
+            event.ignore()
+            return True
 
     def handleDropEvent(self, event):
         if self._onDropped:
-            self._onDropped[0](event, *self._onDropped[1], **self._onDropped[2])
+            return self._onDropped[0](event, *self._onDropped[1], **self._onDropped[2])
         else:
-            print("Dropped", event)
             event.ignore()
+            return False
 
     def qtSizeHint(self):
         node = self.get_node()
@@ -162,7 +162,11 @@ class QtBaseWidget(PUINode):
             self.qt_params[k] = v
         return self
 
-class QtBaseLayout(PUINode):
+class QtBaseLayout(QtBaseWidget):
+    pui_terminal = False
+    container_x = False
+    container_y = False
+
     def __init__(self):
         super().__init__()
         self.qt_params = {}
@@ -178,22 +182,23 @@ class QtBaseLayout(PUINode):
         return self.layout
 
     def destroy(self, direct):
-        if direct:
-            if self.ui:
-                self.ui.deleteLater()
         self.layout = None
-        self.ui = None
         super().destroy(direct)
 
     def update(self, prev=None):
+        if prev and prev.ui:
+            self.mounted_children = prev.mounted_children
+        else:
+            self.mounted_children = []
+
         super().update(prev)
-        _apply_params(self.ui, self)
 
     def addChild(self, idx, child):
         from .modal import Modal
         from .layout import Spacer
         if isinstance(child, Spacer):
             self.qtlayout.insertItem(idx, child.outer)
+            self.mounted_children.insert(idx, child)
         elif isinstance(child, Modal):
             pass
         elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
@@ -201,21 +206,37 @@ class QtBaseLayout(PUINode):
             if not child.layout_weight is None:
                 params["stretch"] = child.layout_weight
             self.qtlayout.insertWidget(idx, child.outer, **params)
+            self.mounted_children.insert(idx, child)
 
     def removeChild(self, idx, child):
         from .modal import Modal
         from .layout import Spacer
         if isinstance(child, Spacer):
             self.qtlayout.removeItem(child.outer)
+            self.mounted_children.pop(idx)
         elif isinstance(child, Modal):
             pass
         elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
             child.outer.setParent(None)
+            self.mounted_children.pop(idx)
 
-    def qt(self, **kwargs):
-        for k,v in kwargs.items():
-            self.qt_params[k] = v
-        return self
+    def postUpdate(self):
+        if self.ui:
+            if self._onDropped:
+                self.ui.setAcceptDrops(True)
+                self.ui.installEventFilter(self.eventFilter)
+            else:
+                self.ui.setAcceptDrops(False)
+
+        super().postUpdate()
+
+        if self.container_x or self.container_y:
+            for i, child in enumerate(self.mounted_children):
+                child = child.get_node()
+                self.mounted_children[i] = child.get_node()
+
+                weight = child.layout_weight
+                self.qtlayout.setStretch(i, weight if weight else 0)
 
 class QtBaseFrame(QtBaseWidget):
     pui_terminal = False

{qpuiq-0.14 → qpuiq-0.24}/PUI/PySide6/canvas.py

@@ -6,7 +6,7 @@ from PySide6.QtGui import QPainter, QColor, QPainterPath, QImage
 
 class PUIQtCanvas(QtWidgets.QWidget):
     def __init__(self, node, width=None, height=None):
-        self.node = node
+        self.puinode = node
         self.width = width
         self.height = height
         super().__init__()
@@ -18,25 +18,25 @@ class PUIQtCanvas(QtWidgets.QWidget):
         e = PUIEvent()
         e.button = event.button().value
         e.x, e.y = event.position().toPoint().toTuple()
-        self.node._dblclicked(e)
+        self.puinode._dblclicked(e)
 
     def mousePressEvent(self, event):
         e = PUIEvent()
         e.button = event.button().value
         e.x, e.y = event.position().toPoint().toTuple()
-        self.node._mousedown(e)
+        self.puinode._mousedown(e)
 
     def mouseReleaseEvent(self, event):
         e = PUIEvent()
         e.button = event.button().value
         e.x, e.y = event.position().toPoint().toTuple()
-        self.node._mouseup(e)
+        self.puinode._mouseup(e)
 
     def mouseMoveEvent(self, event):
         e = PUIEvent()
         e.button = event.button().value
         e.x, e.y = event.position().toPoint().toTuple()
-        self.node._mousemove(e)
+        self.puinode._mousemove(e)
 
     def wheelEvent(self, event):
         e = PUIEvent()
@@ -56,27 +56,48 @@ class PUIQtCanvas(QtWidgets.QWidget):
         if emodifiers & QtCore.Qt.MetaModifier:
             modifier |= KeyModifier.META
         e.modifiers = modifier
-        self.node._wheel(e)
+        self.puinode._wheel(e)
 
     def paintEvent(self, event):
-        node = self.node.get_node()
-        node.qpainter = QPainter()
-        node.qpainter.begin(self)
-        node.qpainter.setRenderHints(QtGui.QPainter.Antialiasing, True)
+        puinode = self.puinode.get_node()
+        puinode.qpainter = QPainter()
+        puinode.qpainter.begin(self)
+        puinode.qpainter.setRenderHints(QtGui.QPainter.Antialiasing, True)
 
-        if not node.style_bgcolor is None:
+        if not puinode.style_bgcolor is None:
             bgBrush = QtGui.QBrush()
-            bgBrush.setColor(QtGui.QColor(node.style_bgcolor))
+            bgBrush.setColor(QtGui.QColor(puinode.style_bgcolor))
             bgBrush.setStyle(QtCore.Qt.SolidPattern)
             rect = QtCore.QRect(0, 0, self.width or self.geometry().width(), self.height or self.geometry().height())
-            node.qpainter.fillRect(rect, bgBrush)
-
-        node.width = self.geometry().width()
-        node.height = self.geometry().height()
-        node.painter(node, *node.args)
-
-        node.qpainter.end()
-        node.qpainter = None
+            puinode.qpainter.fillRect(rect, bgBrush)
+
+        puinode.width = self.geometry().width()
+        puinode.height = self.geometry().height()
+        immediate = puinode.painter(puinode, *puinode.args)
+        puinode.qpainter.end()
+        puinode.qpainter = None
+        if immediate:
+            self.update()
+
+class ImageResource():
+    @staticmethod
+    def load(path):
+        ir = ImageResource()
+        ir.qimage = QImage(path)
+        return ir
+
+    def crop(self, x, y, width, height):
+        ir = ImageResource()
+        ir.qimage = self.qimage.copy(x, y, width, height)
+        return ir
+
+    def scale(self, width, height, keepAspectRatio=True, quality=0):
+        ir = ImageResource()
+        method = {
+            0: QtCore.Qt.TransformationMode.FastTransformation
+        }.get(quality, QtCore.Qt.TransformationMode.SmoothTransformation)
+        ir.qimage = self.qimage.scaled(width, height, QtCore.Qt.AspectRatioMode.KeepAspectRatio if keepAspectRatio else QtCore.Qt.IgnoreAspectRatio, method)
+        return ir
 
 class Canvas(QtBaseWidget):
     def __init__(self, painter, *args):
@@ -300,16 +321,16 @@ class Canvas(QtBaseWidget):
             raise RuntimeError(f"Not implemented: drawShapely({type(shape).__name__}) {dir(shape)}")
 
     def loadImage(self, image_path):
-        return QImage(image_path)
+        return ImageResource.load(image_path)
 
     def drawImage(self, image, x=0, y=0, width=None, height=None, src_x=0, src_y=0, src_width=None, src_height=None, opacity=1.0):
-        if image.isNull():
+        if image.qimage.isNull():
             return
 
         if src_width is None:
-            src_width = image.width() - src_x
+            src_width = image.qimage.width() - src_x
         if src_height is None:
-            src_height = image.height() - src_y
+            src_height = image.qimage.height() - src_y
 
         source_rect = QtCore.QRect(src_x, src_y, src_width, src_height)
 
@@ -320,5 +341,5 @@ class Canvas(QtBaseWidget):
 
         dest_rect = QtCore.QRect(x, y, width, height)
         self.qpainter.setOpacity(opacity)
-        self.qpainter.drawImage(dest_rect, image, source_rect)
+        self.qpainter.drawImage(dest_rect, image.qimage, source_rect)
         self.qpainter.setOpacity(1.0)

{qpuiq-0.14 → qpuiq-0.24}/PUI/PySide6/combobox.py

@@ -24,7 +24,7 @@ class ComboBox(QtBaseWidget):
         super().update(prev)
 
     def postSync(self):
-        index = 0
+        index = -1
         text = ""
 
         if self.index_model:
@@ -35,7 +35,7 @@ class ComboBox(QtBaseWidget):
             try:
                 index = [c.value for c in self.children].index(text)
             except:
-                index = 0
+                index = -1
 
         if self.signal_connected:
             self.ui.currentIndexChanged.disconnect()

{qpuiq-0.14 → qpuiq-0.24}/PUI/PySide6/divider.py

@@ -3,6 +3,8 @@ from .base import *
 from .layout import *
 
 class Divider(QtBaseWidget):
+    pui_movable = False
+
     def __init__(self):
         super().__init__()
 

{qpuiq-0.14 → qpuiq-0.24}/PUI/PySide6/layout.py

@@ -1,7 +1,74 @@
 from .. import *
 from .base import *
 
+class Stack(QtBaseLayout):
+    pui_terminal = False
+    pui_reversed_order = True
+
+    def __init__(self):
+        super().__init__()
+        self.qt_params = {}
+        if not isinstance(self.non_virtual_parent, QtBaseLayout):
+            self.layout_padding = (11,11,11,11)
+
+    @property
+    def outer(self):
+        return self.ui
+
+    @property
+    def inner(self):
+        return self.layout
+
+    def destroy(self, direct):
+        self.layout = None
+        super().destroy(direct)
+
+    def update(self, prev=None):
+        if prev and prev.ui:
+            self.ui = prev.ui
+            self.qtlayout = prev.qtlayout
+        else:
+            self.ui = QtWidgets.QWidget()
+            self.qtlayout = QtWidgets.QStackedLayout()
+            self.qtlayout.setStackingMode(QtWidgets.QStackedLayout.StackAll)
+            self.qtlayout.setContentsMargins(0,0,0,0)
+            self.ui.setLayout(self.qtlayout)
+        super().update(prev)
+
+    def addChild(self, idx, child):
+        from .modal import Modal
+        from .layout import Spacer
+        if isinstance(child, Spacer):
+            pass
+        elif isinstance(child, Modal):
+            pass
+        elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
+            self.qtlayout.insertWidget(idx, child.outer)
+            self.mounted_children.insert(idx, child)
+
+    def removeChild(self, idx, child):
+        from .modal import Modal
+        from .layout import Spacer
+        if isinstance(child, Spacer):
+            pass
+        elif isinstance(child, Modal):
+            pass
+        elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
+            child.outer.setParent(None)
+            self.mounted_children.pop(idx)
+
+    def postUpdate(self):
+        if self.ui:
+            if self._onDropped:
+                self.ui.setAcceptDrops(True)
+                self.ui.installEventFilter(self.eventFilter)
+            else:
+                self.ui.setAcceptDrops(False)
+
+        super().postUpdate()
+
 class HBox(QtBaseLayout):
+    container_x = True
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
@@ -14,6 +81,7 @@ class HBox(QtBaseLayout):
         super().update(prev)
 
 class VBox(QtBaseLayout):
+    container_y = True
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
@@ -27,6 +95,7 @@ class VBox(QtBaseLayout):
 
 class Spacer(PUINode):
     pui_terminal = True
+    pui_movable = False
 
     def update(self, prev):
         if prev and prev.ui:

{qpuiq-0.14 → qpuiq-0.24}/PUI/PySide6/scroll.py

@@ -75,7 +75,6 @@ class Scroll(QtBaseWidget):
         if node.destroyed:
             return
         node.children[0].outer.origResizeEvent(event)
-        node.children[0].outer.resizeEvent = self.onUiResized
         if node.horizontal is False:
             if isinstance(node.children[0], QtBaseLayout):
                 node.outer.setMinimumWidth(node.children[0].outer.sizeHint().width())
@@ -88,6 +87,9 @@ class Scroll(QtBaseWidget):
             elif isinstance(node.children[0], QtBaseWidget):
                 node.outer.setMinimumHeight(node.children[0].outer.sizeHint().height())
 
+    def postSync(self):
+        self.children[0].outer.resizeEvent = self.onUiResized
+
     def scrollX(self, pos=0):
         if math.copysign(1, pos) >= 0:
             self.align_x = 0

{qpuiq-0.14 → qpuiq-0.24}/PUI/PySide6/textfield.py

@@ -35,7 +35,7 @@ class TextField(QtBaseWidget):
 
         super().update(prev)
 
-    def on_editing_finished(self):
+    def on_editing_finished(self): # finish editing
         node = self.get_node()
         node.editing = False
         value = self.ui.text()
@@ -51,14 +51,12 @@ class TextField(QtBaseWidget):
         self._change(e)
         node.ui.clearFocus()
 
-    def on_textchanged(self):
+    def on_textchanged(self): # editing
         node = self.get_node()
+        self.editing = True
         value = self.ui.text()
         if node.edit_model:
-            node.editing = True
             node.edit_model.value = value
-        else:
-            node.model.value = value
         e = PUIEvent()
         e.value = value
         self._input(e)

{qpuiq-0.14 → qpuiq-0.24}/PUI/PySide6/window.py

@@ -9,7 +9,7 @@ class QMainWindow(QtWidgets.QMainWindow):
     def keyPressEvent(self, event):
         e = PUIEvent()
         e.text = event.text()
-        self.node._keypress(e)
+        self.puinode._keypress(e)
 
     def mousePressEvent(self, event):
         focused_widget = QtWidgets.QApplication.focusWidget()
@@ -34,13 +34,13 @@ class Window(QtBaseWidget):
     def update(self, prev=None):
         if prev and prev.ui:
             self.ui = prev.ui
-            self.ui.node = self
+            self.ui.puinode = self
             self.curr_size = prev.curr_size
             self.curr_maximize = prev.curr_maximize
             self.curr_fullscreen = prev.curr_fullscreen
         else:
             self.ui = QMainWindow()
-            self.ui.node = self
+            self.ui.puinode = self
             self.ui.show()
             self.curr_size = Prop()
             self.curr_maximize = Prop()
@@ -49,6 +49,7 @@ class Window(QtBaseWidget):
         if self.curr_size.set(self.size):
             self.ui.resize(*self.size)
         if self.curr_maximize.set(self.maximize):
+            self.ui.resize(800, 600) # workaround on windows ref: https://stackoverflow.com/questions/27157312/qt-showmaximized-not-working-in-windows
             self.ui.showMaximized()
         if self.curr_fullscreen.set(self.fullscreen):
             self.ui.showFullScreen()

{qpuiq-0.14 → qpuiq-0.24}/PUI/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.14"
+__version__ = "0.24"
 
 from .node import *
 from .view import *

{qpuiq-0.14 → qpuiq-0.24}/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:
@@ -44,20 +46,35 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
     dom_children_curr = 0
 
     if DEBUG:
-        print(f"{(depth)*'    '}Syncing {node.key}@{id(node)} parent={dom_parent.key}@{id(dom_parent)} dom_offset={dom_offset} dom_children_num={dom_children_num} old={len(oldVDOM)} new={len(newVDOM)}")
+        print(f"{(depth)*'    '}Syncing {node.key}@{id(node)}#tag={node._tag} parent={dom_parent.key}@{id(dom_parent)}#tag={dom_parent._tag} dom_offset={dom_offset} dom_children_num={dom_children_num} old={len(oldVDOM)} new={len(newVDOM)}")
 
     if node.pui_grid_layout:
         sortGridDOMInPlace(oldVDOM)
         sortGridDOMInPlace(newVDOM)
+    else:
+        oldOrdered = [c for c in oldVDOM if not c.pui_outoforder]
+        oldOutOfOrdered = [c for c in oldVDOM if c.pui_outoforder]
+        newOrdered = [c for c in newVDOM if not c.pui_outoforder]
+        newOutOfOrdered = [c for c in newVDOM if c.pui_outoforder]
+
+        if node.pui_reversed_order:
+            oldOrdered.reverse()
+            newOrdered.reverse()
+
+        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}#tag={c._tag} 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}#tag={c._tag} 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]
@@ -110,7 +127,7 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
                                 print(f"{(depth+2)*'    '}dom_children_curr += 1 => {dom_children_curr} dom_children_num={dom_children_num}")
 
                         if not new.pui_terminal:
-                            sync(new, new, 0, old.children, new.children, depth+1)
+                            sync(new, old, 0, old.children, new.children, depth+1)
 
                 break # finish
 
@@ -134,10 +151,12 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
 
             # Step 3. setup target node
 
-            try:
-                matchedIdx = oldVMap[childIdx+1:].index(new.key) + childIdx + 1
-            except ValueError:
-                matchedIdx = None
+            matchedIdx = None
+            if new.pui_movable:
+                try:
+                    matchedIdx = oldVMap[childIdx+1:].index(new.key) + childIdx + 1
+                except ValueError:
+                    pass
 
             ## Step 3-1. new node
             if matchedIdx is None:
@@ -197,11 +216,11 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
                 else:
                     if DEBUG:
                         print(f"{(depth+1)*'    '}S3-2-2. MOVE {childIdx} {new.key}")
-                    oldVMap.pop(matchedIdx)
-                    old = oldVDOM.pop(matchedIdx)
                     found, offset = dom_parent.findDomOffsetForNode(old)
                     if not found:
-                        raise VDomError(f"findDomOffsetForNode() failed for {old.key} on {dom_parent.key}")
+                        raise VDomError(f"S3-2-2: findDomOffsetForNode() failed for {old.key}#tag={old._tag} on {dom_parent.key}#tag={dom_parent._tag} {dom_parent.children}")
+                    oldVMap.pop(matchedIdx)
+                    old = oldVDOM.pop(matchedIdx)
                     nodes = dom_remove_node(dom_parent, offset, old)
                     dom_add_nodes(dom_parent, dom_offset + dom_children_curr, nodes)
 
@@ -213,13 +232,19 @@ 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)
+        if DEBUG:
+            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.14 → qpuiq-0.24}/PUI/flet/__init__.py

@@ -2,6 +2,7 @@ from .application import *
 from .button import *
 from .canvas import *
 from .checkbox import *
+from .divider import *
 from .label import *
 from .layout import *
 from .progressbar import *

qpuiq-0.24/PUI/flet/divider.py

@@ -0,0 +1,14 @@
+from .. import *
+from .base import *
+
+class Divider(FBase):
+    def update(self, prev):
+        if prev and prev.ui:
+            self.ui = prev.ui
+            try:
+                self.ui.update()
+            except:
+                pass
+        else:
+            self.ui = ft.Divider()
+        self.ui.expand = self.layout_weight

{qpuiq-0.14 → qpuiq-0.24}/PUI/flet/textfield.py

@@ -30,19 +30,17 @@ class TextField(FBase):
 
         super().update(prev)
 
-    def on_textbox_changed(self, e):
+    def on_textbox_changed(self, e): # editing
         node = self.get_node()
+        node.editing = True
         value = e.control.value
         if node.edit_model:
-            node.editing = True
             node.edit_model.value = value
-        else:
-            node.model.value = value
         e = PUIEvent()
         e.value = value
         self._input(e)
 
-    def on_change(self, e):
+    def on_change(self, e): # finish editing
         node = self.get_node()
         node.editing = False
         value = e.control.value