@gtkx/react 0.18.9 → 0.20.0

package/src/nodes/notebook-page.ts

@@ -81,6 +81,10 @@ export class NotebookPageNode extends VirtualNode<NotebookPageProps, WidgetNode<
     public override detachDeletedInstance(): void {
         const childWidget = this.findContentChild()?.container ?? null;
         if (childWidget && this.parent) {
+            const notebook = this.getParentWidget();
+            if (notebook.getNPages() <= 1) {
+                notebook.setShowTabs(false);
+            }
             this.detachPage(childWidget);
         }
         super.detachDeletedInstance();

package/src/nodes/shortcut.ts

@@ -13,25 +13,42 @@ export class ShortcutNode extends VirtualNode<ShortcutProps, EventControllerNode
     public override isValidParent(parent: Node): boolean {
         return parent instanceof EventControllerNode && parent.container instanceof Gtk.ShortcutController;
     }
+
     private shortcut: Gtk.Shortcut | null = null;
     private action: Gtk.CallbackAction | null = null;
 
+    public override setParent(parent: EventControllerNode<Gtk.ShortcutController> | null): void {
+        if (!parent && this.parent) {
+            this.removeFromController();
+        }
+
+        super.setParent(parent);
+
+        if (parent && !this.shortcut) {
+            this.createShortcut();
+            const shortcut = this.shortcut;
+            if (shortcut) parent.container.addShortcut(shortcut);
+        }
+    }
+
     public override commitUpdate(oldProps: ShortcutProps | null, newProps: ShortcutProps): void {
         super.commitUpdate(oldProps, newProps);
         this.applyOwnProps(oldProps, newProps);
     }
 
     public override detachDeletedInstance(): void {
-        this.shortcut = null;
-        this.action = null;
+        this.removeFromController();
         super.detachDeletedInstance();
     }
 
-    public getShortcut(): Gtk.Shortcut | null {
-        return this.shortcut;
+    private removeFromController(): void {
+        if (!this.parent || !this.shortcut) return;
+        this.parent.container.removeShortcut(this.shortcut);
+        this.shortcut = null;
+        this.action = null;
     }
 
-    public createShortcut(): void {
+    private createShortcut(): void {
         const trigger = this.createTrigger();
         this.action = new Gtk.CallbackAction(() => {
             const result = this.props.onActivate();

package/src/nodes/text-anchor.ts

@@ -49,7 +49,12 @@ export class TextAnchorNode extends VirtualNode<TextAnchorProps, Node & TextCont
         const iter = new Gtk.TextIter();
         this.buffer.getIterAtOffset(iter, this.bufferOffset);
 
-        this.anchor = this.buffer.createChildAnchor(iter);
+        if (this.props.replacementChar) {
+            this.anchor = Gtk.TextChildAnchor.newWithReplacement(this.props.replacementChar);
+            this.buffer.insertChildAnchor(iter, this.anchor);
+        } else {
+            this.anchor = this.buffer.createChildAnchor(iter);
+        }
 
         const widgetChild = this.children[0];
         if (widgetChild?.container && this.anchor) {

package/src/nodes/text-tag.ts

@@ -4,6 +4,7 @@ import type { Node } from "../node.js";
 import { hasChanged } from "./internal/props.js";
 import { TextAnchorNode } from "./text-anchor.js";
 import type { TextContentChild, TextContentParent } from "./text-content.js";
+import { TextPaintableNode } from "./text-paintable.js";
 import { isTextContentParent, TextSegmentNode } from "./text-segment.js";
 import { VirtualNode } from "./virtual.js";
 
@@ -282,6 +283,11 @@ export class TextTagNode
     }
 
     private isTextContentChild(child: Node): child is TextContentChild {
-        return child instanceof TextSegmentNode || child instanceof TextTagNode || child instanceof TextAnchorNode;
+        return (
+            child instanceof TextSegmentNode ||
+            child instanceof TextTagNode ||
+            child instanceof TextAnchorNode ||
+            child instanceof TextPaintableNode
+        );
     }
 }

package/src/nodes/text-view.ts

@@ -52,6 +52,11 @@ export class TextViewNode extends WidgetNode<Gtk.TextView, TextViewProps, TextVi
         return new TextBufferController(this, this.container, () => new Gtk.TextBuffer());
     }
 
+    public override finalizeInitialChildren(props: TextViewProps): boolean {
+        this.bufferController?.finalizeInitialMount();
+        return super.finalizeInitialChildren(props);
+    }
+
     public override commitUpdate(oldProps: TextViewProps | null, newProps: TextViewProps): void {
         super.commitUpdate(oldProps ? filterProps(oldProps, OWN_PROPS) : null, filterProps(newProps, OWN_PROPS));
         this.ensureBufferController().applyOwnProps(oldProps, newProps);

package/src/nodes/widget.ts

@@ -11,10 +11,11 @@ import {
     typeNameFromInstance,
 } from "@gtkx/ffi/gobject";
 import * as Gtk from "@gtkx/ffi/gtk";
-import { CONSTRUCTOR_PROPS } from "../generated/internal.js";
-import { resolvePropMeta, resolveSignal } from "../metadata.js";
+import { isConstructOnlyProp, resolvePropMeta, resolveSignal } from "../metadata.js";
 import { Node } from "../node.js";
 import type { Container, Props } from "../types.js";
+import { applyAccessibleProps, isAccessibleProp } from "./internal/accessible.js";
+import { createContainerWithProperties } from "./internal/construct.js";
 import {
     type InsertableWidget,
     isAddable,
@@ -30,7 +31,7 @@ import { filterProps } from "./internal/props.js";
 import type { SignalHandler } from "./internal/signal-store.js";
 import { attachChild, detachChild } from "./internal/widget.js";
 
-const EXCLUDED_PROPS = ["children", "widthRequest", "heightRequest", "grabFocus"];
+const EXCLUDED_PROPS = ["children"];
 
 function findProperty(obj: NativeObject, key: string): GObject.ParamSpec | null {
     const propertyName = key.replace(/([A-Z])/g, "-$1").toLowerCase();
@@ -54,11 +55,7 @@ export class WidgetNode<
         containerClass: typeof Gtk.Widget,
         _rootContainer?: Container,
     ): Container | null {
-        const WidgetClass = containerClass;
-        const typeName = WidgetClass.glibTypeName;
-        const args = (CONSTRUCTOR_PROPS[typeName] ?? []).map((name) => props[name]);
-
-        return new WidgetClass(...(args as ConstructorParameters<typeof Gtk.Widget>));
+        return createContainerWithProperties(containerClass, props);
     }
 
     public override isValidChild(_child: Node): boolean {
@@ -123,57 +120,54 @@ export class WidgetNode<
             throw new Error(`Container is undefined for '${this.typeName}'`);
         }
 
-        this.signalStore.blockAll();
-        try {
-            this.updateSizeRequest(oldProps, newProps);
-            this.updateGrabFocus(oldProps, newProps);
+        applyAccessibleProps(this.container, oldProps, newProps);
 
-            const propNames = new Set([
-                ...Object.keys(filterProps(oldProps ?? {}, EXCLUDED_PROPS)),
-                ...Object.keys(filterProps(newProps ?? {}, EXCLUDED_PROPS)),
-            ]);
+        const propNames = new Set([
+            ...Object.keys(filterProps(oldProps ?? {}, EXCLUDED_PROPS)),
+            ...Object.keys(filterProps(newProps ?? {}, EXCLUDED_PROPS)),
+        ]);
 
-            const pendingSignals: Array<{ name: string; newValue: unknown }> = [];
-            const pendingProperties: Array<{ name: string; oldValue: unknown; newValue: unknown }> = [];
+        const pendingSignals: Array<{ name: string; newValue: unknown }> = [];
+        const pendingProperties: Array<{ name: string; oldValue: unknown; newValue: unknown }> = [];
 
-            for (const name of propNames) {
-                const oldValue = oldProps?.[name];
-                const newValue = newProps[name];
+        for (const name of propNames) {
+            if (isAccessibleProp(name)) continue;
+            if (isConstructOnlyProp(this.container, name)) continue;
 
-                if (oldValue === newValue) continue;
+            const oldValue = oldProps?.[name];
+            const newValue = newProps[name];
 
-                const signalName = resolveSignal(this.container, name);
+            if (oldValue === newValue) continue;
 
-                if (signalName) {
-                    pendingSignals.push({ name, newValue });
-                } else if (newValue !== undefined) {
-                    pendingProperties.push({ name, oldValue, newValue });
-                } else if (oldValue !== undefined) {
-                    const defaultValue = this.getPropertyDefaultValue(name);
-                    if (defaultValue !== undefined) {
-                        pendingProperties.push({ name, oldValue, newValue: defaultValue });
-                    }
+            const signalName = resolveSignal(this.container, name);
+
+            if (signalName) {
+                pendingSignals.push({ name, newValue });
+            } else if (newValue !== undefined) {
+                pendingProperties.push({ name, oldValue, newValue });
+            } else if (oldValue !== undefined) {
+                const defaultValue = this.getPropertyDefaultValue(name);
+                if (defaultValue !== undefined) {
+                    pendingProperties.push({ name, oldValue, newValue: defaultValue });
                 }
             }
+        }
 
-            for (const { name, newValue } of pendingSignals) {
-                const signalName = resolveSignal(this.container, name);
-                if (!signalName) continue;
-                const handler = typeof newValue === "function" ? (newValue as SignalHandler) : undefined;
-                this.signalStore.set(this, this.container, signalName, handler);
-            }
+        for (const { name, newValue } of pendingSignals) {
+            const signalName = resolveSignal(this.container, name);
+            if (!signalName) continue;
+            const handler = typeof newValue === "function" ? (newValue as SignalHandler) : undefined;
+            this.signalStore.set(this, this.container, signalName, handler);
+        }
 
-            for (const { name, oldValue, newValue } of pendingProperties) {
-                if (name === "text" && oldValue !== undefined && isEditable(this.container)) {
-                    if (oldValue !== this.container.getText()) {
-                        continue;
-                    }
+        for (const { name, oldValue, newValue } of pendingProperties) {
+            if (name === "text" && oldValue !== undefined && isEditable(this.container)) {
+                if (oldValue !== this.container.getText()) {
+                    continue;
                 }
-
-                this.setProperty(name, newValue);
             }
-        } finally {
-            this.signalStore.unblockAll();
+
+            this.setProperty(name, newValue);
         }
     }
 
@@ -276,26 +270,6 @@ export class WidgetNode<
         }
     }
 
-    private updateSizeRequest(oldProps: P | null, newProps: P): void {
-        const oldWidth = oldProps?.widthRequest as number | undefined;
-        const oldHeight = oldProps?.heightRequest as number | undefined;
-        const newWidth = newProps.widthRequest as number | undefined;
-        const newHeight = newProps.heightRequest as number | undefined;
-
-        if (oldWidth !== newWidth || oldHeight !== newHeight) {
-            this.container.setSizeRequest(newWidth ?? -1, newHeight ?? -1);
-        }
-    }
-
-    private updateGrabFocus(oldProps: P | null, newProps: P): void {
-        const oldGrabFocus = oldProps?.grabFocus as boolean | undefined;
-        const newGrabFocus = newProps.grabFocus as boolean | undefined;
-
-        if (!oldGrabFocus && newGrabFocus) {
-            this.container.grabFocus();
-        }
-    }
-
     private getPropertyDefaultValue(key: string): unknown {
         if (!resolvePropMeta(this.container, key)) return undefined;
 
@@ -392,7 +366,11 @@ export class WidgetNode<
 
 function detachChildFromParent(child: WidgetNode): void {
     const currentParent = child.container.getParent();
-    if (currentParent !== null && isRemovable(currentParent)) {
-        currentParent.remove(child.container);
+    if (currentParent !== null) {
+        if (isRemovable(currentParent)) {
+            currentParent.remove(child.container);
+        } else {
+            child.container.unparent();
+        }
     }
 }

package/src/nodes/window.ts

@@ -107,6 +107,7 @@ export class WindowNode extends WidgetNode<Gtk.Window, WindowProps, WindowChild>
 
     public override removeChild(child: WindowChild): void {
         if (child instanceof WindowNode) {
+            child.container.setVisible(false);
             child.container.setTransientFor(null);
             super.removeChild(child);
             return;
@@ -152,9 +153,8 @@ export class WindowNode extends WidgetNode<Gtk.Window, WindowProps, WindowChild>
     }
 
     public override detachDeletedInstance(): void {
-        this.container.setVisible(false);
-        this.container.destroy();
         super.detachDeletedInstance();
+        this.container.destroy();
     }
 
     private applyOwnProps(oldProps: WindowProps | null, newProps: WindowProps): void {

package/src/registry.ts

@@ -10,20 +10,17 @@ import { AnimationNode } from "./nodes/animation.js";
 import { ApplicationNode } from "./nodes/application.js";
 import { CalendarNode } from "./nodes/calendar.js";
 import { ColorDialogButtonNode } from "./nodes/color-dialog-button.js";
-import { ColumnViewNode } from "./nodes/column-view.js";
 import { ColumnViewColumnNode } from "./nodes/column-view-column.js";
 import { ContainerSlotNode } from "./nodes/container-slot.js";
 import { DialogNode } from "./nodes/dialog.js";
 import { DrawingAreaNode } from "./nodes/drawing-area.js";
-import { DropDownNode } from "./nodes/drop-down.js";
 import { EventControllerNode } from "./nodes/event-controller.js";
 import { FixedChildNode } from "./nodes/fixed-child.js";
 import { FontDialogButtonNode } from "./nodes/font-dialog-button.js";
 import { GridChildNode } from "./nodes/grid-child.js";
-import { GridViewNode } from "./nodes/grid-view.js";
 import { LevelBarNode } from "./nodes/level-bar.js";
-import { ListItemNode } from "./nodes/list-item.js";
-import { ListViewNode } from "./nodes/list-view.js";
+import { ListNode } from "./nodes/list.js";
+import { ListItemNode } from "./nodes/list-item-node.js";
 import { MenuNode } from "./nodes/menu.js";
 import { NavigationPageNode } from "./nodes/navigation-page.js";
 import { NavigationViewNode } from "./nodes/navigation-view.js";
@@ -36,7 +33,6 @@ import { ScaleNode } from "./nodes/scale.js";
 import { ScrolledWindowNode } from "./nodes/scrolled-window.js";
 import { SearchBarNode } from "./nodes/search-bar.js";
 import { ShortcutNode } from "./nodes/shortcut.js";
-import { ShortcutControllerNode } from "./nodes/shortcut-controller.js";
 import { SlotNode } from "./nodes/slot.js";
 import { SourceViewNode } from "./nodes/source-view.js";
 import { StackNode } from "./nodes/stack.js";
@@ -58,14 +54,16 @@ export type AdjustableWidget = InstanceType<(typeof AdjustableWidgets)[number]>;
 export const StackWidgets = [Gtk.Stack, Adw.ViewStack] as const;
 export type StackWidget = InstanceType<(typeof StackWidgets)[number]>;
 
-export const DropDownWidgets = [Gtk.DropDown, Adw.ComboRow] as const;
-export type DropDownWidget = InstanceType<(typeof DropDownWidgets)[number]>;
-
 export const PopoverMenuWidgets = [Gtk.PopoverMenu, Gtk.PopoverMenuBar, Gtk.MenuButton] as const;
 export type PopoverMenuWidget = InstanceType<(typeof PopoverMenuWidgets)[number]>;
 
-// biome-ignore lint/suspicious/noExplicitAny: Registry entries require flexible typing for varied node constructors
-export type NodeClass = (new (...args: any[]) => Node) & { createContainer(...args: any[]): unknown };
+export type NodeClass = (new (
+    // biome-ignore lint/suspicious/noExplicitAny: Registry entries require flexible typing for varied node constructors
+    ...args: any[]
+) => Node) & {
+    // biome-ignore lint/suspicious/noExplicitAny: Registry entries require flexible typing for varied node constructors
+    createContainer(...args: any[]): unknown;
+};
 
 // biome-ignore lint/suspicious/noExplicitAny: Class keys require flexible typing for GTK class hierarchy matching
 type ClassKey = new (...args: any[]) => any;
@@ -79,7 +77,6 @@ export const NODE_REGISTRY: NodeRegistryEntry[] = [
     ["ColumnViewColumn", ColumnViewColumnNode],
     ["FixedChild", FixedChildNode],
     ["GridChild", GridChildNode],
-    ["ListItem", ListItemNode],
     [["MenuItem", "MenuSection", "MenuSubmenu"], MenuNode],
     ["NavigationPage", NavigationPageNode],
     ["NotebookPage", NotebookPageNode],
@@ -94,7 +91,6 @@ export const NODE_REGISTRY: NodeRegistryEntry[] = [
     ["TextTag", TextTagNode],
     ["Toggle", ToggleNode],
     [Gtk.Application, ApplicationNode],
-    [Gtk.ShortcutController, ShortcutControllerNode],
     [Gtk.EventController, EventControllerNode],
     [GtkSource.View, SourceViewNode],
     [Gtk.TextView, TextViewNode],
@@ -113,11 +109,9 @@ export const NODE_REGISTRY: NodeRegistryEntry[] = [
     [Adw.ToggleGroup, ToggleGroupNode],
     [Gtk.Notebook, NotebookNode],
     [StackWidgets, StackNode],
-    [Gtk.ColumnView, ColumnViewNode],
-    [Gtk.ListView, ListViewNode],
-    [Gtk.GridView, GridViewNode],
-    [DropDownWidgets, DropDownNode],
+    [[Gtk.ListView, Gtk.ColumnView, Gtk.GridView, Gtk.DropDown, Adw.ComboRow], ListNode],
     [PopoverMenuWidgets, PopoverMenuNode],
     [AdjustableWidgets, AdjustableNode],
+    [[Gtk.ListItem, Gtk.ListHeader], ListItemNode],
     [Gtk.Widget, WidgetNode],
 ];

package/src/types.ts

@@ -1,7 +1,12 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
 
-export type Container = Gtk.Widget | Gtk.Application | Gtk.EventController;
+export type Container = Gtk.Widget | Gtk.Application | Gtk.EventController | Gtk.ListItem | Gtk.ListHeader;
 
 export type Props = Record<string, unknown>;
 
-export type ContainerClass = typeof Gtk.Widget | typeof Gtk.Application | typeof Gtk.EventController;
+export type ContainerClass =
+    | typeof Gtk.Widget
+    | typeof Gtk.Application
+    | typeof Gtk.EventController
+    | typeof Gtk.ListItem
+    | typeof Gtk.ListHeader;

package/dist/fiber-root.d.ts

@@ -1,4 +0,0 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
-import type Reconciler from "react-reconciler";
-export declare const createFiberRoot: (container: Gtk.Widget) => Reconciler.FiberRoot;
-//# sourceMappingURL=fiber-root.d.ts.map

package/dist/fiber-root.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fiber-root.d.ts","sourceRoot":"","sources":["../src/fiber-root.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAG/C,eAAO,MAAM,eAAe,GAAI,WAAW,GAAG,CAAC,MAAM,KAAG,UAAU,CAAC,SAelE,CAAC"}

package/dist/fiber-root.js

@@ -1,6 +0,0 @@
-import { reconciler } from "./reconciler.js";
-export const createFiberRoot = (container) => {
-    const instance = reconciler.getInstance();
-    return instance.createContainer(container, 1, null, false, null, "", (error) => console.error("Fiber root render error:", error), () => { }, () => { }, () => { });
-};
-//# sourceMappingURL=fiber-root.js.map

package/dist/fiber-root.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fiber-root.js","sourceRoot":"","sources":["../src/fiber-root.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAAqB,EAAwB,EAAE;IAC3E,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;IAE1C,OAAO,QAAQ,CAAC,eAAe,CAC3B,SAAS,EACT,CAAC,EACD,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,EAAE,EACF,CAAC,KAAY,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,EAClE,GAAG,EAAE,GAAE,CAAC,EACR,GAAG,EAAE,GAAE,CAAC,EACR,GAAG,EAAE,GAAE,CAAC,CACX,CAAC;AACN,CAAC,CAAC"}

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

@@ -1,36 +0,0 @@
-import * as Gtk from "@gtkx/ffi/gtk";
-import type { GtkColumnViewProps } from "../jsx.js";
-import type { Node } from "../node.js";
-import type { Container } from "../types.js";
-import { ColumnViewColumnNode } from "./column-view-column.js";
-import { ContainerSlotNode } from "./container-slot.js";
-import { EventControllerNode } from "./event-controller.js";
-import { ListItemNode } from "./list-item.js";
-import { type ListModelProps } from "./models/list.js";
-import { SlotNode } from "./slot.js";
-import { WidgetNode } from "./widget.js";
-declare const OWN_PROPS: readonly ["sortColumn", "sortOrder", "onSortChanged", "estimatedRowHeight"];
-type ColumnViewProps = Pick<GtkColumnViewProps, (typeof OWN_PROPS)[number]> & ListModelProps;
-type ColumnViewChild = ListItemNode | ColumnViewColumnNode | EventControllerNode | SlotNode | ContainerSlotNode;
-export declare class ColumnViewNode extends WidgetNode<Gtk.ColumnView, ColumnViewProps, ColumnViewChild> {
-    private handleSortChange;
-    private list;
-    isValidChild(child: Node): boolean;
-    private columnNodes;
-    private estimatedRowHeight;
-    constructor(typeName: string, props: ColumnViewProps, container: Gtk.ColumnView, rootContainer: Container);
-    appendChild(child: ColumnViewChild): void;
-    insertBefore(child: ColumnViewChild, before: ColumnViewChild): void;
-    removeChild(child: ColumnViewChild): void;
-    finalizeInitialChildren(props: ColumnViewProps): boolean;
-    commitUpdate(oldProps: ColumnViewProps | null, newProps: ColumnViewProps): void;
-    commitMount(): void;
-    detachDeletedInstance(): void;
-    private applyOwnProps;
-    private findColumn;
-    private getColumn;
-    private getColumnIndex;
-    private findColumnInView;
-}
-export {};
-//# sourceMappingURL=column-view.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"column-view.d.ts","sourceRoot":"","sources":["../../src/nodes/column-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAa,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,QAAA,MAAM,SAAS,6EAA8E,CAAC;AAE9F,KAAK,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC;AAC7F,KAAK,eAAe,GAAG,YAAY,GAAG,oBAAoB,GAAG,mBAAmB,GAAG,QAAQ,GAAG,iBAAiB,CAAC;AAEhH,qBAAa,cAAe,SAAQ,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC;IAC5F,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,IAAI,CAAY;IAER,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO;IASlD,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,kBAAkB,CAAuB;gBAErC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,SAAS;IAiBzF,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAuBzC,YAAY,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAgCnE,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAuBzC,uBAAuB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;IAKxD,YAAY,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI;IAM/E,WAAW,IAAI,IAAI;IAMnB,qBAAqB,IAAI,IAAI;IAK7C,OAAO,CAAC,aAAa;IAiCrB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,gBAAgB;CAI3B"}

package/dist/nodes/column-view.js

@@ -1,175 +0,0 @@
-import * as Gtk from "@gtkx/ffi/gtk";
-import { ColumnViewColumnNode } from "./column-view-column.js";
-import { ContainerSlotNode } from "./container-slot.js";
-import { EventControllerNode } from "./event-controller.js";
-import { filterProps, hasChanged } from "./internal/props.js";
-import { ListItemNode } from "./list-item.js";
-import { ListModel } from "./models/list.js";
-import { SlotNode } from "./slot.js";
-import { WidgetNode } from "./widget.js";
-const OWN_PROPS = ["sortColumn", "sortOrder", "onSortChanged", "estimatedRowHeight"];
-export class ColumnViewNode extends WidgetNode {
-    handleSortChange = null;
-    list;
-    isValidChild(child) {
-        return (child instanceof ListItemNode ||
-            child instanceof ColumnViewColumnNode ||
-            child instanceof EventControllerNode ||
-            child instanceof SlotNode ||
-            child instanceof ContainerSlotNode);
-    }
-    columnNodes = new Set();
-    estimatedRowHeight = null;
-    constructor(typeName, props, container, rootContainer) {
-        super(typeName, props, container, rootContainer);
-        this.list = new ListModel({ owner: this, signalStore: this.signalStore }, {
-            selectionMode: props.selectionMode,
-            selected: props.selected,
-            onSelectionChanged: props.onSelectionChanged,
-        });
-        this.list.getStore().setOnItemUpdated((id) => {
-            for (const column of this.columnNodes) {
-                column.rebindItem(id);
-            }
-        });
-    }
-    appendChild(child) {
-        super.appendChild(child);
-        if (child instanceof ListItemNode) {
-            this.list.appendChild(child);
-            return;
-        }
-        if (!(child instanceof ColumnViewColumnNode))
-            return;
-        const existingColumn = this.findColumnInView(child.getColumn());
-        if (existingColumn) {
-            this.container.removeColumn(existingColumn);
-        }
-        child.setStore(this.list.getStore());
-        child.setEstimatedRowHeight(this.estimatedRowHeight);
-        this.container.appendColumn(child.getColumn());
-        child.attachToColumnView(this.container);
-        this.columnNodes.add(child);
-    }
-    insertBefore(child, before) {
-        super.insertBefore(child, before);
-        if (child instanceof ListItemNode) {
-            if (before instanceof ListItemNode) {
-                this.list.insertBefore(child, before);
-            }
-            return;
-        }
-        if (!(child instanceof ColumnViewColumnNode))
-            return;
-        const existingColumn = this.findColumnInView(child.getColumn());
-        if (existingColumn) {
-            this.container.removeColumn(existingColumn);
-        }
-        child.setStore(this.list.getStore());
-        child.setEstimatedRowHeight(this.estimatedRowHeight);
-        if (before instanceof ColumnViewColumnNode) {
-            const beforeIndex = this.getColumnIndex(before.getColumn());
-            this.container.insertColumn(beforeIndex, child.getColumn());
-        }
-        else {
-            this.container.appendColumn(child.getColumn());
-        }
-        child.attachToColumnView(this.container);
-        this.columnNodes.add(child);
-    }
-    removeChild(child) {
-        if (child instanceof ListItemNode) {
-            this.list.removeChild(child);
-            super.removeChild(child);
-            return;
-        }
-        if (child instanceof ColumnViewColumnNode) {
-            child.detachFromColumnView();
-            const existingColumn = this.findColumnInView(child.getColumn());
-            if (existingColumn) {
-                this.container.removeColumn(existingColumn);
-            }
-            child.setStore(null);
-            this.columnNodes.delete(child);
-        }
-        super.removeChild(child);
-    }
-    finalizeInitialChildren(props) {
-        super.finalizeInitialChildren(props);
-        return true;
-    }
-    commitUpdate(oldProps, newProps) {
-        super.commitUpdate(oldProps ? filterProps(oldProps, OWN_PROPS) : null, filterProps(newProps, OWN_PROPS));
-        this.applyOwnProps(oldProps, newProps);
-        this.list.updateProps(oldProps ? filterProps(oldProps, OWN_PROPS) : null, filterProps(newProps, OWN_PROPS));
-    }
-    commitMount() {
-        super.commitMount();
-        this.list.flushBatch();
-        this.container.setModel(this.list.getSelectionModel());
-    }
-    detachDeletedInstance() {
-        this.columnNodes.clear();
-        super.detachDeletedInstance();
-    }
-    applyOwnProps(oldProps, newProps) {
-        if (hasChanged(oldProps, newProps, "onSortChanged")) {
-            const sorter = this.container.getSorter();
-            const onSortChanged = newProps.onSortChanged;
-            if (sorter instanceof Gtk.ColumnViewSorter) {
-                this.handleSortChange = () => {
-                    onSortChanged?.(sorter.getPrimarySortColumn()?.getId() ?? null, sorter.getPrimarySortOrder());
-                };
-                this.signalStore.set(this, sorter, "changed", this.handleSortChange);
-            }
-        }
-        if (hasChanged(oldProps, newProps, "sortColumn") || hasChanged(oldProps, newProps, "sortOrder")) {
-            const sortColumn = newProps.sortColumn;
-            const sortOrder = newProps.sortOrder ?? Gtk.SortType.ASCENDING;
-            if (!sortColumn) {
-                this.container.sortByColumn(sortOrder, undefined);
-            }
-            else {
-                this.container.sortByColumn(sortOrder, this.getColumn(sortColumn));
-            }
-        }
-        if (hasChanged(oldProps, newProps, "estimatedRowHeight")) {
-            this.estimatedRowHeight = newProps.estimatedRowHeight ?? null;
-            for (const column of this.columnNodes) {
-                column.setEstimatedRowHeight(this.estimatedRowHeight);
-            }
-        }
-    }
-    findColumn(predicate) {
-        const columns = this.container.getColumns();
-        for (let i = 0; i < columns.getNItems(); i++) {
-            const column = columns.getObject(i);
-            if (!(column instanceof Gtk.ColumnViewColumn))
-                continue;
-            const result = predicate(column, i);
-            if (result !== null)
-                return result;
-        }
-        return null;
-    }
-    getColumn(columnId) {
-        const column = this.findColumn((col) => (col.getId() === columnId ? col : null));
-        if (!column) {
-            throw new Error(`Unable to find column '${columnId}' in ${this.typeName}`);
-        }
-        return column;
-    }
-    getColumnIndex(column) {
-        const targetId = column.getId();
-        const index = this.findColumn((col, i) => (col.getId() === targetId ? i : null));
-        if (index === null) {
-            throw new Error(`Unable to find column '${targetId}' in ${this.typeName}`);
-        }
-        return index;
-    }
-    findColumnInView(column) {
-        const targetId = column.getId();
-        return this.findColumn((col) => (col.getId() === targetId ? col : null));
-    }
-}
-//# sourceMappingURL=column-view.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"column-view.js","sourceRoot":"","sources":["../../src/nodes/column-view.ts"],"names":[],"mappings":"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"}