@gtkx/react 0.16.0 → 0.17.2

package/dist/nodes/index.d.ts

@@ -1,6 +1,5 @@
-import "./action-row.js";
 import "./adjustable.js";
-import "./animation/index.js";
+import "./animation.js";
 import "./alert-dialog-response.js";
 import "./application.js";
 import "./autowrapped.js";
@@ -10,7 +9,6 @@ import "./column-view-column.js";
 import "./column-view.js";
 import "./dialog.js";
 import "./drawing-area.js";
-import "./expander-row.js";
 import "./fixed-child.js";
 import "./font-dialog-button.js";
 import "./grid.js";
@@ -25,7 +23,6 @@ import "./notebook-page-tab.js";
 import "./notebook-page.js";
 import "./notebook.js";
 import "./overlay-child.js";
-import "./pack.js";
 import "./popover-menu.js";
 import "./scale.js";
 import "./scrolled-window.js";
@@ -51,6 +48,7 @@ import "./toolbar-child.js";
 import "./tree-list-item.js";
 import "./tree-list-view.js";
 import "./virtual.js";
+import "./web-view.js";
 import "./action-row-child.js";
 import "./expander-row-child.js";
 import "./pack-child.js";

package/dist/nodes/index.js

@@ -1,6 +1,5 @@
-import "./action-row.js";
 import "./adjustable.js";
-import "./animation/index.js";
+import "./animation.js";
 import "./alert-dialog-response.js";
 import "./application.js";
 import "./autowrapped.js";
@@ -10,7 +9,6 @@ import "./column-view-column.js";
 import "./column-view.js";
 import "./dialog.js";
 import "./drawing-area.js";
-import "./expander-row.js";
 import "./fixed-child.js";
 import "./font-dialog-button.js";
 import "./grid.js";
@@ -25,7 +23,6 @@ import "./notebook-page-tab.js";
 import "./notebook-page.js";
 import "./notebook.js";
 import "./overlay-child.js";
-import "./pack.js";
 import "./popover-menu.js";
 import "./scale.js";
 import "./scrolled-window.js";
@@ -51,6 +48,7 @@ import "./toolbar-child.js";
 import "./tree-list-item.js";
 import "./tree-list-view.js";
 import "./virtual.js";
+import "./web-view.js";
 import "./action-row-child.js";
 import "./expander-row-child.js";
 import "./pack-child.js";

package/dist/nodes/internal/deferred-action.d.ts

@@ -4,5 +4,6 @@ export declare class DeferredAction {
     private priority;
     private scheduled;
     constructor(action: () => void, priority: CommitPriority);
+    get isPending(): boolean;
     schedule(): void;
 }

package/dist/nodes/internal/deferred-action.js

@@ -7,6 +7,9 @@ export class DeferredAction {
         this.action = action;
         this.priority = priority;
     }
