@gtkx/react 0.10.1 → 0.10.3

package/dist/generated/jsx.d.ts

@@ -3186,8 +3186,6 @@ export interface GtkGLAreaProps extends WidgetProps {
 export interface GtkGraphicsOffloadProps extends WidgetProps {
     /** Whether to draw a black background. */
     blackBackground?: boolean;
-    /** The child widget. */
-    child?: Gtk.Widget;
     /** Whether graphics offload is enabled. */
     enabled?: Gtk.GraphicsOffloadEnabled;
     children?: ReactNode;
@@ -12328,7 +12326,6 @@ export type WidgetSlotNames = {
     GtkExpander: "child" | "labelWidget";
     GtkFlowBoxChild: "child";
     GtkFrame: "child" | "labelWidget";
-    GtkGraphicsOffload: "child";
     GtkHeaderBar: "titleWidget";
     GtkLabel: "mnemonicWidget";
     GtkListBoxRow: "child";
@@ -12353,26 +12350,38 @@ export type WidgetSlotNames = {
     AdwBin: "child";
     AdwBottomSheet: "bottomBar" | "content" | "sheet";
     AdwBreakpointBin: "child";
+    AdwCarouselIndicatorDots: "carousel";
+    AdwCarouselIndicatorLines: "carousel";
     AdwClamp: "child";
     AdwClampScrollable: "child";
     AdwDialog: "child" | "defaultWidget" | "focusWidget";
     AdwFlap: "content" | "flap" | "separator";
     AdwHeaderBar: "titleWidget";
+    AdwInlineViewSwitcher: "stack";
     AdwLeaflet: "visibleChild";
     AdwMessageDialog: "extraChild";
+    AdwNavigationSplitView: "content" | "sidebar";
     AdwOverlaySplitView: "content" | "sidebar";
     AdwPreferencesDialog: "visiblePage";
     AdwPreferencesGroup: "headerSuffix";
+    AdwPreferencesPage: "banner";
     AdwPreferencesWindow: "visiblePage";
     AdwSplitButton: "child" | "popover";
     AdwStatusPage: "child";
-    AdwTabBar: "endActionWidget" | "startActionWidget";
-    AdwTabOverview: "child";
+    AdwTabBar: "endActionWidget" | "startActionWidget" | "view";
+    AdwTabButton: "view";
+    AdwTabOverview: "child" | "view";
     AdwToastOverlay: "child";
     AdwToolbarView: "content";
     AdwViewStack: "visibleChild";
+    AdwViewSwitcher: "stack";
+    AdwViewSwitcherBar: "stack";
+    AdwViewSwitcherTitle: "stack";
     GtkSourceCompletionCell: "widget";
+    GtkSourceGutter: "view";
+    GtkSourceMap: "view";
     VteTerminal: "contextMenu";
+    WebKitWebView: "relatedView";
 };
 /**
  * The base class for all widgets.

package/dist/host-config.d.ts

@@ -5,7 +5,6 @@ import type { Container, Props } from "./types.js";
 declare global {
     var __GTKX_CONTAINER_NODE_CACHE__: Map<number, Node> | undefined;
 }
-export declare const isCommitting: () => boolean;
 type TextInstance = Node;
 type SuspenseInstance = never;
 type HydratableInstance = never;

package/dist/host-config.js

@@ -1,13 +1,11 @@
 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 { signalStore } from "./nodes/internal/signal-store.js";
 import { flushAfterCommit } from "./scheduler.js";
 if (!globalThis.__GTKX_CONTAINER_NODE_CACHE__) {
     globalThis.__GTKX_CONTAINER_NODE_CACHE__ = new Map();
 }
-let committing = false;
-export const isCommitting = () => committing;
 const containerNodeCache = globalThis.__GTKX_CONTAINER_NODE_CACHE__;
 const getOrCreateContainerNode = (container) => {
     const id = getObjectId(container.id);
@@ -73,15 +71,14 @@ export function createHostConfig() {
             parent.insertBefore(child, beforeChild);
         },
         prepareForCommit: () => {
-            committing = true;
+            signalStore.blockAll();
             beginBatch();
             return null;
         },
         resetAfterCommit: () => {
             endBatch();
-            clearFiredSignals();
+            signalStore.unblockAll();
             flushAfterCommit();
-            committing = false;
         },
         commitTextUpdate: (textInstance, oldText, newText) => {
             textInstance.updateProps({ label: oldText }, { label: newText });

package/dist/node.d.ts

@@ -1,4 +1,3 @@
-import { SignalStore } from "./nodes/internal/signal-store.js";
 import type { Container, ContainerClass, Props } from "./types.js";
 export declare class Node<T = unknown, P = Props> {
     static priority: number;
@@ -6,7 +5,6 @@ export declare class Node<T = unknown, P = Props> {
     static createContainer(_props: Props, _containerClass: ContainerClass, _rootContainer?: Container): unknown;
     container: T;
     typeName: string;
-    protected signalStore: SignalStore;
     constructor(typeName: string, _props: P | undefined, container: T, _rootContainer?: Container);
     appendChild(_child: Node): void;
     removeChild(_child: Node): void;

package/dist/node.js

@@ -1,4 +1,4 @@
-import { SignalStore } from "./nodes/internal/signal-store.js";
+import { signalStore } from "./nodes/internal/signal-store.js";
 export class Node {
     static priority = 0;
     static matches(_type, _containerOrClass) {
@@ -9,11 +9,9 @@ export class Node {
     }
     container;
     typeName;
-    signalStore;
     constructor(typeName, _props = {}, container, _rootContainer) {
         this.typeName = typeName;
         this.container = container;
-        this.signalStore = new SignalStore();
     }
     appendChild(_child) { }
     removeChild(_child) { }
@@ -21,6 +19,6 @@ export class Node {
     updateProps(_oldProps, _newProps) { }
     mount() { }
     unmount() {
-        this.signalStore.clear();
+        signalStore.clear(this);
     }
 }

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

@@ -11,7 +11,7 @@ export class ColumnViewColumnNode extends VirtualNode {
     itemRenderer;
     constructor(typeName, props, container, rootContainer) {
         super(typeName, props, container, rootContainer);
-        this.itemRenderer = new ListItemRenderer(this.signalStore);
+        this.itemRenderer = new ListItemRenderer();
         this.column = new Gtk.ColumnViewColumn();
         this.column.setFactory(this.itemRenderer.getFactory());
     }

package/dist/nodes/column-view.js

@@ -1,6 +1,7 @@
 import * as Gtk from "@gtkx/ffi/gtk";
 import { registerNodeClass } from "../registry.js";
 import { ColumnViewColumnNode } from "./column-view-column.js";
+import { signalStore } from "./internal/signal-store.js";
 import { filterProps, isContainerType } from "./internal/utils.js";
 import { ListItemNode } from "./list-item.js";
 import { List } from "./models/list.js";
@@ -79,7 +80,7 @@ class ColumnViewNode extends WidgetNode {
                 this.handleSortChange = () => {
                     onSortChange?.(sorter.getPrimarySortColumn()?.getId() ?? null, sorter.getPrimarySortOrder());
                 };
-                this.signalStore.set(sorter, "changed", this.handleSortChange);
+                signalStore.set(this, sorter, "changed", this.handleSortChange);
             }
         }
         if (!oldProps || oldProps.sortColumn !== newProps.sortColumn || oldProps.sortOrder !== newProps.sortOrder) {

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/list-item-renderer.d.ts

@@ -1,15 +1,13 @@
 import * as Gtk from "@gtkx/ffi/gtk";
 import type { ReactNode } from "react";
 import type { ListStore } from "./list-store.js";
-import type { SignalStore } from "./signal-store.js";
 export type RenderItemFn<T> = (item: T | null) => ReactNode;
 export declare class ListItemRenderer {
     private factory;
     private store?;
     private fiberRoots;
     private renderFn?;
-    private signalStore;
-    constructor(signalStore: SignalStore);
+    constructor();
     getFactory(): Gtk.SignalListItemFactory;
     setRenderFn(renderFn?: RenderItemFn<unknown>): void;
     setStore(store?: ListStore): void;

package/dist/nodes/internal/list-item-renderer.js

@@ -2,14 +2,13 @@ import { getObjectId } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { createFiberRoot } from "../../fiber-root.js";
 import { reconciler } from "../../reconciler.js";
+import { signalStore } from "./signal-store.js";
 export class ListItemRenderer {
     factory;
     store;
     fiberRoots = new Map();
     renderFn = () => null;
-    signalStore;
-    constructor(signalStore) {
-        this.signalStore = signalStore;
+    constructor() {
         this.factory = new Gtk.SignalListItemFactory();
         this.initialize();
     }
@@ -29,7 +28,7 @@ export class ListItemRenderer {
         return this.store;
     }
     initialize() {
-        this.signalStore.set(this.factory, "setup", (_self, listItem) => {
+        signalStore.set(this, this.factory, "setup", (_self, listItem) => {
             const ptr = getObjectId(listItem.id);
             const box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
             listItem.setChild(box);
@@ -38,7 +37,7 @@ export class ListItemRenderer {
             const element = this.renderFn?.(null);
             reconciler.getInstance().updateContainer(element, fiberRoot, null, () => { });
         });
-        this.signalStore.set(this.factory, "bind", (_self, listItem) => {
+        signalStore.set(this, this.factory, "bind", (_self, listItem) => {
             const ptr = getObjectId(listItem.id);
             const fiberRoot = this.fiberRoots.get(ptr);
             if (!fiberRoot)
@@ -48,14 +47,14 @@ export class ListItemRenderer {
             const element = this.renderFn?.(item);
             reconciler.getInstance().updateContainer(element, fiberRoot, null, () => { });
         });
-        this.signalStore.set(this.factory, "unbind", (_self, listItem) => {
+        signalStore.set(this, this.factory, "unbind", (_self, listItem) => {
             const ptr = getObjectId(listItem.id);
             const fiberRoot = this.fiberRoots.get(ptr);
             if (!fiberRoot)
                 return;
             reconciler.getInstance().updateContainer(null, fiberRoot, null, () => { });
         });
-        this.signalStore.set(this.factory, "teardown", (_self, listItem) => {
+        signalStore.set(this, this.factory, "teardown", (_self, listItem) => {
             const ptr = getObjectId(listItem.id);
             const fiberRoot = this.fiberRoots.get(ptr);
             if (fiberRoot) {

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,10 +1,16 @@
 import * as GObject from "@gtkx/ffi/gobject";
+type SignalOwner = object;
 export type SignalHandler = (...args: any[]) => any;
-export declare const clearFiredSignals: () => void;
-export declare class SignalStore {
-    private signalHandlers;
+declare class SignalStore {
+    private ownerHandlers;
+    private blockedHandlers;
+    private getOwnerMap;
     private disconnect;
     private connect;
-    set(obj: GObject.GObject, signal: string, handler?: SignalHandler): void;
-    clear(): void;
+    set(owner: SignalOwner, obj: GObject.GObject, signal: string, handler?: SignalHandler): void;
+    clear(owner: SignalOwner): void;
+    blockAll(): void;
+    unblockAll(): void;
 }
+export declare const signalStore: SignalStore;
+export {};

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

@@ -1,6 +1,5 @@
 import { getObjectId } from "@gtkx/ffi";
 import * as GObject from "@gtkx/ffi/gobject";
-import { isCommitting } from "../../host-config.js";
 const LIFECYCLE_SIGNALS = new Set([
     "realize",
     "unrealize",
@@ -16,49 +15,69 @@ 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) {
+class SignalStore {
+    ownerHandlers = new Map();
+    blockedHandlers = new Set();
+    getOwnerMap(owner) {
+        let map = this.ownerHandlers.get(owner);
+        if (!map) {
+            map = new Map();
+            this.ownerHandlers.set(owner, map);
+        }
+        return map;
+    }
+    disconnect(owner, obj, signal) {
         const objectId = getObjectId(obj.id);
         const key = `${objectId}:${signal}`;
-        const existing = this.signalHandlers.get(key);
+        const ownerMap = this.ownerHandlers.get(owner);
+        const existing = ownerMap?.get(key);
         if (existing) {
             GObject.signalHandlerDisconnect(existing.obj, existing.handlerId);
-            this.signalHandlers.delete(key);
+            ownerMap?.delete(key);
         }
     }
-    connect(obj, signal, handler) {
+    connect(owner, obj, signal, handler) {
         const objectId = getObjectId(obj.id);
         const key = `${objectId}:${signal}`;
-        const wrappedHandler = (...args) => {
-            if (LIFECYCLE_SIGNALS.has(signal)) {
-                return handler(...args);
+        const handlerId = obj.connect(signal, handler);
+        this.getOwnerMap(owner).set(key, { obj, handlerId });
+    }
+    set(owner, obj, signal, handler) {
+        this.disconnect(owner, obj, signal);
+        if (handler) {
+            this.connect(owner, obj, signal, handler);
+        }
+    }
+    clear(owner) {
+        const ownerMap = this.ownerHandlers.get(owner);
+        if (ownerMap) {
+            for (const { obj, handlerId } of ownerMap.values()) {
+                GObject.signalHandlerDisconnect(obj, handlerId);
             }
-            if (isCommitting()) {
-                if (firedThisCommit.has(key)) {
-                    return;
+            this.ownerHandlers.delete(owner);
+        }
+    }
+    blockAll() {
+        this.blockedHandlers.clear();
+        for (const ownerMap of this.ownerHandlers.values()) {
+            for (const [key, { obj, handlerId }] of ownerMap.entries()) {
+                if (LIFECYCLE_SIGNALS.has(key.split(":")[1] ?? "")) {
+                    continue;
                 }
-                firedThisCommit.add(key);
+                GObject.signalHandlerBlock(obj, handlerId);
+                this.blockedHandlers.add(handlerId);
             }
-            return handler(...args);
-        };
-        const handlerId = obj.connect(signal, wrappedHandler);
-        this.signalHandlers.set(key, { obj, handlerId });
-    }
-    set(obj, signal, handler) {
-        this.disconnect(obj, signal);
-        if (handler) {
-            this.connect(obj, signal, handler);
         }
     }
-    clear() {
-        for (const [_, { obj, handlerId }] of this.signalHandlers) {
-            GObject.signalHandlerDisconnect(obj, handlerId);
+    unblockAll() {
+        for (const ownerMap of this.ownerHandlers.values()) {
+            for (const { obj, handlerId } of ownerMap.values()) {
+                if (this.blockedHandlers.has(handlerId)) {
+                    GObject.signalHandlerUnblock(obj, handlerId);
+                }
+            }
         }
-        this.signalHandlers.clear();
+        this.blockedHandlers.clear();
     }
 }
+export const signalStore = new SignalStore();

package/dist/nodes/internal/tree-list-item-renderer.d.ts

@@ -1,6 +1,5 @@
 import * as Gtk from "@gtkx/ffi/gtk";
 import type { ReactNode } from "react";
-import type { SignalStore } from "./signal-store.js";
 import type { TreeStore } from "./tree-store.js";
 export type TreeRenderItemFn<T> = (item: T | null, row: Gtk.TreeListRow | null) => ReactNode;
 export declare class TreeListItemRenderer {
@@ -8,8 +7,7 @@ export declare class TreeListItemRenderer {
     private store?;
     private fiberRoots;
     private renderFn?;
-    private signalStore;
-    constructor(signalStore: SignalStore);
+    constructor();
     getFactory(): Gtk.SignalListItemFactory;
     setRenderFn(renderFn?: TreeRenderItemFn<unknown>): void;
     setStore(store?: TreeStore): void;

package/dist/nodes/internal/tree-list-item-renderer.js

@@ -2,14 +2,13 @@ import { getObjectId } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { createFiberRoot } from "../../fiber-root.js";
 import { reconciler } from "../../reconciler.js";
+import { signalStore } from "./signal-store.js";
 export class TreeListItemRenderer {
     factory;
     store;
     fiberRoots = new Map();
     renderFn = () => null;
-    signalStore;
-    constructor(signalStore) {
-        this.signalStore = signalStore;
+    constructor() {
         this.factory = new Gtk.SignalListItemFactory();
         this.initialize();
     }
@@ -29,7 +28,7 @@ export class TreeListItemRenderer {
         return this.store;
     }
     initialize() {
-        this.signalStore.set(this.factory, "setup", (_self, listItem) => {
+        signalStore.set(this, this.factory, "setup", (_self, listItem) => {
             const ptr = getObjectId(listItem.id);
             const expander = new Gtk.TreeExpander();
             const box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
@@ -40,7 +39,7 @@ export class TreeListItemRenderer {
             const element = this.renderFn?.(null, null);
             reconciler.getInstance().updateContainer(element, fiberRoot, null, () => { });
         });
-        this.signalStore.set(this.factory, "bind", (_self, listItem) => {
+        signalStore.set(this, this.factory, "bind", (_self, listItem) => {
             const ptr = getObjectId(listItem.id);
             const fiberRoot = this.fiberRoots.get(ptr);
             if (!fiberRoot)
@@ -69,7 +68,7 @@ export class TreeListItemRenderer {
             const element = this.renderFn?.(itemData?.value ?? null, treeListRow);
             reconciler.getInstance().updateContainer(element, fiberRoot, null, () => { });
         });
-        this.signalStore.set(this.factory, "unbind", (_self, listItem) => {
+        signalStore.set(this, this.factory, "unbind", (_self, listItem) => {
             const ptr = getObjectId(listItem.id);
             const fiberRoot = this.fiberRoots.get(ptr);
             if (!fiberRoot)
@@ -78,7 +77,7 @@ export class TreeListItemRenderer {
             expander.setListRow(undefined);
             reconciler.getInstance().updateContainer(null, fiberRoot, null, () => { });
         });
-        this.signalStore.set(this.factory, "teardown", (_self, listItem) => {
+        signalStore.set(this, this.factory, "teardown", (_self, listItem) => {
             const ptr = getObjectId(listItem.id);
             const fiberRoot = this.fiberRoots.get(ptr);
             if (fiberRoot) {

package/dist/nodes/list-view.js

@@ -16,7 +16,7 @@ class ListViewNode extends WidgetNode {
     constructor(typeName, props, container, rootContainer) {
         super(typeName, props, container, rootContainer);
         this.list = new List();
-        this.itemRenderer = new ListItemRenderer(this.signalStore);
+        this.itemRenderer = new ListItemRenderer();
         this.itemRenderer.setStore(this.list.getStore());
         this.container.setFactory(this.itemRenderer.getFactory());
     }

package/dist/nodes/models/list.js

@@ -1,5 +1,6 @@
 import * as Gtk from "@gtkx/ffi/gtk";
 import { ListStore } from "../internal/list-store.js";
+import { signalStore } from "../internal/signal-store.js";
 import { ListItemNode } from "../list-item.js";
 import { VirtualNode } from "../virtual.js";
 export class List extends VirtualNode {
@@ -42,7 +43,7 @@ export class List extends VirtualNode {
     updateProps(oldProps, newProps) {
         super.updateProps(oldProps, newProps);
         if (!oldProps || oldProps.selectionMode !== newProps.selectionMode) {
-            this.signalStore.set(this.selectionModel, "selection-changed", undefined);
+            signalStore.set(this, this.selectionModel, "selection-changed", undefined);
             this.selectionModel = this.createSelectionModel(newProps.selectionMode);
         }
         if (!oldProps ||
@@ -52,7 +53,7 @@ export class List extends VirtualNode {
             this.handleSelectionChange = () => {
                 onSelectionChanged?.(this.getSelection());
             };
-            this.signalStore.set(this.selectionModel, "selection-changed", newProps.onSelectionChanged ? this.handleSelectionChange : undefined);
+            signalStore.set(this, this.selectionModel, "selection-changed", newProps.onSelectionChanged ? this.handleSelectionChange : undefined);
         }
         if (!oldProps || oldProps.selected !== newProps.selected || oldProps.selectionMode !== newProps.selectionMode) {
             this.setSelection(newProps.selected);

package/dist/nodes/models/menu.js

@@ -1,6 +1,7 @@
 import { batch } from "@gtkx/ffi";
 import * as Gio from "@gtkx/ffi/gio";
 import { scheduleAfterCommit } from "../../scheduler.js";
+import { signalStore } from "../internal/signal-store.js";
 import { VirtualNode } from "../virtual.js";
 export class Menu extends VirtualNode {
     actionMap;
@@ -66,10 +67,10 @@ export class Menu extends VirtualNode {
     createAction() {
         batch(() => {
             if (this.action) {
-                this.signalStore.set(this.action, "activate", undefined);
+                signalStore.set(this, this.action, "activate", undefined);
             }
             this.action = new Gio.SimpleAction(this.getId());
-            this.signalStore.set(this.action, "activate", this.getOnActivate());
+            signalStore.set(this, this.action, "activate", this.getOnActivate());
             this.getActionMap().addAction(this.action);
             if (this.application && this.props.accels) {
                 this.application.setAccelsForAction(this.getActionName(), this.getAccels());
@@ -83,7 +84,7 @@ export class Menu extends VirtualNode {
             }
             if (this.action) {
                 this.getActionMap().removeAction(this.getId());
-                this.signalStore.set(this.action, "activate", undefined);
+                signalStore.set(this, this.action, "activate", undefined);
                 this.action = undefined;
             }
         });
@@ -230,7 +231,7 @@ export class Menu extends VirtualNode {
             return;
         }
         if (oldProps.onActivate !== newProps.onActivate) {
-            this.signalStore.set(this.getAction(), "activate", newProps.onActivate);
+            signalStore.set(this, this.getAction(), "activate", newProps.onActivate);
         }
         if (oldProps.accels !== newProps.accels) {
             if (this.application) {

package/dist/nodes/models/tree-list.js

@@ -1,4 +1,5 @@
 import * as Gtk from "@gtkx/ffi/gtk";
+import { signalStore } from "../internal/signal-store.js";
 import { TreeStore } from "../internal/tree-store.js";
 import { TreeListItemNode } from "../tree-list-item.js";
 import { VirtualNode } from "../virtual.js";
@@ -77,7 +78,7 @@ export class TreeList extends VirtualNode {
             this.treeListModel.setAutoexpand(newProps.autoexpand ?? false);
         }
         if (!oldProps || oldProps.selectionMode !== newProps.selectionMode) {
-            this.signalStore.set(this.selectionModel, "selection-changed", undefined);
+            signalStore.set(this, this.selectionModel, "selection-changed", undefined);
             this.selectionModel = this.createSelectionModel(newProps.selectionMode);
             this.selectionModel.setModel(this.treeListModel);
         }
@@ -88,7 +89,7 @@ export class TreeList extends VirtualNode {
             this.handleSelectionChange = () => {
                 onSelectionChanged?.(this.getSelection());
             };
-            this.signalStore.set(this.selectionModel, "selection-changed", newProps.onSelectionChanged ? this.handleSelectionChange : undefined);
+            signalStore.set(this, this.selectionModel, "selection-changed", newProps.onSelectionChanged ? this.handleSelectionChange : undefined);
         }
         if (!oldProps || oldProps.selected !== newProps.selected || oldProps.selectionMode !== newProps.selectionMode) {
             this.setSelection(newProps.selected);

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/simple-list-view.js

@@ -1,6 +1,7 @@
 import * as Adw from "@gtkx/ffi/adw";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { registerNodeClass } from "../registry.js";
+import { signalStore } from "./internal/signal-store.js";
 import { SimpleListStore } from "./internal/simple-list-store.js";
 import { filterProps, isContainerType } from "./internal/utils.js";
 import { SimpleListItemNode } from "./simple-list-item.js";
@@ -28,7 +29,7 @@ class SimpleListViewNode extends WidgetNode {
                     }
                 }
                 : undefined;
-            this.signalStore.set(this.container, "notify::selected", handleSelectionChange);
+            signalStore.set(this, this.container, "notify::selected", handleSelectionChange);
         }
         if (!oldProps || oldProps.selectedId !== newProps.selectedId) {
             const index = newProps.selectedId !== undefined ? this.store.getIndexById(newProps.selectedId) : undefined;

package/dist/nodes/toast.js

@@ -1,5 +1,6 @@
 import * as Adw from "@gtkx/ffi/adw";
 import { registerNodeClass } from "../registry.js";
+import { signalStore } from "./internal/signal-store.js";
 import { VirtualNode } from "./virtual.js";
 export class ToastNode extends VirtualNode {
     static priority = 1;
@@ -35,11 +36,11 @@ export class ToastNode extends VirtualNode {
             return;
         this.toast = this.createToast();
         if (this.props.onButtonClicked) {
-            this.signalStore.set(this.toast, "button-clicked", () => {
+            signalStore.set(this, this.toast, "button-clicked", () => {
                 this.props.onButtonClicked?.();
             });
         }
-        this.signalStore.set(this.toast, "dismissed", () => {
+        signalStore.set(this, this.toast, "dismissed", () => {
             this.props.onDismissed?.();
         });
         this.parent.addToast(this.toast);

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";

package/dist/nodes/tree-list-view.js

@@ -20,7 +20,7 @@ class TreeListViewNode extends WidgetNode {
         const listView = container ?? new Gtk.ListView();
         super(typeName, props, listView, rootContainer);
         this.treeList = new TreeList(props.autoexpand, props.selectionMode);
-        this.itemRenderer = new TreeListItemRenderer(this.signalStore);
+        this.itemRenderer = new TreeListItemRenderer();
         this.itemRenderer.setStore(this.treeList.getStore());
         this.container.setFactory(this.itemRenderer.getFactory());
     }

package/dist/nodes/widget.d.ts

@@ -15,5 +15,6 @@ export declare class WidgetNode<T extends Gtk.Widget = Gtk.Widget, P extends Pro
     updateProps(oldProps: P | null, newProps: P): void;
     private updateEventControllerProp;
     private propNameToSignalName;
+    private getProperty;
     private setProperty;
 }

package/dist/nodes/widget.js

@@ -3,7 +3,8 @@ 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 { signalStore } from "./internal/signal-store.js";
 import { filterProps, isContainerType } from "./internal/utils.js";
 import { SlotNode } from "./slot.js";
 const EVENT_CONTROLLER_PROPS = new Set([
@@ -58,6 +59,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 +84,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);
             }
@@ -167,9 +174,16 @@ export class WidgetNode extends Node {
             const signalName = this.propNameToSignalName(name);
             if (signals.has(signalName)) {
                 const handler = typeof newValue === "function" ? newValue : undefined;
-                this.signalStore.set(this.container, signalName, handler);
+                signalStore.set(this, this.container, signalName, handler);
             }
             else if (newValue !== undefined) {
+                const isEditableText = name === "text" && isEditable(this.container);
+                if (isEditableText && oldValue !== undefined) {
+                    const currentValue = this.getProperty(name);
+                    if (oldValue !== currentValue) {
+                        continue;
+                    }
+                }
                 this.setProperty(name, newValue);
             }
         }
@@ -184,7 +198,7 @@ export class WidgetNode extends Node {
                     this.container.addController(this.motionController);
                 }
                 const signalName = propName === "onEnter" ? "enter" : propName === "onLeave" ? "leave" : "motion";
-                this.signalStore.set(this.motionController, signalName, handler);
+                signalStore.set(this, this.motionController, signalName, handler);
                 break;
             }
             case "onPressed":
@@ -194,7 +208,7 @@ export class WidgetNode extends Node {
                     this.container.addController(this.clickController);
                 }
                 const signalName = propName === "onPressed" ? "pressed" : "released";
-                this.signalStore.set(this.clickController, signalName, handler);
+                signalStore.set(this, this.clickController, signalName, handler);
                 break;
             }
             case "onKeyPressed":
@@ -204,7 +218,7 @@ export class WidgetNode extends Node {
                     this.container.addController(this.keyController);
                 }
                 const signalName = propName === "onKeyPressed" ? "key-pressed" : "key-released";
-                this.signalStore.set(this.keyController, signalName, handler);
+                signalStore.set(this, this.keyController, signalName, handler);
                 break;
             }
             case "onScroll": {
@@ -212,7 +226,7 @@ export class WidgetNode extends Node {
                     this.scrollController = new Gtk.EventControllerScroll(Gtk.EventControllerScrollFlags.BOTH_AXES);
                     this.container.addController(this.scrollController);
                 }
-                this.signalStore.set(this.scrollController, "scroll", handler);
+                signalStore.set(this, this.scrollController, "scroll", handler);
                 break;
             }
             case "onNotify": {
@@ -221,7 +235,7 @@ export class WidgetNode extends Node {
                         handler(obj, pspec.getName());
                     }
                     : undefined;
-                this.signalStore.set(this.container, "notify", wrappedHandler);
+                signalStore.set(this, this.container, "notify", wrappedHandler);
                 break;
             }
         }
@@ -233,6 +247,15 @@ export class WidgetNode extends Node {
             .toLowerCase()
             .replace(/^-/, "");
     }
+    getProperty(key) {
+        const WidgetClass = this.container.constructor;
+        const [getterName] = PROPS[WidgetClass.glibTypeName]?.[key] || [];
+        const getter = getterName ? this.container[getterName] : undefined;
+        if (getter && typeof getter === "function") {
+            return getter.call(this.container);
+        }
+        return undefined;
+    }
     setProperty(key, value) {
         const WidgetClass = this.container.constructor;
         const [getterName, setterName] = PROPS[WidgetClass.glibTypeName]?.[key] || [];
@@ -248,14 +271,7 @@ export class WidgetNode extends Node {
             }
         }
         if (setter && typeof setter === "function") {
-            const editable = isEditable(this.container) ? this.container : null;
-            const shouldPreserveCursor = key === "text" && editable !== null;
-            const cursorPosition = shouldPreserveCursor ? editable.getPosition() : 0;
             setter.call(this.container, value);
-            if (shouldPreserveCursor && editable !== null) {
-                const textLength = editable.getText().length;
-                editable.setPosition(Math.min(cursorPosition, textLength));
-            }
         }
     }
 }

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.1",
+  "version": "0.10.3",
   "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.1",
-    "@gtkx/gir": "0.10.1"
+    "@gtkx/ffi": "0.10.3",
+    "@gtkx/gir": "0.10.3"
   },
   "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);