@gtkx/react 0.1.48 → 0.1.49

package/dist/nodes/widget.js

@@ -1,62 +1,23 @@
-import { getObjectId } from "@gtkx/ffi";
-import * as GObject from "@gtkx/ffi/gobject";
-import * as Gtk from "@gtkx/ffi/gtk";
+import { isChildContainer } from "../container-interfaces.js";
 import { Node } from "../node.js";
-import { OverlayNode } from "./overlay.js";
-const isFlowBox = (widget) => widget instanceof Gtk.FlowBox;
-const isFlowBoxChild = (widget) => GObject.typeNameFromInstance(getObjectId(widget.ptr)) === "GtkFlowBoxChild";
-const isListBox = (widget) => widget instanceof Gtk.ListBox;
-const isListBoxRow = (widget) => GObject.typeNameFromInstance(getObjectId(widget.ptr)) === "GtkListBoxRow";
-const COMBINED_PROPS = [
-    {
-        props: ["defaultWidth", "defaultHeight"],
-        apply: (widget) => (values) => {
-            if (widget instanceof Gtk.Window) {
-                const width = values.defaultWidth ?? -1;
-                const height = values.defaultHeight ?? -1;
-                widget.setDefaultSize(width, height);
-            }
-        },
-    },
-];
+/**
+ * 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 class WidgetNode extends Node {
     static matches(_type) {
         return true;
     }
     attachToParent(parent) {
-        if (this.widget instanceof Gtk.AboutDialog) {
-            return;
-        }
-        if (parent instanceof OverlayNode) {
+        if (isChildContainer(parent)) {
             parent.attachChild(this.widget);
             return;
         }
-        const parentWidget = parent.getWidget();
-        if (!parentWidget)
-            return;
-        if (parentWidget instanceof Gtk.ActionBar) {
-            parentWidget.packStart(this.widget);
-            return;
-        }
-        if (parentWidget instanceof Gtk.Notebook) {
-            parentWidget.appendPage(this.widget);
-            return;
-        }
-        if (isFlowBox(parentWidget)) {
-            parentWidget.append(this.widget);
-            return;
-        }
-        if (isListBox(parentWidget)) {
-            parentWidget.append(this.widget);
-            return;
-        }
         super.attachToParent(parent);
     }
     attachToParentBefore(parent, before) {
-        if (this.widget instanceof Gtk.AboutDialog) {
-            return;
-        }
-        if (parent instanceof OverlayNode) {
+        if (isChildContainer(parent)) {
             const beforeWidget = before.getWidget();
             if (beforeWidget) {
                 parent.insertChildBefore(this.widget, beforeWidget);
@@ -66,114 +27,13 @@ export class WidgetNode extends Node {
             }
             return;
         }
-        const parentWidget = parent.getWidget();
-        const beforeWidget = before.getWidget();
-        if (!parentWidget)
-            return;
-        if (parentWidget instanceof Gtk.ActionBar) {
-            parentWidget.packStart(this.widget);
-            return;
-        }
-        if (parentWidget instanceof Gtk.Notebook && beforeWidget) {
-            const beforePageNum = parentWidget.pageNum(beforeWidget);
-            if (beforePageNum >= 0) {
-                parentWidget.insertPage(this.widget, beforePageNum);
-            }
-            else {
-                parentWidget.appendPage(this.widget);
-            }
-            return;
-        }
-        if (isFlowBox(parentWidget)) {
-            if (beforeWidget) {
-                const beforeChild = beforeWidget.getParent();
-                if (beforeChild && isFlowBoxChild(beforeChild)) {
-                    parentWidget.insert(this.widget, beforeChild.getIndex());
-                }
-                else {
-                    parentWidget.append(this.widget);
-                }
-            }
-            else {
-                parentWidget.append(this.widget);
-            }
-            return;
-        }
-        if (isListBox(parentWidget)) {
-            if (beforeWidget && isListBoxRow(beforeWidget)) {
-                parentWidget.insert(this.widget, beforeWidget.getIndex());
-            }
-            else {
-                parentWidget.append(this.widget);
-            }
-            return;
-        }
         super.attachToParentBefore(parent, before);
     }
     detachFromParent(parent) {
-        if (this.widget instanceof Gtk.Window) {
-            this.widget.destroy();
-            return;
-        }
-        if (this.widget instanceof Gtk.AboutDialog) {
-            return;
-        }
-        if (parent instanceof OverlayNode) {
+        if (isChildContainer(parent)) {
             parent.detachChild(this.widget);
             return;
         }
-        const parentWidget = parent.getWidget();
-        if (!parentWidget)
-            return;
-        if (parentWidget instanceof Gtk.ActionBar) {
-            parentWidget.remove(this.widget);
-            return;
-        }
-        if (parentWidget instanceof Gtk.Notebook) {
-            const pageNum = parentWidget.pageNum(this.widget);
-            if (pageNum >= 0) {
-                parentWidget.removePage(pageNum);
-            }
-            return;
-        }
-        if (isFlowBox(parentWidget)) {
-            const flowBoxChild = this.widget.getParent();
-            if (flowBoxChild) {
-                parentWidget.remove(flowBoxChild);
-            }
-            return;
-        }
-        if (isListBox(parentWidget)) {
-            parentWidget.remove(this.widget);
-            return;
-        }
         super.detachFromParent(parent);
     }
-    consumedProps() {
-        const consumed = super.consumedProps();
-        for (const handler of COMBINED_PROPS) {
-            for (const prop of handler.props) {
-                consumed.add(prop);
-            }
-        }
-        return consumed;
-    }
-    updateProps(oldProps, newProps) {
-        for (const handler of COMBINED_PROPS) {
-            const hasAnyChanged = handler.props.some((prop) => oldProps[prop] !== newProps[prop]);
-            if (hasAnyChanged) {
-                const values = {};
-                for (const prop of handler.props) {
-                    values[prop] = newProps[prop];
-                }
-                handler.apply(this.widget)(values);
-            }
-        }
-        super.updateProps(oldProps, newProps);
-    }
-    mount(_app) {
-        if (this.widget instanceof Gtk.Window) {
-            this.widget.present();
-        }
-    }
 }

package/dist/nodes/window.d.ts

@@ -0,0 +1,11 @@
+import * as Gtk from "@gtkx/ffi/gtk";
+import type { Props } from "../factory.js";
+import { Node } from "../node.js";
+export declare class WindowNode extends Node<Gtk.Window> {
+    static matches(type: string): boolean;
+    protected createWidget(type: string, _props: Props): Gtk.Window;
+    detachFromParent(_parent: Node): void;
+    mount(): void;
+    protected consumedProps(): Set<string>;
+    updateProps(oldProps: Props, newProps: Props): void;
+}

package/dist/nodes/window.js

@@ -0,0 +1,37 @@
+import { getCurrentApp } from "@gtkx/ffi";
+import * as Gtk from "@gtkx/ffi/gtk";
+import { Node } from "../node.js";
+import { getNumberProp } from "../props.js";
+export class WindowNode extends Node {
+    static matches(type) {
+        return type === "Window" || type === "ApplicationWindow";
+    }
+    createWidget(type, _props) {
+        if (type === "ApplicationWindow") {
+            return new Gtk.ApplicationWindow(getCurrentApp());
+        }
+        return new Gtk.Window();
+    }
+    detachFromParent(_parent) {
+        this.widget.destroy();
+    }
+    mount() {
+        this.widget.present();
+    }
+    consumedProps() {
+        const consumed = super.consumedProps();
+        consumed.add("defaultWidth");
+        consumed.add("defaultHeight");
+        return consumed;
+    }
+    updateProps(oldProps, newProps) {
+        const widthChanged = oldProps.defaultWidth !== newProps.defaultWidth;
+        const heightChanged = oldProps.defaultHeight !== newProps.defaultHeight;
+        if (widthChanged || heightChanged) {
+            const width = getNumberProp(newProps, "defaultWidth", -1);
+            const height = getNumberProp(newProps, "defaultHeight", -1);
+            this.widget.setDefaultSize(width, height);
+        }
+        super.updateProps(oldProps, newProps);
+    }
+}

package/dist/props.d.ts

@@ -0,0 +1,5 @@
+import type { Props } from "./factory.js";
+/** Extracts a number property from props with a default value. */
+export declare const getNumberProp: (props: Props, key: string, defaultValue: number) => number;
+/** Extracts a string property from props with a default value. */
+export declare const getStringProp: (props: Props, key: string, defaultValue: string) => string;

