@gtkx/react 0.10.0 → 0.10.2

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/index.d.ts

@@ -9,8 +9,6 @@ import "./grid-child.js";
 import "./list-item.js";
 import "./list-view.js";
 import "./menu.js";
-import "./navigation-page.js";
-import "./navigation-view.js";
 import "./notebook-page-tab.js";
 import "./notebook-page.js";
 import "./notebook.js";
@@ -26,7 +24,6 @@ import "./stack.js";
 import "./toast-overlay.js";
 import "./toast.js";
 import "./toolbar-child.js";
-import "./toolbar.js";
 import "./tree-list-item.js";
 import "./tree-list-view.js";
 import "./virtual.js";

package/dist/nodes/index.js

@@ -9,8 +9,6 @@ import "./grid-child.js";
 import "./list-item.js";
 import "./list-view.js";
 import "./menu.js";
-import "./navigation-page.js";
-import "./navigation-view.js";
 import "./notebook-page-tab.js";
 import "./notebook-page.js";
 import "./notebook.js";
@@ -26,7 +24,6 @@ import "./stack.js";
 import "./toast-overlay.js";
 import "./toast.js";
 import "./toolbar-child.js";
-import "./toolbar.js";
 import "./tree-list-item.js";
 import "./tree-list-view.js";
 import "./virtual.js";

package/dist/nodes/internal/predicates.d.ts

@@ -5,6 +5,9 @@ export declare const isAppendable: (obj: unknown) => obj is Gtk.Widget & {
 export declare const isAddable: (obj: unknown) => obj is Gtk.Widget & {
     add: (child: Gtk.Widget) => void;
 };
+export declare const hasSingleContent: (obj: unknown) => obj is Gtk.Widget & {
+    setContent: (content: Gtk.Widget | undefined) => void;
+};
 export declare const isSingleChild: (obj: unknown) => obj is Gtk.Widget & {
     setChild: (child: Gtk.Widget | null) => void;
 };

package/dist/nodes/internal/predicates.js

@@ -5,6 +5,9 @@ export const isAppendable = (obj) => {
 export const isAddable = (obj) => {
     return obj instanceof Gtk.Widget && "add" in obj && typeof obj.add === "function";
 };
+export const hasSingleContent = (obj) => {
+    return obj instanceof Gtk.Widget && "setContent" in obj && typeof obj.setContent === "function";
+};
 export const isSingleChild = (obj) => {
     return obj instanceof Gtk.Widget && "setChild" in obj && typeof obj.setChild === "function";
 };

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/notebook-page-tab.js

@@ -30,12 +30,9 @@ export class NotebookPageTabNode extends SlotNode {
         }
         const notebook = this.getNotebook();
         const page = this.getPage();
-        // Only call setTabLabel if the page is actually in the notebook
-        // (pageNum returns -1 if not found)
         if (notebook.pageNum(page) === -1) {
             return;
         }
-        // setTabLabel accepts undefined to reset to default
         notebook.setTabLabel(page, this.child);
     }
 }

package/dist/nodes/notebook-page.js

@@ -54,7 +54,6 @@ export class NotebookPageNode extends SlotNode {
             this.tabNode = undefined;
             return;
         }
