@gtkx/testing 0.7.0 → 0.9.0

package/dist/screen.d.ts

@@ -1,5 +1,4 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
-import type { AccessibleRole } from "@gtkx/ffi/gtk";
 import type { ByRoleOptions, TextMatch, TextMatchOptions } from "./types.js";
 /**
  * Sets the root application for screen queries. Called internally by render().
@@ -12,11 +11,11 @@ export declare const setScreenRoot: (root: Gtk.Application | null) => void;
  * needing to destructure from render().
  */
 export declare const screen: {
-    findByRole: (role: AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget>;
+    findByRole: (role: Gtk.AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget>;
     findByLabelText: (text: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget>;
     findByText: (text: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget>;
     findByTestId: (testId: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget>;
-    findAllByRole: (role: AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget[]>;
+    findAllByRole: (role: Gtk.AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget[]>;
     findAllByLabelText: (text: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
     findAllByText: (text: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
     findAllByTestId: (testId: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;

package/dist/types.d.ts

@@ -1,5 +1,4 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
-import type { AccessibleRole } from "@gtkx/ffi/gtk";
 import type { ComponentType, ReactNode } from "react";
 /**
  * A function that receives the text content and widget, returning true for a match.
@@ -86,7 +85,7 @@ export type RenderOptions = {
  */
 export type BoundQueries = {
     /** Find a single element by its accessible role. */
-    findByRole: (role: AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget>;
+    findByRole: (role: Gtk.AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget>;
     /** Find a single element by its associated label text. */
     findByLabelText: (text: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget>;
     /** Find a single element by its text content. */
@@ -94,7 +93,7 @@ export type BoundQueries = {
     /** Find a single element by its test ID. */
     findByTestId: (testId: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget>;
     /** Find all elements matching an accessible role. */
-    findAllByRole: (role: AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget[]>;
+    findAllByRole: (role: Gtk.AccessibleRole, options?: ByRoleOptions) => Promise<Gtk.Widget[]>;
     /** Find all elements with matching label text. */
     findAllByLabelText: (text: TextMatch, options?: TextMatchOptions) => Promise<Gtk.Widget[]>;
     /** Find all elements with matching text content. */

package/dist/user-event.d.ts

@@ -1,4 +1,4 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
+import * as Gtk from "@gtkx/ffi/gtk";
 /**
  * Options for the tab user event.
  */

package/dist/user-event.js

@@ -1,28 +1,28 @@
 import { getInterface, getObject } from "@gtkx/ffi";
-import { Accessible, AccessibleRole, DirectionType, Editable, } from "@gtkx/ffi/gtk";
+import * as Gtk from "@gtkx/ffi/gtk";
 import { fireEvent } from "./fire-event.js";
 import { tick } from "./timing.js";
 import { isEditable } from "./widget.js";
 const TOGGLEABLE_ROLES = new Set([
-    AccessibleRole.CHECKBOX,
-    AccessibleRole.RADIO,
-    AccessibleRole.TOGGLE_BUTTON,
-    AccessibleRole.SWITCH,
+    Gtk.AccessibleRole.CHECKBOX,
+    Gtk.AccessibleRole.RADIO,
+    Gtk.AccessibleRole.TOGGLE_BUTTON,
+    Gtk.AccessibleRole.SWITCH,
 ]);
 const isToggleable = (widget) => {
-    const accessible = getInterface(widget.id, Accessible);
+    const accessible = getInterface(widget.id, Gtk.Accessible);
     if (!accessible)
         return false;
     return TOGGLEABLE_ROLES.has(accessible.getAccessibleRole());
 };
 const click = async (element) => {
     if (isToggleable(element)) {
-        const role = getInterface(element.id, Accessible)?.getAccessibleRole();
-        if (role === AccessibleRole.CHECKBOX || role === AccessibleRole.RADIO) {
+        const role = getInterface(element.id, Gtk.Accessible)?.getAccessibleRole();
+        if (role === Gtk.AccessibleRole.CHECKBOX || role === Gtk.AccessibleRole.RADIO) {
             const checkButton = element;
             checkButton.setActive(!checkButton.getActive());
         }
-        else if (role === AccessibleRole.SWITCH) {
+        else if (role === Gtk.AccessibleRole.SWITCH) {
             const switchWidget = element;
             switchWidget.setActive(!switchWidget.getActive());
         }
@@ -50,7 +50,7 @@ const activate = async (element) => {
     await tick();
 };
 const tab = async (element, options) => {
-    const direction = options?.shift ? DirectionType.TAB_BACKWARD : DirectionType.TAB_FORWARD;
+    const direction = options?.shift ? Gtk.DirectionType.TAB_BACKWARD : Gtk.DirectionType.TAB_FORWARD;
     const root = element.getRoot();
     if (root) {
         getObject(root.id).childFocus(direction);
@@ -61,7 +61,7 @@ const type = async (element, text) => {
     if (!isEditable(element)) {
         throw new Error("Cannot type into element: element is not editable (TEXT_BOX, SEARCH_BOX, or SPIN_BUTTON)");
     }
-    const editable = getInterface(element.id, Editable);
+    const editable = getInterface(element.id, Gtk.Editable);
     if (!editable)
         return;
     const currentText = editable.getText();
@@ -72,12 +72,12 @@ const clear = async (element) => {
     if (!isEditable(element)) {
         throw new Error("Cannot clear element: element is not editable (TEXT_BOX, SEARCH_BOX, or SPIN_BUTTON)");
     }
-    getInterface(element.id, Editable)?.setText("");
+    getInterface(element.id, Gtk.Editable)?.setText("");
     await tick();
 };
-const SELECTABLE_ROLES = new Set([AccessibleRole.COMBO_BOX, AccessibleRole.LIST]);
+const SELECTABLE_ROLES = new Set([Gtk.AccessibleRole.COMBO_BOX, Gtk.AccessibleRole.LIST]);
 const isSelectable = (widget) => {
-    const accessible = getInterface(widget.id, Accessible);
+    const accessible = getInterface(widget.id, Gtk.Accessible);
     if (!accessible)
         return false;
     return SELECTABLE_ROLES.has(accessible.getAccessibleRole());
@@ -86,9 +86,9 @@ const selectOptions = async (element, values) => {
     if (!isSelectable(element)) {
         throw new Error("Cannot select options: element is not a selectable widget (COMBO_BOX or LIST)");
     }
-    const role = getInterface(element.id, Accessible)?.getAccessibleRole();
+    const role = getInterface(element.id, Gtk.Accessible)?.getAccessibleRole();
     const valueArray = Array.isArray(values) ? values : [values];
-    if (role === AccessibleRole.COMBO_BOX) {
+    if (role === Gtk.AccessibleRole.COMBO_BOX) {
         if (valueArray.length > 1) {
             throw new Error("Cannot select multiple options on a ComboBox/DropDown");
         }
@@ -104,7 +104,7 @@ const selectOptions = async (element, values) => {
             element.setActive(value);
         }
     }
-    else if (role === AccessibleRole.LIST) {
+    else if (role === Gtk.AccessibleRole.LIST) {
         const listBox = element;
         for (const value of valueArray) {
             if (typeof value !== "number") {
@@ -120,8 +120,8 @@ const selectOptions = async (element, values) => {
     await tick();
 };
 const deselectOptions = async (element, values) => {
-    const role = getInterface(element.id, Accessible)?.getAccessibleRole();
-    if (role !== AccessibleRole.LIST) {
+    const role = getInterface(element.id, Gtk.Accessible)?.getAccessibleRole();
+    if (role !== Gtk.AccessibleRole.LIST) {
         throw new Error("Cannot deselect options: only ListBox supports deselection");
     }
     const listBox = element;

package/package.json

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