@gtkx/react 0.15.0 → 0.16.0

package/dist/render.js

@@ -1,7 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { discardAllBatches, start, stop } from "@gtkx/ffi";
+import { start, stop } from "@gtkx/ffi";
 import { createContext, useContext } from "react";
 import { formatBoundaryError, formatRenderError } from "./errors.js";
+import { getSignalStore } from "./nodes/internal/signal-store.js";
 import { reconciler } from "./reconciler.js";
 /**
  * React Context providing access to the GTK Application instance.
@@ -96,17 +97,18 @@ export const setHotReloading = (value) => {
  * @see {@link update} for hot-reloading the rendered tree
  */
 export const render = (element, appId, flags) => {
-    app = start(appId, flags);
+    const application = start(appId, flags);
+    app = application;
     const instance = reconciler.getInstance();
-    container = instance.createContainer(app, 1, null, false, null, "", (error) => {
-        discardAllBatches();
+    container = instance.createContainer(application, 1, null, false, null, "", (error) => {
+        getSignalStore(application).forceUnblockAll();
         throw formatRenderError(error);
     }, (error) => {
-        discardAllBatches();
+        getSignalStore(application).forceUnblockAll();
         const formattedError = formatBoundaryError(error);
         console.error(formattedError.toString());
     }, () => { }, () => { }, null);
-    instance.updateContainer(_jsx(ApplicationContext.Provider, { value: app, children: element }), container, null, () => { });
+    instance.updateContainer(_jsx(ApplicationContext.Provider, { value: application, children: element }), container, null, () => { });
 };
 /**
  * Updates the rendered React element tree.

package/dist/scheduler.d.ts

@@ -1,10 +1,20 @@
 type Callback = () => void;
+/**
+ * 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 declare enum CommitPriority {
     /** Runs first. Used for widget removals to unparent before reparenting. */
     HIGH = 0,
     /** Runs after HIGH priority. Used for widget additions. */
     NORMAL = 1,
-    /** 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. */
     LOW = 2
 }
 /**

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,138 +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[];
-}
-/**
- * Props for GestureDrag controller.
- *
- * Enables tracking drag gestures (mouse/touch drag movements) on a widget.
- * Use this for drawing, panning, or any interaction that tracks movement from a start point.
- */
-export interface GestureDragProps {
-    /**
-     * Called when a drag gesture begins.
-     * @param startX - X coordinate where the drag started
-     * @param startY - Y coordinate where the drag started
-     */
-    onGestureDragBegin?: (startX: number, startY: number) => void;
-    /**
-     * Called as the drag gesture continues.
-     * @param offsetX - Horizontal offset from the start point
-     * @param offsetY - Vertical offset from the start point
-     */
-    onGestureDragUpdate?: (offsetX: number, offsetY: number) => void;
-    /**
-     * Called when the drag gesture ends.
-     * @param offsetX - Final horizontal offset from the start point
-     * @param offsetY - Final vertical offset from the start point
-     */
-    onGestureDragEnd?: (offsetX: number, offsetY: number) => void;
-}
+export type ContainerClass = typeof Gtk.Widget | typeof Gtk.Application | typeof Gtk.EventController;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.15.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/gir": "0.15.0",
-    "@gtkx/ffi": "0.15.0"
+    "@gtkx/ffi": "0.16.0",
+    "@gtkx/gir": "0.16.0"
   },
   "devDependencies": {
     "@types/react-reconciler": "^0.32.3"

package/dist/nodes/adjustment.d.ts

@@ -1,48 +0,0 @@
-import type { AdjustableWidget } from "./internal/predicates.js";
-import { VirtualNode } from "./virtual.js";
-/**
- * Props for the Adjustment virtual element.
- *
- * Used to declaratively configure the adjustment for adjustable widgets
- * such as Scale, Scrollbar, ScaleButton, SpinButton, and ListBox.
- *
- * @example
- * ```tsx
- * <GtkScale>
- *     <x.Adjustment
- *         value={50}
- *         lower={0}
- *         upper={100}
- *         stepIncrement={1}
- *         onValueChanged={(v) => console.log("Value:", v)}
- *     />
- * </GtkScale>
- * ```
- */
-export type AdjustmentProps = {
-    /** The current value */
-    value?: number;
-    /** The minimum value */
-    lower?: number;
-    /** The maximum value */
-    upper?: number;
-    /** The increment for arrow keys */
-    stepIncrement?: number;
-    /** The increment for page up/down */
-    pageIncrement?: number;
-    /** The page size (usually 0 for scales) */
-    pageSize?: number;
-    /** Callback when the value changes */
-    onValueChanged?: (value: number) => void;
-};
-export declare class AdjustmentNode extends VirtualNode<AdjustmentProps> {
-    static priority: number;
-    private widget?;
-    private adjustment?;
-    static matches(type: string): boolean;
-    setWidget(widget: AdjustableWidget): void;
-    private setupAdjustment;
-    private updateSignalHandler;
-    updateProps(oldProps: AdjustmentProps | null, newProps: AdjustmentProps): void;
-    unmount(): void;
-}

package/dist/nodes/adjustment.js

@@ -1,70 +0,0 @@
-import * as Gtk from "@gtkx/ffi/gtk";
-import { registerNodeClass } from "../registry.js";
-import { signalStore } from "./internal/signal-store.js";
-import { VirtualNode } from "./virtual.js";
-export class AdjustmentNode extends VirtualNode {
-    static priority = 1;
-    widget;
-    adjustment;
-    static matches(type) {
-        return type === "Adjustment";
-    }
-    setWidget(widget) {
-        this.widget = widget;
-        this.setupAdjustment();
-    }
-    setupAdjustment() {
-        if (!this.widget)
-            return;
-        const { value = 0, lower = 0, upper = 100, stepIncrement = 1, pageIncrement = 10, pageSize = 0 } = this.props;
-        this.adjustment = new Gtk.Adjustment(value, lower, upper, stepIncrement, pageIncrement, pageSize);
-        this.widget.setAdjustment(this.adjustment);
-        this.updateSignalHandler();
-    }
-    updateSignalHandler() {
-        if (!this.adjustment)
-            return;
-        const { onValueChanged } = this.props;
-        if (onValueChanged) {
-            const adjustment = this.adjustment;
-            signalStore.set(this, adjustment, "value-changed", () => onValueChanged(adjustment.getValue()));
-        }
-        else {
-            signalStore.set(this, this.adjustment, "value-changed", null);
-        }
-    }
-    updateProps(oldProps, newProps) {
-        super.updateProps(oldProps, newProps);
-        if (!this.adjustment)
-            return;
-        if (!oldProps || oldProps.lower !== newProps.lower) {
-            this.adjustment.setLower(newProps.lower ?? 0);
-        }
-        if (!oldProps || oldProps.upper !== newProps.upper) {
-            this.adjustment.setUpper(newProps.upper ?? 100);
-        }
-        if (!oldProps || oldProps.stepIncrement !== newProps.stepIncrement) {
-            this.adjustment.setStepIncrement(newProps.stepIncrement ?? 1);
-        }
-        if (!oldProps || oldProps.pageIncrement !== newProps.pageIncrement) {
-            this.adjustment.setPageIncrement(newProps.pageIncrement ?? 10);
-        }
-        if (!oldProps || oldProps.pageSize !== newProps.pageSize) {
-            this.adjustment.setPageSize(newProps.pageSize ?? 0);
-        }
-        if (!oldProps || oldProps.value !== newProps.value) {
-            if (newProps.value !== undefined) {
-                this.adjustment.setValue(newProps.value);
-            }
-        }
-        if (!oldProps || oldProps.onValueChanged !== newProps.onValueChanged) {
-            this.updateSignalHandler();
-        }
-    }
-    unmount() {
-        this.adjustment = undefined;
-        this.widget = undefined;
-        super.unmount();
-    }
-}
-registerNodeClass(AdjustmentNode);

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,24 +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",
-    "onGestureDragBegin",
-    "onGestureDragUpdate",
-    "onGestureDragEnd",
-]);

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/source-buffer.d.ts

