@gtkx/react 0.1.33 → 0.1.35

package/README.md

@@ -119,10 +119,12 @@ import { AccessibleRole } from "@gtkx/ffi/gtk";
 import { App } from "./app.js";
 
 // Clean up after each test
-afterEach(() => cleanup());
+afterEach(async () => {
+  await cleanup();
+});
 
 test("increments count when clicking button", async () => {
-  render(<App />);
+  await render(<App />);
 
   const button = await screen.findByRole(AccessibleRole.BUTTON, {
     name: "Increment",
@@ -132,8 +134,8 @@ test("increments count when clicking button", async () => {
   await screen.findByText("Count: 1");
 });
 
-test("can also use fireEvent for synchronous events", async () => {
-  render(<App />);
+test("can also use fireEvent for low-level events", async () => {
+  await render(<App />);
 
   const button = await screen.findByRole(AccessibleRole.BUTTON, {
     name: "Increment",
@@ -146,10 +148,8 @@ test("can also use fireEvent for synchronous events", async () => {
 
 ### Available APIs
 
-**Queries** - Find elements in the rendered tree:
-- `getBy*` / `getAllBy*` - Throws if not found
-- `queryBy*` / `queryAllBy*` - Returns null/empty array if not found
-- `findBy*` / `findAllBy*` - Async, waits for element
+**Queries** - Find elements in the rendered tree (all async):
+- `findBy*` / `findAllBy*` - Waits for element to appear
 
 Query types: `ByRole`, `ByText`, `ByLabelText`, `ByTestId`
 

package/dist/index.d.ts

@@ -4,4 +4,3 @@ export { createPortal } from "./portal.js";
 export { reconciler } from "./reconciler.js";
 export { render } from "./render.js";
 export declare const quit: () => boolean;
-export declare const getApp: () => import("@gtkx/ffi/gtk").Application;

package/dist/index.js

@@ -14,4 +14,3 @@ export const quit = () => {
     }
     return true;
 };
-export const getApp = () => reconciler.getApp();

package/dist/node.js

@@ -154,13 +154,9 @@ export class Node {
         if (getterName) {
             const getter = widget[getterName];
             if (typeof getter === "function") {
-                try {
-                    const currentValue = getter.call(widget);
-                    if (currentValue === value)
-                        return;
-                }
-                catch {
-                }
+                const currentValue = getter.call(widget);
+                if (currentValue === value)
+                    return;
             }
         }
         setter.call(widget, value);

package/dist/reconciler.d.ts

@@ -1,4 +1,3 @@
-import type { Application } from "@gtkx/ffi/gtk";
 import * as Gtk from "@gtkx/ffi/gtk";
 import ReactReconciler from "react-reconciler";
 import type { Node } from "./node.js";
@@ -10,10 +9,7 @@ type FormInstance = never;
 type ReconcilerInstance = ReactReconciler.Reconciler<Container, Node, TextInstance, SuspenseInstance, FormInstance, PublicInstance>;
 declare class Reconciler {
     private instance;
-    private app;
     constructor();
-    getApp(): Application;
-    setApp(app: Application): void;
     getInstance(): ReconcilerInstance;
     private createHostConfig;
     private createReconcilerContext;

package/dist/reconciler.js

@@ -1,22 +1,13 @@
+import { getCurrentApp } from "@gtkx/ffi";
 import * as Gtk from "@gtkx/ffi/gtk";
 import React from "react";
 import ReactReconciler from "react-reconciler";
 import { createNode } from "./factory.js";
 class Reconciler {
     instance;
-    app = null;
     constructor() {
         this.instance = ReactReconciler(this.createHostConfig());
     }
-    getApp() {
-        if (!this.app) {
-            throw new Error("Tried to get GTK Application before it was set.");
-        }
-        return this.app;
-    }
-    setApp(app) {
-        this.app = app;
-    }
     getInstance() {
         return this.instance;
     }
@@ -30,15 +21,15 @@ class Reconciler {
             getRootHostContext: () => ({}),
             getChildHostContext: (parentHostContext) => parentHostContext,
             shouldSetTextContent: () => false,
-            createInstance: (type, props) => createNode(type, props, this.getApp()),
-            createTextInstance: (text) => createNode("Label.Root", { label: text }, this.getApp()),
+            createInstance: (type, props) => createNode(type, props, getCurrentApp()),
+            createTextInstance: (text) => createNode("Label.Root", { label: text }, getCurrentApp()),
             appendInitialChild: (parent, child) => parent.appendChild(child),
             finalizeInitialChildren: () => true,
             commitUpdate: (instance, _type, oldProps, newProps) => {
                 instance.updateProps(oldProps, newProps);
             },
             commitMount: (instance) => {
-                instance.mount(this.getApp());
+                instance.mount(getCurrentApp());
             },
             appendChild: (parent, child) => parent.appendChild(child),
             removeChild: (parent, child) => parent.removeChild(child),
@@ -81,7 +72,7 @@ class Reconciler {
             prepareScopeUpdate: () => { },
             getInstanceFromScope: () => null,
             detachDeletedInstance: (instance) => {
-                instance.dispose(this.getApp());
+                instance.dispose(getCurrentApp());
             },
             resetFormInstance: () => { },
             requestPostPaintCallback: () => { },
@@ -102,9 +93,9 @@ class Reconciler {
     }
     createNodeFromContainer(container) {
         if (container instanceof Gtk.Widget) {
-            return createNode(container.constructor.name, {}, this.getApp(), container);
+            return createNode(container.constructor.name, {}, getCurrentApp(), container);
         }
-        return createNode("Application", {}, this.getApp(), container);
+        return createNode("Application", {}, getCurrentApp(), container);
     }
 }
 export const reconciler = new Reconciler();

package/dist/render.js

@@ -4,7 +4,6 @@ export let container = null;
 export const render = (element, appId, flags) => {
     const app = start(appId, flags);
     const instance = reconciler.getInstance();
-    reconciler.setApp(app);
     container = instance.createContainer(app, 0, null, false, null, "", (error, info) => {
         console.error("Uncaught error in GTKX application:", error, info);
     }, (_error, _info) => { }, (_error, _info) => { }, () => { }, null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Build GTK4 desktop applications with React and TypeScript",
   "keywords": [
     "gtk",
@@ -36,10 +36,10 @@
   ],
   "dependencies": {
     "react-reconciler": "0.33.0",
-    "@gtkx/ffi": "0.1.33"
+    "@gtkx/ffi": "0.1.35"
   },
   "devDependencies": {
-    "@gtkx/gir": "0.1.33"
+    "@gtkx/gir": "0.1.35"
   },
   "peerDependencies": {
     "react": "^19"