@gtkx/react 0.10.0 → 0.10.1

package/dist/host-config.js

@@ -1,6 +1,7 @@
 import { beginBatch, endBatch, getObjectId } from "@gtkx/ffi";
 import React from "react";
 import { createNode } from "./factory.js";
+import { clearFiredSignals } from "./nodes/internal/signal-store.js";
 import { flushAfterCommit } from "./scheduler.js";
 if (!globalThis.__GTKX_CONTAINER_NODE_CACHE__) {
     globalThis.__GTKX_CONTAINER_NODE_CACHE__ = new Map();
@@ -78,6 +79,7 @@ export function createHostConfig() {
         },
         resetAfterCommit: () => {
             endBatch();
+            clearFiredSignals();
             flushAfterCommit();
             committing = false;
         },

package/dist/jsx.d.ts

@@ -710,10 +710,5 @@ declare global {
 export * from "./generated/jsx.js";
 declare module "./generated/jsx.js" {
     interface WidgetProps extends EventControllerProps {
-        /**
-         * Called when any property on this widget changes.
-         * @param propName - The name of the property that changed
-         */
-        onNotify?: (propName: string) => void;
     }
 }

package/dist/nodes/action-row-child.js

@@ -47,7 +47,10 @@ export class ActionRowChild extends VirtualNode {
         }
         scheduleAfterCommit(() => {
             if (parent) {
-                parent.remove(widget);
+                const currentParent = widget.getParent();
+                if (currentParent?.equals(parent)) {
+                    parent.remove(widget);
+                }
             }
         });
     }
@@ -57,7 +60,10 @@ export class ActionRowChild extends VirtualNode {
         if (parent && childrenToRemove.length > 0) {
             scheduleAfterCommit(() => {
                 for (const widget of childrenToRemove) {
-                    parent.remove(widget);
+                    const currentParent = widget.getParent();
+                    if (currentParent?.equals(parent)) {
+                        parent.remove(widget);
+                    }
                 }
             });
         }

package/dist/nodes/fixed-child.js

@@ -1,3 +1,4 @@
+import { batch } from "@gtkx/ffi";
 import { registerNodeClass } from "../registry.js";
 import { SlotNode } from "./slot.js";
 class FixedChildNode extends SlotNode {
@@ -25,17 +26,22 @@ class FixedChildNode extends SlotNode {
         const y = this.props.y ?? 0;
         if (this.child) {
             const child = this.child;
-            const currentParent = child.getParent();
-            if (currentParent?.equals(fixed)) {
-                fixed.remove(child);
-            }
-            fixed.put(child, x, y);
+            batch(() => {
+                const currentParent = child.getParent();
+                if (currentParent?.equals(fixed)) {
+                    fixed.remove(child);
+                }
+                fixed.put(child, x, y);
+            });
         }
     }
     onChildChange(oldChild) {
         const fixed = this.getFixed();
         if (oldChild) {
-            fixed.remove(oldChild);
+            const parent = oldChild.getParent();
+            if (parent?.equals(fixed)) {
+                fixed.remove(oldChild);
+            }
         }
         if (this.child) {
             this.positionChild();

package/dist/nodes/grid-child.js

@@ -1,3 +1,4 @@
+import { batch } from "@gtkx/ffi";
 import { registerNodeClass } from "../registry.js";
 import { SlotNode } from "./slot.js";
 class GridChildNode extends SlotNode {
@@ -29,22 +30,27 @@ class GridChildNode extends SlotNode {
         const row = this.props.row ?? 0;
         const columnSpan = this.props.columnSpan ?? 1;
         const rowSpan = this.props.rowSpan ?? 1;
-        const existingChild = grid.getChildAt(column, row);
-        if (existingChild && !existingChild.equals(this.child)) {
-            grid.remove(existingChild);
-        }
-        if (this.child) {
-            const currentParent = this.child.getParent();
-            if (currentParent?.equals(grid)) {
-                grid.remove(this.child);
+        batch(() => {
+            const existingChild = grid.getChildAt(column, row);
+            if (existingChild && !existingChild.equals(this.child)) {
+                grid.remove(existingChild);
             }
-            grid.attach(this.child, column, row, columnSpan, rowSpan);
-        }
+            if (this.child) {
+                const currentParent = this.child.getParent();
+                if (currentParent?.equals(grid)) {
+                    grid.remove(this.child);
+                }
+                grid.attach(this.child, column, row, columnSpan, rowSpan);
+            }
+        });
     }
     onChildChange(oldChild) {
         const grid = this.getGrid();
         if (oldChild) {
-            grid.remove(oldChild);
+            const parent = oldChild.getParent();
+            if (parent?.equals(grid)) {
+                grid.remove(oldChild);
+            }
         }
         if (this.child) {
             this.attachChild();

package/dist/nodes/internal/signal-store.d.ts

@@ -1,5 +1,6 @@
 import * as GObject from "@gtkx/ffi/gobject";
 export type SignalHandler = (...args: any[]) => any;
+export declare const clearFiredSignals: () => void;
 export declare class SignalStore {
     private signalHandlers;
     private disconnect;

package/dist/nodes/internal/signal-store.js

@@ -16,6 +16,10 @@ const LIFECYCLE_SIGNALS = new Set([
     "unbind",
     "teardown",
 ]);
+const firedThisCommit = new Set();
+export const clearFiredSignals = () => {
+    firedThisCommit.clear();
+};
 export class SignalStore {
     signalHandlers = new Map();
     disconnect(obj, signal) {
@@ -31,8 +35,14 @@ export class SignalStore {
         const objectId = getObjectId(obj.id);
         const key = `${objectId}:${signal}`;
         const wrappedHandler = (...args) => {
-            if (isCommitting() && !LIFECYCLE_SIGNALS.has(signal)) {
-                return;
+            if (LIFECYCLE_SIGNALS.has(signal)) {
+                return handler(...args);
+            }
+            if (isCommitting()) {
+                if (firedThisCommit.has(key)) {
+                    return;
+                }
+                firedThisCommit.add(key);
             }
             return handler(...args);
         };

package/dist/nodes/overlay-child.js

@@ -14,7 +14,10 @@ class OverlayChildNode extends SlotNode {
     onChildChange(oldChild) {
         const overlay = this.getOverlay();
         if (oldChild) {
-            overlay.removeOverlay(oldChild);
+            const parent = oldChild.getParent();
+            if (parent?.equals(overlay)) {
+                overlay.removeOverlay(oldChild);
+            }
         }
         if (this.child) {
             overlay.addOverlay(this.child);

package/dist/nodes/pack-child.js

@@ -21,7 +21,10 @@ export class PackChild extends VirtualNode {
         if (parent && childrenToRemove.length > 0) {
             scheduleAfterCommit(() => {
                 for (const widget of childrenToRemove) {
-                    parent.remove(widget);
+                    const currentParent = widget.getParent();
+                    if (currentParent?.equals(parent)) {
+                        parent.remove(widget);
+                    }
                 }
             });
         }
@@ -54,13 +57,17 @@ export class PackChild extends VirtualNode {
             throw new Error(`Cannot remove '${child.typeName}' from '${this.typeName}': expected Widget`);
         }
         const widget = child.container;
+        const parent = this.parent;
         const index = this.children.indexOf(widget);
         if (index !== -1) {
             this.children.splice(index, 1);
         }
         scheduleAfterCommit(() => {
-            if (this.parent) {
-                this.parent.remove(widget);
+            if (parent) {
+                const currentParent = widget.getParent();
+                if (currentParent?.equals(parent)) {
+                    parent.remove(widget);
+                }
             }
         });
     }

package/dist/nodes/stack-page.js

@@ -68,7 +68,10 @@ class StackPageNode extends SlotNode {
         if (!oldChild) {
             return;
         }
-        parent.remove(oldChild);
+        const currentParent = oldChild.getParent();
+        if (currentParent?.equals(parent)) {
+            parent.remove(oldChild);
+        }
     }
     onChildChange(oldChild) {
         this.removePage(oldChild);

package/dist/nodes/toolbar-child.js

@@ -17,7 +17,10 @@ export class ToolbarChildNode extends SlotNode {
     onChildChange(oldChild) {
         const toolbar = this.getToolbar();
         if (oldChild) {
-            toolbar.remove(oldChild);
+            const parent = oldChild.getParent();
+            if (parent?.equals(toolbar)) {
+                toolbar.remove(oldChild);
+            }
         }
         if (this.child) {
             const position = this.getPosition();

package/dist/nodes/widget.js

@@ -217,8 +217,8 @@ export class WidgetNode extends Node {
             }
             case "onNotify": {
                 const wrappedHandler = handler
-                    ? (_obj, pspec) => {
-                        handler(pspec.getName());
+                    ? (obj, pspec) => {
+                        handler(obj, pspec.getName());
                     }
                     : undefined;
                 this.signalStore.set(this.container, "notify", wrappedHandler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Build GTK4 desktop applications with React and TypeScript",
   "keywords": [
     "gtk",
@@ -36,8 +36,8 @@
   ],
   "dependencies": {
     "react-reconciler": "^0.33.0",
-    "@gtkx/ffi": "0.10.0",
-    "@gtkx/gir": "0.10.0"
+    "@gtkx/ffi": "0.10.1",
+    "@gtkx/gir": "0.10.1"
   },
   "devDependencies": {
     "@types/react-reconciler": "^0.32.3",