@gtkx/react 0.9.0 → 0.9.1

package/dist/node.js

@@ -92,7 +92,7 @@ export class Node {
             this.attachChild(childWidget);
         }
         else if (this.widget && isAppendable(this.widget)) {
-            childWidget.insertBefore(this.widget, null);
+            childWidget.insertBefore(this.widget);
         }
         else if (this.widget && isAddable(this.widget)) {
             this.widget.add(childWidget);

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

@@ -1,4 +1,5 @@
 import * as Gtk from "@gtkx/ffi/gtk";
+import { StringSorter } from "@gtkx/ffi/gtk";
 import type { ColumnContainer } from "../containers.js";
 import type { Props } from "../factory.js";
 import { Node } from "../node.js";
@@ -37,8 +38,9 @@ type ColumnViewColumnState = {
     factory: Gtk.SignalListItemFactory;
     factoryHandlers: ListItemFactoryHandlers | null;
     renderCell: RenderItemFn<unknown>;
-    columnId: string | null;
+    columnId?: string;
     listItemCache: Map<number, ListItemInfo>;
+    sorter?: StringSorter;
 };
 export declare class ColumnViewColumnNode extends Node<never, ColumnViewColumnState> {
     static consumedPropNames: string[];
@@ -47,7 +49,7 @@ export declare class ColumnViewColumnNode extends Node<never, ColumnViewColumnSt
     private columnView;
     initialize(props: Props): void;
     getColumn(): Gtk.ColumnViewColumn;
-    getId(): string | null;
+    getId(): string | undefined;
     setColumnView(columnView: ColumnViewNode | null): void;
     unmount(): void;
     updateProps(oldProps: Props, newProps: Props): void;

package/dist/nodes/column-view.js

@@ -1,6 +1,6 @@
-import { getObject } from "@gtkx/ffi";
 import * as GObject from "@gtkx/ffi/gobject";
 import * as Gtk from "@gtkx/ffi/gtk";
+import { StringSorter } from "@gtkx/ffi/gtk";
 import { Node } from "../node.js";
 import { connectListItemFactorySignals } from "./list-item-factory.js";
 import { SelectableListNode } from "./selectable-list.js";
@@ -53,10 +53,9 @@ export class ColumnViewNode extends SelectableListNode {
     notifySortChange() {
         if (!this.state.onSortChange)
             return;
-        const baseSorter = this.widget.getSorter();
-        if (!baseSorter)
+        const sorter = this.widget.getSorter();
+        if (!sorter)
             return;
-        const sorter = getObject(baseSorter.id);
         const column = sorter.getPrimarySortColumn();
         const order = sorter.getPrimarySortOrder();
         const columnId = column?.getId() ?? null;
@@ -122,7 +121,7 @@ export class ColumnViewNode extends SelectableListNode {
     }
     applySortIndicator() {
         if (this.state.sortColumn === null) {
-            this.widget.sortByColumn(this.state.sortOrder, null);
+            this.widget.sortByColumn(this.state.sortOrder);
             return;
         }
         const column = this.state.columns.find((c) => c.getId() === this.state.sortColumn);
@@ -158,7 +157,7 @@ export class ColumnViewNode extends SelectableListNode {
     }
 }
 export class ColumnViewColumnNode extends Node {
-    static consumedPropNames = ["renderCell", "title", "expand", "resizable", "fixedWidth", "id"];
+    static consumedPropNames = ["renderCell", "title", "expand", "resizable", "fixedWidth", "id", "sortable"];
     static matches(type) {
         return type === "ColumnView.Column";
     }
@@ -169,7 +168,9 @@ export class ColumnViewColumnNode extends Node {
     initialize(props) {
         const factory = new Gtk.SignalListItemFactory();
         const column = new Gtk.ColumnViewColumn(props.title, factory);
-        const columnId = props.id ?? null;
+        const columnId = props.id ?? undefined;
+        const sortable = props.sortable;
+        const sorter = sortable ? new StringSorter() : undefined;
         this.state = {
             column,
             factory,
@@ -177,7 +178,11 @@ export class ColumnViewColumnNode extends Node {
             renderCell: props.renderCell,
             columnId,
             listItemCache: new Map(),
+            sorter,
         };
+        if (sorter) {
+            column.setSorter(sorter);
+        }
         super.initialize(props);
         if (columnId !== null) {
             column.setId(columnId);
@@ -228,9 +233,20 @@ export class ColumnViewColumnNode extends Node {
             this.state.column.setFixedWidth(newProps.fixedWidth);
         }
         if (oldProps.id !== newProps.id) {
-            this.state.columnId = newProps.id ?? null;
+            this.state.columnId = newProps.id ?? undefined;
             this.state.column.setId(this.state.columnId);
         }
+        if (oldProps.sortable !== newProps.sortable) {
+            const sortable = newProps.sortable;
+            if (sortable && !this.state.sorter) {
+                this.state.sorter = new StringSorter();
+                this.state.column.setSorter(this.state.sorter);
+            }
+            else if (!sortable && this.state.sorter) {
+                this.state.column.setSorter(undefined);
+                this.state.sorter = undefined;
+            }
+        }
     }
 }
 export class ColumnViewItemNode extends VirtualItemNode {

package/dist/nodes/flow-box.js

@@ -16,7 +16,7 @@ export class FlowBoxNode extends IndexedChildContainerNode {
         const parent = child.getParent();
         if (parent && isFlowBoxChild(parent)) {
             beginBatch();
-            parent.setChild(null);
+            parent.setChild(undefined);
             this.widget.remove(parent);
             endBatch();
         }

package/dist/nodes/list-box.js

@@ -16,7 +16,7 @@ export class ListBoxNode extends IndexedChildContainerNode {
         const parent = child.getParent();
         if (parent && isListBoxRow(parent)) {
             beginBatch();
-            parent.setChild(null);
+            parent.setChild(undefined);
             this.widget.remove(parent);
             endBatch();
         }
@@ -38,7 +38,7 @@ export class ListBoxNode extends IndexedChildContainerNode {
     detachChild(child) {
         if (isListBoxRow(child)) {
             beginBatch();
-            child.setChild(null);
+            child.setChild(undefined);
             this.widget.remove(child);
             endBatch();
             return;

package/dist/nodes/list-item-factory.js

@@ -1,4 +1,4 @@
-import { getObject, getObjectId } from "@gtkx/ffi";
+import { getObjectId } from "@gtkx/ffi";
 import * as GObject from "@gtkx/ffi/gobject";
 import * as Gtk from "@gtkx/ffi/gtk";
 import { createFiberRoot } from "../fiber-root.js";
@@ -7,7 +7,7 @@ export function connectListItemFactorySignals(config) {
     const { factory, listItemCache, getRenderFn, getItemAtPosition } = config;
     const handlerIds = [];
     const setupId = factory.connect("setup", (_self, listItemObj) => {
-        const listItem = getObject(listItemObj.id);
+        const listItem = listItemObj;
         const id = getObjectId(listItemObj.id);
         const box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         listItem.setChild(box);
@@ -18,7 +18,7 @@ export function connectListItemFactorySignals(config) {
     });
     handlerIds.push(setupId);
     const bindId = factory.connect("bind", (_self, listItemObj) => {
-        const listItem = getObject(listItemObj.id);
+        const listItem = listItemObj;
         const id = getObjectId(listItemObj.id);
         const info = listItemCache.get(id);
         if (!info)

package/dist/nodes/menu.d.ts

@@ -37,7 +37,7 @@ declare abstract class MenuContainerNode<T extends Gtk.Widget | undefined> exten
     protected onMenuRebuilt(): void;
 }
 type MenuWidget = Gtk.Widget & {
-    setMenuModel(model: Gio.MenuModel | null): void;
+    setMenuModel(model?: Gio.MenuModel): void;
 };
 declare abstract class MenuWidgetNode<T extends MenuWidget> extends MenuContainerNode<T> {
     protected abstract createMenuWidget(menu: Gio.Menu): T;

package/dist/nodes/menu.js

@@ -1,4 +1,4 @@
-import { getCurrentApp, getInterface } from "@gtkx/ffi";
+import { getCurrentApp, getObject } from "@gtkx/ffi";
 import * as Gio from "@gtkx/ffi/gio";
 import * as GObject from "@gtkx/ffi/gobject";
 import * as Gtk from "@gtkx/ffi/gtk";
@@ -67,13 +67,13 @@ class MenuContainerNode extends NodeClass {
         this.menu.removeAll();
         for (const entry of this.entries) {
             if (entry.type === "item") {
-                this.menu.append(entry.label ?? null, entry.action ?? null);
+                this.menu.append(entry.label, entry.action);
             }
             else if (entry.type === "section" && entry.menu) {
-                this.menu.appendSection(entry.menu, entry.label ?? null);
+                this.menu.appendSection(entry.menu, entry.label);
             }
             else if (entry.type === "submenu" && entry.menu) {
-                this.menu.appendSubmenu(entry.menu, entry.label ?? null);
+                this.menu.appendSubmenu(entry.menu, entry.label);
             }
         }
         this.onMenuRebuilt();
@@ -119,7 +119,7 @@ export class ApplicationMenuNode extends MenuContainerNode {
         getCurrentApp().setMenubar(this.menu);
     }
     unmount() {
-        getCurrentApp().setMenubar(null);
+        getCurrentApp().setMenubar(undefined);
         super.unmount();
     }
     onMenuRebuilt() {
@@ -199,7 +199,7 @@ export class MenuItemNode extends NodeClass {
         this.action = new Gio.SimpleAction(this.actionName);
         this.signalHandlerId = this.action.connect("activate", () => this.invokeCurrentCallback());
         const app = getCurrentApp();
-        const action = getInterface(this.action.id, Gio.Action);
+        const action = getObject(this.action.id, Gio.Action);
         if (!action) {
             throw new Error("Failed to get Gio.Action interface from SimpleAction");
         }

package/dist/nodes/notebook.js

@@ -34,15 +34,15 @@ export class NotebookNode extends Node {
         this.widget.setTabLabel(child, tabLabel);
     }
     attachChild(child) {
-        this.widget.appendPage(child, null);
+        this.widget.appendPage(child);
     }
     insertChildBefore(child, before) {
         const beforePageNum = this.widget.pageNum(before);
         if (beforePageNum >= 0) {
-            this.widget.insertPage(child, beforePageNum, null);
+            this.widget.insertPage(child, beforePageNum);
         }
         else {
-            this.widget.appendPage(child, null);
+            this.widget.appendPage(child);
         }
     }
     detachChild(child) {

package/dist/nodes/overlay.js

@@ -36,7 +36,7 @@ export class OverlayNode extends Node {
     }
     detachChild(childWidget) {
         if (this.mainChild === childWidget) {
-            this.widget.setChild(null);
+            this.widget.setChild(undefined);
             this.mainChild = null;
         }
         else {

package/dist/nodes/selectable-list.js

@@ -1,4 +1,4 @@
-import { getInterface } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import * as Gio from "@gtkx/ffi/gio";
 import * as GObject from "@gtkx/ffi/gobject";
 import * as Gtk from "@gtkx/ffi/gtk";
@@ -41,7 +41,7 @@ export class SelectableListNode extends NodeClass {
     initializeSelectionState(props) {
         const selectionMode = props.selectionMode ?? Gtk.SelectionMode.SINGLE;
         const stringList = new Gtk.StringList([]);
-        const listModel = getInterface(stringList.id, Gio.ListModel);
+        const listModel = getObject(stringList.id, Gio.ListModel) ?? undefined;
         const selectionModel = selectionMode === Gtk.SelectionMode.MULTIPLE
             ? new Gtk.MultiSelection(listModel)
             : new Gtk.SingleSelection(listModel);
@@ -100,7 +100,7 @@ export class SelectableListNode extends NodeClass {
         const currentSelection = this.getSelectedIds();
         const hadHandler = this.state.selectionHandlerId !== null;
         this.disconnectSelectionHandler();
-        const listModel = getInterface(this.state.stringList.id, Gio.ListModel);
+        const listModel = getObject(this.state.stringList.id, Gio.ListModel) ?? undefined;
         const newSelectionModel = newSelectionMode === Gtk.SelectionMode.MULTIPLE
             ? new Gtk.MultiSelection(listModel)
             : new Gtk.SingleSelection(listModel);

package/dist/nodes/stack.js

@@ -11,7 +11,7 @@ export class StackNode extends PagedStackNode {
         const { name, title } = props;
         let stackPage;
         if (title !== undefined) {
-            stackPage = this.widget.addTitled(child, title, name ?? null);
+            stackPage = this.widget.addTitled(child, title, name);
         }
         else if (name !== undefined) {
             stackPage = this.widget.addNamed(child, name);

package/dist/nodes/string-list-container.d.ts

@@ -12,7 +12,7 @@ type StringListContainerState = {
     hasAppliedInitialSelection: boolean;
 };
 type StringListWidget = Gtk.Widget & {
-    setModel(model: Gio.ListModel | null): void;
+    setModel(model?: Gio.ListModel): void;
     getSelected(): number;
     setSelected(position: number): void;
 };

package/dist/nodes/string-list-container.js

@@ -1,4 +1,4 @@
-import { getInterface } from "@gtkx/ffi";
+import { getObject } from "@gtkx/ffi";
 import * as Gio from "@gtkx/ffi/gio";
 import { Node as NodeClass } from "../node.js";
 import { getCallbackChange } from "../props.js";
@@ -44,7 +44,7 @@ export class StringListContainerNode extends NodeClass {
         const initialSelection = props.selectedId;
         this.state = { store, onSelectionChanged, initialSelection, hasAppliedInitialSelection: false };
         super.initialize(props);
-        this.widget.setModel(getInterface(store.getModel().id, Gio.ListModel));
+        this.widget.setModel(getObject(store.getModel().id, Gio.ListModel) ?? undefined);
     }
     connectSelectionHandler() {
         const handler = () => {

package/dist/nodes/view-stack.js

@@ -8,10 +8,10 @@ export class ViewStackNode extends PagedStackNode {
         const { name, title, iconName } = props;
         let page;
         if (title !== undefined && iconName !== undefined) {
-            page = this.widget.addTitledWithIcon(child, title, iconName, name ?? null);
+            page = this.widget.addTitledWithIcon(child, title, iconName, name);
         }
         else if (title !== undefined) {
-            page = this.widget.addTitled(child, title, name ?? null);
+            page = this.widget.addTitled(child, title, name);
         }
         else if (name !== undefined) {
             page = this.widget.addNamed(child, name);

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.9.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.9.0"
+    "@gtkx/ffi": "0.9.1"
   },
   "devDependencies": {
-    "@gtkx/native": "0.9.0",
-    "@gtkx/gir": "0.9.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"
   }
 }