@gtkx/react 0.10.4 → 0.11.0

package/dist/generated/registry.d.ts

@@ -1,4 +1,3 @@
-/** Generated namespace registry for widget class resolution. */
 type Namespace = Record<string, unknown>;
 export declare const NAMESPACE_REGISTRY: [string, Namespace][];
 export {};

package/dist/node.d.ts

@@ -1,7 +1,7 @@
 import type { Container, ContainerClass, Props } from "./types.js";
 export declare class Node<T = unknown, P = Props> {
     static priority: number;
-    static matches(_type: string, _containerOrClass?: Container | ContainerClass): boolean;
+    static matches(_type: string, _containerOrClass?: Container | ContainerClass | null): boolean;
     static createContainer(_props: Props, _containerClass: ContainerClass, _rootContainer?: Container): unknown;
     container: T;
     typeName: string;

package/dist/nodes/action-row-child.js

@@ -1,3 +1,4 @@
+import { isObjectEqual } from "@gtkx/ffi";
 import { registerNodeClass } from "../registry.js";
 import { scheduleAfterCommit } from "../scheduler.js";
 import { VirtualNode } from "./virtual.js";
@@ -48,7 +49,7 @@ export class ActionRowChild extends VirtualNode {
         scheduleAfterCommit(() => {
             if (parent) {
                 const currentParent = widget.getParent();
-                if (currentParent?.equals(parent)) {
+                if (currentParent && isObjectEqual(currentParent, parent)) {
                     parent.remove(widget);
                 }
             }
@@ -61,7 +62,7 @@ export class ActionRowChild extends VirtualNode {
             scheduleAfterCommit(() => {
                 for (const widget of childrenToRemove) {
                     const currentParent = widget.getParent();
-                    if (currentParent?.equals(parent)) {
+                    if (currentParent && isObjectEqual(currentParent, parent)) {
                         parent.remove(widget);
                     }
                 }

package/dist/nodes/action-row.js

@@ -1,16 +1,12 @@
-import * as Gtk from "@gtkx/ffi/gtk";
+import { PREFIX_SUFFIX_INTERFACE_METHODS } from "../generated/internal.js";
 import { registerNodeClass } from "../registry.js";
 import { ActionRowChild } from "./action-row-child.js";
+import { matchesInterface } from "./internal/utils.js";
 import { WidgetNode } from "./widget.js";
 class ActionRowNode extends WidgetNode {
     static priority = 0;
     static matches(_type, containerOrClass) {
-        if (!containerOrClass ||
-            (typeof containerOrClass !== "function" && !(containerOrClass instanceof Gtk.Widget))) {
-            return false;
-        }
-        const protoOrInstance = typeof containerOrClass === "function" ? containerOrClass.prototype : containerOrClass;
-        return "addPrefix" in protoOrInstance && "addSuffix" in protoOrInstance && "remove" in protoOrInstance;
+        return matchesInterface(PREFIX_SUFFIX_INTERFACE_METHODS, containerOrClass);
     }
     appendChild(child) {
         if (child instanceof ActionRowChild) {

package/dist/nodes/application.js

@@ -30,7 +30,7 @@ class ApplicationNode extends Node {
         if (child instanceof MenuNode) {
             this.menu.removeChild(child);
             if (this.menu.getMenu().getNItems() === 0) {
-                this.container.setMenubar(undefined);
+                this.container.setMenubar(null);
             }
         }
     }

package/dist/nodes/autowrapped.js

@@ -1,8 +1,9 @@
-import { batch } from "@gtkx/ffi";
+import { batch, isObjectEqual } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
+import { AUTOWRAP_CLASSES } from "../generated/internal.js";
 import { registerNodeClass } from "../registry.js";
 import { isRemovable, isSingleChild } from "./internal/predicates.js";
-import { isContainerType } from "./internal/utils.js";
+import { matchesAnyClass } from "./internal/utils.js";
 import { WidgetNode } from "./widget.js";
 const isAutowrappedChild = (obj) => {
     return obj instanceof Gtk.ListBoxRow || obj instanceof Gtk.FlowBoxChild;
@@ -10,7 +11,7 @@ const isAutowrappedChild = (obj) => {
 class AutowrappedNode extends WidgetNode {
     static priority = 2;
     static matches(_type, containerOrClass) {
-        return isContainerType(Gtk.ListBox, containerOrClass) || isContainerType(Gtk.FlowBox, containerOrClass);
+        return matchesAnyClass(AUTOWRAP_CLASSES, containerOrClass);
     }
     appendChild(child) {
         if (!(child instanceof WidgetNode)) {
@@ -68,7 +69,7 @@ class AutowrappedNode extends WidgetNode {
                 this.removeExistingWrapper(child.container);
             }
             const position = this.findChildPosition(before);
-            if (position !== undefined) {
+            if (position !== null) {
                 this.container.insert(child.container, position);
             }
             else {
@@ -92,12 +93,13 @@ class AutowrappedNode extends WidgetNode {
         const beforeIsWrapper = isAutowrappedChild(before.container);
         while (currentChild) {
             const widgetToCompare = beforeIsWrapper ? currentChild : this.unwrapChild(currentChild);
-            if (widgetToCompare?.equals(before.container)) {
+            if (widgetToCompare && isObjectEqual(widgetToCompare, before.container)) {
                 return position;
             }
             position++;
             currentChild = currentChild.getNextSibling();
         }
+        return null;
     }
     unwrapChild(child) {
         if ("getChild" in child && typeof child.getChild === "function") {

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

@@ -46,7 +46,7 @@ export class ColumnViewColumnNode extends VirtualNode {
                 this.column.setSorter(new Gtk.StringSorter());
             }
             else {
-                this.column.setSorter(undefined);
+                this.column.setSorter(null);
             }
         }
     }

package/dist/nodes/column-view.js

@@ -1,8 +1,9 @@
 import * as Gtk from "@gtkx/ffi/gtk";
+import { COLUMN_VIEW_CLASSES } from "../generated/internal.js";
 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 { filterProps, matchesAnyClass } from "./internal/utils.js";
 import { ListItemNode } from "./list-item.js";
 import { List } from "./models/list.js";
 import { WidgetNode } from "./widget.js";
@@ -12,7 +13,7 @@ class ColumnViewNode extends WidgetNode {
     handleSortChange;
     list;
     static matches(_type, containerOrClass) {
-        return isContainerType(Gtk.ColumnView, containerOrClass);
+        return matchesAnyClass(COLUMN_VIEW_CLASSES, containerOrClass);
     }
     constructor(typeName, props, container, rootContainer) {
         super(typeName, props, container, rootContainer);
@@ -87,7 +88,7 @@ class ColumnViewNode extends WidgetNode {
             const sortColumn = newProps.sortColumn;
             const sortOrder = newProps.sortOrder ?? Gtk.SortType.ASCENDING;
             if (!sortColumn) {
-                this.container.sortByColumn(sortOrder);
+                this.container.sortByColumn(sortOrder, undefined);
             }
             else {
                 this.container.sortByColumn(sortOrder, this.getColumn(sortColumn));

package/dist/nodes/fixed-child.js

@@ -1,4 +1,4 @@
-import { batch } from "@gtkx/ffi";
+import { batch, isObjectEqual } from "@gtkx/ffi";
 import { registerNodeClass } from "../registry.js";
 import { SlotNode } from "./slot.js";
 class FixedChildNode extends SlotNode {
@@ -28,7 +28,7 @@ class FixedChildNode extends SlotNode {
             const child = this.child;
             batch(() => {
                 const currentParent = child.getParent();
-                if (currentParent?.equals(fixed)) {
+                if (currentParent && isObjectEqual(currentParent, fixed)) {
                     fixed.remove(child);
                 }
                 fixed.put(child, x, y);
@@ -39,7 +39,7 @@ class FixedChildNode extends SlotNode {
         const fixed = this.getFixed();
         if (oldChild) {
             const parent = oldChild.getParent();
-            if (parent?.equals(fixed)) {
+            if (parent && isObjectEqual(parent, fixed)) {
                 fixed.remove(oldChild);
             }
         }

package/dist/nodes/grid-child.js

@@ -1,4 +1,4 @@
-import { batch } from "@gtkx/ffi";
+import { batch, isObjectEqual } from "@gtkx/ffi";
 import { registerNodeClass } from "../registry.js";
 import { SlotNode } from "./slot.js";
 class GridChildNode extends SlotNode {
@@ -32,12 +32,12 @@ class GridChildNode extends SlotNode {
         const rowSpan = this.props.rowSpan ?? 1;
         batch(() => {
             const existingChild = grid.getChildAt(column, row);
-            if (existingChild && !existingChild.equals(this.child)) {
+            if (existingChild && this.child && !isObjectEqual(existingChild, this.child)) {
                 grid.remove(existingChild);
             }
             if (this.child) {
                 const currentParent = this.child.getParent();
-                if (currentParent?.equals(grid)) {
+                if (currentParent && isObjectEqual(currentParent, grid)) {
                     grid.remove(this.child);
                 }
                 grid.attach(this.child, column, row, columnSpan, rowSpan);
@@ -48,7 +48,7 @@ class GridChildNode extends SlotNode {
         const grid = this.getGrid();
         if (oldChild) {
             const parent = oldChild.getParent();
-            if (parent?.equals(grid)) {
+            if (parent && isObjectEqual(parent, grid)) {
                 grid.remove(oldChild);
             }
         }

package/dist/nodes/internal/constants.d.ts

@@ -0,0 +1 @@
+export declare const EVENT_CONTROLLER_PROPS: Set<string>;

package/dist/nodes/internal/constants.js

@@ -0,0 +1,10 @@
+export const EVENT_CONTROLLER_PROPS = new Set([
+    "onEnter",
+    "onLeave",
+    "onMotion",
+    "onPressed",
+    "onReleased",
+    "onKeyPressed",
+    "onKeyReleased",
+    "onScroll",
+]);

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

@@ -10,7 +10,7 @@ export declare class ListItemRenderer {
     constructor();
     getFactory(): Gtk.SignalListItemFactory;
     setRenderFn(renderFn?: RenderItemFn<unknown>): void;
-    setStore(store?: ListStore): void;
+    setStore(store?: ListStore | null): void;
     private getStore;
     private initialize;
 }

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

@@ -42,8 +42,10 @@ export class ListItemRenderer {
             const fiberRoot = this.fiberRoots.get(ptr);
             if (!fiberRoot)
                 return;
-            const id = listItem.getItem();
-            const item = this.getStore().getItem(id.getString());
+            const stringObject = listItem.getItem();
+            if (!(stringObject instanceof Gtk.StringObject))
+                return;
+            const item = this.getStore().getItem(stringObject.getString());
             const element = this.renderFn?.(item);
             reconciler.getInstance().updateContainer(element, fiberRoot, null, () => { });
         });

package/dist/nodes/internal/predicates.d.ts

@@ -1,29 +1,38 @@
 import * as Gtk from "@gtkx/ffi/gtk";
-export declare const isAppendable: (obj: unknown) => obj is Gtk.Widget & {
+type AppendableWidget = Gtk.Widget & {
     append: (child: Gtk.Widget) => void;
 };
-export declare const isAddable: (obj: unknown) => obj is Gtk.Widget & {
+type AddableWidget = Gtk.Widget & {
     add: (child: Gtk.Widget) => void;
 };
-export declare const hasSingleContent: (obj: unknown) => obj is Gtk.Widget & {
-    setContent: (content: Gtk.Widget | undefined) => void;
+type ContentWidget = Gtk.Widget & {
+    setContent: (content?: Gtk.Widget | null) => void;
 };
-export declare const isSingleChild: (obj: unknown) => obj is Gtk.Widget & {
+type SingleChildWidget = Gtk.Widget & {
     setChild: (child: Gtk.Widget | null) => void;
 };
-export declare const isRemovable: (obj: unknown) => obj is Gtk.Widget & {
+type RemovableWidget = Gtk.Widget & {
     remove: (child: Gtk.Widget) => void;
 };
-export declare const isReorderable: (obj: unknown) => obj is Gtk.Widget & {
+export type ReorderableWidget = Gtk.Widget & {
     reorderChildAfter: (child: Gtk.Widget, sibling?: Gtk.Widget) => void;
     insertChildAfter: (child: Gtk.Widget, sibling?: Gtk.Widget) => void;
 };
-export declare const isInsertable: (obj: unknown) => obj is Gtk.Widget & {
+export type InsertableWidget = Gtk.Widget & {
     insert: (child: Gtk.Widget, position: number) => void;
     getFirstChild: () => Gtk.Widget | null;
 };
-export declare const isEditable: (obj: unknown) => obj is Gtk.Widget & {
+type EditableWidget = Gtk.Widget & {
     getPosition: () => number;
     setPosition: (position: number) => void;
     getText: () => string;
 };
+export declare const isAppendable: (obj: unknown) => obj is AppendableWidget;
+export declare const isAddable: (obj: unknown) => obj is AddableWidget;
+export declare const hasSingleContent: (obj: unknown) => obj is ContentWidget;
+export declare const isSingleChild: (obj: unknown) => obj is SingleChildWidget;
+export declare const isRemovable: (obj: unknown) => obj is RemovableWidget;
+export declare const isReorderable: (obj: unknown) => obj is ReorderableWidget;
+export declare const isInsertable: (obj: unknown) => obj is InsertableWidget;
+export declare const isEditable: (obj: unknown) => obj is EditableWidget;
+export {};

package/dist/nodes/internal/signal-store.d.ts

@@ -7,7 +7,7 @@ declare class SignalStore {
     private getOwnerMap;
     private disconnect;
     private connect;
-    set(owner: SignalOwner, obj: GObject.GObject, signal: string, handler?: SignalHandler): void;
+    set(owner: SignalOwner, obj: GObject.GObject, signal: string, handler?: SignalHandler | null): void;
     clear(owner: SignalOwner): void;
     blockAll(): void;
     unblockAll(): void;

package/dist/nodes/internal/simple-list-store.d.ts

@@ -8,7 +8,7 @@ export declare class SimpleListStore {
     insertItemBefore(id: string, beforeId: string, label: string): void;
     updateItem(id: string, label: string): void;
     getItem(id: string): string | null;
-    getIdAtIndex(index: number): string | undefined;
-    getIndexById(id: string): number | undefined;
+    getIdAtIndex(index: number): string | null;
+    getIndexById(id: string): number | null;
     getModel(): Gtk.StringList;
 }

package/dist/nodes/internal/simple-list-store.js

@@ -48,11 +48,11 @@ export class SimpleListStore {
         return this.model.getString(this.ids.indexOf(id));
     }
     getIdAtIndex(index) {
-        return this.ids[index];
+        return this.ids[index] ?? null;
     }
     getIndexById(id) {
         const index = this.ids.indexOf(id);
-        return index >= 0 ? index : undefined;
+        return index >= 0 ? index : null;
     }
     getModel() {
         return this.model;

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

@@ -10,7 +10,7 @@ export declare class TreeListItemRenderer {
     constructor();
     getFactory(): Gtk.SignalListItemFactory;
     setRenderFn(renderFn?: TreeRenderItemFn<unknown>): void;
-    setStore(store?: TreeStore): void;
+    setStore(store?: TreeStore | null): void;
     private getStore;
     private initialize;
 }

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

@@ -45,12 +45,14 @@ export class TreeListItemRenderer {
             if (!fiberRoot)
                 return;
             const treeListRow = listItem.getItem();
-            if (!treeListRow)
+            if (!(treeListRow instanceof Gtk.TreeListRow))
                 return;
             const expander = listItem.getChild();
+            if (!(expander instanceof Gtk.TreeExpander))
+                return;
             expander.setListRow(treeListRow);
             const stringObject = treeListRow.getItem();
-            if (!stringObject)
+            if (!(stringObject instanceof Gtk.StringObject))
                 return;
             const id = stringObject.getString();
             const itemData = this.getStore().getItem(id);
@@ -74,7 +76,9 @@ export class TreeListItemRenderer {
             if (!fiberRoot)
                 return;
             const expander = listItem.getChild();
-            expander.setListRow(undefined);
+            if (expander instanceof Gtk.TreeExpander) {
+                expander.setListRow(null);
+            }
             reconciler.getInstance().updateContainer(null, fiberRoot, null, () => { });
         });
         signalStore.set(this, this.factory, "teardown", (_self, listItem) => {

package/dist/nodes/internal/tree-store.d.ts

@@ -19,7 +19,7 @@ export declare class TreeStore {
     removeItem(id: string, parentId?: string): void;
     insertItemBefore(id: string, beforeId: string, data: TreeItemData, parentId?: string): void;
     updateItem(id: string, data: TreeItemData): void;
-    getItem(id: string): TreeItemData | undefined;
+    getItem(id: string): TreeItemData | null;
     getRootModel(): Gtk.StringList;
     getChildrenModel(parentId: string): Gtk.StringList | null;
     hasChildren(parentId: string): boolean;

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

@@ -100,7 +100,7 @@ export class TreeStore {
         }
     }
     getItem(id) {
-        return this.items.get(id);
+        return this.items.get(id) ?? null;
     }
     getRootModel() {
         return this.rootModel;

package/dist/nodes/internal/utils.d.ts

@@ -1,3 +1,9 @@
 import type { Container, ContainerClass, Props } from "../../types.js";
-export declare const isContainerType: (cls: new (...args: any[]) => Container, containerOrClass?: Container | ContainerClass) => boolean;
+type AnyClass = new (...args: any[]) => any;
+export declare const matchesAnyClass: (classes: readonly AnyClass[], containerOrClass?: Container | ContainerClass | null) => boolean;
+export declare const isContainerType: (cls: AnyClass, containerOrClass?: Container | ContainerClass | null) => boolean;
+export declare const matchesInterface: (methods: readonly string[], containerOrClass?: Container | ContainerClass | null) => boolean;
 export declare const filterProps: (props: Props, excludeKeys: string[]) => Props;
+export declare const resolvePropMeta: (container: Container, key: string) => [string | null, string] | null;
+export declare const resolveSignal: (container: Container, signalName: string) => boolean;
+export {};

package/dist/nodes/internal/utils.js

@@ -1,13 +1,19 @@
-export const isContainerType = (
-// biome-ignore lint/suspicious/noExplicitAny: Required for contravariant behavior
-cls, containerOrClass) => {
+import { PROPS, SIGNALS } from "../../generated/internal.js";
+export const matchesAnyClass = (classes, containerOrClass) => {
     if (!containerOrClass) {
         return false;
     }
-    if (containerOrClass instanceof cls) {
-        return true;
+    return classes.some((cls) => containerOrClass instanceof cls ||
+        containerOrClass === cls ||
+        Object.prototype.isPrototypeOf.call(cls, containerOrClass));
+};
+export const isContainerType = (cls, containerOrClass) => matchesAnyClass([cls], containerOrClass);
+export const matchesInterface = (methods, containerOrClass) => {
+    if (!containerOrClass) {
+        return false;
     }
-    return containerOrClass === cls || Object.prototype.isPrototypeOf.call(cls, containerOrClass);
+    const proto = typeof containerOrClass === "function" ? containerOrClass.prototype : containerOrClass;
+    return methods.every((method) => method in proto);
 };
 export const filterProps = (props, excludeKeys) => {
     const result = {};
@@ -18,3 +24,24 @@ export const filterProps = (props, excludeKeys) => {
     }
     return result;
 };
+const walkPrototypeChain = (container, lookup) => {
+    // biome-ignore lint/complexity/noBannedTypes: Walking prototype chain requires Function type
+    let current = container.constructor;
+    while (current) {
+        const typeName = current.glibTypeName;
+        if (typeName) {
+            const result = lookup(typeName);
+            if (result !== null) {
+                return result;
+            }
+        }
+        const prototype = Object.getPrototypeOf(current.prototype);
+        current = prototype?.constructor ?? null;
+        if (current === Object || current === Function) {
+            break;
+        }
+    }
+    return null;
+};
+export const resolvePropMeta = (container, key) => walkPrototypeChain(container, (typeName) => PROPS[typeName]?.[key] ?? null);
+export const resolveSignal = (container, signalName) => walkPrototypeChain(container, (typeName) => (SIGNALS[typeName]?.has(signalName) ? true : null)) ?? false;

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

@@ -6,7 +6,7 @@ export declare class ListItemNode<T extends Omit<ListStore, "items" | "model"> =
     static priority: number;
     private store?;
     static matches(type: string): boolean;
-    setStore(store?: T): void;
+    setStore(store?: T | null): void;
     updateProps(oldProps: P | null, newProps: P): void;
 }
 export {};

package/dist/nodes/list-view.js

@@ -1,7 +1,7 @@
-import * as Gtk from "@gtkx/ffi/gtk";
+import { LIST_WIDGET_CLASSES } from "../generated/internal.js";
 import { registerNodeClass } from "../registry.js";
 import { ListItemRenderer } from "./internal/list-item-renderer.js";
-import { filterProps, isContainerType } from "./internal/utils.js";
+import { filterProps, matchesAnyClass } from "./internal/utils.js";
 import { ListItemNode } from "./list-item.js";
 import { List } from "./models/list.js";
 import { WidgetNode } from "./widget.js";
@@ -11,7 +11,7 @@ class ListViewNode extends WidgetNode {
     itemRenderer;
     list;
     static matches(_type, containerOrClass) {
-        return isContainerType(Gtk.ListView, containerOrClass) || isContainerType(Gtk.GridView, containerOrClass);
+        return matchesAnyClass(LIST_WIDGET_CLASSES, containerOrClass);
     }
     constructor(typeName, props, container, rootContainer) {
         super(typeName, props, container, rootContainer);

package/dist/nodes/models/list.js

@@ -38,12 +38,12 @@ export class List extends VirtualNode {
             return;
         }
         this.store.removeItem(child.props.id);
-        child.setStore(undefined);
+        child.setStore(null);
     }
     updateProps(oldProps, newProps) {
         super.updateProps(oldProps, newProps);
         if (!oldProps || oldProps.selectionMode !== newProps.selectionMode) {
-            signalStore.set(this, this.selectionModel, "selection-changed", undefined);
+            signalStore.set(this, this.selectionModel, "selection-changed", null);
             this.selectionModel = this.createSelectionModel(newProps.selectionMode);
         }
         if (!oldProps ||
@@ -53,7 +53,7 @@ export class List extends VirtualNode {
             this.handleSelectionChange = () => {
                 onSelectionChanged?.(this.getSelection());
             };
-            signalStore.set(this, this.selectionModel, "selection-changed", newProps.onSelectionChanged ? this.handleSelectionChange : undefined);
+            signalStore.set(this, this.selectionModel, "selection-changed", newProps.onSelectionChanged ? this.handleSelectionChange : null);
         }
         if (!oldProps || oldProps.selected !== newProps.selected || oldProps.selectionMode !== newProps.selectionMode) {
             this.setSelection(newProps.selected);

package/dist/nodes/models/menu.js

@@ -1,4 +1,4 @@
-import { batch } from "@gtkx/ffi";
+import { batch, isObjectEqual } from "@gtkx/ffi";
 import * as Gio from "@gtkx/ffi/gio";
 import { scheduleAfterCommit } from "../../scheduler.js";
 import { signalStore } from "../internal/signal-store.js";
@@ -100,7 +100,7 @@ export class Menu extends VirtualNode {
             }
             else {
                 const link = parent.getItemLink(i, this.type);
-                if (link?.equals(this.menu)) {
+                if (link && isObjectEqual(link, this.menu)) {
                     return i;
                 }
             }

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

@@ -16,8 +16,9 @@ export class TreeList extends VirtualNode {
         this.selectionModel.setModel(this.treeListModel);
     }
     createChildModel(item) {
-        const stringObject = item;
-        const parentId = stringObject.getString();
+        if (!(item instanceof Gtk.StringObject))
+            return null;
+        const parentId = item.getString();
         return this.store.getChildrenModel(parentId);
     }
     getStore() {
@@ -70,7 +71,7 @@ export class TreeList extends VirtualNode {
             throw new Error("Cannot remove 'TreeListItem' from 'TreeList': missing required 'id' prop");
         }
         this.store.removeItem(child.props.id);
-        child.setStore(undefined);
+        child.setStore(null);
     }
     updateProps(oldProps, newProps) {
         super.updateProps(oldProps, newProps);
@@ -78,7 +79,7 @@ export class TreeList extends VirtualNode {
             this.treeListModel.setAutoexpand(newProps.autoexpand ?? false);
         }
         if (!oldProps || oldProps.selectionMode !== newProps.selectionMode) {
-            signalStore.set(this, this.selectionModel, "selection-changed", undefined);
+            signalStore.set(this, this.selectionModel, "selection-changed", null);
             this.selectionModel = this.createSelectionModel(newProps.selectionMode);
             this.selectionModel.setModel(this.treeListModel);
         }
@@ -89,7 +90,7 @@ export class TreeList extends VirtualNode {
             this.handleSelectionChange = () => {
                 onSelectionChanged?.(this.getSelection());
             };
-            signalStore.set(this, this.selectionModel, "selection-changed", newProps.onSelectionChanged ? this.handleSelectionChange : undefined);
+            signalStore.set(this, this.selectionModel, "selection-changed", newProps.onSelectionChanged ? this.handleSelectionChange : null);
         }
         if (!oldProps || oldProps.selected !== newProps.selected || oldProps.selectionMode !== newProps.selectionMode) {
             this.setSelection(newProps.selected);
@@ -115,9 +116,9 @@ export class TreeList extends VirtualNode {
             const row = this.treeListModel.getRow(index);
             if (!row)
                 continue;
-            const stringObject = row.getItem();
-            if (stringObject) {
-                ids.push(stringObject.getString());
+            const item = row.getItem();
+            if (item instanceof Gtk.StringObject) {
+                ids.push(item.getString());
             }
         }
         return ids;
@@ -131,8 +132,8 @@ export class TreeList extends VirtualNode {
                 const row = this.treeListModel.getRow(i);
                 if (!row)
                     continue;
-                const stringObject = row.getItem();
-                if (stringObject && ids.includes(stringObject.getString())) {
+                const item = row.getItem();
+                if (item instanceof Gtk.StringObject && ids.includes(item.getString())) {
                     selected.add(i);
                 }
             }

package/dist/nodes/notebook-page-tab.d.ts

@@ -10,6 +10,6 @@ export declare class NotebookPageTabNode extends SlotNode<Props> {
     setPage(notebook?: Gtk.Notebook, page?: Gtk.Widget): void;
     private getNotebook;
     private getPage;
-    protected onChildChange(_oldChild: Gtk.Widget | undefined): void;
+    protected onChildChange(_oldChild: Gtk.Widget | null): void;
 }
 export {};

package/dist/nodes/notebook-page.d.ts

@@ -5,11 +5,11 @@ import { SlotNode } from "./slot.js";
 type Props = Partial<NotebookPageProps>;
 export declare class NotebookPageNode extends SlotNode<Props> {
     static priority: number;
-    position?: number;
+    position?: number | null;
     private tabNode?;
     static matches(type: string): boolean;
     setNotebook(notebook?: Gtk.Notebook): void;
-    setPosition(position?: number): void;
+    setPosition(position?: number | null): void;
     private getNotebook;
     private updateTabNode;
     appendChild(child: Node): void;
@@ -18,6 +18,6 @@ export declare class NotebookPageNode extends SlotNode<Props> {
     updateProps(oldProps: Props | null, newProps: Props): void;
     private attachPage;
     private detachPage;
-    protected onChildChange(oldChild: Gtk.Widget | undefined): void;
+    protected onChildChange(oldChild: Gtk.Widget | null): void;
 }
 export {};

package/dist/nodes/notebook-page.js

@@ -44,7 +44,7 @@ export class NotebookPageNode extends SlotNode {
         this.child = child.container;
         scheduleAfterCommit(() => {
             if (this.parent) {
-                this.onChildChange(oldChild);
+                this.onChildChange(oldChild ?? null);
             }
             this.updateTabNode();
         });
@@ -80,7 +80,7 @@ export class NotebookPageNode extends SlotNode {
             label.setLabel(this.props.label ?? "");
             tabLabel = label;
         }
-        if (this.position !== undefined) {
+        if (this.position != null) {
             notebook.insertPage(child, this.position, tabLabel);
             return;
         }