@gtkx/react 0.19.0 → 0.21.0

package/dist/nodes/column-view-column.js

@@ -1,156 +1,167 @@
+import { getNativeId } from "@gtkx/ffi";
 import * as Gio from "@gtkx/ffi/gio";
 import * as Gtk from "@gtkx/ffi/gtk";
-import { GridItemRenderer } from "./internal/grid-item-renderer.js";
-import { ListItemRenderer } from "./internal/list-item-renderer.js";
 import { hasChanged } from "./internal/props.js";
 import { MenuNode } from "./menu.js";
 import { MenuModel } from "./models/menu.js";
 import { VirtualNode } from "./virtual.js";
 import { WidgetNode } from "./widget.js";
+const UNBOUND_POSITION = -1;
 export class ColumnViewColumnNode extends VirtualNode {
+    column = null;
+    columnFactory = null;
+    containers = new Map();
+    containerKeys = new Map();
+    menu;
+    actionGroup;
+    constructor(typeName, props, container, rootContainer) {
+        super(typeName, props, container, rootContainer);
+        this.actionGroup = new Gio.SimpleActionGroup();
+        this.menu = new MenuModel("root", {}, rootContainer, this.actionGroup);
+        this.menu.setActionMap(this.actionGroup, props.id);
+    }
     isValidChild(child) {
         return child instanceof MenuNode;
     }
     isValidParent(parent) {
         return parent instanceof WidgetNode && parent.container instanceof Gtk.ColumnView;
     }
-    column;
-    treeRenderer;
-    flatRenderer = null;
-    menu = null;
-    actionGroup = null;
-    columnView = null;
-    constructor(typeName, props, container, rootContainer) {
-        super(typeName, props, container, rootContainer);
-        this.treeRenderer = new ListItemRenderer(this.signalStore);
-        this.column = new Gtk.ColumnViewColumn();
-        this.column.setFactory(this.treeRenderer.getFactory());
+    finalizeInitialChildren(props) {
+        this.setupFactory();
+        this.setupColumn(props);
+        this.updateHeaderMenu();
+        return false;
+    }
+    commitUpdate(oldProps, newProps) {
+        super.commitUpdate(oldProps, newProps);
+        if (oldProps === null)
+            return;
+        this.applyColumnProps(oldProps, newProps);
     }
     appendChild(child) {
-        this.initMenu();
-        this.menu?.appendChild(child);
+        this.menu.appendChild(child);
+        this.updateHeaderMenu();
     }
     insertBefore(child, before) {
-        this.initMenu();
-        if (before instanceof MenuNode) {
-            this.menu?.insertBefore(child, before);
-        }
-        else {
-            this.menu?.appendChild(child);
-        }
+        this.menu.insertBefore(child, before);
+        this.updateHeaderMenu();
     }
     removeChild(child) {
-        this.menu?.removeChild(child);
-        if (this.menu && this.menu.getMenu().getNItems() === 0) {
-            this.cleanupMenu();
-        }
-    }
-    commitUpdate(oldProps, newProps) {
-        super.commitUpdate(oldProps, newProps);
-        this.applyOwnProps(oldProps, newProps);
+        this.menu.removeChild(child);
+        this.updateHeaderMenu();
     }
     detachDeletedInstance() {
-        this.cleanupMenu();
-        this.treeRenderer?.dispose();
-        this.flatRenderer?.dispose();
         super.detachDeletedInstance();
     }
     getColumn() {
+        if (!this.column)
+            throw new Error("ColumnViewColumn not initialized");
         return this.column;
     }
-    rebindItem(id) {
-        this.treeRenderer?.rebindItem(id);
-        this.flatRenderer?.rebindItem(id);
-    }
-    setStore(model) {
-        this.treeRenderer?.setStore(model);
-    }
-    setFlatStore(store) {
-        if (this.treeRenderer) {
-            this.treeRenderer.dispose();
-            this.treeRenderer = null;
-        }
-        if (!this.flatRenderer) {
-            this.flatRenderer = new GridItemRenderer(this.signalStore);
-            this.flatRenderer.setRenderFn(this.props.renderCell);
-            this.column.setFactory(this.flatRenderer.getFactory());
-        }
-        this.flatRenderer.setStore(store);
-    }
-    setEstimatedRowHeight(height) {
-        this.treeRenderer?.setEstimatedItemHeight(height);
-        this.flatRenderer?.setEstimatedItemHeight(height);
-    }
-    attachToColumnView(columnView) {
-        this.columnView = columnView;
-        if (this.actionGroup) {
-            this.columnView.insertActionGroup(this.props.id, this.actionGroup);
-        }
-    }
-    detachFromColumnView() {
-        if (this.columnView && this.actionGroup) {
-            this.columnView.insertActionGroup(this.props.id, null);
-        }
-        this.columnView = null;
-    }
-    initMenu() {
-        if (this.menu)
+    collectBoundItems(flatItems) {
+        const { renderCell } = this.props;
+        if (!renderCell)
+            return [];
+        const items = [];
+        for (const [container, position] of this.containers) {
+            if (position === UNBOUND_POSITION)
+                continue;
+            const key = this.containerKeys.get(container);
+            if (!key)
+                continue;
+            const item = flatItems[position];
+            if (!item)
+                continue;
+            const content = renderCell(item.value);
+            items.push([content, container, key]);
+        }
+        return items;
+    }
+    installActionGroup(widget) {
+        widget.insertActionGroup(this.props.id, this.actionGroup);
+    }
+    uninstallActionGroup(widget) {
+        widget.insertActionGroup(this.props.id, null);
+    }
+    setupFactory() {
+        this.columnFactory = new Gtk.SignalListItemFactory();
+        this.columnFactory.connect("setup", (_self, obj) => {
+            const listItem = obj;
+            const key = String(getNativeId(listItem.handle));
+            const placeholder = new Gtk.Box();
+            const { width, height } = this.getParentEstimatedItemSize();
+            placeholder.setSizeRequest(width, height);
+            listItem.setChild(placeholder);
+            this.containers.set(listItem, UNBOUND_POSITION);
+            this.containerKeys.set(listItem, key);
+        });
+        this.columnFactory.connect("bind", (_self, obj) => {
+            const listItem = obj;
+            this.containers.set(listItem, listItem.getPosition());
+            this.scheduleParentUpdate();
+        });
+        this.columnFactory.connect("unbind", (_self, obj) => {
+            const listItem = obj;
+            this.containers.set(listItem, UNBOUND_POSITION);
+            this.scheduleParentUpdate();
+        });
+        this.columnFactory.connect("teardown", (_self, obj) => {
+            const listItem = obj;
+            this.containers.delete(listItem);
+            this.containerKeys.delete(listItem);
+            listItem.setChild(null);
+        });
+    }
+    setupColumn(props) {
+        this.column = new Gtk.ColumnViewColumn(props.title, this.columnFactory);
+        this.column.setId(props.id);
+        if (props.expand !== undefined)
+            this.column.setExpand(props.expand);
+        if (props.resizable !== undefined)
+            this.column.setResizable(props.resizable);
+        if (props.fixedWidth !== undefined)
+            this.column.setFixedWidth(props.fixedWidth);
+        if (props.visible !== undefined)
+            this.column.setVisible(props.visible);
+        if (props.sortable)
+            this.column.setSorter(new Gtk.CustomSorter());
+    }
+    applyColumnProps(oldProps, newProps) {
+        if (!this.column)
             return;
-        this.actionGroup = new Gio.SimpleActionGroup();
-        this.menu = new MenuModel("root", {}, this.rootContainer);
-        this.menu.setActionMap(this.actionGroup, this.props.id);
-        this.column.setHeaderMenu(this.menu.getMenu());
-        if (this.columnView) {
-            this.columnView.insertActionGroup(this.props.id, this.actionGroup);
-        }
-    }
-    cleanupMenu() {
-        if (!this.menu)
-            return;
-        this.column.setHeaderMenu(null);
-        if (this.columnView && this.actionGroup) {
-            this.columnView.insertActionGroup(this.props.id, null);
-        }
-        this.menu = null;
-        this.actionGroup = null;
-    }
-    applyOwnProps(oldProps, newProps) {
-        if (hasChanged(oldProps, newProps, "renderCell")) {
-            this.treeRenderer?.setRenderFn(newProps.renderCell);
-            this.flatRenderer?.setRenderFn(newProps.renderCell);
-        }
-        if (hasChanged(oldProps, newProps, "title")) {
+        if (hasChanged(oldProps, newProps, "title"))
             this.column.setTitle(newProps.title);
-        }
-        if (hasChanged(oldProps, newProps, "expand")) {
+        if (hasChanged(oldProps, newProps, "expand"))
             this.column.setExpand(newProps.expand ?? false);
-        }
-        if (hasChanged(oldProps, newProps, "resizable")) {
+        if (hasChanged(oldProps, newProps, "resizable"))
             this.column.setResizable(newProps.resizable ?? false);
-        }
-        if (hasChanged(oldProps, newProps, "fixedWidth")) {
+        if (hasChanged(oldProps, newProps, "fixedWidth"))
             this.column.setFixedWidth(newProps.fixedWidth ?? -1);
-        }
-        if (hasChanged(oldProps, newProps, "id")) {
-            if (this.columnView && this.actionGroup && oldProps?.id) {
-                this.columnView.insertActionGroup(oldProps.id, null);
-                this.columnView.insertActionGroup(newProps.id, this.actionGroup);
-            }
-            this.column.setId(newProps.id);
-            if (oldProps && this.menu && this.actionGroup) {
-                this.menu.setActionMap(this.actionGroup, newProps.id);
-            }
-        }
-        if (hasChanged(oldProps, newProps, "visible")) {
+        if (hasChanged(oldProps, newProps, "visible"))
             this.column.setVisible(newProps.visible ?? true);
-        }
         if (hasChanged(oldProps, newProps, "sortable")) {
-            if (newProps.sortable) {
-                this.column.setSorter(new Gtk.StringSorter());
-            }
-            else {
-                this.column.setSorter(null);
-            }
+            this.column.setSorter(newProps.sortable ? new Gtk.CustomSorter() : null);
+        }
+        if (hasChanged(oldProps, newProps, "renderCell"))
+            this.scheduleParentUpdate();
+    }
+    updateHeaderMenu() {
+        if (!this.column)
+            return;
+        const menu = this.menu.getMenu();
+        this.column.setHeaderMenu(menu.getNItems() > 0 ? menu : null);
+    }
+    getParentEstimatedItemSize() {
+        if (this.parent && "getEstimatedItemSize" in this.parent) {
+            return this.parent.getEstimatedItemSize();
+        }
+        return { width: -1, height: -1 };
+    }
+    scheduleParentUpdate() {
+        if (this.parent &&
+            "scheduleBoundItemsUpdate" in this.parent &&
+            typeof this.parent.scheduleBoundItemsUpdate === "function") {
+            this.parent.scheduleBoundItemsUpdate();
         }
     }
 }

package/dist/nodes/column-view-column.js.map

@@ -1 +1 @@
-{"version":3,"file":"column-view-column.js","sourceRoot":"","sources":["../../src/nodes/column-view-column.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"column-view-column.js","sourceRoot":"","sources":["../../src/nodes/column-view-column.ts"],"names":[],"mappings":"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"}

package/dist/nodes/container-slot.d.ts

@@ -11,6 +11,8 @@ export declare class ContainerSlotNode extends VirtualNode<ContainerSlotProps, W
     removeChild(child: WidgetNode): void;
     detachDeletedInstance(): void;
     private attachToParent;
-    private detachAllChildren;
+    private detachFromGtkParent;
+    private reinsertAllChildren;
+    private detachAllFromGtkParent;
 }
 //# sourceMappingURL=container-slot.d.ts.map

package/dist/nodes/container-slot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container-slot.d.ts","sourceRoot":"","sources":["../../src/nodes/container-slot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,qBAAa,iBAAkB,SAAQ,WAAW,CAAC,kBAAkB,EAAE,UAAU,EAAE,UAAU,CAAC;IAC1E,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;IAIlC,aAAa,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO;IAIpC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI;IAc1C,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQpC,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAQzD,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAYpC,qBAAqB,IAAI,IAAI;IAO7C,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,iBAAiB;CAU5B"}
+{"version":3,"file":"container-slot.d.ts","sourceRoot":"","sources":["../../src/nodes/container-slot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,qBAAa,iBAAkB,SAAQ,WAAW,CAAC,kBAAkB,EAAE,UAAU,EAAE,UAAU,CAAC;IAC1E,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;IAIlC,aAAa,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO;IAIpC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI;IAc1C,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IASpC,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAQzD,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAKpC,qBAAqB,IAAI,IAAI;IAO7C,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,sBAAsB;CAKjC"}

package/dist/nodes/container-slot.js

@@ -10,7 +10,7 @@ export class ContainerSlotNode extends VirtualNode {
     }
     setParent(parent) {
         if (!parent && this.parent) {
-            this.detachAllChildren(this.parent.container);
+            this.detachAllFromGtkParent();
         }
         super.setParent(parent);
         if (parent) {
@@ -22,28 +22,23 @@ export class ContainerSlotNode extends VirtualNode {
     appendChild(child) {
         super.appendChild(child);
         if (this.parent) {
+            this.detachFromGtkParent(child);
             this.attachToParent(this.parent.container, child.container);
         }
     }
     insertBefore(child, before) {
         super.insertBefore(child, before);
         if (this.parent) {
-            this.attachToParent(this.parent.container, child.container);
+            this.reinsertAllChildren();
         }
     }
     removeChild(child) {
-        if (this.parent && isRemovable(this.parent.container)) {
-            const widget = child.container;
-            const currentParent = widget.getParent();
-            if (currentParent && currentParent === this.parent.container) {
-                this.parent.container.remove(widget);
-            }
-        }
+        this.detachFromGtkParent(child);
         super.removeChild(child);
     }
     detachDeletedInstance() {
         if (this.parent) {
-            this.detachAllChildren(this.parent.container);
+            this.detachAllFromGtkParent();
         }
         super.detachDeletedInstance();
     }
@@ -55,14 +50,31 @@ export class ContainerSlotNode extends VirtualNode {
         }
         method.call(parent, child);
     }
-    detachAllChildren(parent) {
-        if (!isRemovable(parent))
+    detachFromGtkParent(child) {
+        const currentParent = child.container.getParent();
+        if (currentParent !== null) {
+            if (isRemovable(currentParent)) {
+                currentParent.remove(child.container);
+            }
+            else {
+                child.container.unparent();
+            }
+        }
+    }
+    reinsertAllChildren() {
+        if (!this.parent)
             return;
+        const parent = this.parent.container;
         for (const child of this.children) {
-            const currentParent = child.container.getParent();
-            if (currentParent && currentParent === parent) {
-                parent.remove(child.container);
-            }
+            this.detachFromGtkParent(child);
+        }
+        for (const child of this.children) {
+            this.attachToParent(parent, child.container);
+        }
+    }
+    detachAllFromGtkParent() {
+        for (const child of this.children) {
+            this.detachFromGtkParent(child);
         }
     }
 }

package/dist/nodes/container-slot.js.map

@@ -1 +1 @@
-{"version":3,"file":"container-slot.js","sourceRoot":"","sources":["../../src/nodes/container-slot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"container-slot.js","sourceRoot":"","sources":["../../src/nodes/container-slot.ts"],"names":[],"mappings":"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"}

package/dist/nodes/drawing-area.d.ts

@@ -5,12 +5,14 @@ import { ContainerSlotNode } from "./container-slot.js";
 import { EventControllerNode } from "./event-controller.js";
 import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
-declare const OWN_PROPS: readonly ["onDraw"];
+declare const OWN_PROPS: readonly ["render"];
 type DrawingAreaProps = Pick<GtkDrawingAreaProps, (typeof OWN_PROPS)[number]>;
 type DrawingAreaChild = EventControllerNode | SlotNode | ContainerSlotNode;
 export declare class DrawingAreaNode extends WidgetNode<Gtk.DrawingArea, DrawingAreaProps, DrawingAreaChild> {
+    private currentDrawFunc;
     isValidChild(child: Node): boolean;
     commitUpdate(oldProps: DrawingAreaProps | null, newProps: DrawingAreaProps): void;
+    detachDeletedInstance(): void;
     private applyOwnProps;
 }
 export {};

package/dist/nodes/drawing-area.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawing-area.d.ts","sourceRoot":"","sources":["../../src/nodes/drawing-area.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,QAAA,MAAM,SAAS,qBAAsB,CAAC;AAGtC,KAAK,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AA4B9E,KAAK,gBAAgB,GAAG,mBAAmB,GAAG,QAAQ,GAAG,iBAAiB,CAAC;AAE3E,qBAAa,eAAgB,SAAQ,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAChF,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;IAIlC,YAAY,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAKjG,OAAO,CAAC,aAAa;CASxB"}
+{"version":3,"file":"drawing-area.d.ts","sourceRoot":"","sources":["../../src/nodes/drawing-area.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,QAAA,MAAM,SAAS,qBAAsB,CAAC;AAGtC,KAAK,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE9E,KAAK,gBAAgB,GAAG,mBAAmB,GAAG,QAAQ,GAAG,iBAAiB,CAAC;AAE3E,qBAAa,eAAgB,SAAQ,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CAAC;IAChG,OAAO,CAAC,eAAe,CAAyB;IAEhC,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;IAIlC,YAAY,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAKjF,qBAAqB,IAAI,IAAI;IAM7C,OAAO,CAAC,aAAa;CAkBxB"}

package/dist/nodes/drawing-area.js

@@ -3,24 +3,9 @@ import { EventControllerNode } from "./event-controller.js";
 import { filterProps, hasChanged } from "./internal/props.js";
 import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
-const OWN_PROPS = ["onDraw"];
-const pendingDrawFuncs = [];
-function wrapDrawFunc(fn) {
-    return (self, cr, width, height) => fn(cr, width, height, self);
-}
-function ensurePendingBatch() {
-    if (pendingDrawFuncs.length === 0) {
-        queueMicrotask(flushPendingDrawFuncs);
-    }
-    return pendingDrawFuncs;
-}
-function flushPendingDrawFuncs() {
-    const batch = pendingDrawFuncs.splice(0);
-    for (const { container, fn } of batch) {
-        container.setDrawFunc(wrapDrawFunc(fn));
-    }
-}
+const OWN_PROPS = ["render"];
 export class DrawingAreaNode extends WidgetNode {
+    currentDrawFunc = null;
     isValidChild(child) {
         return child instanceof EventControllerNode || child instanceof SlotNode || child instanceof ContainerSlotNode;
     }
@@ -28,13 +13,26 @@ export class DrawingAreaNode extends WidgetNode {
         super.commitUpdate(oldProps ? filterProps(oldProps, OWN_PROPS) : null, filterProps(newProps, OWN_PROPS));
         this.applyOwnProps(oldProps, newProps);
     }
+    detachDeletedInstance() {
+        this.currentDrawFunc = null;
+        this.container.setDrawFunc(undefined);
+        super.detachDeletedInstance();
+    }
     applyOwnProps(oldProps, newProps) {
-        if (hasChanged(oldProps, newProps, "onDraw")) {
-            if (this.container.getAllocatedWidth() > 0) {
-                this.container.setDrawFunc(newProps.onDraw ? wrapDrawFunc(newProps.onDraw) : null);
+        if (hasChanged(oldProps, newProps, "render")) {
+            const hadDraw = !!oldProps?.render;
+            const hasDraw = !!newProps.render;
+            this.currentDrawFunc = newProps.render ?? null;
+            if (hasDraw && !hadDraw) {
+                this.container.setDrawFunc((self, cr, width, height) => {
+                    this.currentDrawFunc?.(cr, width, height, self);
+                });
+            }
+            else if (!hasDraw && hadDraw) {
+                this.container.setDrawFunc(undefined);
             }
-            else if (newProps.onDraw) {
-                ensurePendingBatch().push({ container: this.container, fn: newProps.onDraw });
+            else if (hasDraw) {
+                this.container.queueDraw();
             }
         }
     }

package/dist/nodes/drawing-area.js.map

@@ -1 +1 @@
-{"version":3,"file":"drawing-area.js","sourceRoot":"","sources":["../../src/nodes/drawing-area.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAU,CAAC;AAOtC,MAAM,gBAAgB,GAA2B,EAAE,CAAC;AAEpD,SAAS,YAAY,CACjB,EAAY;IAEZ,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,kBAAkB;IACvB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,cAAc,CAAC,qBAAqB,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAED,SAAS,qBAAqB;IAC1B,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAEzC,KAAK,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC;QACpC,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,CAAC;AACL,CAAC;AAID,MAAM,OAAO,eAAgB,SAAQ,UAA+D;IAChF,YAAY,CAAC,KAAW;QACpC,OAAO,KAAK,YAAY,mBAAmB,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,YAAY,iBAAiB,CAAC;IACnH,CAAC;IAEe,YAAY,CAAC,QAAiC,EAAE,QAA0B;QACtF,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAEO,aAAa,CAAC,QAAiC,EAAE,QAA0B;QAC/E,IAAI,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACvF,CAAC;iBAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACzB,kBAAkB,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAClF,CAAC;QACL,CAAC;IACL,CAAC;CACJ"}
+{"version":3,"file":"drawing-area.js","sourceRoot":"","sources":["../../src/nodes/drawing-area.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAU,CAAC;AAOtC,MAAM,OAAO,eAAgB,SAAQ,UAA+D;IACxF,eAAe,GAAoB,IAAI,CAAC;IAEhC,YAAY,CAAC,KAAW;QACpC,OAAO,KAAK,YAAY,mBAAmB,IAAI,KAAK,YAAY,QAAQ,IAAI,KAAK,YAAY,iBAAiB,CAAC;IACnH,CAAC;IAEe,YAAY,CAAC,QAAiC,EAAE,QAA0B;QACtF,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAEe,qBAAqB;QACjC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACtC,KAAK,CAAC,qBAAqB,EAAE,CAAC;IAClC,CAAC;IAEO,aAAa,CAAC,QAAiC,EAAE,QAA0B;QAC/E,IAAI,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC3C,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC;YACnC,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YAElC,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC;YAE/C,IAAI,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;gBACtB,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;oBACnD,IAAI,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;gBACpD,CAAC,CAAC,CAAC;YACP,CAAC;iBAAM,IAAI,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC;gBAC7B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAC1C,CAAC;iBAAM,IAAI,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAC/B,CAAC;QACL,CAAC;IACL,CAAC;CACJ"}

package/dist/nodes/event-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-controller.d.ts","sourceRoot":"","sources":["../../src/nodes/event-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,eAAe,CAAC;AAGrC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,EAEnD,MAAM,SAAS,IAAI,GAAG,GAAG,CAC3B,SAAQ,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC;WACjB,eAAe,CAClC,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE,OAAO,GAAG,CAAC,eAAe,GAC3C,GAAG,CAAC,eAAe;IAgBN,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;IAIlC,aAAa,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO;IAIpC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI;IAY1C,YAAY,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;IAK3D,qBAAqB,IAAI,IAAI;IAO7C,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,WAAW;CAiBtB"}
+{"version":3,"file":"event-controller.d.ts","sourceRoot":"","sources":["../../src/nodes/event-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,eAAe,CAAC;AAErC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,EAEnD,MAAM,SAAS,IAAI,GAAG,GAAG,CAC3B,SAAQ,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC;WACjB,eAAe,CAClC,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE,OAAO,GAAG,CAAC,eAAe,GAC3C,GAAG,CAAC,eAAe;IASN,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;IAIlC,aAAa,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO;IAIpC,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI;IAY1C,YAAY,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI;IAK3D,qBAAqB,IAAI,IAAI;IAO7C,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,WAAW;CAatB"}

package/dist/nodes/event-controller.js

@@ -1,22 +1,16 @@
 import * as Gtk from "@gtkx/ffi/gtk";
-import { CONSTRUCTOR_PROPS } from "../generated/internal.js";
 import { isConstructOnlyProp, resolvePropMeta, resolveSignal } from "../metadata.js";
 import { Node } from "../node.js";
-import { createContainerWithConstructOnly } from "./internal/construct.js";
+import { createContainerWithProperties } from "./internal/construct.js";
 import { WidgetNode } from "./widget.js";
 const G_TYPE_INVALID = 0;
 export class EventControllerNode extends Node {
     static createContainer(props, containerClass) {
-        const typeName = containerClass.glibTypeName;
-        if (typeName === "GtkDropTarget") {
+        if (containerClass.glibTypeName === "GtkDropTarget") {
             const actions = props.actions ?? 0;
             return new Gtk.DropTarget(G_TYPE_INVALID, actions);
         }
-        const args = (CONSTRUCTOR_PROPS[typeName] ?? []).map((name) => props[name]);
-        return createContainerWithConstructOnly(containerClass, props, () => {
-            // biome-ignore lint/suspicious/noExplicitAny: Dynamic constructor invocation
-            return new containerClass(...args);
-        });
+        return createContainerWithProperties(containerClass, props);
     }
     isValidChild(child) {
         return this.container instanceof Gtk.ShortcutController && child.typeName === "Shortcut";
@@ -70,13 +64,9 @@ export class EventControllerNode extends Node {
             this.container.setGtypes(types.length, types);
             return;
         }
-        const propMeta = resolvePropMeta(this.container, name);
-        if (propMeta) {
-            const [, setterName] = propMeta;
-            const setterFn = this.container[setterName];
-            if (typeof setterFn === "function") {
-                setterFn.call(this.container, value);
-            }
+        const propName = resolvePropMeta(this.container, name);
+        if (propName) {
+            this.container[propName] = value;
         }
     }
 }

package/dist/nodes/event-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-controller.js","sourceRoot":"","sources":["../../src/nodes/event-controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"event-controller.js","sourceRoot":"","sources":["../../src/nodes/event-controller.ts"],"names":[],"mappings":"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"}

package/dist/nodes/fixed-child.d.ts

@@ -13,6 +13,7 @@ export declare class FixedChildNode extends VirtualNode<FixedChildProps, WidgetN
     detachDeletedInstance(): void;
     private attachToParent;
     private detachFromParent;
+    private detachFromGtkParent;
     private applyLayoutTransform;
 }
 //# sourceMappingURL=fixed-child.d.ts.map