package/dist/props.js

@@ -0,0 +1,10 @@
+/** Extracts a number property from props with a default value. */
+export const getNumberProp = (props, key, defaultValue) => {
+    const value = props[key];
+    return typeof value === "number" ? value : defaultValue;
+};
+/** Extracts a string property from props with a default value. */
+export const getStringProp = (props, key, defaultValue) => {
+    const value = props[key];
+    return typeof value === "string" ? value : defaultValue;
+};

package/dist/reconciler.js

@@ -1,4 +1,3 @@
-import { getCurrentApp } from "@gtkx/ffi";
 import React from "react";
 import ReactReconciler from "react-reconciler";
 import { beginCommit, endCommit } from "./batch.js";
@@ -30,16 +29,16 @@ class Reconciler {
             getChildHostContext: (parentHostContext) => parentHostContext,
             shouldSetTextContent: () => false,
             createInstance: (type, props) => {
-                return createNode(type, props, getCurrentApp());
+                return createNode(type, props);
             },
-            createTextInstance: (text) => createNode("Label.Root", { label: text }, getCurrentApp()),
+            createTextInstance: (text) => createNode("Label.Root", { label: text }),
             appendInitialChild: (parent, child) => parent.appendChild(child),
             finalizeInitialChildren: () => true,
             commitUpdate: (instance, _type, oldProps, newProps) => {
                 instance.updateProps(oldProps, newProps);
             },
             commitMount: (instance) => {
-                instance.mount(getCurrentApp());
+                instance.mount();
             },
             appendChild: (parent, child) => parent.appendChild(child),
             removeChild: (parent, child) => parent.removeChild(child),
@@ -105,7 +104,7 @@ class Reconciler {
         return context;
     }
     createNodeFromContainer(container) {
-        return createNode(container.constructor.name, {}, getCurrentApp(), container);
+        return createNode(container.constructor.name, {}, container);
     }
 }
 /** The singleton GTKX React reconciler instance. */

