@gtkx/testing 0.1.36 → 0.1.38

package/README.md

@@ -134,13 +134,13 @@ test("increments count when clicking button", async () => {
   await screen.findByText("Count: 1");
 });
 
-test("can also use fireEvent for low-level events", async () => {
+test("can also use fireEvent for low-level signals", async () => {
   await render(<App />);
 
   const button = await screen.findByRole(AccessibleRole.BUTTON, {
     name: "Increment",
   });
-  fireEvent.click(button);
+  fireEvent(button, "clicked");
 
   await screen.findByText("Count: 1");
 });
@@ -156,14 +156,13 @@ Query types: `ByRole`, `ByText`, `ByLabelText`, `ByTestId`
 **User Interactions**:
 - `userEvent.click(element)` - Simulate click
 - `userEvent.dblClick(element)` - Simulate double click
+- `userEvent.activate(element)` - Activate element (e.g., press Enter in input)
 - `userEvent.type(element, text)` - Type text into input
 - `userEvent.clear(element)` - Clear input text
 - `userEvent.setup()` - Create reusable instance
 
 **Low-level Events**:
-- `fireEvent(element, signalName)` - Emit any GTK signal
-- `fireEvent.click(element)` - Emit clicked signal
-- `fireEvent.activate(element)` - Emit activate signal
+- `fireEvent(element, signalName, ...args)` - Emit any GTK signal with optional arguments
 
 **Utilities**:
 - `waitFor(callback)` - Wait for condition

package/dist/fire-event.d.ts

@@ -1,10 +1,3 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
-type FireEventFunction = {
-    (element: Gtk.Widget, signalName: string): void;
-    click: (element: Gtk.Widget) => void;
-    activate: (element: Gtk.Widget) => void;
-    toggled: (element: Gtk.Widget) => void;
-    changed: (element: Gtk.Widget) => void;
-};
-export declare const fireEvent: FireEventFunction;
-export {};
+import type { Arg } from "@gtkx/native";
+export declare const fireEvent: (element: Gtk.Widget, signalName: string, ...args: Arg[]) => void;

package/dist/fire-event.js

@@ -1,47 +1,4 @@
 import { call } from "@gtkx/native";
-const hasToggle = (widget) => "getActive" in widget &&
-    typeof widget.getActive === "function" &&
-    "setActive" in widget &&
-    typeof widget.setActive === "function";
-const emitSignal = (widget, signalName) => {
-    call("libgobject-2.0.so.0", "g_signal_emit_by_name", [
-        { type: { type: "gobject" }, value: widget.ptr },
-        { type: { type: "string" }, value: signalName },
-    ], { type: "undefined" });
+export const fireEvent = (element, signalName, ...args) => {
+    call("libgobject-2.0.so.0", "g_signal_emit_by_name", [{ type: { type: "gobject" }, value: element.ptr }, { type: { type: "string" }, value: signalName }, ...args], { type: "undefined" });
 };
-export const fireEvent = Object.assign((element, signalName) => {
-    switch (signalName) {
-        case "clicked":
-            emitSignal(element, "clicked");
-            break;
-        case "activate":
-            element.activate();
-            break;
-        case "toggled":
-            if (hasToggle(element)) {
-                element.setActive(!element.getActive());
-            }
-            break;
-        case "changed":
-            emitSignal(element, "changed");
-            break;
-        default:
-            throw new Error(`fireEvent: Signal "${signalName}" is not supported. ` +
-                `Supported signals: clicked, activate, toggled, changed`);
-    }
-}, {
-    click: (element) => {
-        emitSignal(element, "clicked");
-    },
-    activate: (element) => {
-        element.activate();
-    },
-    toggled: (element) => {
-        if (hasToggle(element)) {
-            element.setActive(!element.getActive());
-        }
-    },
-    changed: (element) => {
-        emitSignal(element, "changed");
-    },
-});

package/dist/index.d.ts

@@ -2,7 +2,8 @@ export { fireEvent } from "./fire-event.js";
 export { findAllByLabelText, findAllByRole, findAllByTestId, findAllByText, findByLabelText, findByRole, findByTestId, findByText, } from "./queries.js";
 export { cleanup, render, teardown } from "./render.js";
 export { screen } from "./screen.js";
-export type { ByRoleOptions, RenderOptions, RenderResult, TextMatchOptions, WaitForOptions, } from "./types.js";
+export type { BoundQueries, ByRoleOptions, RenderOptions, RenderResult, TextMatchOptions, WaitForOptions, } from "./types.js";
 export type { UserEventInstance, UserEventOptions } from "./user-event.js";
 export { userEvent } from "./user-event.js";
 export { waitFor, waitForElementToBeRemoved } from "./wait-for.js";
+export { within } from "./within.js";

package/dist/index.js

@@ -4,3 +4,4 @@ export { cleanup, render, teardown } from "./render.js";
 export { screen } from "./screen.js";
 export { userEvent } from "./user-event.js";
 export { waitFor, waitForElementToBeRemoved } from "./wait-for.js";
+export { within } from "./within.js";

package/dist/types.d.ts

@@ -23,8 +23,7 @@ export interface RenderOptions {
         children: ReactNode;
     }>;
 }
-export interface RenderResult {
-    container: Gtk.Application;
+export interface BoundQueries {
     findByRole: (role: AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget>;
     findByLabelText: (text: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget>;
     findByText: (text: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget>;
@@ -33,6 +32,9 @@ export interface RenderResult {
     findAllByLabelText: (text: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
     findAllByText: (text: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
     findAllByTestId: (testId: string | RegExp, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
+}
+export interface RenderResult extends BoundQueries {
+    container: Gtk.Application;
     unmount: () => Promise<void>;
     rerender: (element: ReactNode) => Promise<void>;
     debug: () => void;

package/dist/user-event.d.ts

@@ -5,6 +5,7 @@ export interface UserEventOptions {
 export interface UserEventInstance {
     click: (element: Gtk.Widget) => Promise<void>;
     dblClick: (element: Gtk.Widget) => Promise<void>;
+    activate: (element: Gtk.Widget) => Promise<void>;
     type: (element: Gtk.Widget, text: string) => Promise<void>;
     clear: (element: Gtk.Widget) => Promise<void>;
 }
@@ -12,6 +13,7 @@ export declare const userEvent: {
     setup: (options?: UserEventOptions) => UserEventInstance;
     click: (element: Gtk.Widget) => Promise<void>;
     dblClick: (element: Gtk.Widget) => Promise<void>;
+    activate: (element: Gtk.Widget) => Promise<void>;
     type: (element: Gtk.Widget, text: string) => Promise<void>;
     clear: (element: Gtk.Widget) => Promise<void>;
 };

package/dist/user-event.js

@@ -1,22 +1,20 @@
-import { call } from "@gtkx/native";
+import { fireEvent } from "./fire-event.js";
 import { hasGetText, hasSetText } from "./widget.js";
 const tick = () => new Promise((resolve) => setTimeout(resolve, 0));
-const emitSignal = (widget, signalName) => {
-    call("libgobject-2.0.so.0", "g_signal_emit_by_name", [
-        { type: { type: "gobject" }, value: widget.ptr },
-        { type: { type: "string" }, value: signalName },
-    ], { type: "undefined" });
-};
 const createUserEventInstance = (_options) => {
     return {
         click: async (element) => {
-            emitSignal(element, "clicked");
+            fireEvent(element, "clicked");
             await tick();
         },
         dblClick: async (element) => {
-            emitSignal(element, "clicked");
+            fireEvent(element, "clicked");
+            await tick();
+            fireEvent(element, "clicked");
             await tick();
-            emitSignal(element, "clicked");
+        },
+        activate: async (element) => {
+            element.activate();
             await tick();
         },
         type: async (element, text) => {
@@ -39,13 +37,17 @@ const createUserEventInstance = (_options) => {
 export const userEvent = {
     setup: (options) => createUserEventInstance(options),
     click: async (element) => {
-        emitSignal(element, "clicked");
+        fireEvent(element, "clicked");
         await tick();
     },
     dblClick: async (element) => {
-        emitSignal(element, "clicked");
+        fireEvent(element, "clicked");
         await tick();
-        emitSignal(element, "clicked");
+        fireEvent(element, "clicked");
+        await tick();
+    },
+    activate: async (element) => {
+        element.activate();
         await tick();
     },
     type: async (element, text) => {

package/dist/within.d.ts

@@ -0,0 +1,3 @@
+import type * as Gtk from "@gtkx/ffi/gtk";
+import type { BoundQueries } from "./types.js";
+export declare const within: (container: Gtk.Widget) => BoundQueries;

package/dist/within.js

@@ -0,0 +1,11 @@
+import * as queries from "./queries.js";
+export const within = (container) => ({
+    findByRole: (role, options) => queries.findByRole(container, role, options),
+    findByLabelText: (text, options) => queries.findByLabelText(container, text, options),
+    findByText: (text, options) => queries.findByText(container, text, options),
+    findByTestId: (testId, options) => queries.findByTestId(container, testId, options),
+    findAllByRole: (role, options) => queries.findAllByRole(container, role, options),
+    findAllByLabelText: (text, options) => queries.findAllByLabelText(container, text, options),
+    findAllByText: (text, options) => queries.findAllByText(container, text, options),
+    findAllByTestId: (testId, options) => queries.findAllByTestId(container, testId, options),
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/testing",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Testing utilities for GTKX applications",
   "keywords": [
     "gtk",
@@ -32,9 +32,9 @@
     "dist"
   ],
   "dependencies": {
-    "@gtkx/native": "0.1.36",
-    "@gtkx/react": "0.1.36",
-    "@gtkx/ffi": "0.1.36"
+    "@gtkx/ffi": "0.1.38",
+    "@gtkx/native": "0.1.38",
+    "@gtkx/react": "0.1.38"
   },
   "scripts": {
     "build": "tsc -b && cp ../../README.md .",