@gtkx/react 0.1.48 → 0.1.49

package/dist/nodes/flow-box.d.ts

@@ -0,0 +1,9 @@
+import type * as Gtk from "@gtkx/ffi/gtk";
+import type { ChildContainer } from "../container-interfaces.js";
+import { Node } from "../node.js";
+export declare class FlowBoxNode extends Node<Gtk.FlowBox> implements ChildContainer {
+    static matches(type: string): boolean;
+    attachChild(child: Gtk.Widget): void;
+    insertChildBefore(child: Gtk.Widget, before: Gtk.Widget): void;
+    detachChild(child: Gtk.Widget): void;
+}

package/dist/nodes/flow-box.js

@@ -0,0 +1,25 @@
+import { Node } from "../node.js";
+const isFlowBoxChild = (widget) => "getIndex" in widget && "getChild" in widget && typeof widget.getIndex === "function";
+export class FlowBoxNode extends Node {
+    static matches(type) {
+        return type === "FlowBox";
+    }
+    attachChild(child) {
+        this.widget.append(child);
+    }
+    insertChildBefore(child, before) {
+        const beforeParent = before.getParent();
+        if (beforeParent && isFlowBoxChild(beforeParent)) {
+            this.widget.insert(child, beforeParent.getIndex());
+        }
+        else {
+            this.widget.append(child);
+        }
+    }
+    detachChild(child) {
+        const flowBoxChild = child.getParent();
+        if (flowBoxChild) {
+            this.widget.remove(flowBoxChild);
+        }
+    }
+}

package/dist/nodes/grid.d.ts

@@ -1,8 +1,11 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
+import { type GridContainer } from "../container-interfaces.js";
 import type { Props } from "../factory.js";
 import { Node } from "../node.js";
