@gtkx/components 0.21.0 → 1.0.0-rc.1

package/dist/hooks/use-list-model.js

@@ -1,49 +1,74 @@
 import { useLayoutEffect, useMemo, useRef } from "react";
-import { createControlledResolver, createModelResolver, createSectionHeaderResolver, } from "../utils/item-resolver.js";
+import { createFlatModel, createSectionModel, createTreeModel, resizeFlatModel, retagRows, } from "../utils/item-models.js";
+import { createItemResolver, createSectionHeaderResolver, createTreeResolver, } from "../utils/item-resolver.js";
 import { detectStructure, structuralSignature } from "../utils/list-item-flatten.js";
-import { createFlatModel, createSectionModel, createTreeModel, resizeFlatModel, retagRows, } from "../utils/position-only-model.js";
-const controlledSignature = (structure, autoexpand, items) => (structure === "flat" ? "" : `${structure}|${autoexpand ? 1 : 0}|${structuralSignature(items)}`);
-const buildControlledState = (items, autoexpand, structure, signature) => {
+const sectionRows = (sections) => {
+    if (sections === undefined)
+        return [];
+    const rows = [];
+    for (const section of sections)
+        rows.push(...section.data);
+    return rows;
+};
+const sectionSignature = (sections) => {
+    if (sections === undefined)
+        return "";
+    const parts = [];
+    for (const section of sections) {
+        parts.push(`${section.id}{${structuralSignature(section.data)}}`);
+    }
+    return parts.join(",");
+};
+const signatureOf = (structure, items, sections) => {
+    if (structure === "sections")
+        return `sections|${sectionSignature(sections)}`;
+    return structure === "flat" ? "" : `${structure}|${structuralSignature(items)}`;
+};
+const buildState = (input) => {
+    const { items, sections, structure, signature } = input;
     const rowValues = new WeakMap();
     const placeholdersById = new Map();
     let model;
+    let treeModel = null;
     let flatModel;
     if (structure === "sections") {
-        model = createSectionModel(items ?? []);
+        model = createSectionModel(sections ?? []);
     }
     else if (structure === "tree") {
-        model = createTreeModel(items ?? [], autoexpand, rowValues, placeholdersById);
+        treeModel = createTreeModel(items ?? [], rowValues, placeholdersById);
+        model = treeModel;
     }
     else {
         flatModel = createFlatModel(items?.length ?? 0);
         model = flatModel;
     }
-    return { model, flatModel, items, structure, autoexpand, signature, rowValues, placeholdersById };
+    return { model, treeModel, flatModel, items, sections, structure, signature, rowValues, placeholdersById };
 };
-const resolveControlledState = (prev, items, autoexpand) => {
-    if (prev !== null && prev.items === items && prev.autoexpand === autoexpand)
+const resolveState = (prev, items, sections) => {
+    if (prev !== null && prev.items === items && prev.sections === sections) {
         return prev;
-    const structure = detectStructure(items);
-    const signature = controlledSignature(structure, autoexpand, items);
+    }
+    const structure = sections !== undefined ? "sections" : detectStructure(items);
+    const signature = signatureOf(structure, items, sections);
+    const input = { items, sections, structure, signature };
     if (prev === null || prev.structure !== structure) {
-        return buildControlledState(items, autoexpand, structure, signature);
+        return buildState(input);
     }
     if (structure !== "flat" && prev.signature !== signature) {
-        return buildControlledState(items, autoexpand, structure, signature);
+        return buildState(input);
     }
-    if (structure !== "flat") {
+    if (structure === "tree") {
         retagRows(items ?? [], prev.rowValues, prev.placeholdersById);
     }
     prev.items = items;
-    prev.autoexpand = autoexpand;
+    prev.sections = sections;
     prev.signature = signature;
     return prev;
 };
-const useControlledModel = (mode) => {
-    const { items } = mode;
-    const autoexpand = mode.autoexpand ?? false;
+export const useListModel = (input) => {
+    const { items, sections } = input;
     const stateRef = useRef(null);
-    const state = resolveControlledState(stateRef.current, items, autoexpand);
+    const state = resolveState(stateRef.current, items, sections);
     stateRef.current = state;
     const { structure, flatModel } = state;
     useLayoutEffect(() => {
@@ -51,20 +76,22 @@ const useControlledModel = (mode) => {
             resizeFlatModel(flatModel, items?.length ?? 0);
         }
     }, [flatModel, items]);
-    const resolver = useMemo(() => createControlledResolver(items, structure !== "flat" && autoexpand, state.rowValues), [items, structure, autoexpand, state.rowValues]);
-    const headerResolver = useMemo(() => createSectionHeaderResolver(structure === "sections" ? items : undefined), [items, structure]);
-    return { model: state.model, resolver, headerResolver };
-};
-const useUncontrolledModel = (mode) => {
-    const { model } = mode;
-    const resolver = useMemo(() => createModelResolver(model), [model]);
-    const headerResolver = useMemo(() => createSectionHeaderResolver(undefined), []);
-    return { model, resolver, headerResolver };
-};
-export const useListModel = (mode) => {
-    const controlled = useControlledModel(mode.model === undefined ? { items: mode.items, autoexpand: mode.autoexpand } : { items: [] });
-    const uncontrolled = useUncontrolledModel(mode.model === undefined ? { model: EMPTY_MODEL } : { model: mode.model });
-    return mode.model === undefined ? controlled : uncontrolled;
+    const resolver = useMemo(() => {
+        if (structure === "sections") {
+            return createItemResolver(sectionRows(sections), true, state.rowValues);
+        }
+        if (structure === "tree" && state.treeModel !== null) {
+            return createTreeResolver(items, state.rowValues, state.treeModel);
+        }
+        return createItemResolver(items, false, state.rowValues);
+    }, [items, sections, structure, state.rowValues, state.treeModel]);
+    const headerResolver = useMemo(() => createSectionHeaderResolver(structure === "sections" ? sections : undefined), [sections, structure]);
+    return {
+        model: state.model,
+        treeModel: state.treeModel,
+        resolver,
+        headerResolver,
+        rowValues: state.rowValues,
+    };
 };
-const EMPTY_MODEL = createFlatModel(0);
 //# sourceMappingURL=use-list-model.js.map

package/dist/hooks/use-list-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-list-model.js","sourceRoot":"","sources":["../../src/hooks/use-list-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-list-model.js","sourceRoot":"","sources":["../../src/hooks/use-list-model.ts"],"names":[],"mappings":"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","sourcesContent":["import type * as Gio from \"@gtkx/gi/gio\";\nimport type * as GObject from \"@gtkx/gi/gobject\";\nimport type * as Gtk from \"@gtkx/gi/gtk\";\nimport { useLayoutEffect, useMemo, useRef } from \"react\";\nimport type { ItemNode, SectionNode } from \"../types.js\";\nimport {\n    createFlatModel,\n    createSectionModel,\n    createTreeModel,\n    resizeFlatModel,\n    retagRows,\n} from \"../utils/item-models.js\";\nimport {\n    createItemResolver,\n    createSectionHeaderResolver,\n    createTreeResolver,\n    type ItemResolver,\n    type RowValue,\n} from \"../utils/item-resolver.js\";\nimport { detectStructure, type ListStructure, structuralSignature } from \"../utils/list-item-flatten.js\";\n\ntype ListModelInput<T, S> = {\n    items: ItemNode<T>[] | undefined;\n    sections?: SectionNode<S, T>[] | undefined;\n};\n\ntype ListModelResult<T, S> = {\n    model: Gio.ListModel;\n    treeModel: Gtk.TreeListModel | null;\n    resolver: ItemResolver<T, S>;\n    headerResolver: ItemResolver<T, S>;\n    rowValues: WeakMap<GObject.Object, RowValue<T>>;\n};\n\ntype ListModelStructure = \"sections\" | ListStructure;\n\ntype ListModelState<T, S> = {\n    model: Gio.ListModel;\n    treeModel: Gtk.TreeListModel | null;\n    flatModel: Gtk.StringList | undefined;\n    items: ItemNode<T>[] | undefined;\n    sections: SectionNode<S, T>[] | undefined;\n    structure: ListModelStructure;\n    signature: string;\n    rowValues: WeakMap<GObject.Object, RowValue<T>>;\n    placeholdersById: Map<string, GObject.Object>;\n};\n\nconst sectionRows = <T, S>(sections: SectionNode<S, T>[] | undefined): ItemNode<T>[] => {\n    if (sections === undefined) return [];\n    const rows: ItemNode<T>[] = [];\n    for (const section of sections) rows.push(...section.data);\n    return rows;\n};\n\nconst sectionSignature = <T, S>(sections: SectionNode<S, T>[] | undefined): string => {\n    if (sections === undefined) return \"\";\n    const parts: string[] = [];\n    for (const section of sections) {\n        parts.push(`${section.id}{${structuralSignature(section.data)}}`);\n    }\n    return parts.join(\",\");\n};\n\nconst signatureOf = <T, S>(\n    structure: ListModelStructure,\n    items: ItemNode<T>[] | undefined,\n    sections: SectionNode<S, T>[] | undefined,\n): string => {\n    if (structure === \"sections\") return `sections|${sectionSignature(sections)}`;\n    return structure === \"flat\" ? \"\" : `${structure}|${structuralSignature(items)}`;\n};\n\ntype ListModelInternalInput<T, S> = {\n    items: ItemNode<T>[] | undefined;\n    sections: SectionNode<S, T>[] | undefined;\n    structure: ListModelStructure;\n    signature: string;\n};\n\nconst buildState = <T, S>(input: ListModelInternalInput<T, S>): ListModelState<T, S> => {\n    const { items, sections, structure, signature } = input;\n    const rowValues = new WeakMap<GObject.Object, RowValue<T>>();\n    const placeholdersById = new Map<string, GObject.Object>();\n    let model: Gio.ListModel;\n    let treeModel: Gtk.TreeListModel | null = null;\n    let flatModel: Gtk.StringList | undefined;\n    if (structure === \"sections\") {\n        model = createSectionModel(sections ?? []);\n    } else if (structure === \"tree\") {\n        treeModel = createTreeModel(items ?? [], rowValues, placeholdersById);\n        model = treeModel;\n    } else {\n        flatModel = createFlatModel(items?.length ?? 0);\n        model = flatModel;\n    }\n    return { model, treeModel, flatModel, items, sections, structure, signature, rowValues, placeholdersById };\n};\n\nconst resolveState = <T, S>(\n    prev: ListModelState<T, S> | null,\n    items: ItemNode<T>[] | undefined,\n    sections: SectionNode<S, T>[] | undefined,\n): ListModelState<T, S> => {\n    if (prev !== null && prev.items === items && prev.sections === sections) {\n        return prev;\n    }\n    const structure: ListModelStructure = sections !== undefined ? \"sections\" : detectStructure(items);\n    const signature = signatureOf(structure, items, sections);\n    const input: ListModelInternalInput<T, S> = { items, sections, structure, signature };\n    if (prev === null || prev.structure !== structure) {\n        return buildState(input);\n    }\n    if (structure !== \"flat\" && prev.signature !== signature) {\n        return buildState(input);\n    }\n    if (structure === \"tree\") {\n        retagRows(items ?? [], prev.rowValues, prev.placeholdersById);\n    }\n    prev.items = items;\n    prev.sections = sections;\n    prev.signature = signature;\n    return prev;\n};\n\nexport const useListModel = <T, S>(input: ListModelInput<T, S>): ListModelResult<T, S> => {\n    const { items, sections } = input;\n    const stateRef = useRef<ListModelState<T, S> | null>(null);\n    const state = resolveState(stateRef.current, items, sections);\n    stateRef.current = state;\n    const { structure, flatModel } = state;\n\n    useLayoutEffect(() => {\n        if (flatModel !== undefined) {\n            resizeFlatModel(flatModel, items?.length ?? 0);\n        }\n    }, [flatModel, items]);\n\n    const resolver = useMemo(() => {\n        if (structure === \"sections\") {\n            return createItemResolver<T, S>(sectionRows(sections), true, state.rowValues);\n        }\n        if (structure === \"tree\" && state.treeModel !== null) {\n            return createTreeResolver<T, S>(items, state.rowValues, state.treeModel);\n        }\n        return createItemResolver<T, S>(items, false, state.rowValues);\n    }, [items, sections, structure, state.rowValues, state.treeModel]);\n\n    const headerResolver = useMemo(\n        () => createSectionHeaderResolver<T, S>(structure === \"sections\" ? sections : undefined),\n        [sections, structure],\n    );\n\n    return {\n        model: state.model,\n        treeModel: state.treeModel,\n        resolver,\n        headerResolver,\n        rowValues: state.rowValues,\n    };\n};\n"]}

package/dist/hooks/use-placed-child.d.ts

@@ -0,0 +1,18 @@
+import type * as GObject from "@gtkx/gi/gobject";
+import { type Context, type ReactNode, type Ref, type RefCallback, type RefObject } from "react";
+export type ParentContext<T> = {
+    Context: Context<RefObject<T | null> | null>;
+    useParentRef: () => RefObject<T | null>;
+};
+export declare const createParentContext: <T>(orphanMessage: string) => ParentContext<T>;
+export type PlacedChildRender<T> = (ref: RefCallback<T>) => ReactNode;
+export type PlacedChildOptions<T extends GObject.Object, P> = {
+    render: PlacedChildRender<T>;
+    ref?: Ref<T | null> | undefined;
+    placement: P;
+    samePlacement: (a: P, b: P) => boolean;
+    place: (object: T, placement: P, previous: P | undefined) => void;
+    release: (object: T) => void;
+};
+export declare const usePlacedChild: <T extends GObject.Object, P>(options: PlacedChildOptions<T, P>) => ReactNode;
+//# sourceMappingURL=use-placed-child.d.ts.map

package/dist/hooks/use-placed-child.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-placed-child.d.ts","sourceRoot":"","sources":["../../src/hooks/use-placed-child.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EACH,KAAK,OAAO,EAEZ,KAAK,SAAS,EACd,KAAK,GAAG,EACR,KAAK,WAAW,EAChB,KAAK,SAAS,EAKjB,MAAM,OAAO,CAAC;AAEf,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC3B,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7C,YAAY,EAAE,MAAM,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,CAAC,iBAAiB,MAAM,KAAG,aAAa,CAAC,CAAC,CAU7E,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;AAEtE,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI;IAC1D,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC7B,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IAChC,SAAS,EAAE,CAAC,CAAC;IACb,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC;IACvC,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,SAAS,KAAK,IAAI,CAAC;IAClE,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,OAAO,CAAC,MAAM,EAAE,CAAC,WAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,SAkC/F,CAAC"}

package/dist/hooks/use-placed-child.js

@@ -0,0 +1,47 @@
+import { createPortal, rootElement } from "@gtkx/react";
+import { useMergeRefs } from "@gtkx/react/internal";
+import { createContext, useCallback, useContext, useLayoutEffect, useRef, } from "react";
+export const createParentContext = (orphanMessage) => {
+    const context = createContext(null);
+    return {
+        Context: context,
+        useParentRef: () => {
+            const ref = useContext(context);
+            if (!ref)
+                throw new Error(orphanMessage);
+            return ref;
+        },
+    };
+};
+export const usePlacedChild = (options) => {
+    const { render, ref, placement, samePlacement, place, release } = options;
+    const objectRef = useRef(null);
+    const appliedRef = useRef(null);
+    const captureObject = useCallback((object) => {
+        objectRef.current = object;
+    }, []);
+    const setObjectRef = useMergeRefs(ref, captureObject);
+    useLayoutEffect(() => {
+        const object = objectRef.current;
+        const applied = appliedRef.current;
+        if (applied !== null && applied.object !== object) {
+            release(applied.object);
+            appliedRef.current = null;
+        }
+        if (object === null)
+            return;
+        const current = appliedRef.current;
+        if (current === null || !samePlacement(current.placement, placement)) {
+            place(object, placement, current?.placement);
+            appliedRef.current = { object, placement };
+        }
+    });
+    useLayoutEffect(() => () => {
+        const applied = appliedRef.current;
+        if (applied !== null)
+            release(applied.object);
+        appliedRef.current = null;
+    }, []);
+    return createPortal(render(setObjectRef), rootElement);
+};
+//# sourceMappingURL=use-placed-child.js.map

package/dist/hooks/use-placed-child.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-placed-child.js","sourceRoot":"","sources":["../../src/hooks/use-placed-child.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAEH,aAAa,EAKb,WAAW,EACX,UAAU,EACV,eAAe,EACf,MAAM,GACT,MAAM,OAAO,CAAC;AAOf,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAI,aAAqB,EAAoB,EAAE;IAC9E,MAAM,OAAO,GAAG,aAAa,CAA6B,IAAI,CAAC,CAAC;IAChE,OAAO;QACH,OAAO,EAAE,OAAO;QAChB,YAAY,EAAE,GAAwB,EAAE;YACpC,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;YACzC,OAAO,GAAG,CAAC;QACf,CAAC;KACJ,CAAC;AACN,CAAC,CAAC;AAaF,MAAM,CAAC,MAAM,cAAc,GAAG,CAA8B,OAAiC,EAAa,EAAE;IACxG,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC1E,MAAM,SAAS,GAAG,MAAM,CAAW,IAAI,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,MAAM,CAAqC,IAAI,CAAC,CAAC;IACpE,MAAM,aAAa,GAAG,WAAW,CAAiB,CAAC,MAAM,EAAE,EAAE;QACzD,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC;IAC/B,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,MAAM,YAAY,GAAG,YAAY,CAAI,GAAG,EAAE,aAAa,CAAC,CAAC;IAEzD,eAAe,CAAC,GAAG,EAAE;QACjB,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC;QACjC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QACnC,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAChD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxB,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO;QAC5B,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QACnC,IAAI,OAAO,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;YACnE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YAC7C,UAAU,CAAC,OAAO,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC/C,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,eAAe,CACX,GAAG,EAAE,CAAC,GAAG,EAAE;QACP,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QACnC,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9C,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;IAC9B,CAAC,EACD,EAAE,CACL,CAAC;IAEF,OAAO,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,CAAC;AAC3D,CAAC,CAAC","sourcesContent":["import type * as GObject from \"@gtkx/gi/gobject\";\nimport { createPortal, rootElement } from \"@gtkx/react\";\nimport { useMergeRefs } from \"@gtkx/react/internal\";\nimport {\n    type Context,\n    createContext,\n    type ReactNode,\n    type Ref,\n    type RefCallback,\n    type RefObject,\n    useCallback,\n    useContext,\n    useLayoutEffect,\n    useRef,\n} from \"react\";\n\nexport type ParentContext<T> = {\n    Context: Context<RefObject<T | null> | null>;\n    useParentRef: () => RefObject<T | null>;\n};\n\nexport const createParentContext = <T>(orphanMessage: string): ParentContext<T> => {\n    const context = createContext<RefObject<T | null> | null>(null);\n    return {\n        Context: context,\n        useParentRef: (): RefObject<T | null> => {\n            const ref = useContext(context);\n            if (!ref) throw new Error(orphanMessage);\n            return ref;\n        },\n    };\n};\n\nexport type PlacedChildRender<T> = (ref: RefCallback<T>) => ReactNode;\n\nexport type PlacedChildOptions<T extends GObject.Object, P> = {\n    render: PlacedChildRender<T>;\n    ref?: Ref<T | null> | undefined;\n    placement: P;\n    samePlacement: (a: P, b: P) => boolean;\n    place: (object: T, placement: P, previous: P | undefined) => void;\n    release: (object: T) => void;\n};\n\nexport const usePlacedChild = <T extends GObject.Object, P>(options: PlacedChildOptions<T, P>): ReactNode => {\n    const { render, ref, placement, samePlacement, place, release } = options;\n    const objectRef = useRef<T | null>(null);\n    const appliedRef = useRef<{ object: T; placement: P } | null>(null);\n    const captureObject = useCallback<RefCallback<T>>((object) => {\n        objectRef.current = object;\n    }, []);\n    const setObjectRef = useMergeRefs<T>(ref, captureObject);\n\n    useLayoutEffect(() => {\n        const object = objectRef.current;\n        const applied = appliedRef.current;\n        if (applied !== null && applied.object !== object) {\n            release(applied.object);\n            appliedRef.current = null;\n        }\n        if (object === null) return;\n        const current = appliedRef.current;\n        if (current === null || !samePlacement(current.placement, placement)) {\n            place(object, placement, current?.placement);\n            appliedRef.current = { object, placement };\n        }\n    });\n\n    useLayoutEffect(\n        () => () => {\n            const applied = appliedRef.current;\n            if (applied !== null) release(applied.object);\n            appliedRef.current = null;\n        },\n        [],\n    );\n\n    return createPortal(render(setObjectRef), rootElement);\n};\n"]}

