@gtkx/react 0.10.1 → 0.10.2

package/dist/generated/jsx.d.ts

@@ -3186,8 +3186,6 @@ export interface GtkGLAreaProps extends WidgetProps {
 export interface GtkGraphicsOffloadProps extends WidgetProps {
     /** Whether to draw a black background. */
     blackBackground?: boolean;
-    /** The child widget. */
-    child?: Gtk.Widget;
     /** Whether graphics offload is enabled. */
     enabled?: Gtk.GraphicsOffloadEnabled;
     children?: ReactNode;
@@ -12328,7 +12326,6 @@ export type WidgetSlotNames = {
     GtkExpander: "child" | "labelWidget";
     GtkFlowBoxChild: "child";
     GtkFrame: "child" | "labelWidget";
-    GtkGraphicsOffload: "child";
     GtkHeaderBar: "titleWidget";
     GtkLabel: "mnemonicWidget";
     GtkListBoxRow: "child";
@@ -12353,26 +12350,38 @@ export type WidgetSlotNames = {
     AdwBin: "child";
     AdwBottomSheet: "bottomBar" | "content" | "sheet";
     AdwBreakpointBin: "child";
+    AdwCarouselIndicatorDots: "carousel";
+    AdwCarouselIndicatorLines: "carousel";
     AdwClamp: "child";
     AdwClampScrollable: "child";
     AdwDialog: "child" | "defaultWidget" | "focusWidget";
     AdwFlap: "content" | "flap" | "separator";
     AdwHeaderBar: "titleWidget";
+    AdwInlineViewSwitcher: "stack";
     AdwLeaflet: "visibleChild";
     AdwMessageDialog: "extraChild";
+    AdwNavigationSplitView: "content" | "sidebar";
     AdwOverlaySplitView: "content" | "sidebar";
     AdwPreferencesDialog: "visiblePage";
     AdwPreferencesGroup: "headerSuffix";
+    AdwPreferencesPage: "banner";
     AdwPreferencesWindow: "visiblePage";
     AdwSplitButton: "child" | "popover";
     AdwStatusPage: "child";
-    AdwTabBar: "endActionWidget" | "startActionWidget";
-    AdwTabOverview: "child";
+    AdwTabBar: "endActionWidget" | "startActionWidget" | "view";
+    AdwTabButton: "view";
+    AdwTabOverview: "child" | "view";
     AdwToastOverlay: "child";
     AdwToolbarView: "content";
     AdwViewStack: "visibleChild";
+    AdwViewSwitcher: "stack";
+    AdwViewSwitcherBar: "stack";
+    AdwViewSwitcherTitle: "stack";
     GtkSourceCompletionCell: "widget";
+    GtkSourceGutter: "view";
+    GtkSourceMap: "view";
     VteTerminal: "contextMenu";
+    WebKitWebView: "relatedView";
 };
 /**
  * The base class for all widgets.

package/dist/nodes/index.d.ts

@@ -9,8 +9,6 @@ import "./grid-child.js";
 import "./list-item.js";
 import "./list-view.js";
 import "./menu.js";
-import "./navigation-page.js";
-import "./navigation-view.js";
 import "./notebook-page-tab.js";
 import "./notebook-page.js";
 import "./notebook.js";
@@ -26,7 +24,6 @@ import "./stack.js";
 import "./toast-overlay.js";
 import "./toast.js";
 import "./toolbar-child.js";
-import "./toolbar.js";
 import "./tree-list-item.js";
 import "./tree-list-view.js";
 import "./virtual.js";

package/dist/nodes/index.js

@@ -9,8 +9,6 @@ import "./grid-child.js";
 import "./list-item.js";
 import "./list-view.js";
 import "./menu.js";
-import "./navigation-page.js";
-import "./navigation-view.js";
 import "./notebook-page-tab.js";
 import "./notebook-page.js";
 import "./notebook.js";
@@ -26,7 +24,6 @@ import "./stack.js";
 import "./toast-overlay.js";
 import "./toast.js";
 import "./toolbar-child.js";
-import "./toolbar.js";
 import "./tree-list-item.js";
 import "./tree-list-view.js";
 import "./virtual.js";

package/dist/nodes/internal/predicates.d.ts

@@ -5,6 +5,9 @@ export declare const isAppendable: (obj: unknown) => obj is Gtk.Widget & {
 export declare const isAddable: (obj: unknown) => obj is Gtk.Widget & {
     add: (child: Gtk.Widget) => void;
 };
+export declare const hasSingleContent: (obj: unknown) => obj is Gtk.Widget & {
+    setContent: (content: Gtk.Widget | undefined) => void;
+};
 export declare const isSingleChild: (obj: unknown) => obj is Gtk.Widget & {
     setChild: (child: Gtk.Widget | null) => void;
 };

package/dist/nodes/internal/predicates.js

@@ -5,6 +5,9 @@ export const isAppendable = (obj) => {
 export const isAddable = (obj) => {
     return obj instanceof Gtk.Widget && "add" in obj && typeof obj.add === "function";
 };
+export const hasSingleContent = (obj) => {
+    return obj instanceof Gtk.Widget && "setContent" in obj && typeof obj.setContent === "function";
+};
 export const isSingleChild = (obj) => {
     return obj instanceof Gtk.Widget && "setChild" in obj && typeof obj.setChild === "function";
 };

package/dist/nodes/notebook-page-tab.js

@@ -30,12 +30,9 @@ export class NotebookPageTabNode extends SlotNode {
         }
         const notebook = this.getNotebook();
         const page = this.getPage();
-        // Only call setTabLabel if the page is actually in the notebook
-        // (pageNum returns -1 if not found)
         if (notebook.pageNum(page) === -1) {
             return;
         }
-        // setTabLabel accepts undefined to reset to default
         notebook.setTabLabel(page, this.child);
     }
 }

package/dist/nodes/notebook-page.js

@@ -54,7 +54,6 @@ export class NotebookPageNode extends SlotNode {
             this.tabNode = undefined;
             return;
         }
-        // For content widget, use SlotNode's removeChild logic
         super.removeChild();
     }
     unmount() {
@@ -63,7 +62,6 @@ export class NotebookPageNode extends SlotNode {
     }
     updateProps(oldProps, newProps) {
         if (!oldProps || oldProps.label !== newProps.label) {
-            // Only update if using text label (no custom tab node)
             if (this.child && this.parent && !this.tabNode?.child) {
                 const tabLabel = this.getNotebook().getTabLabel(this.child);
                 tabLabel.setLabel(newProps.label ?? "");
@@ -73,7 +71,6 @@ export class NotebookPageNode extends SlotNode {
     attachPage() {
         const child = this.getChild();
         const notebook = this.getNotebook();
-        // Use custom tab widget if provided, otherwise create a Label
         let tabLabel;
         if (this.tabNode?.child) {
             tabLabel = this.tabNode.child;

package/dist/nodes/toolbar-child.d.ts

@@ -1,9 +1 @@
-import type * as Gtk from "@gtkx/ffi/gtk";
-import { SlotNode } from "./slot.js";
-export declare class ToolbarChildNode extends SlotNode {
-    static priority: number;
-    static matches(type: string): boolean;
-    private getToolbar;
-    private getPosition;
-    protected onChildChange(oldChild: Gtk.Widget | undefined): void;
-}
+export {};

package/dist/nodes/toolbar-child.js

@@ -1,6 +1,6 @@
 import { registerNodeClass } from "../registry.js";
 import { SlotNode } from "./slot.js";
-export class ToolbarChildNode extends SlotNode {
+class ToolbarChildNode extends SlotNode {
     static priority = 1;
     static matches(type) {
         return type === "Toolbar.Top" || type === "Toolbar.Bottom";

package/dist/nodes/widget.js

@@ -3,7 +3,7 @@ import * as Gtk from "@gtkx/ffi/gtk";
 import { CONSTRUCTOR_PROPS, PROPS, SIGNALS } from "../generated/internal.js";
 import { Node } from "../node.js";
 import { registerNodeClass } from "../registry.js";
-import { isAddable, isAppendable, isEditable, isInsertable, isRemovable, isReorderable, isSingleChild, } from "./internal/predicates.js";
+import { hasSingleContent, isAddable, isAppendable, isEditable, isInsertable, isRemovable, isReorderable, isSingleChild, } from "./internal/predicates.js";
 import { filterProps, isContainerType } from "./internal/utils.js";
 import { SlotNode } from "./slot.js";
 const EVENT_CONTROLLER_PROPS = new Set([
@@ -58,6 +58,9 @@ export class WidgetNode extends Node {
                 }
                 this.container.add(child.container);
             }
+            else if (hasSingleContent(this.container)) {
+                this.container.setContent(child.container);
+            }
             else if (isSingleChild(this.container)) {
                 this.container.setChild(child.container);
             }
@@ -80,6 +83,9 @@ export class WidgetNode extends Node {
             if (isRemovable(this.container)) {
                 this.container.remove(child.container);
             }
+            else if (hasSingleContent(this.container)) {
+                this.container.setContent(undefined);
+            }
             else if (isSingleChild(this.container)) {
                 this.container.setChild(null);
             }

package/dist/nodes/window.js

@@ -37,11 +37,6 @@ class WindowNode extends WidgetNode {
             return;
         }
         this.menu.appendChild(child);
-        if (child instanceof WidgetNode &&
-            (this.container instanceof Adw.ApplicationWindow || this.container instanceof Adw.Window)) {
-            this.container.setContent(child.container);
-            return;
-        }
         super.appendChild(child);
     }
     removeChild(child) {
@@ -50,11 +45,6 @@ class WindowNode extends WidgetNode {
             return;
         }
         this.menu.removeChild(child);
-        if (child instanceof WidgetNode &&
-            (this.container instanceof Adw.ApplicationWindow || this.container instanceof Adw.Window)) {
-            this.container.setContent(undefined);
-            return;
-        }
         super.removeChild(child);
     }
     insertBefore(child, before) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/react",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Build GTK4 desktop applications with React and TypeScript",
   "keywords": [
     "gtk",
@@ -36,8 +36,8 @@
   ],
   "dependencies": {
     "react-reconciler": "^0.33.0",
-    "@gtkx/ffi": "0.10.1",
-    "@gtkx/gir": "0.10.1"
+    "@gtkx/ffi": "0.10.2",
+    "@gtkx/gir": "0.10.2"
   },
   "devDependencies": {
     "@types/react-reconciler": "^0.32.3",

package/dist/nodes/navigation-page.d.ts

@@ -1,21 +0,0 @@
-import * as Adw from "@gtkx/ffi/adw";
-import type { AdwNavigationPageProps } from "../jsx.js";
-import type { Node } from "../node.js";
-import { VirtualNode } from "./virtual.js";
-type Props = Partial<AdwNavigationPageProps>;
-export declare class NavigationPageNode extends VirtualNode<Props> {
-    static priority: number;
-    private parent?;
-    private child?;
-    private page?;
-    static matches(type: string): boolean;
-    setParent(parent?: Adw.NavigationView): void;
-    appendChild(child: Node): void;
-    removeChild(): void;
-    unmount(): void;
-    updateProps(oldProps: Props | null, newProps: Props): void;
-    private onChildChange;
-    private addPage;
-    private removePage;
-}
-export {};

package/dist/nodes/navigation-page.js

@@ -1,95 +0,0 @@
-import * as Adw from "@gtkx/ffi/adw";
-import { registerNodeClass } from "../registry.js";
-import { scheduleAfterCommit } from "../scheduler.js";
-import { VirtualNode } from "./virtual.js";
-import { WidgetNode } from "./widget.js";
-export class NavigationPageNode extends VirtualNode {
-    static priority = -1;
-    parent;
-    child;
-    page;
-    static matches(type) {
-        return type === "AdwNavigationPage";
-    }
-    setParent(parent) {
-        this.parent = parent;
-    }
-    appendChild(child) {
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot append '${child.typeName}' to 'NavigationPage': expected Widget`);
-        }
-        const oldChild = this.child;
-        this.child = child.container;
-        scheduleAfterCommit(() => {
-            if (this.parent) {
-                this.onChildChange(oldChild);
-            }
-        });
-    }
-    removeChild() {
-        const oldChild = this.child;
-        scheduleAfterCommit(() => {
-            if (oldChild === this.child) {
-                this.child = undefined;
-            }
-            if (this.parent) {
-                this.onChildChange(oldChild);
-            }
-        });
-    }
-    unmount() {
-        if (this.parent && this.child) {
-            const oldChild = this.child;
-            this.child = undefined;
-            this.onChildChange(oldChild);
-        }
-        this.parent = undefined;
-        super.unmount();
-    }
-    updateProps(oldProps, newProps) {
-        super.updateProps(oldProps, newProps);
-        if (!this.page) {
-            return;
-        }
-        if (newProps.title && (!oldProps || oldProps.title !== newProps.title)) {
-            this.page.setTitle(newProps.title);
-        }
-        if (!oldProps || oldProps.tag !== newProps.tag) {
-            this.page.setTag(newProps.tag);
-        }
-        if (!oldProps || oldProps.canPop !== newProps.canPop) {
-            this.page.setCanPop(newProps.canPop ?? true);
-        }
-    }
-    onChildChange(oldChild) {
-        if (oldChild) {
-            this.removePage();
-        }
-        if (this.child) {
-            this.addPage();
-        }
-    }
-    addPage() {
-        if (!this.child || !this.parent) {
-            return;
-        }
-        let page;
-        if (this.props.tag) {
-            page = Adw.NavigationPage.pageNewWithTag(this.child, this.props.title ?? "", this.props.tag);
-        }
-        else {
-            page = new Adw.NavigationPage(this.child, this.props.title ?? "");
-        }
-        this.page = page;
-        this.parent.add(page);
-        this.updateProps(null, this.props);
-    }
-    removePage() {
-        if (!this.page || !this.parent) {
-            return;
-        }
-        this.parent.remove(this.page);
-        this.page = undefined;
-    }
-}
-registerNodeClass(NavigationPageNode);

package/dist/nodes/navigation-view.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/nodes/navigation-view.js

@@ -1,29 +0,0 @@
-import * as Adw from "@gtkx/ffi/adw";
-import { registerNodeClass } from "../registry.js";
-import { isContainerType } from "./internal/utils.js";
-import { NavigationPageNode } from "./navigation-page.js";
-import { WidgetNode } from "./widget.js";
-class NavigationViewNode extends WidgetNode {
-    static priority = -1;
-    static matches(_type, containerOrClass) {
-        return isContainerType(Adw.NavigationView, containerOrClass);
-    }
-    appendChild(child) {
-        if (child instanceof NavigationPageNode) {
-            child.setParent(this.container);
-            return;
-        }
-        super.appendChild(child);
-    }
-    insertBefore(child, _before) {
-        this.appendChild(child);
-    }
-    removeChild(child) {
-        if (child instanceof NavigationPageNode) {
-            child.unmount();
-            return;
-        }
-        super.removeChild(child);
-    }
-}
-registerNodeClass(NavigationViewNode);

package/dist/nodes/toolbar.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/nodes/toolbar.js

@@ -1,42 +0,0 @@
-import * as Adw from "@gtkx/ffi/adw";
-import { registerNodeClass } from "../registry.js";
-import { isContainerType } from "./internal/utils.js";
-import { ToolbarChildNode } from "./toolbar-child.js";
-import { WidgetNode } from "./widget.js";
-class ToolbarNode extends WidgetNode {
-    static priority = 0;
-    static matches(_type, containerOrClass) {
-        return isContainerType(Adw.ToolbarView, containerOrClass);
-    }
-    appendChild(child) {
-        if (child instanceof ToolbarChildNode) {
-            child.setParent(this.container);
-            return;
-        }
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot append '${child.typeName}' to 'ToolbarView': expected Widget`);
-        }
-        this.container.setContent(child.container);
-    }
-    insertBefore(child) {
-        if (child instanceof ToolbarChildNode) {
-            child.setParent(this.container);
-            return;
-        }
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot insert '${child.typeName}' to 'ToolbarView': expected Widget`);
-        }
-        this.container.setContent(child.container);
-    }
-    removeChild(child) {
-        if (child instanceof ToolbarChildNode) {
-            child.unmount();
-            return;
-        }
-        if (!(child instanceof WidgetNode)) {
-            throw new Error(`Cannot remove '${child.typeName}' from 'ToolbarView': expected Widget`);
-        }
-        this.container.setContent(undefined);
-    }
-}
-registerNodeClass(ToolbarNode);