-export declare class GridNode extends Node<Gtk.Grid> {
+export declare class GridNode extends Node<Gtk.Grid> implements GridContainer {
     static matches(type: string): boolean;
+    attachToGrid(child: Gtk.Widget, column: number, row: number, colSpan: number, rowSpan: number): void;
+    removeFromGrid(child: Gtk.Widget): void;
 }
 export declare class GridChildNode extends Node<never> {
     static matches(type: string): boolean;
@@ -12,8 +15,8 @@ export declare class GridChildNode extends Node<never> {
     private columnSpan;
     private rowSpan;
     private childWidget;
-    private parentGrid;
-    constructor(type: string, props: Props, app: Gtk.Application);
+    private parentContainer;
+    constructor(type: string, props: Props);
     appendChild(child: Node): void;
     removeChild(child: Node): void;
     private attachChildToGrid;

package/dist/nodes/grid.js

@@ -1,8 +1,16 @@
+import { isGridContainer } from "../container-interfaces.js";
 import { Node } from "../node.js";
+import { getNumberProp } from "../props.js";
 export class GridNode extends Node {
     static matches(type) {
         return type === "Grid.Root";
     }
+    attachToGrid(child, column, row, colSpan, rowSpan) {
+        this.widget.attach(child, column, row, colSpan, rowSpan);
+    }
+    removeFromGrid(child) {
+        this.widget.remove(child);
+    }
 }
 export class GridChildNode extends Node {
     static matches(type) {
@@ -16,19 +24,19 @@ export class GridChildNode extends Node {
     columnSpan;
     rowSpan;
     childWidget = null;
-    parentGrid = null;
-    constructor(type, props, app) {
-        super(type, props, app);
-        this.column = props.column ?? 0;
-        this.row = props.row ?? 0;
-        this.columnSpan = props.columnSpan ?? 1;
-        this.rowSpan = props.rowSpan ?? 1;
+    parentContainer = null;
+    constructor(type, props) {
+        super(type, props);
+        this.column = getNumberProp(props, "column", 0);
+        this.row = getNumberProp(props, "row", 0);
+        this.columnSpan = getNumberProp(props, "columnSpan", 1);
+        this.rowSpan = getNumberProp(props, "rowSpan", 1);
     }
     appendChild(child) {
         const widget = child.getWidget();
         if (widget) {
             this.childWidget = widget;
-            if (this.parentGrid) {
+            if (this.parentContainer) {
                 this.attachChildToGrid();
             }
         }
@@ -41,33 +49,27 @@ export class GridChildNode extends Node {
         }
     }
     attachChildToGrid() {
-        if (!this.parentGrid || !this.childWidget)
+        if (!this.parentContainer || !this.childWidget)
             return;
-        const grid = this.parentGrid.getWidget();
-        if (!grid)
-            return;
-        grid.attach(this.childWidget, this.column, this.row, this.columnSpan, this.rowSpan);
+        this.parentContainer.attachToGrid(this.childWidget, this.column, this.row, this.columnSpan, this.rowSpan);
     }
     detachChildFromGrid() {
-        if (!this.parentGrid || !this.childWidget)
-            return;
-        const grid = this.parentGrid.getWidget();
-        if (!grid)
+        if (!this.parentContainer || !this.childWidget)
             return;
-        grid.remove(this.childWidget);
+        this.parentContainer.removeFromGrid(this.childWidget);
     }
     attachToParent(parent) {
-        if (parent instanceof GridNode) {
-            this.parentGrid = parent;
+        if (isGridContainer(parent)) {
+            this.parentContainer = parent;
             if (this.childWidget) {
                 this.attachChildToGrid();
             }
         }
     }
     detachFromParent(parent) {
-        if (parent instanceof GridNode) {
+        if (isGridContainer(parent)) {
             this.detachChildFromGrid();
-            this.parentGrid = null;
+            this.parentContainer = null;
         }
     }
     updateProps(oldProps, newProps) {
@@ -77,10 +79,10 @@ export class GridChildNode extends Node {
             oldProps.rowSpan !== newProps.rowSpan;
         if (positionChanged) {
             this.detachChildFromGrid();
-            this.column = newProps.column ?? 0;
-            this.row = newProps.row ?? 0;
-            this.columnSpan = newProps.columnSpan ?? 1;
-            this.rowSpan = newProps.rowSpan ?? 1;
+            this.column = getNumberProp(newProps, "column", 0);
+            this.row = getNumberProp(newProps, "row", 0);
+            this.columnSpan = getNumberProp(newProps, "columnSpan", 1);
+            this.rowSpan = getNumberProp(newProps, "rowSpan", 1);
             this.attachChildToGrid();
         }
     }

package/dist/nodes/list-box.d.ts

@@ -0,0 +1,9 @@
+import type * as Gtk from "@gtkx/ffi/gtk";
+import type { ChildContainer } from "../container-interfaces.js";
+import { Node } from "../node.js";
+export declare class ListBoxNode extends Node<Gtk.ListBox> implements ChildContainer {
+    static matches(type: string): boolean;
+    attachChild(child: Gtk.Widget): void;
+    insertChildBefore(child: Gtk.Widget, before: Gtk.Widget): void;
+    detachChild(child: Gtk.Widget): void;
+}

package/dist/nodes/list-box.js

@@ -0,0 +1,21 @@
+import { Node } from "../node.js";
+const isListBoxRow = (widget) => "getIndex" in widget && "isSelected" in widget && typeof widget.getIndex === "function";
+export class ListBoxNode extends Node {
+    static matches(type) {
+        return type === "ListBox";
+    }
+    attachChild(child) {
+        this.widget.append(child);
+    }
+    insertChildBefore(child, before) {
+        if (isListBoxRow(before)) {
+            this.widget.insert(child, before.getIndex());
+        }
+        else {
+            this.widget.append(child);
+        }
+    }
+    detachChild(child) {
+        this.widget.remove(child);
+    }
+}

package/dist/nodes/list.d.ts

@@ -1,7 +1,8 @@
 import * as Gtk from "@gtkx/ffi/gtk";
+import { type ItemContainer } from "../container-interfaces.js";
 import type { Props } from "../factory.js";
 import { Node } from "../node.js";
-export declare class ListViewNode extends Node<Gtk.ListView | Gtk.GridView> {
+export declare class ListViewNode extends Node<Gtk.ListView | Gtk.GridView> implements ItemContainer<unknown> {
     static matches(type: string): boolean;
     private stringList;
     private selectionModel;
@@ -10,7 +11,7 @@ export declare class ListViewNode extends Node<Gtk.ListView | Gtk.GridView> {
     private renderItem;
     private listItemCache;
     private committedLength;
-    constructor(type: string, props: Props, app: Gtk.Application);
+    constructor(type: string, props: Props);
     private syncStringList;
     addItem(item: unknown): void;
     insertItemBefore(item: unknown, beforeItem: unknown): void;
@@ -22,7 +23,7 @@ export declare class ListItemNode extends Node {
     static matches(type: string): boolean;
     protected isVirtual(): boolean;
     private item;
-    constructor(type: string, props: Props, app: Gtk.Application);
+    constructor(type: string, props: Props);
     getItem(): unknown;
     attachToParent(parent: Node): void;
     attachToParentBefore(parent: Node, before: Node): void;

package/dist/nodes/list.js

@@ -1,6 +1,7 @@
 import { getObject, getObjectId } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { scheduleFlush } from "../batch.js";
+import { isItemContainer } from "../container-interfaces.js";
 import { createFiberRoot } from "../fiber-root.js";
 import { Node } from "../node.js";
 import { reconciler } from "../reconciler.js";
@@ -15,8 +16,8 @@ export class ListViewNode extends Node {
     renderItem;
     listItemCache = new Map();
     committedLength = 0;
-    constructor(type, props, app) {
-        super(type, props, app);
+    constructor(type, props) {
+        super(type, props);
         this.stringList = new Gtk.StringList([]);
         this.selectionModel = new Gtk.SingleSelection(this.stringList);
         this.factory = new Gtk.SignalListItemFactory();
@@ -109,20 +110,20 @@ export class ListItemNode extends Node {
         return true;
     }
     item;
-    constructor(type, props, app) {
-        super(type, props, app);
+    constructor(type, props) {
+        super(type, props);
         this.item = props.item;
     }
     getItem() {
         return this.item;
     }
     attachToParent(parent) {
-        if (parent instanceof ListViewNode) {
+        if (isItemContainer(parent)) {
             parent.addItem(this.item);
         }
     }
     attachToParentBefore(parent, before) {
-        if (parent instanceof ListViewNode && before instanceof ListItemNode) {
+        if (isItemContainer(parent) && before instanceof ListItemNode) {
             parent.insertItemBefore(this.item, before.getItem());
         }
         else {
@@ -130,7 +131,7 @@ export class ListItemNode extends Node {
         }
     }
     detachFromParent(parent) {
-        if (parent instanceof ListViewNode) {
+        if (isItemContainer(parent)) {
             parent.removeItem(this.item);
         }
     }

package/dist/nodes/notebook.d.ts

@@ -1,20 +1,24 @@
 import * as Gtk from "@gtkx/ffi/gtk";
+import { type ChildContainer, type PageContainer } from "../container-interfaces.js";
 import type { Props } from "../factory.js";
 import { Node } from "../node.js";
-export declare class NotebookNode extends Node<Gtk.Notebook> {
+export declare class NotebookNode extends Node<Gtk.Notebook> implements PageContainer, ChildContainer {
     static matches(type: string): boolean;
     addPage(child: Gtk.Widget, label: string): void;
     insertPageBefore(child: Gtk.Widget, label: string, beforeChild: Gtk.Widget): void;
     removePage(child: Gtk.Widget): void;
     updatePageLabel(child: Gtk.Widget, label: string): void;
+    attachChild(child: Gtk.Widget): void;
+    insertChildBefore(child: Gtk.Widget, before: Gtk.Widget): void;
+    detachChild(child: Gtk.Widget): void;
 }
 export declare class NotebookPageNode extends Node {
     static matches(type: string): boolean;
     protected isVirtual(): boolean;
     private label;
     private childWidget;
-    private parentNotebook;
-    constructor(type: string, props: Props, app: Gtk.Application);
+    private parentContainer;
+    constructor(type: string, props: Props);
     getLabel(): string;
     setChildWidget(widget: Gtk.Widget): void;
     getChildWidget(): Gtk.Widget | null;

package/dist/nodes/notebook.js

@@ -1,8 +1,10 @@
 import * as Gtk from "@gtkx/ffi/gtk";
+import { isPageContainer } from "../container-interfaces.js";
 import { Node } from "../node.js";
+import { getStringProp } from "../props.js";
 export class NotebookNode extends Node {
     static matches(type) {
-        return type === "Notebook.Root";
+        return type === "Notebook" || type === "Notebook.Root";
     }
     addPage(child, label) {
         const tabLabel = new Gtk.Label();
@@ -31,6 +33,21 @@ export class NotebookNode extends Node {
         tabLabel.setLabel(label);
         this.widget.setTabLabel(child, tabLabel);
     }
+    attachChild(child) {
+        this.widget.appendPage(child, null);
+    }
+    insertChildBefore(child, before) {
+        const beforePageNum = this.widget.pageNum(before);
+        if (beforePageNum >= 0) {
+            this.widget.insertPage(child, beforePageNum, null);
+        }
+        else {
+            this.widget.appendPage(child, null);
+        }
+    }
+    detachChild(child) {
+        this.removePage(child);
+    }
 }
 export class NotebookPageNode extends Node {
     static matches(type) {
@@ -41,10 +58,10 @@ export class NotebookPageNode extends Node {
     }
     label;
     childWidget = null;
-    parentNotebook = null;
-    constructor(type, props, app) {
-        super(type, props, app);
-        this.label = props.label ?? "";
+    parentContainer = null;
+    constructor(type, props) {
+        super(type, props);
+        this.label = getStringProp(props, "label", "");
     }
     getLabel() {
         return this.label;
@@ -62,14 +79,14 @@ export class NotebookPageNode extends Node {
         }
     }
     attachToParent(parent) {
-        if (parent instanceof NotebookNode && this.childWidget) {
-            this.parentNotebook = parent;
+        if (isPageContainer(parent) && this.childWidget) {
+            this.parentContainer = parent;
             parent.addPage(this.childWidget, this.label);
         }
     }
     attachToParentBefore(parent, before) {
-        if (parent instanceof NotebookNode && this.childWidget) {
-            this.parentNotebook = parent;
+        if (isPageContainer(parent) && this.childWidget) {
+            this.parentContainer = parent;
             const beforePage = before instanceof NotebookPageNode ? before.getChildWidget() : before.getWidget();
             if (beforePage) {
                 parent.insertPageBefore(this.childWidget, this.label, beforePage);
@@ -80,9 +97,9 @@ export class NotebookPageNode extends Node {
         }
     }
     detachFromParent(parent) {
-        if (parent instanceof NotebookNode && this.childWidget) {
+        if (isPageContainer(parent) && this.childWidget) {
             parent.removePage(this.childWidget);
-            this.parentNotebook = null;
+            this.parentContainer = null;
         }
     }
     consumedProps() {
@@ -92,9 +109,9 @@ export class NotebookPageNode extends Node {
     }
     updateProps(oldProps, newProps) {
         if (oldProps.label !== newProps.label) {
-            this.label = newProps.label ?? "";
-            if (this.parentNotebook && this.childWidget) {
-                this.parentNotebook.updatePageLabel(this.childWidget, this.label);
+            this.label = getStringProp(newProps, "label", "");
+            if (this.parentContainer && this.childWidget) {
+                this.parentContainer.updatePageLabel(this.childWidget, this.label);
             }
         }
         super.updateProps(oldProps, newProps);

package/dist/nodes/overlay.d.ts

@@ -1,6 +1,7 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
+import type { ChildContainer } from "../container-interfaces.js";
 import { Node } from "../node.js";
-export declare class OverlayNode extends Node<Gtk.Overlay> {
+export declare class OverlayNode extends Node<Gtk.Overlay> implements ChildContainer {
     static matches(type: string): boolean;
     private mainChild;
     private overlayChildren;

package/dist/nodes/root.d.ts

@@ -1,9 +1,8 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
-import type { Props } from "../factory.js";
 import { Node } from "../node.js";
 export declare const ROOT_NODE_CONTAINER: unique symbol;
 export declare class RootNode extends Node<never> {
-    static matches(_type: string, _props: Props, existingWidget?: Gtk.Widget | typeof ROOT_NODE_CONTAINER): boolean;
+    static matches(_type: string, existingWidget?: Gtk.Widget | typeof ROOT_NODE_CONTAINER): boolean;
     protected isVirtual(): boolean;
-    constructor(app: Gtk.Application);
+    constructor();
 }

package/dist/nodes/root.js

@@ -1,13 +1,13 @@
 import { Node } from "../node.js";
 export const ROOT_NODE_CONTAINER = Symbol.for("ROOT_NODE_CONTAINER");
 export class RootNode extends Node {
-    static matches(_type, _props, existingWidget) {
+    static matches(_type, existingWidget) {
         return existingWidget === ROOT_NODE_CONTAINER;
     }
     isVirtual() {
         return true;
     }
-    constructor(app) {
-        super("", {}, app);
+    constructor() {
+        super("", {});
     }
 }

package/dist/nodes/slot.d.ts

@@ -1,4 +1,3 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
 import type { Props } from "../factory.js";
 import { Node } from "../node.js";
 export declare class SlotNode extends Node<never> {
@@ -7,7 +6,7 @@ export declare class SlotNode extends Node<never> {
     private child;
     private slotName;
     private parentNode;
-    constructor(type: string, props: Props, app: Gtk.Application);
+    constructor(type: string, props: Props);
     private updateParentSlot;
     appendChild(child: Node): void;
     removeChild(_child: Node): void;

package/dist/nodes/slot.js

@@ -15,8 +15,8 @@ export class SlotNode extends Node {
     child = null;
     slotName;
     parentNode = null;
-    constructor(type, props, app) {
-        super(type, props, app);
+    constructor(type, props) {
+        super(type, props);
         const dotIndex = type.indexOf(".");
         if (dotIndex === -1) {
             throw new Error(`Invalid slot type: ${type}`);

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

@@ -1,14 +1,9 @@
-import * as Gtk from "@gtkx/ffi/gtk";
+import type * as Gtk from "@gtkx/ffi/gtk";
 import type { Props } from "../factory.js";
 import { Node } from "../node.js";
 export declare class TextViewNode extends Node<Gtk.TextView> {
     static matches(type: string): boolean;
-    private buffer;
-    private onChanged?;
-    private bufferChangedHandlerId?;
-    constructor(type: string, props: Props, app: Gtk.Application);
-    private connectBufferSignal;
-    private disconnectBufferSignal;
+    constructor(type: string, props: Props);
     protected consumedProps(): Set<string>;
     updateProps(oldProps: Props, newProps: Props): void;
 }

package/dist/nodes/text-view.js

@@ -1,64 +1,25 @@
-import { createRef } from "@gtkx/ffi";
-import * as GObject from "@gtkx/ffi/gobject";
-import * as Gtk from "@gtkx/ffi/gtk";
 import { Node } from "../node.js";
-const getBufferText = (buffer) => {
-    const startRef = createRef(new Gtk.TextIter());
-    const endRef = createRef(new Gtk.TextIter());
-    buffer.getStartIter(startRef);
-    buffer.getEndIter(endRef);
-    return buffer.getText(startRef.value, endRef.value, true);
-};
-const setBufferText = (buffer, text) => {
-    buffer.setText(text, -1);
-};
 export class TextViewNode extends Node {
     static matches(type) {
         return type === "TextView";
     }
-    buffer;
-    onChanged;
-    bufferChangedHandlerId;
-    constructor(type, props, app) {
-        super(type, props, app);
-        this.buffer = this.widget.getBuffer();
-        this.onChanged = props.onChanged;
-        if (typeof props.text === "string") {
-            setBufferText(this.buffer, props.text);
-        }
-        // Connect after a microtask to avoid signal firing during widget construction
-        queueMicrotask(() => this.connectBufferSignal());
-    }
-    connectBufferSignal() {
-        if (this.onChanged && this.bufferChangedHandlerId === undefined) {
-            this.bufferChangedHandlerId = this.buffer.connect("changed", () => {
-                const text = getBufferText(this.buffer);
-                this.onChanged?.(text);
-            });
-        }
-    }
-    disconnectBufferSignal() {
-        if (this.bufferChangedHandlerId !== undefined) {
-            GObject.signalHandlerDisconnect(this.buffer, this.bufferChangedHandlerId);
-            this.bufferChangedHandlerId = undefined;
+    constructor(type, props) {
+        super(type, props);
+        const buffer = props.buffer;
+        if (buffer) {
+            this.widget.setBuffer(buffer);
         }
     }
     consumedProps() {
         const consumed = super.consumedProps();
-        consumed.add("text");
-        consumed.add("onChanged");
+        consumed.add("buffer");
         return consumed;
     }
     updateProps(oldProps, newProps) {
-        if (this.buffer && oldProps.onChanged !== newProps.onChanged) {
-            this.disconnectBufferSignal();
-            this.onChanged = newProps.onChanged;
-            this.connectBufferSignal();
-        }
-        if (this.buffer && oldProps.text !== newProps.text && typeof newProps.text === "string") {
-            const currentText = getBufferText(this.buffer);
-            if (currentText !== newProps.text) {
-                setBufferText(this.buffer, newProps.text);
+        if (oldProps.buffer !== newProps.buffer) {
+            const buffer = newProps.buffer;
+            if (buffer) {
+                this.widget.setBuffer(buffer);
             }
         }
         super.updateProps(oldProps, newProps);

package/dist/nodes/widget.d.ts

@@ -1,12 +1,13 @@
-import * as Gtk from "@gtkx/ffi/gtk";
-import type { Props } from "../factory.js";
+import type * as Gtk from "@gtkx/ffi/gtk";
 import { Node } from "../node.js";
+/**
+ * Catch-all node for standard GTK widgets that don't need special handling.
+ * Specialized widgets (Window, AboutDialog, ActionBar, FlowBox, ListBox, etc.)
+ * are handled by their own dedicated Node classes.
+ */
 export declare class WidgetNode extends Node<Gtk.Widget> {
     static matches(_type: string): boolean;
     attachToParent(parent: Node): void;
     attachToParentBefore(parent: Node, before: Node): void;
     detachFromParent(parent: Node): void;
-    protected consumedProps(): Set<string>;
-    updateProps(oldProps: Props, newProps: Props): void;
-    mount(_app: Gtk.Application): void;
 }