package/dist/hooks/use-selection-model.d.ts

@@ -1,12 +1,13 @@
 import type * as Gio from "@gtkx/gi/gio";
 import * as Gtk from "@gtkx/gi/gtk";
 import type { ItemResolver } from "../utils/item-resolver.js";
-export interface SelectionModelOptions<T, S> {
+type SelectionModelOptions<T, S> = {
     base: Gio.ListModel;
     selectionMode: Gtk.SelectionMode | null | undefined;
-    selected: string[] | null | undefined;
+    selectedIds: string[] | null | undefined;
     onSelectionChanged: ((ids: string[]) => void) | null | undefined;
     resolver: ItemResolver<T, S>;
-}
+};
 export declare const useSelectionModel: <T, S>(options: SelectionModelOptions<T, S>) => Gtk.SelectionModel;
+export {};
 //# sourceMappingURL=use-selection-model.d.ts.map

package/dist/hooks/use-selection-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-selection-model.d.ts","sourceRoot":"","sources":["../../src/hooks/use-selection-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAGpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,WAAW,qBAAqB,CAAC,CAAC,EAAE,CAAC;IACvC,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC;IACpB,aAAa,EAAE,GAAG,CAAC,aAAa,GAAG,IAAI,GAAG,SAAS,CAAC;IACpD,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IACtC,kBAAkB,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IACjE,QAAQ,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAChC;AAsED,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,CAAC,EAAE,SAAS,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,GAAG,CAAC,cAsClF,CAAC"}
+{"version":3,"file":"use-selection-model.d.ts","sourceRoot":"","sources":["../../src/hooks/use-selection-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAIpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,KAAK,qBAAqB,CAAC,CAAC,EAAE,CAAC,IAAI;IAC/B,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC;IACpB,aAAa,EAAE,GAAG,CAAC,aAAa,GAAG,IAAI,GAAG,SAAS,CAAC;IACpD,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,kBAAkB,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IACjE,QAAQ,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAChC,CAAC;AA8DF,eAAO,MAAM,iBAAiB,GAAI,CAAC,EAAE,CAAC,WAAW,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,GAAG,CAAC,cAsClF,CAAC"}

package/dist/hooks/use-selection-model.js

@@ -1,5 +1,6 @@
 import * as Gtk from "@gtkx/gi/gtk";
 import { useSignal } from "@gtkx/react";
+import { isSameArray } from "@gtkx/utils";
 import { useLayoutEffect, useRef } from "react";
 const createSelectionModel = (mode, base) => {
     if (mode === Gtk.SelectionMode.MULTIPLE)
@@ -25,7 +26,7 @@ const applySelectedPositions = (model, positions) => {
             return;
         }
         const requested = bitsetOf(positions);
-        const changed = model.getSelection();
+        const changed = model.getSelection().copy();
         changed.difference(requested);
         if (changed.isEmpty())
             return;
@@ -57,23 +58,14 @@ const idsToPositions = (ids, resolver) => {
         return [];
     const positions = [];
     for (const id of ids) {
-        const position = resolver.positionOf(id);
+        const position = resolver.positionOfId(id);
         if (position >= 0)
             positions.push(position);
     }
     return positions;
 };
-const sameIds = (a, b) => {
-    if (a.length !== b.length)
-        return false;
-    for (let index = 0; index < a.length; index++) {
-        if (a[index] !== b[index])
-            return false;
-    }
-    return true;
-};
 export const useSelectionModel = (options) => {
-    const { base, selectionMode, selected, onSelectionChanged, resolver } = options;
+    const { base, selectionMode, selectedIds, onSelectionChanged, resolver } = options;
     const mode = selectionMode ?? Gtk.SelectionMode.SINGLE;
     const modelRef = useRef(null);
     const modeRef = useRef(null);
@@ -92,7 +84,7 @@ export const useSelectionModel = (options) => {
         if (!callback)
             return;
         const ids = readSelectedIds(model, resolverRef.current);
-        if (lastReportedRef.current !== null && sameIds(lastReportedRef.current, ids))
+        if (lastReportedRef.current !== null && isSameArray(lastReportedRef.current, ids))
             return;
         lastReportedRef.current = ids;
         callback(ids);
@@ -101,11 +93,11 @@ export const useSelectionModel = (options) => {
     useLayoutEffect(() => {
         if (model.getModel() !== base)
             model.setModel(base);
-        if (selected !== undefined && selected !== null) {
-            applySelectedPositions(model, idsToPositions(selected, resolver));
+        if (selectedIds !== undefined && selectedIds !== null) {
+            applySelectedPositions(model, idsToPositions(selectedIds, resolver));
         }
         report();
-    }, [model, base, selected, resolver]);
+    }, [model, base, selectedIds, resolver]);
     return model;
 };
 //# sourceMappingURL=use-selection-model.js.map

package/dist/hooks/use-selection-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-selection-model.js","sourceRoot":"","sources":["../../src/hooks/use-selection-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-selection-model.js","sourceRoot":"","sources":["../../src/hooks/use-selection-model.ts"],"names":[],"mappings":"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","sourcesContent":["import type * as Gio from \"@gtkx/gi/gio\";\nimport * as Gtk from \"@gtkx/gi/gtk\";\nimport { useSignal } from \"@gtkx/react\";\nimport { isSameArray } from \"@gtkx/utils\";\nimport { useLayoutEffect, useRef } from \"react\";\nimport type { ItemResolver } from \"../utils/item-resolver.js\";\n\ntype SelectionModelOptions<T, S> = {\n    base: Gio.ListModel;\n    selectionMode: Gtk.SelectionMode | null | undefined;\n    selectedIds: string[] | null | undefined;\n    onSelectionChanged: ((ids: string[]) => void) | null | undefined;\n    resolver: ItemResolver<T, S>;\n};\n\ntype WrappingSelectionModel = (Gtk.SingleSelection | Gtk.MultiSelection | Gtk.NoSelection) & Gtk.SelectionModel;\n\nconst createSelectionModel = (mode: Gtk.SelectionMode, base: Gio.ListModel): WrappingSelectionModel => {\n    if (mode === Gtk.SelectionMode.MULTIPLE) return Gtk.MultiSelection.new(base);\n    if (mode === Gtk.SelectionMode.NONE) return Gtk.NoSelection.new(base);\n    return new Gtk.SingleSelection({ model: base, autoselect: false, canUnselect: true });\n};\n\nconst bitsetOf = (positions: number[]): Gtk.Bitset => {\n    const bitset = Gtk.Bitset.newEmpty();\n    for (const position of positions) {\n        if (position >= 0) bitset.add(position);\n    }\n    return bitset;\n};\n\nconst applySelectedPositions = (model: Gtk.SelectionModel, positions: number[]): void => {\n    if (model instanceof Gtk.MultiSelection) {\n        if (positions.length === 0) {\n            const current = model.getSelection();\n            if (!current.isEmpty()) model.unselectAll();\n            return;\n        }\n        const requested = bitsetOf(positions);\n        const changed = model.getSelection().copy();\n        changed.difference(requested);\n        if (changed.isEmpty()) return;\n        model.setSelection(requested, changed);\n        return;\n    }\n    if (positions.length === 0) {\n        model.unselectAll();\n        return;\n    }\n    const first = positions[0];\n    if (first !== undefined && first >= 0) model.selectItem(first, true);\n};\n\nconst readSelectedIds = <T, S>(model: Gtk.SelectionModel, resolver: ItemResolver<T, S>): string[] => {\n    const selection = model.getSelection();\n    const ids: string[] = [];\n    const count = Number(selection.getSize());\n    for (let index = 0; index < count; index++) {\n        const position = selection.getNth(index);\n        const id = resolver.idOf(position);\n        if (id !== undefined) ids.push(id);\n    }\n    return ids;\n};\n\nconst idsToPositions = <T, S>(ids: string[] | null | undefined, resolver: ItemResolver<T, S>): number[] => {\n    if (ids === undefined || ids === null) return [];\n    const positions: number[] = [];\n    for (const id of ids) {\n        const position = resolver.positionOfId(id);\n        if (position >= 0) positions.push(position);\n    }\n    return positions;\n};\n\nexport const useSelectionModel = <T, S>(options: SelectionModelOptions<T, S>): Gtk.SelectionModel => {\n    const { base, selectionMode, selectedIds, onSelectionChanged, resolver } = options;\n    const mode = selectionMode ?? Gtk.SelectionMode.SINGLE;\n\n    const modelRef = useRef<WrappingSelectionModel | null>(null);\n    const modeRef = useRef<Gtk.SelectionMode | null>(null);\n    if (modelRef.current === null || modeRef.current !== mode) {\n        modelRef.current = createSelectionModel(mode, base);\n        modeRef.current = mode;\n    }\n    const model = modelRef.current;\n\n    const onChangedRef = useRef(onSelectionChanged);\n    onChangedRef.current = onSelectionChanged;\n    const resolverRef = useRef(resolver);\n    resolverRef.current = resolver;\n    const lastReportedRef = useRef<string[] | null>(null);\n\n    const report = (): void => {\n        const callback = onChangedRef.current;\n        if (!callback) return;\n        const ids = readSelectedIds(model, resolverRef.current);\n        if (lastReportedRef.current !== null && isSameArray(lastReportedRef.current, ids)) return;\n        lastReportedRef.current = ids;\n        callback(ids);\n    };\n\n    useSignal(model, \"selection-changed\", report);\n\n    useLayoutEffect(() => {\n        if (model.getModel() !== base) model.setModel(base);\n        if (selectedIds !== undefined && selectedIds !== null) {\n            applySelectedPositions(model, idsToPositions(selectedIds, resolver));\n        }\n        report();\n    }, [model, base, selectedIds, resolver]);\n\n    return model;\n};\n"]}

package/dist/hooks/use-sort-handler.d.ts

@@ -1,12 +1,17 @@
 import * as Gtk from "@gtkx/gi/gtk";
-import { type GObjectTarget } from "@gtkx/react/internal";
-import type { ColumnRegistration } from "../contexts/column-view-context.js";
-export interface SortHandlerOptions {
-    columnView: GObjectTarget<Gtk.ColumnView>;
+import { type ObjectProp } from "@gtkx/react/internal";
+export type ColumnRegistration = {
+    id: string;
+    column: Gtk.ColumnViewColumn;
+    sortable: boolean;
+};
+type SortHandlerOptions = {
+    columnView: ObjectProp<Gtk.ColumnView>;
     sortColumn: string | null | undefined;
     sortOrder: Gtk.SortType | null | undefined;
     onSortChanged: ((column: string | null, order: Gtk.SortType) => void) | null | undefined;
     columns: ColumnRegistration[];
-}
+};
 export declare const useSortHandler: (options: SortHandlerOptions) => void;
+export {};
 //# sourceMappingURL=use-sort-handler.d.ts.map

package/dist/hooks/use-sort-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-sort-handler.d.ts","sourceRoot":"","sources":["../../src/hooks/use-sort-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,sBAAsB,CAAC;AAEhF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7E,MAAM,WAAW,kBAAkB;IAC/B,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1C,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,GAAG,CAAC,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3C,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IACzF,OAAO,EAAE,kBAAkB,EAAE,CAAC;CACjC;AAkDD,eAAO,MAAM,cAAc,GAAI,SAAS,kBAAkB,KAAG,IAwC5D,CAAC"}
+{"version":3,"file":"use-sort-handler.d.ts","sourceRoot":"","sources":["../../src/hooks/use-sort-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,sBAAsB,CAAC;AAG1E,MAAM,MAAM,kBAAkB,GAAG;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC;IAC7B,QAAQ,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACtB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACvC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,GAAG,CAAC,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3C,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IACzF,OAAO,EAAE,kBAAkB,EAAE,CAAC;CACjC,CAAC;AAkDF,eAAO,MAAM,cAAc,YAAa,kBAAkB,KAAG,IAwC5D,CAAC"}

package/dist/hooks/use-sort-handler.js

@@ -1,5 +1,5 @@
 import * as Gtk from "@gtkx/gi/gtk";
-import { resolveGobjectTarget } from "@gtkx/react/internal";
+import { resolveObjectProp } from "@gtkx/react/internal";
 import { useLayoutEffect, useRef } from "react";
 const neutralSorter = () => Gtk.CustomSorter.new(() => 0);
 const ensureColumnSorters = (columns, activeId) => {
@@ -73,7 +73,7 @@ export const useSortHandler = (options) => {
         sorter.on("changed", handler);
     };
     useLayoutEffect(() => {
-        const view = resolveGobjectTarget(columnView);
+        const view = resolveObjectProp(columnView);
         if (view === null)
             return;
         ensureColumnSorters(columns, activeId);

package/dist/hooks/use-sort-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-sort-handler.js","sourceRoot":"","sources":["../../src/hooks/use-sort-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-sort-handler.js","sourceRoot":"","sources":["../../src/hooks/use-sort-handler.ts"],"names":[],"mappings":"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","sourcesContent":["import * as Gtk from \"@gtkx/gi/gtk\";\nimport { type ObjectProp, resolveObjectProp } from \"@gtkx/react/internal\";\nimport { useLayoutEffect, useRef } from \"react\";\n\nexport type ColumnRegistration = {\n    id: string;\n    column: Gtk.ColumnViewColumn;\n    sortable: boolean;\n};\n\ntype SortHandlerOptions = {\n    columnView: ObjectProp<Gtk.ColumnView>;\n    sortColumn: string | null | undefined;\n    sortOrder: Gtk.SortType | null | undefined;\n    onSortChanged: ((column: string | null, order: Gtk.SortType) => void) | null | undefined;\n    columns: ColumnRegistration[];\n};\n\nconst neutralSorter = (): Gtk.CustomSorter => Gtk.CustomSorter.new(() => 0);\n\nconst ensureColumnSorters = (columns: ColumnRegistration[], activeId: string | null): void => {\n    for (const registration of columns) {\n        const wantsSorter = registration.sortable || registration.id === activeId;\n        const hasSorter = registration.column.getSorter() !== null;\n        if (wantsSorter && !hasSorter) {\n            registration.column.setSorter(neutralSorter());\n        } else if (!wantsSorter && hasSorter) {\n            registration.column.setSorter(null);\n        }\n    }\n};\n\nconst columnForId = (columns: ColumnRegistration[], id: string | null): Gtk.ColumnViewColumn | null => {\n    if (id === null) return null;\n    for (const registration of columns) {\n        if (registration.id === id) return registration.column;\n    }\n    return null;\n};\n\nconst idForColumn = (columns: ColumnRegistration[], column: Gtk.ColumnViewColumn | null): string | null => {\n    if (column === null) return null;\n    for (const registration of columns) {\n        if (registration.column === column) return registration.id;\n    }\n    return column.getId();\n};\n\nconst primarySort = (sorter: Gtk.Sorter): { column: Gtk.ColumnViewColumn | null; order: Gtk.SortType } =>\n    sorter instanceof Gtk.ColumnViewSorter\n        ? { column: sorter.getPrimarySortColumn(), order: sorter.getPrimarySortOrder() }\n        : { column: null, order: Gtk.SortType.ASCENDING };\n\ntype SorterSubscription = {\n    sorter: Gtk.Sorter | null;\n    handler: ((change: Gtk.SorterChange) => void) | null;\n};\n\nconst disconnectSorter = (subscription: SorterSubscription): void => {\n    if (subscription.sorter !== null && subscription.handler !== null) {\n        subscription.sorter.off(\"changed\", subscription.handler);\n    }\n    subscription.sorter = null;\n    subscription.handler = null;\n};\n\nexport const useSortHandler = (options: SortHandlerOptions): void => {\n    const { columnView, sortColumn, sortOrder, onSortChanged, columns } = options;\n    const activeId = sortColumn ?? null;\n    const order = sortOrder ?? Gtk.SortType.ASCENDING;\n\n    const onChangedRef = useRef(onSortChanged);\n    onChangedRef.current = onSortChanged;\n    const columnsRef = useRef(columns);\n    columnsRef.current = columns;\n    const suppressRef = useRef(false);\n    const subscriptionRef = useRef<SorterSubscription>({ sorter: null, handler: null });\n\n    const resubscribe = (sorter: Gtk.Sorter | null): void => {\n        const subscription = subscriptionRef.current;\n        if (sorter === subscription.sorter) return;\n        disconnectSorter(subscription);\n        if (sorter === null) return;\n        const handler = (): void => {\n            if (suppressRef.current) return;\n            const callback = onChangedRef.current;\n            if (!callback) return;\n            const { column, order: primaryOrder } = primarySort(sorter);\n            callback(idForColumn(columnsRef.current, column), primaryOrder);\n        };\n        subscription.sorter = sorter;\n        subscription.handler = handler;\n        sorter.on(\"changed\", handler);\n    };\n\n    useLayoutEffect(() => {\n        const view = resolveObjectProp(columnView);\n        if (view === null) return;\n        ensureColumnSorters(columns, activeId);\n        suppressRef.current = true;\n        view.sortByColumn(columnForId(columns, activeId), order);\n        suppressRef.current = false;\n        resubscribe(view.getSorter());\n    });\n\n    useLayoutEffect(() => () => disconnectSorter(subscriptionRef.current), []);\n};\n"]}

package/dist/index.d.ts

@@ -1,19 +1,13 @@
-/**
- * Higher-level GTKX components: declarative, opinionated abstractions layered on
- * top of the generated `@gtkx/jsx` element bindings and the `@gtkx/react`
- * runtime. Each component pairs a GObject widget with a gtkx-authored prop
- * surface (item models, render callbacks, selection, sorting) and is exported
- * under an unprefixed name to distinguish it from the raw `Gtk*`/`Adw*`/`G*`
- * intrinsic element it builds upon.
- *
- * @packageDocumentation
- */
-export { ColumnView, type ColumnViewComponentProps } from "./column-view.js";
-export { ColumnViewColumn, type ColumnViewColumnComponentProps } from "./column-view-column.js";
+export { type ColumnDef, type ColumnDefDeclarativeProps, ColumnView, type ColumnViewDeclarativeProps, type ColumnViewProps, type ColumnViewSortProps, } from "./column-view.js";
 export { ConstraintLayout, type ConstraintLayoutProps } from "./constraint-layout.js";
-export { ComboRow, type ComboRowComponentProps, DropDown, type DropDownComponentProps } from "./drop-down.js";
-export { GridView, type GridViewComponentProps } from "./grid-view.js";
-export { ListView, type ListViewComponentProps } from "./list-view.js";
-export { Menu, type MenuProps } from "./menu.js";
-export type { ColumnViewColumnProps, ColumnViewProps, ConstraintGuideProps, ConstraintProps, ConstraintVflProps, DropDownProps, GridViewProps, ListItem, ListViewProps, MenuEntry, MenuItemsProps, } from "./types.js";
+export type { ConstraintGuideProps, ConstraintProps, ConstraintVflProps } from "./constraint-layout-apply.js";
+export { DropDown, type DropDownDeclarativeProps, type DropDownItemRenderer, type DropDownProps } from "./drop-down.js";
+export { Fixed, type FixedChildProps, type FixedPlacementProps, type FixedProps } from "./fixed.js";
+export { Grid, type GridChildProps, type GridPlacement, type GridProps } from "./grid.js";
+export { GridView, type GridViewDeclarativeProps, type GridViewProps } from "./grid-view.js";
+export { ListView, type ListViewDeclarativeProps, type ListViewProps } from "./list-view.js";
+export { Menu, type MenuItemsProps, type MenuProps } from "./menu.js";
+export { Overlay, type OverlayChildProps, type OverlayPlacementProps, type OverlayProps } from "./overlay.js";
+export { SizeGroup, type SizeGroupChildProps, type SizeGroupProps } from "./size-group.js";
+export type { ChildProps, CollectionItemSizeProps, ControlledExpansionProps, ControlledSelectionProps, ItemNode, MenuEntry, RenderItemProps, SectionNode, WidgetProps, } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,UAAU,EAAE,KAAK,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,KAAK,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAE,QAAQ,EAAE,KAAK,sBAAsB,EAAE,QAAQ,EAAE,KAAK,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC9G,OAAO,EAAE,QAAQ,EAAE,KAAK,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,KAAK,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,IAAI,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AACjD,YAAY,EACR,qBAAqB,EACrB,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,QAAQ,EACR,aAAa,EACb,SAAS,EACT,cAAc,GACjB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,UAAU,EACV,KAAK,0BAA0B,EAC/B,KAAK,eAAe,EACpB,KAAK,mBAAmB,GAC3B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACtF,YAAY,EAAE,oBAAoB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAC9G,OAAO,EAAE,QAAQ,EAAE,KAAK,wBAAwB,EAAE,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACxH,OAAO,EAAE,KAAK,EAAE,KAAK,eAAe,EAAE,KAAK,mBAAmB,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACpG,OAAO,EAAE,IAAI,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,KAAK,wBAAwB,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,KAAK,wBAAwB,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,IAAI,EAAE,KAAK,cAAc,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,qBAAqB,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAC9G,OAAO,EAAE,SAAS,EAAE,KAAK,mBAAmB,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC3F,YAAY,EACR,UAAU,EACV,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,QAAQ,EACR,SAAS,EACT,eAAe,EACf,WAAW,EACX,WAAW,GACd,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,18 +1,11 @@
-/**
- * Higher-level GTKX components: declarative, opinionated abstractions layered on
- * top of the generated `@gtkx/jsx` element bindings and the `@gtkx/react`
- * runtime. Each component pairs a GObject widget with a gtkx-authored prop
- * surface (item models, render callbacks, selection, sorting) and is exported
- * under an unprefixed name to distinguish it from the raw `Gtk*`/`Adw*`/`G*`
- * intrinsic element it builds upon.
- *
- * @packageDocumentation
- */
-export { ColumnView } from "./column-view.js";
-export { ColumnViewColumn } from "./column-view-column.js";
+export { ColumnView, } from "./column-view.js";
 export { ConstraintLayout } from "./constraint-layout.js";
-export { ComboRow, DropDown } from "./drop-down.js";
+export { DropDown } from "./drop-down.js";
+export { Fixed } from "./fixed.js";
+export { Grid } from "./grid.js";
 export { GridView } from "./grid-view.js";
 export { ListView } from "./list-view.js";
 export { Menu } from "./menu.js";
+export { Overlay } from "./overlay.js";
+export { SizeGroup } from "./size-group.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,UAAU,EAAiC,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAuC,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAA8B,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAE,QAAQ,EAA+B,QAAQ,EAA+B,MAAM,gBAAgB,CAAC;AAC9G,OAAO,EAAE,QAAQ,EAA+B,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,QAAQ,EAA+B,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,IAAI,EAAkB,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,UAAU,GAIb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAA8B,MAAM,wBAAwB,CAAC;AAEtF,OAAO,EAAE,QAAQ,EAAgF,MAAM,gBAAgB,CAAC;AACxH,OAAO,EAAE,KAAK,EAAmE,MAAM,YAAY,CAAC;AACpG,OAAO,EAAE,IAAI,EAA2D,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAqD,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAqD,MAAM,gBAAgB,CAAC;AAC7F,OAAO,EAAE,IAAI,EAAuC,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,OAAO,EAAyE,MAAM,cAAc,CAAC;AAC9G,OAAO,EAAE,SAAS,EAAiD,MAAM,iBAAiB,CAAC","sourcesContent":["export {\n    type ColumnDef,\n    type ColumnDefDeclarativeProps,\n    ColumnView,\n    type ColumnViewDeclarativeProps,\n    type ColumnViewProps,\n    type ColumnViewSortProps,\n} from \"./column-view.js\";\nexport { ConstraintLayout, type ConstraintLayoutProps } from \"./constraint-layout.js\";\nexport type { ConstraintGuideProps, ConstraintProps, ConstraintVflProps } from \"./constraint-layout-apply.js\";\nexport { DropDown, type DropDownDeclarativeProps, type DropDownItemRenderer, type DropDownProps } from \"./drop-down.js\";\nexport { Fixed, type FixedChildProps, type FixedPlacementProps, type FixedProps } from \"./fixed.js\";\nexport { Grid, type GridChildProps, type GridPlacement, type GridProps } from \"./grid.js\";\nexport { GridView, type GridViewDeclarativeProps, type GridViewProps } from \"./grid-view.js\";\nexport { ListView, type ListViewDeclarativeProps, type ListViewProps } from \"./list-view.js\";\nexport { Menu, type MenuItemsProps, type MenuProps } from \"./menu.js\";\nexport { Overlay, type OverlayChildProps, type OverlayPlacementProps, type OverlayProps } from \"./overlay.js\";\nexport { SizeGroup, type SizeGroupChildProps, type SizeGroupProps } from \"./size-group.js\";\nexport type {\n    ChildProps,\n    CollectionItemSizeProps,\n    ControlledExpansionProps,\n    ControlledSelectionProps,\n    ItemNode,\n    MenuEntry,\n    RenderItemProps,\n    SectionNode,\n    WidgetProps,\n} from \"./types.js\";\n"]}

package/dist/list-view.d.ts

@@ -1,16 +1,24 @@
 import { type GtkListViewProps } from "@gtkx/jsx/gtk";
 import type { ReactNode } from "react";
-import type { ListViewProps } from "./types.js";
+import type { CollectionItemSizeProps, ControlledExpansionProps, ControlledSelectionProps, ItemNode, RenderItemProps, SectionNode } from "./types.js";
+export type ListViewDeclarativeProps<T = unknown, S = unknown> = CollectionItemSizeProps & ControlledSelectionProps & ControlledExpansionProps & {
+    items?: ItemNode<T>[] | undefined;
+    sections?: SectionNode<S, T>[] | undefined;
+    renderItem: (props: RenderItemProps<T>) => ReactNode;
+    renderHeader?: ((info: {
+        section: S;
+    }) => ReactNode) | null | undefined;
+};
 /**
- * Props for the {@link ListView} component: the raw `GtkListView` element
- * surface with its factory/model wiring replaced by the declarative
- * {@link ListViewProps} API.
+ * Props for {@link ListView}. Combines the underlying Gtk.ListView props with
+ * declarative collection props: flat items or grouped sections, a per-row renderItem,
+ * an optional section header renderer, controlled selection and expansion, and
+ * estimated item sizing.
  */
-export type ListViewComponentProps<T = unknown, S = unknown> = Omit<GtkListViewProps, keyof ListViewProps<T, S>> & ListViewProps<T, S>;
+export type ListViewProps<T = unknown, S = unknown> = Omit<GtkListViewProps, "model" | "factory" | "headerFactory" | keyof ListViewDeclarativeProps<T, S>> & ListViewDeclarativeProps<T, S>;
 /**
- * A `GtkListView` driven by a declarative `items`/`renderItem` API with
- * optional controlled selection, section headers, and tree autoexpansion.
- * Supplying an external `model` switches to the uncontrolled form.
+ * Renders a Gtk.ListView: a scrollable, single-column list backed by a collection
+ * model, with each row drawn by renderItem and optional section headers.
  */
-export declare const ListView: <T = unknown, S = unknown>(props: ListViewComponentProps<T, S>) => ReactNode;
+export declare const ListView: <T = unknown, S = unknown>(props: ListViewProps<T, S>) => ReactNode;
 //# sourceMappingURL=list-view.d.ts.map

package/dist/list-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-view.d.ts","sourceRoot":"","sources":["../src/list-view.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAO,MAAM,OAAO,CAAC;AAG5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAgBhD;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,IAAI,CAAC,gBAAgB,EAAE,MAAM,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC5G,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAExB;;;;GAIG;AACH,eAAO,MAAM,QAAQ,GAAI,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,OAAO,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,SAiDxF,CAAC"}
+{"version":3,"file":"list-view.d.ts","sourceRoot":"","sources":["../src/list-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAO,MAAM,OAAO,CAAC;AAW5C,OAAO,KAAK,EACR,uBAAuB,EACvB,wBAAwB,EACxB,wBAAwB,EACxB,QAAQ,EACR,eAAe,EACf,WAAW,EACd,MAAM,YAAY,CAAC;AAUpB,MAAM,MAAM,wBAAwB,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,uBAAuB,GACpF,wBAAwB,GACxB,wBAAwB,GAAG;IACvB,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC;IAC3C,UAAU,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC;IACrD,YAAY,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,CAAC,CAAA;KAAE,KAAK,SAAS,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;CAC3E,CAAC;AAEN;;;;;GAKG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,IAAI,CACtD,gBAAgB,EAChB,OAAO,GAAG,SAAS,GAAG,eAAe,GAAG,MAAM,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAC/E,GACG,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAgDnC;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAI,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,SAAS,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,SA8C/E,CAAC"}