@gtkx/react 0.13.2 → 0.14.0

package/dist/jsx.d.ts

@@ -2,7 +2,7 @@ import type * as Gtk from "@gtkx/ffi/gtk";
 import type { ReactElement, ReactNode } from "react";
 import type { RenderItemFn } from "./nodes/internal/list-item-renderer.js";
 import type { TreeRenderItemFn } from "./nodes/internal/tree-list-item-renderer.js";
-export type { EventControllerProps } from "./types.js";
+export type { DragSourceProps, DropTargetProps, EventControllerProps } from "./types.js";
 /**
  * Props for slot-based child positioning.
  *
@@ -14,6 +14,13 @@ export type SlotProps = {
     /** Content to place in the slot */
     children?: ReactNode;
 };
+/**
+ * Props for virtual child containers that don't expose slot id.
+ */
+export type VirtualSlotProps = {
+    /** Content to place in the slot */
+    children?: ReactNode;
+};
 /**
  * Props for items in a {@link ListView} or {@link GridView}.
  *
@@ -60,7 +67,7 @@ export type StringListItemProps = {
  *
  * @see {@link GridChild} for usage
  */
-export type GridChildProps = Omit<SlotProps, "id"> & {
+export type GridChildProps = VirtualSlotProps & {
     /** Column index (0-based) */
     column?: number;
     /** Row index (0-based) */
@@ -75,7 +82,7 @@ export type GridChildProps = Omit<SlotProps, "id"> & {
  *
  * @see {@link FixedChild} for usage
  */
-export type FixedChildProps = Omit<SlotProps, "id"> & {
+export type FixedChildProps = VirtualSlotProps & {
     /** X coordinate in pixels */
     x?: number;
     /** Y coordinate in pixels */
@@ -131,18 +138,18 @@ export type ColumnViewRootProps<C extends string = string> = {
 /**
  * Props for notebook (tabbed) pages.
  */
-export type NotebookPageProps = Omit<SlotProps, "id"> & {
+export type NotebookPageProps = VirtualSlotProps & {
     /** Tab label text (optional when using Notebook.PageTab) */
     label?: string;
 };
 /**
  * Props for custom notebook page tab widgets.
  */
-export type NotebookPageTabProps = SlotProps;
+export type NotebookPageTabProps = VirtualSlotProps;
 /**
  * Props for the root Stack component.
  */
-export type StackRootProps = Omit<SlotProps, "id"> & {
+export type StackRootProps = VirtualSlotProps & {
     /** ID of the currently visible page */
     page?: string;
 };
@@ -151,7 +158,7 @@ export type StackRootProps = Omit<SlotProps, "id"> & {
  *
  * @see {@link StackPage} for usage
  */
-export type StackPageProps = Omit<SlotProps, "id"> & {
+export type StackPageProps = VirtualSlotProps & {
     /** Unique identifier for this page (used with page prop) */
     id?: string;
     /** Display title shown in stack switchers */
@@ -205,7 +212,7 @@ export type MenuSubmenuProps = {
 /**
  * Props for children within an Overlay container.
  */
-export type OverlayChildProps = Omit<SlotProps, "id"> & {
+export type OverlayChildProps = VirtualSlotProps & {
     /** Whether to include this child in size measurement */
     measure?: boolean;
     /** Whether to clip this overlay child to the main child bounds */
@@ -307,33 +314,45 @@ export type ExpanderRowChildProps = {
     /** Children to add to this slot */
     children?: ReactNode;
 };
+type NavigationPageBaseProps = {
+    title?: string;
+    canPop?: boolean;
+    children?: ReactNode;
+};
 /**
- * Props for the NavigationPage virtual element.
+ * Props for the NavigationPage virtual element with type-safe targeting.
  *
- * Used to declaratively define pages in an AdwNavigationView.
+ * The `for` prop is required and determines valid `id` values:
+ * - `AdwNavigationView`: `id` can be any string (page tags for navigation history)
+ * - `AdwNavigationSplitView`: `id` is narrowed to `"content" | "sidebar"` (slot positions)
  *
  * @example
  * ```tsx
+ * // In NavigationView - id can be any string
  * <AdwNavigationView history={["home", "details"]}>
- *   <x.NavigationPage id="home" title="Home">
+ *   <x.NavigationPage for={AdwNavigationView} id="home" title="Home">
  *     <HomeContent />
  *   </x.NavigationPage>
- *   <x.NavigationPage id="details" title="Details">
- *     <DetailsContent />
- *   </x.NavigationPage>
  * </AdwNavigationView>
+ *
+ * // In NavigationSplitView - id is narrowed to "content" | "sidebar"
+ * <AdwNavigationSplitView>
+ *   <x.NavigationPage for={AdwNavigationSplitView} id="sidebar" title="Sidebar">
+ *     <SidebarContent />
+ *   </x.NavigationPage>
+ *   <x.NavigationPage for={AdwNavigationSplitView} id="content" title="Content">
+ *     <MainContent />
+ *   </x.NavigationPage>
+ * </AdwNavigationSplitView>
  * ```
  */
-export type NavigationPageProps = {
-    /** Unique identifier for this page (used in history array) */
+export type NavigationPageProps = (NavigationPageBaseProps & {
+    for: "AdwNavigationView";
     id: string;
-    /** Title displayed in the header bar */
-    title?: string;
-    /** Whether the page can be popped via back button/gestures */
-    canPop?: boolean;
-    /** Page content */
-    children?: ReactNode;
-};
+}) | (NavigationPageBaseProps & {
+    for: "AdwNavigationSplitView";
+    id: import("./generated/jsx.js").WidgetSlotNames["AdwNavigationSplitView"];
+});
 /**
  * Type mapping widget names to their available slot IDs.
  */
@@ -772,18 +791,30 @@ export declare const x: {
      */
     ExpanderRowAction: "ExpanderRowAction";
     /**
-     * A page within an AdwNavigationView.
+     * Type-safe page component for AdwNavigationView or AdwNavigationSplitView.
+     *
+     * The `for` prop is required and determines valid `id` values:
+     * - `AdwNavigationView`: any string (page tags for navigation history)
+     * - `AdwNavigationSplitView`: `"content"` or `"sidebar"` (slot positions)
      *
      * @example
      * ```tsx
+     * // In NavigationView - id can be any string
      * <AdwNavigationView history={["home"]}>
-     *   <x.NavigationPage id="home" title="Home">
+     *   <x.NavigationPage for={AdwNavigationView} id="home" title="Home">
      *     <GtkLabel label="Welcome!" />
      *   </x.NavigationPage>
-     *   <x.NavigationPage id="settings" title="Settings">
-     *     <GtkLabel label="Settings page" />
-     *   </x.NavigationPage>
      * </AdwNavigationView>
+     *
+     * // In NavigationSplitView - id is narrowed to "content" | "sidebar"
+     * <AdwNavigationSplitView>
+     *   <x.NavigationPage for={AdwNavigationSplitView} id="sidebar" title="Sidebar">
+     *     <GtkLabel label="Sidebar" />
+     *   </x.NavigationPage>
+     *   <x.NavigationPage for={AdwNavigationSplitView} id="content" title="Content">
+     *     <GtkLabel label="Content" />
+     *   </x.NavigationPage>
+     * </AdwNavigationSplitView>
      * ```
      */
     NavigationPage: "NavigationPage";
@@ -792,8 +823,8 @@ declare global {
     namespace React {
         namespace JSX {
             interface IntrinsicElements {
-                ActionRowPrefix: SlotProps;
-                ActionRowSuffix: SlotProps;
+                ActionRowPrefix: VirtualSlotProps;
+                ActionRowSuffix: VirtualSlotProps;
                 CalendarMark: CalendarMarkProps;
                 ColumnViewColumn: ColumnViewColumnProps<any>;
                 ExpanderRowAction: ExpanderRowChildProps;
@@ -806,16 +837,16 @@ declare global {
                 MenuSection: MenuSectionProps;
                 MenuSubmenu: MenuSubmenuProps;
                 NotebookPage: NotebookPageProps;
-                NotebookPageTab: NotebookPageTabProps;
+                NotebookPageTab: VirtualSlotProps;
                 OverlayChild: OverlayChildProps;
-                PackEnd: SlotProps;
-                PackStart: SlotProps;
+                PackEnd: VirtualSlotProps;
+                PackStart: VirtualSlotProps;
                 ScaleMark: ScaleMarkProps;
                 SimpleListItem: StringListItemProps;
                 StackPage: StackPageProps;
                 Toggle: ToggleProps;
-                ToolbarBottom: SlotProps;
-                ToolbarTop: SlotProps;
+                ToolbarBottom: VirtualSlotProps;
+                ToolbarTop: VirtualSlotProps;
                 TreeListItem: TreeListItemProps<any>;
                 NavigationPage: NavigationPageProps;
             }

package/dist/jsx.js

@@ -398,18 +398,30 @@ export const x = {
      */
     ExpanderRowAction: "ExpanderRowAction",
     /**
-     * A page within an AdwNavigationView.
+     * Type-safe page component for AdwNavigationView or AdwNavigationSplitView.
+     *
+     * The `for` prop is required and determines valid `id` values:
+     * - `AdwNavigationView`: any string (page tags for navigation history)
+     * - `AdwNavigationSplitView`: `"content"` or `"sidebar"` (slot positions)
      *
      * @example
      * ```tsx
+     * // In NavigationView - id can be any string
      * <AdwNavigationView history={["home"]}>
-     *   <x.NavigationPage id="home" title="Home">
+     *   <x.NavigationPage for={AdwNavigationView} id="home" title="Home">
      *     <GtkLabel label="Welcome!" />
      *   </x.NavigationPage>
-     *   <x.NavigationPage id="settings" title="Settings">
-     *     <GtkLabel label="Settings page" />
-     *   </x.NavigationPage>
      * </AdwNavigationView>
+     *
+     * // In NavigationSplitView - id is narrowed to "content" | "sidebar"
+     * <AdwNavigationSplitView>
+     *   <x.NavigationPage for={AdwNavigationSplitView} id="sidebar" title="Sidebar">
+     *     <GtkLabel label="Sidebar" />
+     *   </x.NavigationPage>
+     *   <x.NavigationPage for={AdwNavigationSplitView} id="content" title="Content">
+     *     <GtkLabel label="Content" />
+     *   </x.NavigationPage>
+     * </AdwNavigationSplitView>
      * ```
      */
     NavigationPage: "NavigationPage",

package/dist/nodes/application.js

@@ -23,20 +23,20 @@ class ApplicationNode extends Node {
             this.container.setMenubar(this.menu.getMenu());
             return;
         }
-        if (child instanceof WindowNode) {
+        if (child instanceof WindowNode && child.container instanceof Gtk.ApplicationWindow) {
             return;
         }
-        throw new Error(`Cannot append '${child.typeName}' to 'Application': expected Window or MenuItem`);
+        throw new Error(`Cannot append '${child.typeName}' to 'Application': expected ApplicationWindow or MenuItem`);
     }
     insertBefore(child, before) {
         if (child instanceof MenuNode) {
             this.menu.insertBefore(child, before);
             return;
         }
-        if (child instanceof WindowNode) {
+        if (child instanceof WindowNode && child.container instanceof Gtk.ApplicationWindow) {
             return;
         }
-        throw new Error(`Cannot insert '${child.typeName}' into 'Application': expected Window or MenuItem`);
+        throw new Error(`Cannot insert '${child.typeName}' into 'Application': expected ApplicationWindow or MenuItem`);
     }
     removeChild(child) {
         if (child instanceof MenuNode) {
@@ -48,10 +48,10 @@ class ApplicationNode extends Node {
             }, CommitPriority.LOW);
             return;
         }
-        if (child instanceof WindowNode) {
+        if (child instanceof WindowNode && child.container instanceof Gtk.ApplicationWindow) {
             return;
         }
-        throw new Error(`Cannot remove '${child.typeName}' from 'Application': expected Window or MenuItem`);
+        throw new Error(`Cannot remove '${child.typeName}' from 'Application': expected ApplicationWindow or MenuItem`);
     }
 }
 registerNodeClass(ApplicationNode);

package/dist/nodes/index.d.ts

@@ -26,6 +26,7 @@ import "./pack.js";
 import "./popover-menu.js";
 import "./scale-mark.js";
 import "./scale.js";
+import "./scrolled-window.js";
 import "./simple-list-item.js";
 import "./simple-list-view.js";
 import "./slot.js";

package/dist/nodes/index.js

@@ -26,6 +26,7 @@ import "./pack.js";
 import "./popover-menu.js";
 import "./scale-mark.js";
 import "./scale.js";
+import "./scrolled-window.js";
 import "./simple-list-item.js";
 import "./simple-list-view.js";
 import "./slot.js";

package/dist/nodes/internal/constants.js

@@ -7,4 +7,15 @@ export const EVENT_CONTROLLER_PROPS = new Set([
     "onKeyPressed",
     "onKeyReleased",
     "onScroll",
+    "onDragPrepare",
+    "onDragBegin",
+    "onDragEnd",
+    "onDragCancel",
+    "dragActions",
+    "onDrop",
+    "onDropEnter",
+    "onDropLeave",
+    "onDropMotion",
+    "dropActions",
+    "dropTypes",
 ]);

package/dist/nodes/internal/list-item-renderer.js

@@ -35,7 +35,7 @@ export class ListItemRenderer {
     initialize() {
         signalStore.set(this, this.factory, "setup", (_self, listItem) => {
             const ptr = getNativeId(listItem.handle);
-            const box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+            const box = new Gtk.Box(Gtk.Orientation.VERTICAL);
             if (this.estimatedItemHeight !== undefined) {
                 box.setSizeRequest(-1, this.estimatedItemHeight);
             }

package/dist/nodes/internal/tree-list-item-renderer.js

@@ -39,7 +39,7 @@ export class TreeListItemRenderer {
         signalStore.set(this, this.factory, "setup", (_self, listItem) => {
             const ptr = getNativeId(listItem.handle);
             const expander = new Gtk.TreeExpander();
-            const box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+            const box = new Gtk.Box(Gtk.Orientation.VERTICAL);
             if (this.estimatedItemHeight !== undefined) {
                 box.setSizeRequest(-1, this.estimatedItemHeight);
             }

package/dist/nodes/list-view.js

@@ -53,7 +53,12 @@ class ListViewNode extends WidgetNode {
         if (!oldProps || oldProps.estimatedItemHeight !== newProps.estimatedItemHeight) {
             this.itemRenderer.setEstimatedItemHeight(newProps.estimatedItemHeight);
         }
+        const previousModel = this.list.getSelectionModel();
         this.list.updateProps(oldProps ? filterProps(oldProps, PROP_NAMES) : null, filterProps(newProps, PROP_NAMES));
+        const currentModel = this.list.getSelectionModel();
+        if (previousModel !== currentModel) {
+            this.container.setModel(currentModel);
+        }
         super.updateProps(oldProps ? filterProps(oldProps, PROP_NAMES) : null, filterProps(newProps, PROP_NAMES));
     }
 }

package/dist/nodes/models/list.d.ts

@@ -7,14 +7,17 @@ export type ListProps = {
     selected?: string[];
     onSelectionChanged?: (ids: string[]) => void;
 };
+type SelectionModel = Gtk.NoSelection | Gtk.SingleSelection | Gtk.MultiSelection;
 export declare class List extends VirtualNode<ListProps> {
     private store;
     private selectionModel;
     private handleSelectionChange?;
+    private pendingSelection?;
+    private selectionScheduled;
     constructor(props?: ListProps);
     private initSelectionHandler;
     getStore(): ListStore;
-    getSelectionModel(): Gtk.SingleSelection | Gtk.MultiSelection;
+    getSelectionModel(): SelectionModel;
     appendChild(child: Node): void;
     insertBefore(child: Node, before: Node): void;
     removeChild(child: Node): void;
@@ -22,4 +25,6 @@ export declare class List extends VirtualNode<ListProps> {
     private createSelectionModel;
     private getSelection;
     private setSelection;
+    private applySelection;
 }
+export {};

package/dist/nodes/models/list.js

@@ -1,4 +1,5 @@
 import * as Gtk from "@gtkx/ffi/gtk";
+import { CommitPriority, scheduleAfterCommit } from "../../scheduler.js";
 import { ListStore } from "../internal/list-store.js";
 import { signalStore } from "../internal/signal-store.js";
 import { ListItemNode } from "../list-item.js";
@@ -7,6 +8,8 @@ export class List extends VirtualNode {
     store;
     selectionModel;
     handleSelectionChange;
+    pendingSelection;
+    selectionScheduled = false;
     constructor(props = {}) {
         super("", {}, undefined);
         this.store = new ListStore();
@@ -71,13 +74,15 @@ export class List extends VirtualNode {
     createSelectionModel(mode) {
         const model = this.store.getModel();
         const selectionMode = mode ?? Gtk.SelectionMode.SINGLE;
-        const selectionModel = selectionMode === Gtk.SelectionMode.MULTIPLE
-            ? new Gtk.MultiSelection(model)
-            : new Gtk.SingleSelection(model);
-        if (selectionModel instanceof Gtk.SingleSelection) {
-            selectionModel.setAutoselect(false);
-            selectionModel.setCanUnselect(true);
+        if (selectionMode === Gtk.SelectionMode.NONE) {
+            return new Gtk.NoSelection(model);
         }
+        if (selectionMode === Gtk.SelectionMode.MULTIPLE) {
+            return new Gtk.MultiSelection(model);
+        }
+        const selectionModel = new Gtk.SingleSelection(model);
+        selectionModel.setAutoselect(selectionMode === Gtk.SelectionMode.BROWSE);
+        selectionModel.setCanUnselect(selectionMode !== Gtk.SelectionMode.BROWSE);
         return selectionModel;
     }
     getSelection() {
@@ -95,6 +100,16 @@ export class List extends VirtualNode {
         return ids;
     }
     setSelection(ids) {
+        this.pendingSelection = ids;
+        if (!this.selectionScheduled) {
+            this.selectionScheduled = true;
+            scheduleAfterCommit(() => this.applySelection(), CommitPriority.LOW);
+        }
+    }
+    applySelection() {
+        this.selectionScheduled = false;
+        const ids = this.pendingSelection;
+        this.pendingSelection = undefined;
         const model = this.store.getModel();
         const nItems = model.getNItems();
         const selected = new Gtk.Bitset();

package/dist/nodes/models/tree-list.d.ts

@@ -8,17 +8,20 @@ export type TreeListProps = {
     selected?: string[];
     onSelectionChanged?: (ids: string[]) => void;
 };
+type SelectionModel = Gtk.NoSelection | Gtk.SingleSelection | Gtk.MultiSelection;
 export declare class TreeList extends VirtualNode<TreeListProps> {
     private store;
     private treeListModel;
     private selectionModel;
     private handleSelectionChange?;
+    private pendingSelection?;
+    private selectionScheduled;
     constructor(props?: TreeListProps);
     private initSelectionHandler;
     private createChildModel;
     getStore(): TreeStore;
     getTreeListModel(): Gtk.TreeListModel;
-    getSelectionModel(): Gtk.SingleSelection | Gtk.MultiSelection;
+    getSelectionModel(): SelectionModel;
     appendChild(child: Node): void;
     insertBefore(child: Node, before: Node): void;
     removeChild(child: Node): void;
@@ -26,4 +29,6 @@ export declare class TreeList extends VirtualNode<TreeListProps> {
     private createSelectionModel;
     private getSelection;
     private setSelection;
+    private applySelection;
 }
+export {};

package/dist/nodes/models/tree-list.js

@@ -1,5 +1,5 @@
 import * as Gtk from "@gtkx/ffi/gtk";
-import { scheduleAfterCommit } from "../../scheduler.js";
+import { CommitPriority, scheduleAfterCommit } from "../../scheduler.js";
 import { signalStore } from "../internal/signal-store.js";
 import { TreeStore } from "../internal/tree-store.js";
 import { TreeListItemNode } from "../tree-list-item.js";
@@ -9,6 +9,8 @@ export class TreeList extends VirtualNode {
     treeListModel;
     selectionModel;
     handleSelectionChange;
+    pendingSelection;
+    selectionScheduled = false;
     constructor(props = {}) {
         super("", {}, undefined);
         this.store = new TreeStore();
@@ -117,13 +119,15 @@ export class TreeList extends VirtualNode {
     }
     createSelectionModel(mode) {
         const selectionMode = mode ?? Gtk.SelectionMode.SINGLE;
-        const selectionModel = selectionMode === Gtk.SelectionMode.MULTIPLE
-            ? new Gtk.MultiSelection(this.treeListModel)
-            : new Gtk.SingleSelection(this.treeListModel);
-        if (selectionModel instanceof Gtk.SingleSelection) {
-            selectionModel.setAutoselect(false);
-            selectionModel.setCanUnselect(true);
+        if (selectionMode === Gtk.SelectionMode.NONE) {
+            return new Gtk.NoSelection(this.treeListModel);
         }
+        if (selectionMode === Gtk.SelectionMode.MULTIPLE) {
+            return new Gtk.MultiSelection(this.treeListModel);
+        }
+        const selectionModel = new Gtk.SingleSelection(this.treeListModel);
+        selectionModel.setAutoselect(selectionMode === Gtk.SelectionMode.BROWSE);
+        selectionModel.setCanUnselect(selectionMode !== Gtk.SelectionMode.BROWSE);
         return selectionModel;
     }
     getSelection() {
@@ -143,6 +147,16 @@ export class TreeList extends VirtualNode {
         return ids;
     }
     setSelection(ids) {
+        this.pendingSelection = ids;
+        if (!this.selectionScheduled) {
+            this.selectionScheduled = true;
+            scheduleAfterCommit(() => this.applySelection(), CommitPriority.LOW);
+        }
+    }
+    applySelection() {
+        this.selectionScheduled = false;
+        const ids = this.pendingSelection;
+        this.pendingSelection = undefined;
         const nItems = this.treeListModel.getNItems();
         const selected = new Gtk.Bitset();
         const mask = Gtk.Bitset.newRange(0, nItems);

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

@@ -1,16 +1,11 @@
 import * as Adw from "@gtkx/ffi/adw";
-import type * as Gtk from "@gtkx/ffi/gtk";
 import type { NavigationPageProps } from "../jsx.js";
 import { SlotNode } from "./slot.js";
 type Props = Partial<NavigationPageProps>;
 export declare class NavigationPageNode extends SlotNode<Props> {
     static priority: number;
-    private page?;
     static matches(type: string): boolean;
-    getPage(): Adw.NavigationPage | undefined;
     updateProps(oldProps: Props | null, newProps: Props): void;
-    private addPage;
-    private removePage;
-    protected onChildChange(oldChild: Gtk.Widget | null): void;
+    protected onChildChange(oldChild: Adw.NavigationPage | null): void;
 }
 export {};

package/dist/nodes/navigation-page.js

@@ -1,57 +1,46 @@
-import { isObjectEqual } from "@gtkx/ffi";
 import * as Adw from "@gtkx/ffi/adw";
 import { registerNodeClass } from "../registry.js";
 import { SlotNode } from "./slot.js";
 export class NavigationPageNode extends SlotNode {
     static priority = 1;
-    page;
     static matches(type) {
         return type === "NavigationPage";
     }
-    getPage() {
-        return this.page;
-    }
     updateProps(oldProps, newProps) {
         super.updateProps(oldProps, newProps);
-        if (!this.page) {
+        const child = this.child;
+        if (!(child instanceof Adw.NavigationPage)) {
             return;
         }
         if (newProps.id !== undefined && (!oldProps || oldProps.id !== newProps.id)) {
-            this.page.setTag(newProps.id);
+            child.setTag(newProps.id);
         }
         if (newProps.title !== undefined && (!oldProps || oldProps.title !== newProps.title)) {
-            this.page.setTitle(newProps.title);
+            child.setTitle(newProps.title);
         }
         if (newProps.canPop !== undefined && (!oldProps || oldProps.canPop !== newProps.canPop)) {
-            this.page.setCanPop(newProps.canPop);
+            child.setCanPop(newProps.canPop);
         }
     }
-    addPage() {
-        const child = this.getChild();
-        const parent = this.getParent();
+    onChildChange(oldChild) {
+        const navigationView = this.getParent();
         const title = this.props.title ?? "";
-        const page = this.props.id
-            ? Adw.NavigationPage.newWithTag(child, title, this.props.id)
-            : new Adw.NavigationPage(child, title);
-        parent.add(page);
-        this.page = page;
-        this.updateProps(null, this.props);
-    }
-    removePage(oldChild) {
-        const parent = this.getParent();
-        if (!oldChild || !this.page) {
-            return;
+        if (this.child) {
+            this.child = this.props.id
+                ? Adw.NavigationPage.newWithTag(this.child, title, this.props.id)
+                : new Adw.NavigationPage(this.child, title);
+            this.updateProps(null, this.props);
         }
-        const pageChild = this.page.getChild();
-        if (pageChild && isObjectEqual(pageChild, oldChild)) {
-            parent.remove(this.page);
-            this.page = undefined;
+        if (navigationView instanceof Adw.NavigationView) {
+            if (oldChild instanceof Adw.NavigationPage) {
+                navigationView.remove(oldChild);
+            }
+            if (this.child) {
+                navigationView.add(this.child);
+            }
         }
-    }
-    onChildChange(oldChild) {
-        this.removePage(oldChild);
-        if (this.child) {
-            this.addPage();
+        else {
+            super.onChildChange(oldChild);
         }
     }
 }

package/dist/nodes/scrolled-window.d.ts

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

package/dist/nodes/scrolled-window.js

@@ -0,0 +1,21 @@
+import * as Gtk from "@gtkx/ffi/gtk";
+import { registerNodeClass } from "../registry.js";
+import { filterProps, isContainerType } from "./internal/utils.js";
+import { WidgetNode } from "./widget.js";
+const PROPS = ["hscrollbarPolicy", "vscrollbarPolicy"];
+class ScrolledWindowNode extends WidgetNode {
+    static priority = 2;
+    static matches(_type, containerOrClass) {
+        return isContainerType(Gtk.ScrolledWindow, containerOrClass);
+    }
+    updateProps(oldProps, newProps) {
+        if (oldProps?.hscrollbarPolicy !== newProps.hscrollbarPolicy ||
+            oldProps?.vscrollbarPolicy !== newProps.vscrollbarPolicy) {
+            const hPolicy = newProps.hscrollbarPolicy ?? Gtk.PolicyType.AUTOMATIC;
+            const vPolicy = newProps.vscrollbarPolicy ?? Gtk.PolicyType.AUTOMATIC;
+            this.container.setPolicy(hPolicy, vPolicy);
+        }
+        super.updateProps(filterProps(oldProps ?? {}, PROPS), filterProps(newProps, PROPS));
+    }
+}
+registerNodeClass(ScrolledWindowNode);

package/dist/nodes/slot.js

@@ -17,11 +17,20 @@ export class SlotNode extends VirtualNode {
     }
     unmount() {
         if (this.parent && this.child) {
+            const parent = this.parent;
             const oldChild = this.child;
             this.child = undefined;
-            this.onChildChange(oldChild ?? null);
+            queueMicrotask(() => {
+                if (parent.getRoot() !== null) {
+                    this.parent = parent;
+                    this.onChildChange(oldChild);
+                }
+                this.parent = undefined;
+            });
+        }
+        else {
+            this.parent = undefined;
         }
-        this.parent = undefined;
         super.unmount();
     }
     getId() {