@gtkx/react 0.17.2 → 0.18.0

package/dist/host-config.d.ts

@@ -3,7 +3,7 @@ import type ReactReconciler from "react-reconciler";
 import type { Node } from "./node.js";
 import type { Container, Props } from "./types.js";
 declare global {
-    var __GTKX_CONTAINER_NODE_CACHE__: Map<number, Node> | undefined;
+    var __GTKX_CONTAINER_NODE_CACHE__: WeakMap<Container, Node> | undefined;
 }
 type TextInstance = Node;
 type SuspenseInstance = never;

package/dist/host-config.js

@@ -1,19 +1,16 @@
-import { getNativeId } from "@gtkx/ffi";
 import React from "react";
-import { createNode } from "./factory.js";
-import { isBufferedType } from "./nodes/internal/predicates.js";
-import { flushAfterCommit } from "./scheduler.js";
+import { createNode, resolveContainerClass } from "./factory.js";
+import { isBuffered } from "./nodes/internal/predicates.js";
 if (!globalThis.__GTKX_CONTAINER_NODE_CACHE__) {
-    globalThis.__GTKX_CONTAINER_NODE_CACHE__ = new Map();
+    globalThis.__GTKX_CONTAINER_NODE_CACHE__ = new WeakMap();
 }
 const containerNodeCache = globalThis.__GTKX_CONTAINER_NODE_CACHE__;
 const getOrCreateContainerNode = (container) => {
-    const id = getNativeId(container.handle);
-    let node = containerNodeCache.get(id);
+    let node = containerNodeCache.get(container);
     if (!node) {
         const type = container.constructor.glibTypeName;
         node = createNode(type, {}, container, container);
-        containerNodeCache.set(id, node);
+        containerNodeCache.set(container, node);
     }
     return node;
 };
@@ -26,7 +23,8 @@ export function createHostConfig() {
         noTimeout: -1,
         getRootHostContext: () => ({}),
         getChildHostContext: (parentHostContext, type) => {
-            if (isBufferedType(type) || type === "TextTag") {
+            const containerClass = resolveContainerClass(type);
+            if ((containerClass && isBuffered(containerClass.prototype)) || type === "TextTag") {
                 return { insideTextBuffer: true };
             }
             if (parentHostContext.insideTextBuffer) {
@@ -42,26 +40,25 @@ export function createHostConfig() {
             if (hostContext.insideTextBuffer) {
                 const props = { text };
                 const node = createNode("TextSegment", props, undefined, rootContainer);
-                node.updateProps(null, props);
+                node.commitUpdate(null, props);
                 return node;
             }
             const props = { label: text };
             const node = createNode("GtkLabel", props, undefined, rootContainer);
-            node.updateProps(null, props);
+            node.commitUpdate(null, props);
             return node;
         },
         appendInitialChild: (parent, child) => {
-            parent.appendChild(child);
+            parent.appendInitialChild(child);
         },
         finalizeInitialChildren: (instance, _type, props) => {
-            instance.commitProps(null, props);
-            return true;
+            return instance.finalizeInitialChildren(props);
         },
         commitUpdate: (instance, _type, oldProps, newProps) => {
-            instance.commitProps(oldProps, newProps);
+            instance.commitUpdate(oldProps, newProps);
         },
-        commitMount: (instance, _type) => {
-            instance.mount();
+        commitMount: (instance) => {
+            instance.commitMount();
         },
         appendChild: (parent, child) => {
             parent.appendChild(child);
@@ -87,15 +84,13 @@ export function createHostConfig() {
         prepareForCommit: () => {
             return null;
         },
-        resetAfterCommit: () => {
-            flushAfterCommit();
-        },
+        resetAfterCommit: () => { },
         commitTextUpdate: (textInstance, oldText, newText) => {
             if (textInstance.typeName === "TextSegment") {
-                textInstance.commitProps({ text: oldText }, { text: newText });
+                textInstance.commitUpdate({ text: oldText }, { text: newText });
             }
             else {
-                textInstance.commitProps({ label: oldText }, { label: newText });
+                textInstance.commitUpdate({ label: oldText }, { label: newText });
             }
         },
         clearContainer: () => { },
@@ -118,7 +113,7 @@ export function createHostConfig() {
         afterActiveInstanceBlur: () => { },
         prepareScopeUpdate: () => { },
         getInstanceFromScope: () => null,
-        detachDeletedInstance: (instance) => instance.unmount(),
+        detachDeletedInstance: (instance) => instance.detachDeletedInstance(),
         resetFormInstance: () => { },
         requestPostPaintCallback: () => { },
         shouldAttemptEagerTransition: () => false,

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./jsx.js";
 export { createPortal } from "./portal.js";
 export { reconciler } from "./reconciler.js";
-export { ApplicationContext, getApplication, quit, render, setHotReloading, update, useApplication, } from "./render.js";
+export { ApplicationContext, quit, render, setHotReloading, update, useApplication, } from "./render.js";

package/dist/index.js

@@ -1,4 +1,4 @@
 export * from "./jsx.js";
 export { createPortal } from "./portal.js";
 export { reconciler } from "./reconciler.js";
-export { ApplicationContext, getApplication, quit, render, setHotReloading, update, useApplication, } from "./render.js";
+export { ApplicationContext, quit, render, setHotReloading, update, useApplication, } from "./render.js";