@@ -1,73 +0,0 @@
-import * as Gtk from "@gtkx/ffi/gtk";
-import * as GtkSource from "@gtkx/ffi/gtksource";
-import { VirtualNode } from "./virtual.js";
-/**
- * Props for the SourceBuffer virtual element.
- *
- * Used to declaratively configure the text buffer for a GtkSourceView with syntax highlighting,
- * bracket matching, and other source code editing features.
- *
- * @example
- * ```tsx
- * <GtkSourceView>
- *     <x.SourceBuffer
- *         text={sourceCode}
- *         language="typescript"
- *         styleScheme="Adwaita-dark"
- *         highlightSyntax
- *         highlightMatchingBrackets
- *         onTextChanged={(text) => console.log("Code:", text)}
- *     />
- * </GtkSourceView>
- * ```
- */
-export type SourceBufferProps = {
-    /** Text content */
-    text?: string;
-    /** Whether to enable undo/redo */
-    enableUndo?: boolean;
-    /** Callback when the text content changes */
-    onTextChanged?: (text: string) => void;
-    /** Callback when can-undo state changes */
-    onCanUndoChanged?: (canUndo: boolean) => void;
-    /** Callback when can-redo state changes */
-    onCanRedoChanged?: (canRedo: boolean) => void;
-    /**
-     * Language for syntax highlighting.
-     * Can be a language ID string (e.g., "typescript", "python", "rust") or a GtkSource.Language object.
-     */
-    language?: string | GtkSource.Language;
-    /**
-     * Style scheme for syntax highlighting colors.
-     * Can be a scheme ID string (e.g., "Adwaita-dark", "classic") or a GtkSource.StyleScheme object.
-     */
-    styleScheme?: string | GtkSource.StyleScheme;
-    /** Whether to enable syntax highlighting. Defaults to true when language is set. */
-    highlightSyntax?: boolean;
-    /** Whether to highlight matching brackets when cursor is on a bracket. Defaults to true. */
-    highlightMatchingBrackets?: boolean;
-    /**
-     * Whether the buffer has an implicit trailing newline.
-     * When true (default), trailing newlines are handled automatically during file load/save.
-     */
-    implicitTrailingNewline?: boolean;
-    /** Callback when the cursor position changes */
-    onCursorMoved?: () => void;
-    /** Callback when syntax highlighting is updated for a region */
-    onHighlightUpdated?: (start: Gtk.TextIter, end: Gtk.TextIter) => void;
-};
-export declare class SourceBufferNode extends VirtualNode<SourceBufferProps> {
-    static priority: number;
-    private sourceView?;
-    private buffer?;
-    static matches(type: string): boolean;
-    setSourceView(sourceView: GtkSource.View): void;
-    private resolveLanguage;
-    private resolveStyleScheme;
-    private setupBuffer;
-    private applySourceProps;
-    private getBufferText;
-    private updateSignalHandlers;
-    updateProps(oldProps: SourceBufferProps | null, newProps: SourceBufferProps): void;
-    unmount(): void;
-}