@gtkx/react 0.8.0 → 0.9.1

package/dist/nodes/virtual-item.js

@@ -1,20 +1,18 @@
-import { isItemContainer } from "../container-interfaces.js";
-import { Node } from "../node.js";
-const hasGetId = (node) => {
-    return typeof node.getId === "function";
-};
+import { Node as NodeClass } from "../node.js";
+import { isItemContainer } from "../predicates.js";
 /**
  * Base class for virtual item nodes used in list-based containers.
  * Virtual nodes don't create GTK widgets directly but represent items
  * in list models (ListView, GridView, ColumnView).
  */
-export class VirtualItemNode extends Node {
+export class VirtualItemNode extends NodeClass {
     static consumedPropNames = ["id", "item"];
     isVirtual() {
         return true;
     }
     id = "";
     item;
+    parentContainer = null;
     initialize(props) {
         this.id = props.id;
         this.item = props.item;
@@ -26,23 +24,21 @@ export class VirtualItemNode extends Node {
     getItem() {
         return this.item;
     }
-    attachToParent(parent) {
-        if (isItemContainer(parent)) {
-            parent.addItem(this.id, this.item);
-        }
+    setParentContainer(container) {
+        this.parentContainer = container;
     }
-    attachToParentBefore(parent, before) {
-        if (isItemContainer(parent) && hasGetId(before)) {
-            parent.insertItemBefore(this.id, this.item, before.getId());
-        }
-        else {
-            this.attachToParent(parent);
-        }
+    addToContainer(container) {
+        container.addItem(this.id, this.item);
+    }
+    insertBeforeInContainer(container, beforeId) {
+        container.insertItemBefore(this.id, this.item, beforeId);
     }
-    detachFromParent(parent) {
-        if (isItemContainer(parent)) {
-            parent.removeItem(this.id);
+    unmount() {
+        if (this.parentContainer) {
+            this.parentContainer.removeItem(this.id);
         }
+        this.parentContainer = null;
+        super.unmount();
     }
     updateProps(oldProps, newProps) {
         const newId = newProps.id;

package/dist/nodes/virtual-slot.d.ts

@@ -16,10 +16,10 @@ export declare abstract class VirtualSlotNode<TContainer, TProps> extends Node<n
     protected abstract extractSlotProps(props: Props): TProps;
     initialize(props: Props): void;
     getChildWidget(): Gtk.Widget | null;
+    getSlotProps(): TProps;
+    setParentContainer(container: Node & TContainer): void;
+    getBeforeWidget(before: Node): Gtk.Widget | null;
     appendChild(child: Node): void;
-    attachToParent(parent: Node): void;
-    attachToParentBefore(parent: Node, before: Node): void;
-    protected getBeforeWidget(before: Node): Gtk.Widget | null;
-    detachFromParent(parent: Node): void;
+    unmount(): void;
     protected updateSlotPropsIfChanged(oldProps: Props, newProps: Props, propKeys: string[]): boolean;
 }

package/dist/nodes/virtual-slot.js

@@ -22,29 +22,11 @@ export class VirtualSlotNode extends Node {
     getChildWidget() {
         return this.childWidget;
     }
-    appendChild(child) {
-        const childWidget = child.getWidget();
-        if (childWidget) {
-            this.childWidget = childWidget;
-        }
+    getSlotProps() {
+        return this.slotProps;
     }
-    attachToParent(parent) {
-        if (this.isValidContainer(parent) && this.childWidget) {
-            this.parentContainer = parent;
-            this.addToContainer(parent, this.childWidget, this.slotProps);
-        }
-    }
-    attachToParentBefore(parent, before) {
-        if (this.isValidContainer(parent) && this.childWidget) {
-            this.parentContainer = parent;
-            const beforeWidget = this.getBeforeWidget(before);
-            if (beforeWidget) {
-                this.insertBeforeInContainer(parent, this.childWidget, this.slotProps, beforeWidget);
-            }
-            else {
-                this.addToContainer(parent, this.childWidget, this.slotProps);
-            }
-        }
+    setParentContainer(container) {
+        this.parentContainer = container;
     }
     getBeforeWidget(before) {
         if (before instanceof VirtualSlotNode) {
@@ -52,12 +34,16 @@ export class VirtualSlotNode extends Node {
         }
         return before.getWidget() ?? null;
     }
-    detachFromParent(parent) {
-        if (this.isValidContainer(parent) && this.childWidget) {
-            this.removeFromContainer(parent, this.childWidget);
-            this.parentContainer = null;
+    appendChild(child) {
+        const childWidget = child.getWidget();
+        if (childWidget) {
+            this.childWidget = childWidget;
         }
     }
+    unmount() {
+        this.parentContainer = null;
+        super.unmount();
+    }
     updateSlotPropsIfChanged(oldProps, newProps, propKeys) {
         const changed = propKeys.some((key) => oldProps[key] !== newProps[key]);
         if (changed) {

package/dist/nodes/window.d.ts

@@ -4,8 +4,9 @@ import { Node } from "../node.js";
 export declare class WindowNode extends Node<Gtk.Window> {
     static consumedPropNames: string[];
     static matches(type: string): boolean;
+    protected isStandalone(): boolean;
     protected createWidget(type: string, _props: Props): Gtk.Window;
-    detachFromParent(_parent: Node): void;
     mount(): void;
+    unmount(): void;
     updateProps(oldProps: Props, newProps: Props): void;
 }

package/dist/nodes/window.js

@@ -8,6 +8,9 @@ export class WindowNode extends Node {
     static matches(type) {
         return WINDOW_TYPES.has(normalizeWidgetType(type));
     }
+    isStandalone() {
+        return true;
+    }
     createWidget(type, _props) {
         const widgetType = normalizeWidgetType(type);
         if (widgetType === "ApplicationWindow") {
@@ -21,12 +24,13 @@ export class WindowNode extends Node {
         }
         return new Gtk.Window();
     }
-    detachFromParent(_parent) {
-        this.widget.destroy();
-    }
     mount() {
         this.widget.present();
     }
+    unmount() {
+        this.widget.destroy();
+        super.unmount();
+    }
     updateProps(oldProps, newProps) {
         const widthChanged = oldProps.defaultWidth !== newProps.defaultWidth;
         const heightChanged = oldProps.defaultHeight !== newProps.defaultHeight;

package/dist/predicates.d.ts

@@ -1,4 +1,6 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
+import type { ChildContainer, GridContainer, ItemContainer, PackContainer, PageContainer, StackPageContainer, StringListContainer } from "./containers.js";
+import type { Node } from "./node.js";
 interface Appendable extends Gtk.Widget {
     append(child: unknown): void;
 }
@@ -11,28 +13,17 @@ interface SingleChild extends Gtk.Widget {
 interface Removable extends Gtk.Widget {
     remove(child: unknown): void;
 }
-/**
- * Type guard that checks if a GTK widget supports appending children via an append method.
- */
 export declare const isAppendable: (widget: Gtk.Widget) => widget is Appendable;
-/**
- * Type guard that checks if a GTK widget supports adding children via an add method.
- */
 export declare const isAddable: (widget: Gtk.Widget) => widget is Addable;
-/**
- * Type guard that checks if a GTK widget supports a single child via setChild method.
- */
 export declare const isSingleChild: (widget: Gtk.Widget) => widget is SingleChild;
-/**
- * Type guard that checks if a GTK widget supports removing children via a remove method.
- */
 export declare const isRemovable: (widget: Gtk.Widget) => widget is Removable;
-/**
- * Type guard that checks if a GTK widget is a FlowBoxChild.
- */
 export declare const isFlowBoxChild: (widget: Gtk.Widget) => widget is Gtk.FlowBoxChild;
-/**
- * Type guard that checks if a GTK widget is a ListBoxRow.
- */
 export declare const isListBoxRow: (widget: Gtk.Widget) => widget is Gtk.ListBoxRow;
+export declare const isChildContainer: (node: Node) => node is Node & ChildContainer;
+export declare const isPageContainer: (node: Node) => node is Node & PageContainer;
+export declare const isStackPageContainer: (node: Node) => node is Node & StackPageContainer;
+export declare const isGridContainer: (node: Node) => node is Node & GridContainer;
+export declare const isItemContainer: (node: Node) => node is Node & ItemContainer<unknown>;
+export declare const isPackContainer: (node: Node) => node is Node & PackContainer;
+export declare const isStringListContainer: (node: Node) => node is Node & StringListContainer;
 export {};

package/dist/predicates.js

@@ -1,24 +1,37 @@
-/**
- * Type guard that checks if a GTK widget supports appending children via an append method.
- */
 export const isAppendable = (widget) => "append" in widget && typeof widget.append === "function";
-/**
- * Type guard that checks if a GTK widget supports adding children via an add method.
- */
 export const isAddable = (widget) => "add" in widget && typeof widget.add === "function";
-/**
- * Type guard that checks if a GTK widget supports a single child via setChild method.
- */
 export const isSingleChild = (widget) => "setChild" in widget && typeof widget.setChild === "function";
-/**
- * Type guard that checks if a GTK widget supports removing children via a remove method.
- */
 export const isRemovable = (widget) => "remove" in widget && typeof widget.remove === "function";
-/**
- * Type guard that checks if a GTK widget is a FlowBoxChild.
- */
 export const isFlowBoxChild = (widget) => "getIndex" in widget && "getChild" in widget && typeof widget.getIndex === "function";
-/**
- * Type guard that checks if a GTK widget is a ListBoxRow.
- */
 export const isListBoxRow = (widget) => "getIndex" in widget && "isSelected" in widget && typeof widget.getIndex === "function";
+const createContainerGuard = (requiredMethods) => (node) => requiredMethods.every((method) => method in node);
+export const isChildContainer = createContainerGuard([
+    "attachChild",
+    "detachChild",
+    "insertChildBefore",
+]);
+export const isPageContainer = createContainerGuard([
+    "addPage",
+    "removePage",
+    "insertPageBefore",
+    "updatePageLabel",
+]);
+export const isStackPageContainer = createContainerGuard([
+    "addStackPage",
+    "removeStackPage",
+    "updateStackPageProps",
+]);
+export const isGridContainer = createContainerGuard(["attachToGrid", "removeFromGrid"]);
+export const isItemContainer = createContainerGuard([
+    "addItem",
+    "insertItemBefore",
+    "removeItem",
+    "updateItem",
+]);
+export const isPackContainer = createContainerGuard(["packStart", "packEnd", "removeFromPack"]);
+export const isStringListContainer = createContainerGuard([
+    "addStringListItem",
+    "insertStringListItemBefore",
+    "removeStringListItem",
+    "updateStringListItem",
+]);

package/dist/reconciler.d.ts

@@ -1,4 +1,4 @@
-import { type ReconcilerInstance } from "./reconciler/host-config.js";
+import { type ReconcilerInstance } from "./host-config.js";
 declare class Reconciler {
     private instance;
     constructor();

package/dist/reconciler.js

@@ -1,7 +1,7 @@
 import ReactReconciler from "react-reconciler";
 import packageJson from "../package.json" with { type: "json" };
 import { createNode } from "./factory.js";
-import { createHostConfig } from "./reconciler/host-config.js";
+import { createHostConfig } from "./host-config.js";
 class Reconciler {
     instance;
     constructor() {

package/dist/types.d.ts

@@ -61,6 +61,8 @@ export type ColumnViewColumnProps<T = unknown> = {
     fixedWidth?: number;
     /** Unique identifier for the column. Used for sorting. */
     id?: string;
+    /** Whether this column header can be clicked to trigger sorting. */
+    sortable?: boolean;
     /**
      * Render function for column cells.
      * Called with null during setup (for loading state) and with the actual item during bind.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "Build GTK4 desktop applications with React and TypeScript",
   "keywords": [
     "gtk",
@@ -36,11 +36,11 @@
   ],
   "dependencies": {
     "react-reconciler": "^0.33.0",
-    "@gtkx/ffi": "0.8.0"
+    "@gtkx/ffi": "0.9.1"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.8.0",
-    "@gtkx/native": "0.8.0"
+    "@gtkx/gir": "0.9.1",
+    "@gtkx/native": "0.9.1"
   },
   "peerDependencies": {
     "react": "^19"
@@ -48,6 +48,6 @@
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",
     "codegen": "tsx scripts/codegen.ts",
-    "test": "if [ -n \"$CI\" ]; then vitest run; else GDK_BACKEND=x11 xvfb-run -a vitest run; fi"
+    "test": "../../scripts/run-tests.sh"
   }
 }

package/dist/container-interfaces.js

@@ -1,26 +0,0 @@
-const createContainerGuard = (requiredMethods) => (node) => requiredMethods.every((method) => method in node);
-export const isChildContainer = createContainerGuard([
-    "attachChild",
-    "detachChild",
-    "insertChildBefore",
-]);
-export const isPageContainer = createContainerGuard([
-    "addPage",
-    "removePage",
-    "insertPageBefore",
-    "updatePageLabel",
-]);
-export const isStackPageContainer = createContainerGuard([
-    "addStackPage",
-    "removeStackPage",
-    "updateStackPageProps",
-]);
-export const isGridContainer = createContainerGuard(["attachToGrid", "removeFromGrid"]);
-export const isItemContainer = createContainerGuard([
-    "addItem",
-    "insertItemBefore",
-    "removeItem",
-    "updateItem",
-]);
-export const isColumnContainer = createContainerGuard(["addColumn", "removeColumn", "getItems"]);
-export const isPackContainer = createContainerGuard(["packStart", "packEnd", "removeFromPack"]);