@gtkx/react 0.14.0 → 0.16.0

package/dist/scheduler.js

@@ -1,10 +1,20 @@
+/**
+ * Priority levels for scheduling operations after React commit.
+ *
+ * Priority guidelines:
+ * - HIGH: Removals and detachments (must run before additions to avoid conflicts)
+ * - NORMAL: Additions and attachments (standard widget operations)
+ * - LOW: Sync operations that depend on all additions being complete (e.g., model updates)
+ *
+ * Within the same priority level, callbacks execute in FIFO order.
+ */
 export var CommitPriority;
 (function (CommitPriority) {
     /** Runs first. Used for widget removals to unparent before reparenting. */
     CommitPriority[CommitPriority["HIGH"] = 0] = "HIGH";
     /** Runs after HIGH priority. Used for widget additions. */
     CommitPriority[CommitPriority["NORMAL"] = 1] = "NORMAL";
-    /** Runs last. Used for model sync operations that need all data to be added first. */
+    /** Runs after NORMAL. Used for model sync operations that need all data to be added first. */
     CommitPriority[CommitPriority["LOW"] = 2] = "LOW";
 })(CommitPriority || (CommitPriority = {}));
 const queues = {
@@ -22,9 +32,11 @@ export const scheduleAfterCommit = (callback, priority = CommitPriority.NORMAL)
 };
 export const flushAfterCommit = () => {
     for (const priority of priorities) {
-        const callbacks = queues[priority].splice(0);
-        for (const callback of callbacks) {
-            callback();
+        const queue = queues[priority];
+        while (queue.length > 0) {
+            const callback = queue.shift();
+            if (callback)
+                callback();
         }
     }
 };

package/dist/types.d.ts

@@ -1,112 +1,4 @@
-import type * as Gdk from "@gtkx/ffi/gdk";
-import type * as GObject from "@gtkx/ffi/gobject";
 import type * as Gtk from "@gtkx/ffi/gtk";
-export type Container = Gtk.Widget | Gtk.Application;
+export type Container = Gtk.Widget | Gtk.Application | Gtk.EventController;
 export type Props = Record<string, unknown>;
-export type ContainerClass = typeof Gtk.Widget | typeof Gtk.Application;
-/**
- * Props for EventController-based event handlers.
- *
- * These props attach EventControllers to widgets for handling
- * pointer motion, clicks, keyboard events, and drag-and-drop.
- */
-export interface EventControllerProps {
-    /** Called when the pointer enters the widget */
-    onEnter?: (x: number, y: number) => void;
-    /** Called when the pointer leaves the widget */
-    onLeave?: () => void;
-    /** Called when the pointer moves over the widget */
-    onMotion?: (x: number, y: number) => void;
-    /** Called when a mouse button is pressed */
-    onPressed?: (nPress: number, x: number, y: number) => void;
-    /** Called when a mouse button is released */
-    onReleased?: (nPress: number, x: number, y: number) => void;
-    /** Called when a key is pressed (for focusable widgets) */
-    onKeyPressed?: (keyval: number, keycode: number, state: Gdk.ModifierType) => boolean;
-    /** Called when a key is released */
-    onKeyReleased?: (keyval: number, keycode: number, state: Gdk.ModifierType) => void;
-    /** Called when the widget is scrolled */
-    onScroll?: (dx: number, dy: number) => boolean;
-}
-/**
- * Props for DragSource controller.
- *
- * Enables dragging content from a widget. Attach a DragSource to make
- * a widget draggable.
- */
-export interface DragSourceProps {
-    /**
-     * Called when a drag is about to start. Return a ContentProvider with the data
-     * to be dragged, or null to cancel the drag.
-     * @param x - X coordinate where drag started
-     * @param y - Y coordinate where drag started
-     */
-    onDragPrepare?: (x: number, y: number) => Gdk.ContentProvider | null;
-    /**
-     * Called when the drag operation begins.
-     * @param drag - The Gdk.Drag object representing the ongoing drag
-     */
-    onDragBegin?: (drag: Gdk.Drag) => void;
-    /**
-     * Called when the drag operation ends.
-     * @param drag - The Gdk.Drag object
-     * @param deleteData - Whether the data should be deleted (for move operations)
-     */
-    onDragEnd?: (drag: Gdk.Drag, deleteData: boolean) => void;
-    /**
-     * Called when the drag operation is cancelled.
-     * @param drag - The Gdk.Drag object
-     * @param reason - The reason for cancellation
-     * @returns true if the cancel was handled
-     */
-    onDragCancel?: (drag: Gdk.Drag, reason: Gdk.DragCancelReason) => boolean;
-    /**
-     * The allowed drag actions (COPY, MOVE, LINK, ASK).
-     * Defaults to Gdk.DragAction.COPY if not specified.
-     */
-    dragActions?: Gdk.DragAction;
-}
-/**
- * Props for DropTarget controller.
- *
- * Enables dropping content onto a widget. Attach a DropTarget to make
- * a widget accept drops.
- */
-export interface DropTargetProps {
-    /**
-     * Called when content is dropped on the widget.
-     * @param value - The dropped value (use value.getTypeName() to check type, then extract)
-     * @param x - X coordinate of drop
-     * @param y - Y coordinate of drop
-     * @returns true if the drop was accepted
-     */
-    onDrop?: (value: GObject.Value, x: number, y: number) => boolean;
-    /**
-     * Called when a drag enters the widget bounds.
-     * @param x - X coordinate
-     * @param y - Y coordinate
-     * @returns The preferred action, or 0 to reject
-     */
-    onDropEnter?: (x: number, y: number) => Gdk.DragAction;
-    /**
-     * Called when a drag leaves the widget bounds.
-     */
-    onDropLeave?: () => void;
-    /**
-     * Called when a drag moves within the widget bounds.
-     * @param x - X coordinate
-     * @param y - Y coordinate
-     * @returns The preferred action, or 0 to reject
-     */
-    onDropMotion?: (x: number, y: number) => Gdk.DragAction;
-    /**
-     * The allowed drop actions (COPY, MOVE, LINK, ASK).
-     * Defaults to Gdk.DragAction.COPY if not specified.
-     */
-    dropActions?: Gdk.DragAction;
-    /**
-     * Array of GTypes that this drop target accepts.
-     * Use typeFromName() to get GType values (e.g., typeFromName("gchararray") for strings).
-     */
-    dropTypes?: number[];
-}
+export type ContainerClass = typeof Gtk.Widget | typeof Gtk.Application | typeof Gtk.EventController;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "description": "Build GTK4 desktop applications with React and TypeScript",
   "keywords": [
     "gtkx",
@@ -37,8 +37,8 @@
   ],
   "dependencies": {
     "react-reconciler": "^0.33.0",
-    "@gtkx/ffi": "0.14.0",
-    "@gtkx/gir": "0.14.0"
+    "@gtkx/ffi": "0.16.0",
+    "@gtkx/gir": "0.16.0"
   },
   "devDependencies": {
     "@types/react-reconciler": "^0.32.3"

package/dist/nodes/calendar-mark.d.ts

@@ -1,15 +0,0 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
-import { VirtualNode } from "./virtual.js";
-export type CalendarMarkProps = {
-    day: number;
-};
-export declare class CalendarMarkNode extends VirtualNode<CalendarMarkProps> {
-    static priority: number;
-    private calendar?;
-    private onRebuild?;
-    static matches(type: string): boolean;
-    setCalendar(calendar: Gtk.Calendar, onRebuild: () => void): void;
-    addMark(): void;
-    updateProps(oldProps: CalendarMarkProps | null, newProps: CalendarMarkProps): void;
-    unmount(): void;
-}

package/dist/nodes/calendar-mark.js

@@ -1,29 +0,0 @@
-import { registerNodeClass } from "../registry.js";
-import { VirtualNode } from "./virtual.js";
-export class CalendarMarkNode extends VirtualNode {
-    static priority = 1;
-    calendar;
-    onRebuild;
-    static matches(type) {
-        return type === "CalendarMark";
-    }
-    setCalendar(calendar, onRebuild) {
-        this.calendar = calendar;
-        this.onRebuild = onRebuild;
-    }
-    addMark() {
-        this.calendar?.markDay(this.props.day);
-    }
-    updateProps(oldProps, newProps) {
-        super.updateProps(oldProps, newProps);
-        if (oldProps && this.calendar && oldProps.day !== newProps.day) {
-            this.onRebuild?.();
-        }
-    }
-    unmount() {
-        this.calendar = undefined;
-        this.onRebuild = undefined;
-        super.unmount();
-    }
-}
-registerNodeClass(CalendarMarkNode);

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

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

package/dist/nodes/internal/constants.js

@@ -1,21 +0,0 @@
-export const EVENT_CONTROLLER_PROPS = new Set([
-    "onEnter",
-    "onLeave",
-    "onMotion",
-    "onPressed",
-    "onReleased",
-    "onKeyPressed",
-    "onKeyReleased",
-    "onScroll",
-    "onDragPrepare",
-    "onDragBegin",
-    "onDragEnd",
-    "onDragCancel",
-    "dragActions",
-    "onDrop",
-    "onDropEnter",
-    "onDropLeave",
-    "onDropMotion",
-    "dropActions",
-    "dropTypes",
-]);

package/dist/nodes/level-bar-offset.d.ts

@@ -1,13 +0,0 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
-import type { LevelBarOffsetProps } from "../jsx.js";
-import { VirtualNode } from "./virtual.js";
-export declare class LevelBarOffsetNode extends VirtualNode<LevelBarOffsetProps> {
-    static priority: number;
-    private levelBar?;
-    private onRebuild?;
-    static matches(type: string): boolean;
-    setLevelBar(levelBar: Gtk.LevelBar, onRebuild: () => void): void;
-    addOffset(): string | undefined;
-    updateProps(oldProps: LevelBarOffsetProps | null, newProps: LevelBarOffsetProps): void;
-    unmount(): void;
-}

package/dist/nodes/level-bar-offset.js

@@ -1,35 +0,0 @@
-import { registerNodeClass } from "../registry.js";
-import { VirtualNode } from "./virtual.js";
-export class LevelBarOffsetNode extends VirtualNode {
-    static priority = 1;
-    levelBar;
-    onRebuild;
-    static matches(type) {
-        return type === "LevelBarOffset";
-    }
-    setLevelBar(levelBar, onRebuild) {
-        this.levelBar = levelBar;
-        this.onRebuild = onRebuild;
-    }
-    addOffset() {
-        if (!this.levelBar)
-            return undefined;
-        this.levelBar.addOffsetValue(this.props.id, this.props.value);
-        return this.props.id;
-    }
-    updateProps(oldProps, newProps) {
-        super.updateProps(oldProps, newProps);
-        if (oldProps && this.levelBar) {
-            const changed = oldProps.id !== newProps.id || oldProps.value !== newProps.value;
-            if (changed) {
-                this.onRebuild?.();
-            }
-        }
-    }
-    unmount() {
-        this.levelBar = undefined;
-        this.onRebuild = undefined;
-        super.unmount();
-    }
-}
-registerNodeClass(LevelBarOffsetNode);

package/dist/nodes/scale-mark.d.ts

@@ -1,17 +0,0 @@
-import * as Gtk from "@gtkx/ffi/gtk";
-import { VirtualNode } from "./virtual.js";
-export type ScaleMarkProps = {
-    value: number;
-    position?: Gtk.PositionType;
-    label?: string | null;
-};
-export declare class ScaleMarkNode extends VirtualNode<ScaleMarkProps> {
-    static priority: number;
-    private scale?;
-    private onRebuild?;
-    static matches(type: string): boolean;
-    setScale(scale: Gtk.Scale, onRebuild: () => void): void;
-    addMark(): void;
-    updateProps(oldProps: ScaleMarkProps | null, newProps: ScaleMarkProps): void;
-    unmount(): void;
-}

package/dist/nodes/scale-mark.js

@@ -1,38 +0,0 @@
-import * as Gtk from "@gtkx/ffi/gtk";
-import { registerNodeClass } from "../registry.js";
-import { VirtualNode } from "./virtual.js";
-export class ScaleMarkNode extends VirtualNode {
-    static priority = 1;
-    scale;
-    onRebuild;
-    static matches(type) {
-        return type === "ScaleMark";
-    }
-    setScale(scale, onRebuild) {
-        this.scale = scale;
-        this.onRebuild = onRebuild;
-    }
-    addMark() {
-        if (!this.scale)
-            return;
-        const { value, position, label } = this.props;
-        this.scale.addMark(value, position ?? Gtk.PositionType.BOTTOM, label);
-    }
-    updateProps(oldProps, newProps) {
-        super.updateProps(oldProps, newProps);
-        if (oldProps && this.scale) {
-            const changed = oldProps.value !== newProps.value ||
-                oldProps.position !== newProps.position ||
-                oldProps.label !== newProps.label;
-            if (changed) {
-                this.onRebuild?.();
-            }
-        }
-    }
-    unmount() {
-        this.scale = undefined;
-        this.onRebuild = undefined;
-        super.unmount();
-    }
-}
-registerNodeClass(ScaleMarkNode);

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

@@ -1,18 +0,0 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
-import type { Node } from "../node.js";
-import { VirtualNode } from "./virtual.js";
-type ChildParentWidget = Gtk.Widget & {
-    remove(child: Gtk.Widget): void;
-};
-export declare abstract class VirtualChildNode<P extends ChildParentWidget = ChildParentWidget> extends VirtualNode {
-    protected parent?: P;
-    protected children: Gtk.Widget[];
-    setParent(newParent?: P): void;
-    protected abstract getPositionLabel(): string;
-    protected abstract attachChild(parent: P, widget: Gtk.Widget): void;
-    unmount(): void;
-    appendChild(child: Node): void;
-    insertBefore(child: Node): void;
-    removeChild(child: Node): void;
-}
-export {};

package/dist/nodes/virtual-child.js

@@ -1,62 +0,0 @@
-import { isObjectEqual } from "@gtkx/ffi";
-import { CommitPriority, scheduleAfterCommit } from "../scheduler.js";
-import { VirtualNode } from "./virtual.js";
-import { WidgetNode } from "./widget.js";
-export class VirtualChildNode extends VirtualNode {
-    parent;
-    children = [];
-    setParent(newParent) {
-        this.parent = newParent;
-    }
-    unmount() {
-        const parent = this.parent;
-        const childrenToRemove = [...this.children];
-        if (parent && childrenToRemove.length > 0) {
-            scheduleAfterCommit(() => {
-                for (const widget of childrenToRemove) {
-                    const currentParent = widget.getParent();
-                    if (currentParent && isObjectEqual(currentParent, parent)) {
-                        parent.remove(widget);
-                    }
-                }
-            }, CommitPriority.HIGH);
-        }
-        this.children = [];
-        this.parent = undefined;
-        super.unmount();
-    }
-    appendChild(child) {
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot append '${child.typeName}' to '${this.typeName}': expected Widget`);
-        }
-        const widget = child.container;
-        this.children.push(widget);
-        scheduleAfterCommit(() => {
-            if (this.parent) {
-                this.attachChild(this.parent, widget);
-            }
-        });
-    }
-    insertBefore(child) {
-        this.appendChild(child);
-    }
-    removeChild(child) {
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot remove '${child.typeName}' from '${this.typeName}': expected Widget`);
-        }
-        const widget = child.container;
-        const parent = this.parent;
-        const index = this.children.indexOf(widget);
-        if (index !== -1) {
-            this.children.splice(index, 1);
-        }
-        scheduleAfterCommit(() => {
-            if (parent) {
-                const currentParent = widget.getParent();
-                if (currentParent && isObjectEqual(currentParent, parent)) {
-                    parent.remove(widget);
-                }
-            }
-        }, CommitPriority.HIGH);
-    }
-}