-        // For content widget, use SlotNode's removeChild logic
         super.removeChild();
     }
     unmount() {
@@ -63,7 +62,6 @@ export class NotebookPageNode extends SlotNode {
     }
     updateProps(oldProps, newProps) {
         if (!oldProps || oldProps.label !== newProps.label) {
-            // Only update if using text label (no custom tab node)
             if (this.child && this.parent && !this.tabNode?.child) {
                 const tabLabel = this.getNotebook().getTabLabel(this.child);
                 tabLabel.setLabel(newProps.label ?? "");
@@ -73,7 +71,6 @@ export class NotebookPageNode extends SlotNode {
     attachPage() {
         const child = this.getChild();
         const notebook = this.getNotebook();
-        // Use custom tab widget if provided, otherwise create a Label
         let tabLabel;
         if (this.tabNode?.child) {
             tabLabel = this.tabNode.child;

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.d.ts

@@ -1,9 +1 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
-import { SlotNode } from "./slot.js";
-export declare class ToolbarChildNode extends SlotNode {
-    static priority: number;
-    static matches(type: string): boolean;
-    private getToolbar;
-    private getPosition;
-    protected onChildChange(oldChild: Gtk.Widget | undefined): void;
-}
+export {};

package/dist/nodes/toolbar-child.js

@@ -1,6 +1,6 @@
 import { registerNodeClass } from "../registry.js";
 import { SlotNode } from "./slot.js";
-export class ToolbarChildNode extends SlotNode {
+class ToolbarChildNode extends SlotNode {
     static priority = 1;
     static matches(type) {
         return type === "Toolbar.Top" || type === "Toolbar.Bottom";
@@ -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

@@ -3,7 +3,7 @@ import * as Gtk from "@gtkx/ffi/gtk";
 import { CONSTRUCTOR_PROPS, PROPS, SIGNALS } from "../generated/internal.js";
 import { Node } from "../node.js";
 import { registerNodeClass } from "../registry.js";
-import { isAddable, isAppendable, isEditable, isInsertable, isRemovable, isReorderable, isSingleChild, } from "./internal/predicates.js";
+import { hasSingleContent, isAddable, isAppendable, isEditable, isInsertable, isRemovable, isReorderable, isSingleChild, } from "./internal/predicates.js";
 import { filterProps, isContainerType } from "./internal/utils.js";
 import { SlotNode } from "./slot.js";
 const EVENT_CONTROLLER_PROPS = new Set([
@@ -58,6 +58,9 @@ export class WidgetNode extends Node {
                 }
                 this.container.add(child.container);
             }
+            else if (hasSingleContent(this.container)) {
+                this.container.setContent(child.container);
+            }
             else if (isSingleChild(this.container)) {
                 this.container.setChild(child.container);
             }
@@ -80,6 +83,9 @@ export class WidgetNode extends Node {
             if (isRemovable(this.container)) {
                 this.container.remove(child.container);
             }
+            else if (hasSingleContent(this.container)) {
+                this.container.setContent(undefined);
+            }
             else if (isSingleChild(this.container)) {
                 this.container.setChild(null);
             }
@@ -217,8 +223,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/dist/nodes/window.js

@@ -37,11 +37,6 @@ class WindowNode extends WidgetNode {
             return;
         }
         this.menu.appendChild(child);
-        if (child instanceof WidgetNode &&
-            (this.container instanceof Adw.ApplicationWindow || this.container instanceof Adw.Window)) {
-            this.container.setContent(child.container);
-            return;
-        }
         super.appendChild(child);
     }
     removeChild(child) {
@@ -50,11 +45,6 @@ class WindowNode extends WidgetNode {
             return;
         }
         this.menu.removeChild(child);
-        if (child instanceof WidgetNode &&
-            (this.container instanceof Adw.ApplicationWindow || this.container instanceof Adw.Window)) {
-            this.container.setContent(undefined);
-            return;
-        }
         super.removeChild(child);
     }
     insertBefore(child, before) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "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.2",
+    "@gtkx/gir": "0.10.2"
   },
   "devDependencies": {
     "@types/react-reconciler": "^0.32.3",

package/dist/nodes/navigation-page.d.ts

@@ -1,21 +0,0 @@
-import * as Adw from "@gtkx/ffi/adw";
-import type { AdwNavigationPageProps } from "../jsx.js";
-import type { Node } from "../node.js";
-import { VirtualNode } from "./virtual.js";
-type Props = Partial<AdwNavigationPageProps>;
-export declare class NavigationPageNode extends VirtualNode<Props> {
-    static priority: number;
-    private parent?;
-    private child?;
-    private page?;
-    static matches(type: string): boolean;
-    setParent(parent?: Adw.NavigationView): void;
-    appendChild(child: Node): void;
-    removeChild(): void;
-    unmount(): void;
-    updateProps(oldProps: Props | null, newProps: Props): void;
-    private onChildChange;
-    private addPage;
-    private removePage;
-}
-export {};

package/dist/nodes/navigation-page.js

@@ -1,95 +0,0 @@
-import * as Adw from "@gtkx/ffi/adw";
-import { registerNodeClass } from "../registry.js";
-import { scheduleAfterCommit } from "../scheduler.js";
-import { VirtualNode } from "./virtual.js";
-import { WidgetNode } from "./widget.js";
-export class NavigationPageNode extends VirtualNode {
-    static priority = -1;
-    parent;
-    child;
-    page;
-    static matches(type) {
-        return type === "AdwNavigationPage";
-    }
-    setParent(parent) {
-        this.parent = parent;
-    }
-    appendChild(child) {
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot append '${child.typeName}' to 'NavigationPage': expected Widget`);
-        }
-        const oldChild = this.child;
-        this.child = child.container;
-        scheduleAfterCommit(() => {
-            if (this.parent) {
-                this.onChildChange(oldChild);
-            }
-        });
-    }
-    removeChild() {
-        const oldChild = this.child;
-        scheduleAfterCommit(() => {
-            if (oldChild === this.child) {
-                this.child = undefined;
-            }
-            if (this.parent) {
-                this.onChildChange(oldChild);
-            }
-        });
-    }
-    unmount() {
-        if (this.parent && this.child) {
-            const oldChild = this.child;
-            this.child = undefined;
-            this.onChildChange(oldChild);
-        }
-        this.parent = undefined;
-        super.unmount();
-    }
-    updateProps(oldProps, newProps) {
-        super.updateProps(oldProps, newProps);
-        if (!this.page) {
-            return;
-        }
-        if (newProps.title && (!oldProps || oldProps.title !== newProps.title)) {
-            this.page.setTitle(newProps.title);
-        }
-        if (!oldProps || oldProps.tag !== newProps.tag) {
-            this.page.setTag(newProps.tag);
-        }
-        if (!oldProps || oldProps.canPop !== newProps.canPop) {
-            this.page.setCanPop(newProps.canPop ?? true);
-        }
-    }
-    onChildChange(oldChild) {
-        if (oldChild) {
-            this.removePage();
-        }
-        if (this.child) {
-            this.addPage();
-        }
-    }
-    addPage() {
-        if (!this.child || !this.parent) {
-            return;
-        }
-        let page;
-        if (this.props.tag) {
-            page = Adw.NavigationPage.pageNewWithTag(this.child, this.props.title ?? "", this.props.tag);
-        }
-        else {
-            page = new Adw.NavigationPage(this.child, this.props.title ?? "");
-        }
-        this.page = page;
-        this.parent.add(page);
-        this.updateProps(null, this.props);
-    }
-    removePage() {
-        if (!this.page || !this.parent) {
-            return;
-        }
-        this.parent.remove(this.page);
-        this.page = undefined;
-    }
-}
-registerNodeClass(NavigationPageNode);

package/dist/nodes/navigation-view.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/nodes/navigation-view.js

@@ -1,29 +0,0 @@
-import * as Adw from "@gtkx/ffi/adw";
-import { registerNodeClass } from "../registry.js";
-import { isContainerType } from "./internal/utils.js";
-import { NavigationPageNode } from "./navigation-page.js";
-import { WidgetNode } from "./widget.js";
-class NavigationViewNode extends WidgetNode {
-    static priority = -1;
-    static matches(_type, containerOrClass) {
-        return isContainerType(Adw.NavigationView, containerOrClass);
-    }
-    appendChild(child) {
-        if (child instanceof NavigationPageNode) {
-            child.setParent(this.container);
-            return;
-        }
-        super.appendChild(child);
-    }
-    insertBefore(child, _before) {
-        this.appendChild(child);
-    }
-    removeChild(child) {
-        if (child instanceof NavigationPageNode) {
-            child.unmount();
-            return;
-        }
-        super.removeChild(child);
-    }
-}
-registerNodeClass(NavigationViewNode);

package/dist/nodes/toolbar.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/nodes/toolbar.js

@@ -1,42 +0,0 @@
-import * as Adw from "@gtkx/ffi/adw";
-import { registerNodeClass } from "../registry.js";
-import { isContainerType } from "./internal/utils.js";
-import { ToolbarChildNode } from "./toolbar-child.js";
-import { WidgetNode } from "./widget.js";
-class ToolbarNode extends WidgetNode {
-    static priority = 0;
-    static matches(_type, containerOrClass) {
-        return isContainerType(Adw.ToolbarView, containerOrClass);
-    }
-    appendChild(child) {
-        if (child instanceof ToolbarChildNode) {
-            child.setParent(this.container);
-            return;
-        }
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot append '${child.typeName}' to 'ToolbarView': expected Widget`);
-        }
-        this.container.setContent(child.container);
-    }
-    insertBefore(child) {
-        if (child instanceof ToolbarChildNode) {
-            child.setParent(this.container);
-            return;
-        }
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot insert '${child.typeName}' to 'ToolbarView': expected Widget`);
-        }
-        this.container.setContent(child.container);
-    }
-    removeChild(child) {
-        if (child instanceof ToolbarChildNode) {
-            child.unmount();
-            return;
-        }
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot remove '${child.typeName}' from 'ToolbarView': expected Widget`);
-        }
-        this.container.setContent(undefined);
-    }
-}
-registerNodeClass(ToolbarNode);