@gtkx/react 0.18.4 → 0.18.6

package/src/nodes/column-view.ts

@@ -3,22 +3,31 @@ import type { GtkColumnViewProps } from "../jsx.js";
 import type { Node } from "../node.js";
 import type { Container } from "../types.js";
 import { ColumnViewColumnNode } from "./column-view-column.js";
+import { ContainerSlotNode } from "./container-slot.js";
+import { EventControllerNode } from "./event-controller.js";
 import { filterProps, hasChanged } from "./internal/props.js";
 import { ListItemNode } from "./list-item.js";
 import { ListModel, type ListModelProps } from "./models/list.js";
+import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
 
 const OWN_PROPS = ["sortColumn", "sortOrder", "onSortChanged", "estimatedRowHeight"] as const;
 
 type ColumnViewProps = Pick<GtkColumnViewProps, (typeof OWN_PROPS)[number]> & ListModelProps;
-type ColumnViewChild = ListItemNode | ColumnViewColumnNode;
+type ColumnViewChild = ListItemNode | ColumnViewColumnNode | EventControllerNode | SlotNode | ContainerSlotNode;
 
 export class ColumnViewNode extends WidgetNode<Gtk.ColumnView, ColumnViewProps, ColumnViewChild> {
     private handleSortChange: (() => void) | null = null;
     private list: ListModel;
 
     public override isValidChild(child: Node): boolean {
-        return child instanceof ListItemNode || child instanceof ColumnViewColumnNode;
+        return (
+            child instanceof ListItemNode ||
+            child instanceof ColumnViewColumnNode ||
+            child instanceof EventControllerNode ||
+            child instanceof SlotNode ||
+            child instanceof ContainerSlotNode
+        );
     }
     private columnNodes = new Set<ColumnViewColumnNode>();
     private estimatedRowHeight: number | null = null;
@@ -43,6 +52,8 @@ export class ColumnViewNode extends WidgetNode<Gtk.ColumnView, ColumnViewProps,
             return;
         }
 
+        if (!(child instanceof ColumnViewColumnNode)) return;
+
         const existingColumn = this.findColumnInView(child.getColumn());
 
         if (existingColumn) {
@@ -65,6 +76,8 @@ export class ColumnViewNode extends WidgetNode<Gtk.ColumnView, ColumnViewProps,
             return;
         }
 
+        if (!(child instanceof ColumnViewColumnNode)) return;
+
         const existingColumn = this.findColumnInView(child.getColumn());
 
         if (existingColumn) {
@@ -91,14 +104,17 @@ export class ColumnViewNode extends WidgetNode<Gtk.ColumnView, ColumnViewProps,
             return;
         }
 
-        const existingColumn = this.findColumnInView(child.getColumn());
+        if (child instanceof ColumnViewColumnNode) {
+            const existingColumn = this.findColumnInView(child.getColumn());
 
-        if (existingColumn) {
-            this.container.removeColumn(existingColumn);
+            if (existingColumn) {
+                this.container.removeColumn(existingColumn);
+            }
+
+            child.setStore(null);
+            this.columnNodes.delete(child);
         }
 
-        child.setStore(null);
-        this.columnNodes.delete(child);
         super.removeChild(child);
     }
 

package/src/nodes/drawing-area.ts

@@ -1,19 +1,28 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
 import type { GtkDrawingAreaProps } from "../jsx.js";
 import type { Node } from "../node.js";
+import { ContainerSlotNode } from "./container-slot.js";
 import { EventControllerNode } from "./event-controller.js";
 import { filterProps, hasChanged } from "./internal/props.js";
+import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
 
 const OWN_PROPS = ["onDraw"] as const;
 
-type DrawFunc = (self: Gtk.DrawingArea, cr: import("@gtkx/ffi/cairo").Context, width: number, height: number) => void;
+type DrawFunc = (cr: import("@gtkx/ffi/cairo").Context, width: number, height: number, self: Gtk.DrawingArea) => void;
 type DrawingAreaProps = Pick<GtkDrawingAreaProps, (typeof OWN_PROPS)[number]>;
-type PendingDrawFunc = { container: Gtk.DrawingArea; fn: DrawFunc };
 
-const pendingDrawFuncs: PendingDrawFunc[] = [];
+type PendingDrawFuncEntry = { container: Gtk.DrawingArea; fn: DrawFunc };
 