+    get isPending() {
+        return this.scheduled;
+    }
     schedule() {
         if (this.scheduled)
             return;

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

@@ -1,17 +1,15 @@
 import * as Gtk from "@gtkx/ffi/gtk";
-import { BaseStore } from "./base-store.js";
 export type ItemUpdatedCallback = (id: string) => void;
-export declare class ListStore extends BaseStore<unknown> {
+export declare class ListStore {
     private model;
-    private newSortedIds;
-    private newIdSet;
-    private sortedIds;
+    private ids;
+    private items;
     private onItemUpdated;
     setOnItemUpdated(callback: ItemUpdatedCallback | null): void;
     addItem(id: string, item: unknown): void;
     removeItem(id: string): void;
     insertItemBefore(id: string, beforeId: string, item: unknown): void;
     updateItem(id: string, item: unknown): void;
+    getItem(id: string): unknown;
     getModel(): Gtk.StringList;
-    protected sync(): void;
 }

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

@@ -1,48 +1,46 @@
 import * as Gtk from "@gtkx/ffi/gtk";
-import { BaseStore } from "./base-store.js";
-export class ListStore extends BaseStore {
+export class ListStore {
     model = new Gtk.StringList();
-    newSortedIds = [];
-    newIdSet = new Set();
-    sortedIds = [];
+    ids = [];
+    items = new Map();
     onItemUpdated = null;
     setOnItemUpdated(callback) {
         this.onItemUpdated = callback;
     }
     addItem(id, item) {
         this.items.set(id, item);
-        if (this.newIdSet.has(id)) {
-            const existingIndex = this.newSortedIds.indexOf(id);
-            this.newSortedIds.splice(existingIndex, 1);
+        const existingIndex = this.ids.indexOf(id);
+        if (existingIndex >= 0) {
+            this.model.remove(existingIndex);
+            this.ids.splice(existingIndex, 1);
         }
-        this.newSortedIds.push(id);
-        this.newIdSet.add(id);
-        this.scheduleSync();
+        this.ids.push(id);
+        this.model.append(id);
     }
     removeItem(id) {
-        if (!this.newIdSet.has(id))
+        const index = this.ids.indexOf(id);
+        if (index < 0)
             return;
-        const index = this.newSortedIds.indexOf(id);
-        this.newSortedIds.splice(index, 1);
-        this.newIdSet.delete(id);
+        this.model.remove(index);
+        this.ids.splice(index, 1);
         this.items.delete(id);
-        this.scheduleSync();
     }
     insertItemBefore(id, beforeId, item) {
         this.items.set(id, item);
-        if (this.newIdSet.has(id)) {
-            const existingIndex = this.newSortedIds.indexOf(id);
-            this.newSortedIds.splice(existingIndex, 1);
+        const existingIndex = this.ids.indexOf(id);
+        if (existingIndex >= 0) {
+            this.model.remove(existingIndex);
+            this.ids.splice(existingIndex, 1);
         }
-        const beforeIndex = this.newSortedIds.indexOf(beforeId);
-        if (beforeIndex === -1) {
-            this.newSortedIds.push(id);
+        const beforeIndex = this.ids.indexOf(beforeId);
+        if (beforeIndex < 0) {
+            this.ids.push(id);
+            this.model.append(id);
         }
         else {
-            this.newSortedIds.splice(beforeIndex, 0, id);
+            this.ids.splice(beforeIndex, 0, id);
+            this.model.splice(beforeIndex, 0, [id]);
         }
-        this.newIdSet.add(id);
-        this.scheduleSync();
     }
     updateItem(id, item) {
         if (this.items.has(id)) {
@@ -53,13 +51,10 @@ export class ListStore extends BaseStore {
             this.addItem(id, item);
         }
     }
+    getItem(id) {
+        return this.items.get(id);
+    }
     getModel() {
         return this.model;
     }
-    sync() {
-        const newOrder = this.newSortedIds;
-        const oldLength = this.sortedIds.length;
-        this.model.splice(0, oldLength, newOrder.length > 0 ? newOrder : undefined);
-        this.sortedIds = [...newOrder];
-    }
 }

package/dist/nodes/internal/selection-model.js

@@ -73,10 +73,6 @@ export class SelectionModelManager {
     applySelection() {
         const ids = this.pendingSelection;
         const nItems = this.getItemCount();
-        if (nItems === 0 && ids && ids.length > 0) {
-            this.setSelection(ids);
-            return;
-        }
         this.pendingSelection = null;
         const selected = ids ? this.resolveSelectionIndices(ids) : new Gtk.Bitset();
         const mask = Gtk.Bitset.newRange(0, nItems);

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

@@ -1,6 +1,9 @@
 import * as GObject from "@gtkx/ffi/gobject";
 type SignalOwner = object;
 export type SignalHandler = (...args: any[]) => any;
+export interface SignalOptions {
+    blockable?: boolean;
+}
 export declare class SignalStore {
     private ownerHandlers;
     private blockDepth;
@@ -8,7 +11,7 @@ export declare class SignalStore {
     private wrapHandler;
     private disconnect;
     private connect;
-    set(owner: SignalOwner, obj: GObject.GObject, signal: string, handler?: SignalHandler | null): void;
+    set(owner: SignalOwner, obj: GObject.Object, signal: string, handler?: SignalHandler | null, options?: SignalOptions): void;
     clear(owner: SignalOwner): void;
     blockAll(): void;
     unblockAll(): void;

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

@@ -14,8 +14,6 @@ const LIFECYCLE_SIGNALS = new Set([
     "bind",
     "unbind",
     "teardown",
-    "load-changed",
-    "notify",
 ]);
 export class SignalStore {
     ownerHandlers = new Map();
@@ -28,9 +26,9 @@ export class SignalStore {
         }
         return map;
     }
-    wrapHandler(handler, signal) {
+    wrapHandler(handler, signal, blockable) {
         return (...args) => {
-            if (this.blockDepth > 0 && !LIFECYCLE_SIGNALS.has(signal)) {
+            if (this.blockDepth > 0 && blockable && !LIFECYCLE_SIGNALS.has(signal)) {
                 return;
             }
             const [self, ...rest] = args;
@@ -47,17 +45,17 @@ export class SignalStore {
             ownerMap?.delete(key);
         }
     }
-    connect(owner, obj, signal, handler) {
+    connect(owner, obj, signal, handler, blockable) {
         const objectId = getNativeId(obj.handle);
         const key = `${objectId}:${signal}`;
-        const wrappedHandler = this.wrapHandler(handler, signal);
+        const wrappedHandler = this.wrapHandler(handler, signal, blockable);
         const handlerId = obj.connect(signal, wrappedHandler);
         this.getOwnerMap(owner).set(key, { obj, handlerId });
     }
-    set(owner, obj, signal, handler) {
+    set(owner, obj, signal, handler, options) {
         this.disconnect(owner, obj, signal);
         if (handler) {
-            this.connect(owner, obj, signal, handler);
+            this.connect(owner, obj, signal, handler, options?.blockable ?? true);
         }
     }
     clear(owner) {

package/dist/nodes/internal/text-buffer-controller.js

@@ -58,7 +58,7 @@ export class TextBufferController {
         const { onBufferChanged, onTextInserted, onTextDeleted, onCanUndoChanged, onCanRedoChanged } = callbacks;
         this.owner.signalStore.set(this.owner, buffer, "changed", onBufferChanged ? () => onBufferChanged(buffer) : null);
         this.owner.signalStore.set(this.owner, buffer, "insert-text", onTextInserted
-            ? (location, text, _len) => onTextInserted(buffer, location.getOffset(), text)
+            ? (location, text) => onTextInserted(buffer, location.getOffset(), text)
             : null);
         this.owner.signalStore.set(this.owner, buffer, "delete-range", onTextDeleted
             ? (start, end) => onTextDeleted(buffer, start.getOffset(), end.getOffset())

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

@@ -1,5 +1,4 @@
 import * as Gtk from "@gtkx/ffi/gtk";
-import { BaseStore } from "./base-store.js";
 export type TreeItemUpdatedCallback = (id: string) => void;
 export type TreeItemData<T = unknown> = {
     value: T;
@@ -7,15 +6,13 @@ export type TreeItemData<T = unknown> = {
     indentForIcon?: boolean;
     hideExpander?: boolean;
 };
-export declare class TreeStore extends BaseStore<TreeItemData> {
+export declare class TreeStore {
     private rootIds;
-    private newRootIds;
     private children;
-    private newChildren;
     private rootModel;
     private childModels;
+    private items;
     private onItemUpdated;
-    constructor();
     setOnItemUpdated(callback: TreeItemUpdatedCallback | null): void;
     updateItem(id: string, item: TreeItemData): void;
     addItem(id: string, data: TreeItemData, parentId?: string): void;
@@ -25,5 +22,4 @@ export declare class TreeStore extends BaseStore<TreeItemData> {
     getRootModel(): Gtk.StringList;
     getChildrenModel(parentId: string): Gtk.StringList | null;
     hasChildren(parentId: string): boolean;
-    protected sync(): void;
 }

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

@@ -1,17 +1,11 @@
 import * as Gtk from "@gtkx/ffi/gtk";
-import { BaseStore } from "./base-store.js";
-export class TreeStore extends BaseStore {
+export class TreeStore {
     rootIds = [];
-    newRootIds = [];
     children = new Map();
-    newChildren = new Map();
-    rootModel;
+    rootModel = new Gtk.StringList();
     childModels = new Map();
+    items = new Map();
     onItemUpdated = null;
-    constructor() {
-        super();
-        this.rootModel = new Gtk.StringList();
-    }
     setOnItemUpdated(callback) {
         this.onItemUpdated = callback;
     }
@@ -27,83 +21,109 @@ export class TreeStore extends BaseStore {
     addItem(id, data, parentId) {
         this.items.set(id, data);
         if (parentId === undefined) {
-            const existingIndex = this.newRootIds.indexOf(id);
-            if (existingIndex !== -1) {
-                this.newRootIds.splice(existingIndex, 1);
+            const existingIndex = this.rootIds.indexOf(id);
+            if (existingIndex >= 0) {
+                this.rootModel.remove(existingIndex);
+                this.rootIds.splice(existingIndex, 1);
             }
-            this.newRootIds.push(id);
+            this.rootIds.push(id);
+            this.rootModel.append(id);
         }
         else {
-            let siblings = this.newChildren.get(parentId);
+            let siblings = this.children.get(parentId);
             if (!siblings) {
                 siblings = [];
-                this.newChildren.set(parentId, siblings);
+                this.children.set(parentId, siblings);
             }
             const existingIndex = siblings.indexOf(id);
-            if (existingIndex !== -1) {
+            if (existingIndex >= 0) {
+                const model = this.childModels.get(parentId);
+                if (model) {
+                    model.remove(existingIndex);
+                }
                 siblings.splice(existingIndex, 1);
             }
             siblings.push(id);
+            let model = this.childModels.get(parentId);
+            if (!model) {
+                model = new Gtk.StringList();
+                this.childModels.set(parentId, model);
+            }
+            model.append(id);
         }
-        this.scheduleSync();
     }
     removeItem(id, parentId) {
         this.items.delete(id);
-        this.newChildren.delete(id);
+        this.children.delete(id);
+        this.childModels.delete(id);
         if (parentId === undefined) {
-            const index = this.newRootIds.indexOf(id);
-            if (index !== -1) {
-                this.newRootIds.splice(index, 1);
+            const index = this.rootIds.indexOf(id);
+            if (index >= 0) {
+                this.rootIds.splice(index, 1);
+                this.rootModel.remove(index);
             }
         }
         else {
-            const siblings = this.newChildren.get(parentId);
+            const siblings = this.children.get(parentId);
             if (siblings) {
                 const index = siblings.indexOf(id);
-                if (index !== -1) {
+                if (index >= 0) {
                     siblings.splice(index, 1);
+                    const model = this.childModels.get(parentId);
+                    if (model) {
+                        model.remove(index);
+                    }
                 }
                 if (siblings.length === 0) {
-                    this.newChildren.delete(parentId);
+                    this.children.delete(parentId);
                 }
             }
         }
-        this.scheduleSync();
     }
     insertItemBefore(id, beforeId, data, parentId) {
         this.items.set(id, data);
         if (parentId === undefined) {
-            const existingIndex = this.newRootIds.indexOf(id);
-            if (existingIndex !== -1) {
-                this.newRootIds.splice(existingIndex, 1);
+            const existingIndex = this.rootIds.indexOf(id);
+            if (existingIndex >= 0) {
+                this.rootModel.remove(existingIndex);
+                this.rootIds.splice(existingIndex, 1);
             }
-            const beforeIndex = this.newRootIds.indexOf(beforeId);
-            if (beforeIndex === -1) {
-                this.newRootIds.push(id);
+            const beforeIndex = this.rootIds.indexOf(beforeId);
+            if (beforeIndex < 0) {
+                this.rootIds.push(id);
+                this.rootModel.append(id);
             }
             else {
-                this.newRootIds.splice(beforeIndex, 0, id);
+                this.rootIds.splice(beforeIndex, 0, id);
+                this.rootModel.splice(beforeIndex, 0, [id]);
             }
         }
         else {
-            let siblings = this.newChildren.get(parentId);
+            let siblings = this.children.get(parentId);
             if (!siblings) {
                 siblings = [];
-                this.newChildren.set(parentId, siblings);
+                this.children.set(parentId, siblings);
+            }
+            let model = this.childModels.get(parentId);
+            if (!model) {
+                model = new Gtk.StringList();
+                this.childModels.set(parentId, model);
             }
             const existingIndex = siblings.indexOf(id);
-            if (existingIndex !== -1) {
+            if (existingIndex >= 0) {
+                model.remove(existingIndex);
                 siblings.splice(existingIndex, 1);
             }
             const beforeIndex = siblings.indexOf(beforeId);
-            if (beforeIndex === -1) {
+            if (beforeIndex < 0) {
                 siblings.push(id);
+                model.append(id);
             }
             else {
                 siblings.splice(beforeIndex, 0, id);
+                model.splice(beforeIndex, 0, [id]);
             }
         }
-        this.scheduleSync();
     }
     getItem(id) {
         return this.items.get(id);
@@ -112,7 +132,7 @@ export class TreeStore extends BaseStore {
         return this.rootModel;
     }
     getChildrenModel(parentId) {
-        const childIds = this.children.get(parentId) ?? this.newChildren.get(parentId);
+        const childIds = this.children.get(parentId);
         if (!childIds || childIds.length === 0) {
             return null;
         }
@@ -127,22 +147,4 @@ export class TreeStore extends BaseStore {
         const childIds = this.children.get(parentId);
         return childIds !== undefined && childIds.length > 0;
     }
-    sync() {
-        const oldRootLength = this.rootIds.length;
-        this.rootModel.splice(0, oldRootLength, this.newRootIds.length > 0 ? this.newRootIds : undefined);
-        this.rootIds = [...this.newRootIds];
-        for (const [parentId, newChildIds] of this.newChildren) {
-            const model = this.childModels.get(parentId);
-            if (model) {
-                const oldLength = model.getNItems();
-                model.splice(0, oldLength, newChildIds.length > 0 ? newChildIds : undefined);
-            }
-        }
-        for (const [parentId] of this.children) {
-            if (!this.newChildren.has(parentId)) {
-                this.childModels.delete(parentId);
-            }
-        }
-        this.children = new Map(this.newChildren);
-    }
 }

package/dist/nodes/list-view.js

@@ -1,3 +1,4 @@
+import { isObjectEqual } from "@gtkx/ffi";
 import { LIST_WIDGET_CLASSES } from "../generated/internal.js";
 import { registerNodeClass } from "../registry.js";
 import { ListItemRenderer } from "./internal/list-item-renderer.js";
@@ -65,7 +66,7 @@ class ListViewNode extends WidgetNode {
         const previousModel = this.list.getSelectionModel();
         this.list.updateProps(oldProps, newProps);
         const currentModel = this.list.getSelectionModel();
-        if (previousModel !== currentModel) {
+        if (!isObjectEqual(previousModel, currentModel)) {
             this.container.setModel(currentModel);
         }
     }

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

@@ -42,10 +42,10 @@ export class TreeList extends VirtualNode {
         const id = node.props.id;
         if (id === undefined)
             return;
-        this.store.addItem(id, createTreeItemData(node.props), parentId);
         for (const child of node.getChildNodes()) {
             this.addItemWithChildren(child, id);
         }
+        this.store.addItem(id, createTreeItemData(node.props), parentId);
     }
     insertBefore(child, before) {
         if (!(child instanceof TreeListItemNode) || !(before instanceof TreeListItemNode)) {

package/dist/nodes/overlay-child.js

@@ -1,4 +1,4 @@
-import { isObjectEqual } from "@gtkx/ffi";
+import { getNativeId, isObjectEqual } from "@gtkx/ffi";
 import { registerNodeClass } from "../registry.js";
 import { CommitPriority, scheduleAfterCommit } from "../scheduler.js";
 import { VirtualNode } from "./virtual.js";
@@ -9,7 +9,7 @@ class OverlayChildNode extends VirtualNode {
         return type === "OverlayChild";
     }
     parent = null;
-    children = new Set();
+    children = new Map();
     canBeChildOf(parent) {
         return parent instanceof WidgetNode;
     }
@@ -22,7 +22,7 @@ class OverlayChildNode extends VirtualNode {
     unmount() {
         if (this.parent && this.children.size > 0) {
             const parent = this.parent;
-            const children = [...this.children];
+            const children = [...this.children.values()];
             this.children.clear();
             for (const child of children) {
                 const currentParent = child.getParent();
@@ -39,7 +39,7 @@ class OverlayChildNode extends VirtualNode {
             throw new Error(`Cannot append '${child.typeName}' to '${this.typeName}': expected Widget`);
         }
         const widget = child.container;
-        this.children.add(widget);
+        this.children.set(getNativeId(widget.handle), widget);
         scheduleAfterCommit(() => {
             if (this.parent) {
                 this.attachChild(widget);
@@ -51,7 +51,7 @@ class OverlayChildNode extends VirtualNode {
             throw new Error(`Cannot insert '${child.typeName}' into '${this.typeName}': expected Widget`);
         }
         const widget = child.container;
-        this.children.add(widget);
+        this.children.set(getNativeId(widget.handle), widget);
         scheduleAfterCommit(() => {
             if (this.parent) {
                 this.attachChild(widget);
@@ -64,7 +64,7 @@ class OverlayChildNode extends VirtualNode {
         }
         const widget = child.container;
         const parent = this.parent;
-        this.children.delete(widget);
+        this.children.delete(getNativeId(widget.handle));
         scheduleAfterCommit(() => {
             if (parent) {
                 const currentParent = widget.getParent();
@@ -83,7 +83,7 @@ class OverlayChildNode extends VirtualNode {
         const clipOverlayChanged = oldProps?.clipOverlay !== newProps.clipOverlay;
         if (measureChanged || clipOverlayChanged) {
             const parent = this.parent;
-            for (const child of this.children) {
+            for (const child of this.children.values()) {
                 if (measureChanged) {
                     parent.setMeasureOverlay(child, newProps.measure ?? false);
                 }

package/dist/nodes/pack-child.js

@@ -1,10 +1,15 @@
+import { PACK_INTERFACE_METHODS } from "../generated/internal.js";
 import { registerNodeClass } from "../registry.js";
 import { VirtualContainerNode } from "./abstract/virtual-container.js";
+import { matchesInterface } from "./internal/utils.js";
 class PackStartNode extends VirtualContainerNode {
     static priority = 1;
     static matches(type) {
         return type === "PackStart";
     }
+    canBeChildOf(parent) {
+        return matchesInterface(PACK_INTERFACE_METHODS, parent.container);
+    }
     attachChild(parent, widget) {
         parent.packStart(widget);
     }
@@ -14,6 +19,9 @@ class PackEndNode extends VirtualContainerNode {
     static matches(type) {
         return type === "PackEnd";
     }
+    canBeChildOf(parent) {
+        return matchesInterface(PACK_INTERFACE_METHODS, parent.container);
+    }
     attachChild(parent, widget) {
         parent.packEnd(widget);
     }