@gtkx/react 0.1.14 → 0.1.16

package/dist/nodes/widget.d.ts

@@ -1,6 +1,10 @@
 import * as Gtk from "@gtkx/ffi/gtk";
 import type { Props } from "../factory.js";
 import { Node } from "../node.js";
+export declare class WidgetWrapper extends Node<Gtk.Widget> {
+    constructor(widget: Gtk.Widget);
+    protected isVirtual(): boolean;
+}
 export declare class WidgetNode extends Node<Gtk.Widget> {
     static matches(_type: string): boolean;
     attachToParent(parent: Node): void;

package/dist/nodes/widget.js

@@ -14,6 +14,15 @@ const COMBINED_PROPS = [
         },
     },
 ];
+export class WidgetWrapper extends Node {
+    constructor(widget) {
+        super("", {});
+        this.widget = widget;
+    }
+    isVirtual() {
+        return true;
+    }
+}
 export class WidgetNode extends Node {
     static matches(_type) {
         return true;

package/dist/portal.d.ts

@@ -1,2 +1,3 @@
 import type { ReactNode, ReactPortal } from "react";
+export declare const ROOT_CONTAINER: unique symbol;
 export declare const createPortal: (children: ReactNode, container?: unknown, key?: string | null) => ReactPortal;

package/dist/portal.js

@@ -1,10 +1,10 @@
-const ROOT_PORTAL_CONTAINER = Symbol("ROOT_PORTAL_CONTAINER");
+export const ROOT_CONTAINER = Symbol("ROOT_CONTAINER");
 export const createPortal = (children, container, key) => {
     return {
         $$typeof: Symbol.for("react.portal"),
         key: key ?? null,
         children,
-        containerInfo: container ?? ROOT_PORTAL_CONTAINER,
+        containerInfo: container ?? ROOT_CONTAINER,
         implementation: null,
     };
 };

package/dist/reconciler.d.ts

@@ -2,6 +2,8 @@ import type * as Gtk from "@gtkx/ffi/gtk";
 import type { Application } from "@gtkx/ffi/gtk";
 import Reconciler from "react-reconciler";
 import type { Node } from "./node.js";
+import { ROOT_CONTAINER } from "./portal.js";
+type Container = Gtk.Widget | typeof ROOT_CONTAINER;
 type TextInstance = Node;
 export declare class GtkReconciler {
     private reconciler;
@@ -13,7 +15,7 @@ export declare class GtkReconciler {
     private createHostConfig;
     private createReconcilerContext;
 }
-export declare const reconciler: Reconciler.Reconciler<unknown, Node<Gtk.Widget | undefined>, TextInstance, never, never, Gtk.Widget>;
+export declare const reconciler: Reconciler.Reconciler<Container, Node<Gtk.Widget | undefined>, TextInstance, never, never, Gtk.Widget>;
 export declare const setCurrentApp: (app: Application) => void;
 export declare const getCurrentApp: () => Application | null;
 export {};

package/dist/reconciler.js

@@ -1,6 +1,8 @@
 import React from "react";
 import Reconciler from "react-reconciler";
 import { createNode } from "./factory.js";
+import { WidgetWrapper } from "./nodes/widget.js";
+import { ROOT_CONTAINER } from "./portal.js";
 export class GtkReconciler {
     reconciler;
     currentApp = null;
@@ -39,9 +41,18 @@ export class GtkReconciler {
             appendChild: (parent, child) => parent.appendChild(child),
             removeChild: (parent, child) => parent.removeChild(child),
             insertBefore: (parent, child, beforeChild) => parent.insertBefore(child, beforeChild),
-            removeChildFromContainer: (_container, _child) => { },
-            appendChildToContainer: (_container, _child) => { },
-            insertInContainerBefore: (_container, _child, _beforeChild) => { },
+            removeChildFromContainer: (container, child) => {
+                if (container !== ROOT_CONTAINER)
+                    child.detachFromParent(new WidgetWrapper(container));
+            },
+            appendChildToContainer: (container, child) => {
+                if (container !== ROOT_CONTAINER)
+                    child.attachToParent(new WidgetWrapper(container));
+            },
+            insertInContainerBefore: (container, child, _beforeChild) => {
+                if (container !== ROOT_CONTAINER)
+                    child.attachToParent(new WidgetWrapper(container));
+            },
             prepareForCommit: () => null,
             resetAfterCommit: () => { },
             commitTextUpdate: (textInstance, oldText, newText) => {

package/dist/render.js

@@ -1,10 +1,11 @@
 import { start } from "@gtkx/ffi";
+import { ROOT_CONTAINER } from "./portal.js";
 import { reconciler, setCurrentApp } from "./reconciler.js";
 export let container = null;
 export const render = (element, appId, flags) => {
     const app = start(appId, flags);
     setCurrentApp(app);
-    container = reconciler.createContainer(appId, 0, null, false, false, "", (error, info) => {
+    container = reconciler.createContainer(ROOT_CONTAINER, 0, null, false, false, "", (error, info) => {
         console.error("React reconciler error:", error, info);
     }, null, null, null, null);
     reconciler.updateContainer(element, container, null, () => { });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Build GTK4 desktop applications with React and TypeScript",
   "keywords": [
     "gtk",
@@ -37,10 +37,10 @@
   ],
   "dependencies": {
     "react-reconciler": "0.33.0",
-    "@gtkx/ffi": "0.1.14"
+    "@gtkx/ffi": "0.1.16"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.1.14"
+    "@gtkx/gir": "0.1.16"
   },
   "peerDependencies": {
     "react": "19"
@@ -48,6 +48,6 @@
   "scripts": {
     "build": "tsc -b",
     "codegen": "tsx scripts/codegen.ts",
-    "test": "xvfb-run -a vitest run"
+    "test": "vitest run"
   }
 }