-function ensurePendingBatch(): PendingDrawFunc[] {
+const pendingDrawFuncs: PendingDrawFuncEntry[] = [];
+
+function wrapDrawFunc(
+    fn: DrawFunc,
+): (self: Gtk.DrawingArea, cr: import("@gtkx/ffi/cairo").Context, width: number, height: number) => void {
+    return (self, cr, width, height) => fn(cr, width, height, self);
+}
+
+function ensurePendingBatch(): PendingDrawFuncEntry[] {
     if (pendingDrawFuncs.length === 0) {
         queueMicrotask(flushPendingDrawFuncs);
     }
@@ -25,13 +34,15 @@ function flushPendingDrawFuncs(): void {
     const batch = pendingDrawFuncs.splice(0);
 
     for (const { container, fn } of batch) {
-        container.setDrawFunc(fn);
+        container.setDrawFunc(wrapDrawFunc(fn));
     }
 }
 
-export class DrawingAreaNode extends WidgetNode<Gtk.DrawingArea, DrawingAreaProps, EventControllerNode> {
+type DrawingAreaChild = EventControllerNode | SlotNode | ContainerSlotNode;
+
+export class DrawingAreaNode extends WidgetNode<Gtk.DrawingArea, DrawingAreaProps, DrawingAreaChild> {
     public override isValidChild(child: Node): boolean {
-        return child instanceof EventControllerNode;
+        return child instanceof EventControllerNode || child instanceof SlotNode || child instanceof ContainerSlotNode;
     }
 
     public override commitUpdate(oldProps: DrawingAreaProps | null, newProps: DrawingAreaProps): void {
@@ -42,7 +53,7 @@ export class DrawingAreaNode extends WidgetNode<Gtk.DrawingArea, DrawingAreaProp
     private applyOwnProps(oldProps: DrawingAreaProps | null, newProps: DrawingAreaProps): void {
         if (hasChanged(oldProps, newProps, "onDraw")) {
             if (this.container.getAllocatedWidth() > 0) {
-                this.container.setDrawFunc(newProps.onDraw);
+                this.container.setDrawFunc(newProps.onDraw ? wrapDrawFunc(newProps.onDraw) : null);
             } else if (newProps.onDraw) {
                 ensurePendingBatch().push({ container: this.container, fn: newProps.onDraw });
             }

package/src/nodes/drop-down.ts

@@ -2,21 +2,31 @@ import type { AdwComboRowProps, GtkDropDownProps } from "../jsx.js";
 import type { Node } from "../node.js";
 import type { DropDownWidget } from "../registry.js";
 import type { Container } from "../types.js";
+import { ContainerSlotNode } from "./container-slot.js";
+import { EventControllerNode } from "./event-controller.js";
 import { filterProps, hasChanged } from "./internal/props.js";
 import { SimpleListStore } from "./internal/simple-list-store.js";
 import { ListItemNode } from "./list-item.js";
+import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
 
 const OWN_PROPS = ["selectedId", "onSelectionChanged"] as const;
 
 type DropDownProps = Pick<GtkDropDownProps | AdwComboRowProps, (typeof OWN_PROPS)[number]>;
 
-export class DropDownNode extends WidgetNode<DropDownWidget, DropDownProps, ListItemNode> {
+type DropDownChild = ListItemNode | EventControllerNode | SlotNode | ContainerSlotNode;
+
+export class DropDownNode extends WidgetNode<DropDownWidget, DropDownProps, DropDownChild> {
     private store = new SimpleListStore();
     private initialSelectedId: string | null | undefined;
 
     public override isValidChild(child: Node): boolean {
-        return child instanceof ListItemNode;
+        return (
+            child instanceof ListItemNode ||
+            child instanceof EventControllerNode ||
+            child instanceof SlotNode ||
+            child instanceof ContainerSlotNode
+        );
     }
 
     constructor(typeName: string, props: DropDownProps, container: DropDownWidget, rootContainer: Container) {
@@ -42,20 +52,26 @@ export class DropDownNode extends WidgetNode<DropDownWidget, DropDownProps, List
         }
     }
 
-    public override appendChild(child: ListItemNode): void {
+    public override appendChild(child: DropDownChild): void {
         super.appendChild(child);
-        child.setStore(this.store);
-        this.store.addItem(child.props.id, child.props.value as string);
+        if (child instanceof ListItemNode) {
+            child.setStore(this.store);
+            this.store.addItem(child.props.id, child.props.value as string);
+        }
     }
 
-    public override insertBefore(child: ListItemNode, before: ListItemNode): void {
+    public override insertBefore(child: DropDownChild, before: DropDownChild): void {
         super.insertBefore(child, before);
-        child.setStore(this.store);
-        this.store.insertItemBefore(child.props.id, before.props.id, child.props.value as string);
+        if (child instanceof ListItemNode && before instanceof ListItemNode) {
+            child.setStore(this.store);
+            this.store.insertItemBefore(child.props.id, before.props.id, child.props.value as string);
+        }
     }
 
-    public override removeChild(child: ListItemNode): void {
-        this.store.removeItem(child.props.id);
+    public override removeChild(child: DropDownChild): void {
+        if (child instanceof ListItemNode) {
+            this.store.removeItem(child.props.id);
+        }
         super.removeChild(child);
     }
 

package/src/nodes/grid-view.ts

@@ -2,17 +2,22 @@ import type * as Gtk from "@gtkx/ffi/gtk";
 import type { GtkGridViewProps } from "../jsx.js";
 import type { Node } from "../node.js";
 import type { Container } from "../types.js";
+import { ContainerSlotNode } from "./container-slot.js";
+import { EventControllerNode } from "./event-controller.js";
 import { GridItemRenderer } from "./internal/grid-item-renderer.js";
 import { filterProps, hasChanged } from "./internal/props.js";
 import { ListItemNode } from "./list-item.js";
 import { GridModel, type GridModelProps } from "./models/grid.js";
+import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
 
 const OWN_PROPS = ["renderItem", "estimatedItemHeight"] as const;
 
 type GridViewProps = Pick<GtkGridViewProps, (typeof OWN_PROPS)[number]> & GridModelProps;
 
-export class GridViewNode extends WidgetNode<Gtk.GridView, GridViewProps, ListItemNode> {
+type GridViewChild = ListItemNode | EventControllerNode | SlotNode | ContainerSlotNode;
+
+export class GridViewNode extends WidgetNode<Gtk.GridView, GridViewProps, GridViewChild> {
     private itemRenderer: GridItemRenderer;
     private grid: GridModel;
 
@@ -33,6 +38,8 @@ export class GridViewNode extends WidgetNode<Gtk.GridView, GridViewProps, ListIt
     }
 
     public override isValidChild(child: Node): boolean {
+        if (child instanceof EventControllerNode || child instanceof SlotNode || child instanceof ContainerSlotNode)
+            return true;
         if (!(child instanceof ListItemNode)) return false;
         if (child.getChildNodes().length > 0) {
             throw new Error("GtkGridView does not support nested ListItems. Use GtkListView for tree lists.");
@@ -40,18 +47,24 @@ export class GridViewNode extends WidgetNode<Gtk.GridView, GridViewProps, ListIt
         return true;
     }
 
-    public override appendChild(child: ListItemNode): void {
+    public override appendChild(child: GridViewChild): void {
         super.appendChild(child);
-        this.grid.appendChild(child);
+        if (child instanceof ListItemNode) {
+            this.grid.appendChild(child);
+        }
     }
 
-    public override insertBefore(child: ListItemNode, before: ListItemNode): void {
+    public override insertBefore(child: GridViewChild, before: GridViewChild): void {
         super.insertBefore(child, before);
-        this.grid.insertBefore(child, before);
+        if (child instanceof ListItemNode && before instanceof ListItemNode) {
+            this.grid.insertBefore(child, before);
+        }
     }
 
-    public override removeChild(child: ListItemNode): void {
-        this.grid.removeChild(child);
+    public override removeChild(child: GridViewChild): void {
+        if (child instanceof ListItemNode) {
+            this.grid.removeChild(child);
+        }
         super.removeChild(child);
     }
 

package/src/nodes/internal/grid-item-renderer.ts

@@ -5,7 +5,7 @@ import { reconciler } from "../../reconciler.js";
 import { BaseItemRenderer } from "./base-item-renderer.js";
 import type { ListStore } from "./list-store.js";
 
-export type GridRenderItemFn<T> = (item: T | null) => ReactNode;
+type GridRenderItemFn<T> = (item: T | null) => ReactNode;
 
 export class GridItemRenderer extends BaseItemRenderer<ListStore> {
     private renderFn: GridRenderItemFn<unknown> | null = () => null;

package/src/nodes/internal/list-item-renderer.ts

@@ -5,7 +5,7 @@ import { reconciler } from "../../reconciler.js";
 import { BaseItemRenderer } from "./base-item-renderer.js";
 import type { TreeStore } from "./tree-store.js";
 
-export type RenderItemFn<T> = (item: T | null, row: Gtk.TreeListRow | null) => ReactNode;
+type RenderItemFn<T> = (item: T | null, row: Gtk.TreeListRow | null) => ReactNode;
 
 type PendingBind = {
     treeListRow: Gtk.TreeListRow;

package/src/nodes/internal/list-store.ts

@@ -1,6 +1,6 @@
 import * as Gtk from "@gtkx/ffi/gtk";
 
-export type ItemUpdatedCallback = (id: string) => void;
+type ItemUpdatedCallback = (id: string) => void;
 
 export class ListStore {
     private model = new Gtk.StringList();

package/src/nodes/internal/selection-model-controller.ts

@@ -5,7 +5,7 @@ import type { SignalStore } from "./signal-store.js";
 
 type SelectionModel = Gtk.NoSelection | Gtk.SingleSelection | Gtk.MultiSelection;
 
-export type SelectionModelConfig = Pick<GtkListViewProps, "selectionMode" | "selected" | "onSelectionChanged"> & {
+type SelectionModelConfig = Pick<GtkListViewProps, "selectionMode" | "selected" | "onSelectionChanged"> & {
     owner: object;
     signalStore: SignalStore;
 };

package/src/nodes/internal/signal-store.ts

@@ -25,7 +25,7 @@ type HandlerEntry = { obj: GObject.Object; handlerId: number };
 
 type SignalKey = `${string}:${string}`;
 
-export interface SignalOptions {
+interface SignalOptions {
     blockable?: boolean;
 }
 

package/src/nodes/internal/tree-store.ts

@@ -1,6 +1,6 @@
 import * as Gtk from "@gtkx/ffi/gtk";
 
-export type TreeItemUpdatedCallback = (id: string) => void;
+type TreeItemUpdatedCallback = (id: string) => void;
 
 export type TreeItemData<T = unknown> = {
     value: T;

package/src/nodes/list-view.ts

@@ -2,10 +2,13 @@ import type * as Gtk from "@gtkx/ffi/gtk";
 import type { GtkListViewProps } from "../jsx.js";
 import type { Node } from "../node.js";
 import type { Container } from "../types.js";
+import { ContainerSlotNode } from "./container-slot.js";
+import { EventControllerNode } from "./event-controller.js";
 import { ListItemRenderer } from "./internal/list-item-renderer.js";
 import { filterProps, hasChanged } from "./internal/props.js";
 import { ListItemNode } from "./list-item.js";
 import { ListModel, type ListModelProps } from "./models/list.js";
+import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
 
 const RENDERER_PROPS = ["renderItem", "estimatedItemHeight"] as const;
@@ -13,12 +16,19 @@ const OWN_PROPS = [...RENDERER_PROPS, "autoexpand", "selectionMode", "selected",
 
 type ListViewProps = Pick<GtkListViewProps, (typeof RENDERER_PROPS)[number]> & ListModelProps;
 
-export class ListViewNode extends WidgetNode<Gtk.ListView, ListViewProps, ListItemNode> {
+type ListViewChild = ListItemNode | EventControllerNode | SlotNode | ContainerSlotNode;
+
+export class ListViewNode extends WidgetNode<Gtk.ListView, ListViewProps, ListViewChild> {
     private itemRenderer: ListItemRenderer;
     private list: ListModel;
 
     public override isValidChild(child: Node): boolean {
-        return child instanceof ListItemNode;
+        return (
+            child instanceof ListItemNode ||
+            child instanceof EventControllerNode ||
+            child instanceof SlotNode ||
+            child instanceof ContainerSlotNode
+        );
     }
 
     constructor(typeName: string, props: ListViewProps, container: Gtk.ListView, rootContainer: Container) {
@@ -38,18 +48,24 @@ export class ListViewNode extends WidgetNode<Gtk.ListView, ListViewProps, ListIt
         this.container.setFactory(this.itemRenderer.getFactory());
     }
 
-    public override appendChild(child: ListItemNode): void {
+    public override appendChild(child: ListViewChild): void {
         super.appendChild(child);
-        this.list.appendChild(child);
+        if (child instanceof ListItemNode) {
+            this.list.appendChild(child);
+        }
     }
 
-    public override insertBefore(child: ListItemNode, before: ListItemNode): void {
+    public override insertBefore(child: ListViewChild, before: ListViewChild): void {
         super.insertBefore(child, before);
-        this.list.insertBefore(child, before);
+        if (child instanceof ListItemNode && before instanceof ListItemNode) {
+            this.list.insertBefore(child, before);
+        }
     }
 
-    public override removeChild(child: ListItemNode): void {
-        this.list.removeChild(child);
+    public override removeChild(child: ListViewChild): void {
+        if (child instanceof ListItemNode) {
+            this.list.removeChild(child);
+        }
         super.removeChild(child);
     }
 

package/src/nodes/navigation-view.ts

@@ -1,6 +1,8 @@
 import * as Adw from "@gtkx/ffi/adw";
 import type { AdwNavigationViewProps } from "../jsx.js";
 import type { Node } from "../node.js";
+import { ContainerSlotNode } from "./container-slot.js";
+import { EventControllerNode } from "./event-controller.js";
 import { filterProps, hasChanged, primitiveArrayEqual } from "./internal/props.js";
 import { NavigationPageNode } from "./navigation-page.js";
 import { SlotNode } from "./slot.js";
@@ -9,11 +11,17 @@ import { WidgetNode } from "./widget.js";
 const OWN_PROPS = ["history", "onHistoryChanged"] as const;
 
 type NavigationViewProps = Pick<AdwNavigationViewProps, (typeof OWN_PROPS)[number]>;
-type NavigationViewChild = NavigationPageNode | SlotNode | WidgetNode;
+type NavigationViewChild = NavigationPageNode | SlotNode | ContainerSlotNode | EventControllerNode | WidgetNode;
 
 export class NavigationViewNode extends WidgetNode<Adw.NavigationView, NavigationViewProps, NavigationViewChild> {
     public override isValidChild(child: Node): boolean {
-        return child instanceof NavigationPageNode || child instanceof SlotNode || child instanceof WidgetNode;
+        return (
+            child instanceof NavigationPageNode ||
+            child instanceof SlotNode ||
+            child instanceof EventControllerNode ||
+            child instanceof ContainerSlotNode ||
+            child instanceof WidgetNode
+        );
     }
 
     public override commitUpdate(oldProps: NavigationViewProps | null, newProps: NavigationViewProps): void {

package/src/nodes/notebook.ts

@@ -1,28 +1,42 @@
 import type * as Gtk from "@gtkx/ffi/gtk";
 import type { Node } from "../node.js";
 import type { Props } from "../types.js";
+import { ContainerSlotNode } from "./container-slot.js";
+import { EventControllerNode } from "./event-controller.js";
 import { NotebookPageNode } from "./notebook-page.js";
+import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
 
-export class NotebookNode extends WidgetNode<Gtk.Notebook, Props, NotebookPageNode> {
+type NotebookChild = NotebookPageNode | EventControllerNode | SlotNode | ContainerSlotNode;
+
+export class NotebookNode extends WidgetNode<Gtk.Notebook, Props, NotebookChild> {
     public override isValidChild(child: Node): boolean {
-        return child instanceof NotebookPageNode;
+        return (
+            child instanceof NotebookPageNode ||
+            child instanceof EventControllerNode ||
+            child instanceof SlotNode ||
+            child instanceof ContainerSlotNode
+        );
     }
 
-    public override insertBefore(child: NotebookPageNode, before: NotebookPageNode): void {
-        const isMove = this.children.includes(child);
-        const beforePosition = this.container.pageNum(before.getChildWidget());
-        child.setPosition(beforePosition);
+    public override insertBefore(child: NotebookChild, before: NotebookChild): void {
+        if (child instanceof NotebookPageNode && before instanceof NotebookPageNode) {
+            const isMove = this.children.includes(child);
+            const beforePosition = this.container.pageNum(before.getChildWidget());
+            child.setPosition(beforePosition);
 
-        if (isMove) {
-            this.container.reorderChild(child.getChildWidget(), beforePosition);
+            if (isMove) {
+                this.container.reorderChild(child.getChildWidget(), beforePosition);
+            }
         }
 
         super.insertBefore(child, before);
     }
 
-    public override removeChild(child: NotebookPageNode): void {
-        child.setPosition(null);
+    public override removeChild(child: NotebookChild): void {
+        if (child instanceof NotebookPageNode) {
+            child.setPosition(null);
+        }
         super.removeChild(child);
     }
 }

package/src/nodes/popover-menu.ts

@@ -3,18 +3,26 @@ import * as Gtk from "@gtkx/ffi/gtk";
 import type { Node } from "../node.js";
 import type { PopoverMenuWidget } from "../registry.js";
 import type { Container, Props } from "../types.js";
+import { ContainerSlotNode } from "./container-slot.js";
+import { EventControllerNode } from "./event-controller.js";
 import { MenuNode } from "./menu.js";
 import { MenuModel } from "./models/menu.js";
 import { SlotNode } from "./slot.js";
 import { WidgetNode } from "./widget.js";
 
-type PopoverMenuChild = MenuNode | SlotNode | WidgetNode;
+type PopoverMenuChild = MenuNode | SlotNode | ContainerSlotNode | EventControllerNode | WidgetNode;
 
 export class PopoverMenuNode extends WidgetNode<PopoverMenuWidget, Props, PopoverMenuChild> {
     private menu: MenuModel;
 
     public override isValidChild(child: Node): boolean {
-        return child instanceof MenuNode || child instanceof SlotNode || child instanceof WidgetNode;
+        return (
+            child instanceof MenuNode ||
+            child instanceof SlotNode ||
+            child instanceof EventControllerNode ||
+            child instanceof ContainerSlotNode ||
+            child instanceof WidgetNode
+        );
     }
 
     constructor(typeName: string, props: Props, container: PopoverMenuWidget, rootContainer: Container) {

package/src/nodes/text-view.ts

@@ -1,6 +1,7 @@
 import * as Gtk from "@gtkx/ffi/gtk";
 import type { GtkTextViewProps } from "../jsx.js";
 import type { Node } from "../node.js";
+import { ContainerSlotNode } from "./container-slot.js";
 import { EventControllerNode } from "./event-controller.js";
 import { filterProps } from "./internal/props.js";
 import { TextBufferController } from "./internal/text-buffer-controller.js";
@@ -22,7 +23,7 @@ const OWN_PROPS = [
 ] as const;
 
 type TextViewProps = Pick<GtkTextViewProps, (typeof OWN_PROPS)[number]>;
-type TextViewChild = TextContentChild | SlotNode | EventControllerNode | WidgetNode;
+type TextViewChild = TextContentChild | SlotNode | ContainerSlotNode | EventControllerNode | WidgetNode;
 
 export class TextViewNode extends WidgetNode<Gtk.TextView, TextViewProps, TextViewChild> implements TextContentParent {
     protected bufferController: TextBufferController | null = null;
@@ -34,6 +35,7 @@ export class TextViewNode extends WidgetNode<Gtk.TextView, TextViewProps, TextVi
             child instanceof TextAnchorNode ||
             child instanceof TextPaintableNode ||
             child instanceof SlotNode ||
+            child instanceof ContainerSlotNode ||
             child instanceof EventControllerNode ||
             child instanceof WidgetNode
         );

package/src/nodes/window.ts

@@ -4,7 +4,9 @@ import type { GtkAboutDialogProps, GtkWindowProps } from "../jsx.js";
 import type { Node } from "../node.js";
 import type { Container, Props } from "../types.js";
 import { AnimationNode } from "./animation.js";
+import { ContainerSlotNode } from "./container-slot.js";
 import type { DialogNode } from "./dialog.js";
+import { EventControllerNode } from "./event-controller.js";
 import { filterProps, hasChanged } from "./internal/props.js";
 import { MenuNode } from "./menu.js";
 import { MenuModel } from "./models/menu.js";
@@ -18,9 +20,18 @@ const isOrExtendsClass = (target: object, cls: abstract new (...args: any[]) =>
 
 const OWN_PROPS = ["onClose"] as const;
 
-export type WindowProps = Pick<GtkWindowProps, "onClose"> & Pick<GtkAboutDialogProps, "creditSections">;
+type WindowProps = Pick<GtkWindowProps, "onClose"> & Pick<GtkAboutDialogProps, "creditSections">;
 
-type WindowChild = WindowNode | DialogNode | MenuNode | SlotNode | AnimationNode | NavigationPageNode | WidgetNode;
+type WindowChild =
+    | WindowNode
+    | DialogNode
+    | MenuNode
+    | SlotNode
+    | ContainerSlotNode
+    | AnimationNode
+    | NavigationPageNode
+    | EventControllerNode
+    | WidgetNode;
 
 export class WindowNode extends WidgetNode<Gtk.Window, WindowProps, WindowChild> {
     private menu: MenuModel;
@@ -73,7 +84,9 @@ export class WindowNode extends WidgetNode<Gtk.Window, WindowProps, WindowChild>
             child instanceof MenuNode ||
             child instanceof SlotNode ||
             child instanceof AnimationNode ||
-            child instanceof NavigationPageNode
+            child instanceof NavigationPageNode ||
+            child instanceof EventControllerNode ||
+            child instanceof ContainerSlotNode
         );
     }