package/dist/types.d.ts

@@ -32,7 +32,7 @@ export interface ListViewRenderProps<T = unknown> {
  * @param columnId - The ID of the column being sorted
  */
 export type ColumnSortFn<T, C extends string = string> = (a: T, b: T, columnId: C) => number;
-export interface ColumnViewColumnProps {
+export interface ColumnViewColumnProps<T = unknown> {
     title?: string;
     expand?: boolean;
     resizable?: boolean;
@@ -43,13 +43,13 @@ export interface ColumnViewColumnProps {
      * Called with null during setup (for loading state) and with the actual item during bind.
      * Always annotate your callback parameter type to include null, e.g.: `(item: MyItem | null) => ...`
      */
-    renderCell: (item: any) => ReactElement;
+    renderCell: (item: T | null) => ReactElement;
 }
-export interface ColumnViewRootProps<C extends string = string> {
+export interface ColumnViewRootProps<T = unknown, C extends string = string> {
     sortColumn?: C | null;
     sortOrder?: SortType;
     onSortChange?: (column: C | null, order: SortType) => void;
-    sortFn?: ColumnSortFn<any, C>;
+    sortFn?: ColumnSortFn<T, C>;
 }
 export interface NotebookPageProps extends SlotProps {
     label: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.1.48",
+  "version": "0.1.49",
   "description": "Build GTK4 desktop applications with React and TypeScript",
   "keywords": [
     "gtk",
@@ -36,10 +36,10 @@
   ],
   "dependencies": {
     "react-reconciler": "0.33.0",
-    "@gtkx/ffi": "0.1.48"
+    "@gtkx/ffi": "0.1.49"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.1.48"
+    "@gtkx/gir": "0.1.49"
   },
   "peerDependencies": {
     "react": "^19"