@gtkx/components 0.21.0 → 1.0.0-rc.1

package/dist/utils/item-resolver.js

@@ -1,4 +1,4 @@
-import { flattenListItems } from "./list-item-flatten.js";
+import { countDescendants, flattenListItems } from "./list-item-flatten.js";
 const NO_TREE_METADATA = { hideExpander: false, indentForDepth: true, indentForIcon: true };
 const treeItemCache = new WeakMap();
 const treeRowItem = (treeRow) => {
@@ -10,18 +10,21 @@ const treeRowItem = (treeRow) => {
         treeItemCache.set(treeRow, item);
     return item;
 };
-export const createControlledResolver = (items, flattenTreeChildren, rowValues) => {
+export const rowIdOf = (rowValues, row) => {
+    const item = row.getItem();
+    return item === null ? undefined : rowValues.get(item)?.id;
+};
+export const createItemResolver = (items, flattenTreeChildren, rowValues) => {
     const flattened = flattenListItems(items, flattenTreeChildren);
     return {
-        count: flattened.records.length,
-        positionOf(id) {
+        positionOfId(id) {
             const position = flattened.idToPosition.get(id);
             return position === undefined ? -1 : position;
         },
         idOf(position) {
             return flattened.positionToId.get(position);
         },
-        resolve(position, treeRow, _boundItem) {
+        resolve(position, treeRow) {
             if (treeRow !== null && !flattenTreeChildren) {
                 const rowItem = treeRowItem(treeRow);
                 if (rowItem !== null) {
@@ -30,8 +33,7 @@ export const createControlledResolver = (items, flattenTreeChildren, rowValues)
                         return {
                             value: tagged.value,
                             present: true,
-                            isHeader: tagged.isHeader,
-                            treeRow,
+                            isHeader: false,
                             metadata: tagged.metadata,
                         };
                     }
@@ -43,69 +45,58 @@ export const createControlledResolver = (items, flattenTreeChildren, rowValues)
                     value: undefined,
                     present: false,
                     isHeader: false,
-                    treeRow,
                     metadata: NO_TREE_METADATA,
                 };
             }
             return {
                 value: record.value,
                 present: true,
-                isHeader: record.isHeader,
-                treeRow,
-                metadata: record.metadata,
-            };
-        },
-    };
-};
-export const createModelResolver = (model) => {
-    return {
-        get count() {
-            return model.getNItems();
-        },
-        positionOf(id) {
-            const numeric = Number(id);
-            return Number.isInteger(numeric) ? numeric : -1;
-        },
-        idOf(position) {
-            return String(position);
-        },
-        resolve(position, treeRow, boundItem) {
-            const item = boundItem ?? model.getItem(position);
-            return {
-                value: (item ?? undefined),
-                present: item !== null,
                 isHeader: false,
-                treeRow,
-                metadata: NO_TREE_METADATA,
+                metadata: record.metadata,
             };
         },
     };
 };
-export const createSectionHeaderResolver = (items) => {
+export const createSectionHeaderResolver = (sections) => {
     const valueByStart = new Map();
     let start = 0;
-    for (const section of items ?? []) {
-        if (section.section !== true)
-            continue;
+    for (const section of sections ?? []) {
         valueByStart.set(start, section.value);
-        start += section.children?.length ?? 0;
+        start += countDescendants(section.data);
     }
     return {
-        count: valueByStart.size,
-        positionOf: () => -1,
+        positionOfId: () => -1,
         idOf: () => undefined,
         resolve(position) {
             if (!valueByStart.has(position)) {
-                return { value: undefined, present: false, isHeader: true, treeRow: null, metadata: NO_TREE_METADATA };
+                return { value: undefined, present: false, isHeader: true, metadata: NO_TREE_METADATA };
             }
             return {
                 value: valueByStart.get(position),
                 present: true,
                 isHeader: true,
-                treeRow: null,
                 metadata: NO_TREE_METADATA,
             };
         },
     };
 };
+export const createTreeResolver = (items, rowValues, model) => {
+    const base = createItemResolver(items, false, rowValues);
+    return {
+        resolve: base.resolve,
+        idOf: (position) => {
+            const row = model.getRow(position);
+            return row === null ? undefined : rowIdOf(rowValues, row);
+        },
+        positionOfId: (id) => {
+            const count = model.getNItems();
+            for (let position = 0; position < count; position++) {
+                const row = model.getRow(position);
+                if (row !== null && rowIdOf(rowValues, row) === id)
+                    return position;
+            }
+            return -1;
+        },
+    };
+};
 //# sourceMappingURL=item-resolver.js.map

package/dist/utils/item-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"item-resolver.js","sourceRoot":"","sources":["../../src/utils/item-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"item-resolver.js","sourceRoot":"","sources":["../../src/utils/item-resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type * as GObject from \"@gtkx/gi/gobject\";\nimport type * as Gtk from \"@gtkx/gi/gtk\";\nimport type { ItemNode, SectionNode } from \"../types.js\";\nimport { countDescendants, flattenListItems, type TreeItemMetadata } from \"./list-item-flatten.js\";\n\nconst NO_TREE_METADATA: TreeItemMetadata = { hideExpander: false, indentForDepth: true, indentForIcon: true };\n\nconst treeItemCache = new WeakMap<Gtk.TreeListRow, GObject.Object>();\n\nconst treeRowItem = (treeRow: Gtk.TreeListRow): GObject.Object | null => {\n    const cached = treeItemCache.get(treeRow);\n    if (cached !== undefined) return cached;\n    const item = treeRow.getItem();\n    if (item !== null) treeItemCache.set(treeRow, item);\n    return item;\n};\n\nexport type Resolved<T = unknown, S = unknown> = {\n    value: T | S | undefined;\n    present: boolean;\n    isHeader: boolean;\n    metadata: TreeItemMetadata;\n};\n\nexport type ItemResolver<T = unknown, S = unknown> = {\n    resolve(position: number, treeRow: Gtk.TreeListRow | null): Resolved<T, S>;\n    positionOfId(id: string): number;\n    idOf(position: number): string | undefined;\n};\n\nexport type RowValue<T = unknown> = {\n    id: string;\n    value: T;\n    metadata: TreeItemMetadata;\n};\n\nexport const rowIdOf = <T>(\n    rowValues: WeakMap<GObject.Object, RowValue<T>>,\n    row: Gtk.TreeListRow,\n): string | undefined => {\n    const item = row.getItem();\n    return item === null ? undefined : rowValues.get(item)?.id;\n};\n\nexport const createItemResolver = <T, S>(\n    items: ItemNode<T>[] | undefined,\n    flattenTreeChildren: boolean,\n    rowValues: WeakMap<GObject.Object, RowValue<T>>,\n): ItemResolver<T, S> => {\n    const flattened = flattenListItems(items, flattenTreeChildren);\n    return {\n        positionOfId(id: string): number {\n            const position = flattened.idToPosition.get(id);\n            return position === undefined ? -1 : position;\n        },\n        idOf(position: number): string | undefined {\n            return flattened.positionToId.get(position);\n        },\n        resolve(position: number, treeRow: Gtk.TreeListRow | null): Resolved<T, S> {\n            if (treeRow !== null && !flattenTreeChildren) {\n                const rowItem = treeRowItem(treeRow);\n                if (rowItem !== null) {\n                    const tagged = rowValues.get(rowItem);\n                    if (tagged !== undefined) {\n                        return {\n                            value: tagged.value,\n                            present: true,\n                            isHeader: false,\n                            metadata: tagged.metadata,\n                        };\n                    }\n                }\n            }\n            const record = flattened.records[position];\n            if (record === undefined) {\n                return {\n                    value: undefined,\n                    present: false,\n                    isHeader: false,\n                    metadata: NO_TREE_METADATA,\n                };\n            }\n            return {\n                value: record.value,\n                present: true,\n                isHeader: false,\n                metadata: record.metadata,\n            };\n        },\n    };\n};\n\nexport const createSectionHeaderResolver = <T, S>(sections: SectionNode<S, T>[] | undefined): ItemResolver<T, S> => {\n    const valueByStart = new Map<number, S>();\n    let start = 0;\n    for (const section of sections ?? []) {\n        valueByStart.set(start, section.value);\n        start += countDescendants(section.data);\n    }\n    return {\n        positionOfId: () => -1,\n        idOf: () => undefined,\n        resolve(position: number): Resolved<T, S> {\n            if (!valueByStart.has(position)) {\n                return { value: undefined, present: false, isHeader: true, metadata: NO_TREE_METADATA };\n            }\n            return {\n                value: valueByStart.get(position),\n                present: true,\n                isHeader: true,\n                metadata: NO_TREE_METADATA,\n            };\n        },\n    };\n};\n\nexport const createTreeResolver = <T, S>(\n    items: ItemNode<T>[] | undefined,\n    rowValues: WeakMap<GObject.Object, RowValue<T>>,\n    model: Gtk.TreeListModel,\n): ItemResolver<T, S> => {\n    const base = createItemResolver<T, S>(items, false, rowValues);\n    return {\n        resolve: base.resolve,\n        idOf: (position: number): string | undefined => {\n            const row = model.getRow(position);\n            return row === null ? undefined : rowIdOf(rowValues, row);\n        },\n        positionOfId: (id: string): number => {\n            const count = model.getNItems();\n            for (let position = 0; position < count; position++) {\n                const row = model.getRow(position);\n                if (row !== null && rowIdOf(rowValues, row) === id) return position;\n            }\n            return -1;\n        },\n    };\n};\n"]}

package/dist/utils/list-item-flatten.d.ts

@@ -1,32 +1,24 @@
-import type { ListItem } from "../types.js";
-export interface TreeItemMetadata {
+import type { ItemNode } from "../types.js";
+export type TreeItemMetadata = {
     hideExpander: boolean;
     indentForDepth: boolean;
     indentForIcon: boolean;
-}
-export interface FlattenedRecord<T = unknown, S = unknown> {
+};
+type FlattenedRecord<T = unknown> = {
     id: string;
-    value: T | S;
-    isHeader: boolean;
-    hasChildren: boolean;
-    children: ListItem<T, S>[];
+    value: T;
     metadata: TreeItemMetadata;
-}
-export interface FlattenResult<T = unknown, S = unknown> {
-    records: FlattenedRecord<T, S>[];
+};
+type FlattenResult<T = unknown> = {
+    records: FlattenedRecord<T>[];
     idToPosition: Map<string, number>;
     positionToId: Map<number, string>;
-    isTree: boolean;
-    isSectioned: boolean;
-}
-export type ListStructure = "flat" | "tree" | "sections";
-/**
- * Classify a controlled item list as flat, tree, or sectioned without building a
- * {@link FlattenResult}. A list is sectioned if any top-level item is a section, a
- * tree if any top-level item carries children, and flat otherwise.
- */
-export declare const detectStructure: <T, S>(items: ListItem<T, S>[] | undefined) => ListStructure;
-export declare const structuralSignature: <T, S>(items: ListItem<T, S>[] | undefined) => string;
-export declare const treeItemMetadata: <T, S>(item: ListItem<T, S>) => TreeItemMetadata;
-export declare const flattenListItems: <T, S>(items: ListItem<T, S>[] | undefined, flattenTreeChildren: boolean) => FlattenResult<T, S>;
+};
+export type ListStructure = "flat" | "tree";
+export declare const detectStructure: <T>(items: ItemNode<T>[] | undefined) => ListStructure;
+export declare const structuralSignature: <T>(items: ItemNode<T>[] | undefined) => string;
+export declare const countDescendants: <T>(items: ItemNode<T>[]) => number;
+export declare const treeItemMetadata: <T>(item: ItemNode<T>) => TreeItemMetadata;
+export declare const flattenListItems: <T>(items: ItemNode<T>[] | undefined, flattenTreeChildren: boolean) => FlattenResult<T>;
+export {};
 //# sourceMappingURL=list-item-flatten.d.ts.map

package/dist/utils/list-item-flatten.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-item-flatten.d.ts","sourceRoot":"","sources":["../../src/utils/list-item-flatten.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,gBAAgB;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO;IACrD,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IAC3B,QAAQ,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO;IACnD,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,CAAC,EAAE,OAAO,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,SAAS,KAAG,aAQ3E,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,CAAC,EAAE,OAAO,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,SAAS,KAAG,MAc/E,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,CAAC,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,gBAS7D,CAAC;AAqBF,eAAO,MAAM,gBAAgB,GAAI,CAAC,EAAE,CAAC,EACjC,OAAO,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,SAAS,EACnC,qBAAqB,OAAO,KAC7B,aAAa,CAAC,CAAC,EAAE,CAAC,CAqBpB,CAAC"}
+{"version":3,"file":"list-item-flatten.d.ts","sourceRoot":"","sources":["../../src/utils/list-item-flatten.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,MAAM,gBAAgB,GAAG;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,KAAK,eAAe,CAAC,CAAC,GAAG,OAAO,IAAI;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,gBAAgB,CAAC;CAC9B,CAAC;AAEF,KAAK,aAAa,CAAC,CAAC,GAAG,OAAO,IAAI;IAC9B,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,MAAM,CAAC;AAE5C,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,KAAG,aAMrE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,KAAG,MAczE,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAG,MAO1D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,CAAC,QAAQ,QAAQ,CAAC,CAAC,CAAC,KAAG,gBAItD,CAAC;AAgBH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SACvB,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,uBACX,OAAO,KAC7B,aAAa,CAAC,CAAC,CAWjB,CAAC"}

package/dist/utils/list-item-flatten.js

@@ -1,19 +1,11 @@
-/**
- * Classify a controlled item list as flat, tree, or sectioned without building a
- * {@link FlattenResult}. A list is sectioned if any top-level item is a section, a
- * tree if any top-level item carries children, and flat otherwise.
- */
 export const detectStructure = (items) => {
     if (items === undefined)
         return "flat";
-    let sawTree = false;
     for (const item of items) {
-        if (item.section === true)
-            return "sections";
         if (item.children !== undefined && item.children.length > 0)
-            sawTree = true;
+            return "tree";
     }
-    return sawTree ? "tree" : "flat";
+    return "flat";
 };
 export const structuralSignature = (items) => {
     if (items === undefined)
@@ -22,8 +14,8 @@ export const structuralSignature = (items) => {
     const walk = (list) => {
         parts.push("[");
         for (const item of list) {
-            const hidden = item.section === true ? false : item.hideExpander === true;
-            parts.push(`${item.id}|${item.section === true ? 1 : 0}|${hidden ? 1 : 0}`);
+            const hidden = item.hideExpander === true;
+            parts.push(`${item.id}|${hidden ? 1 : 0}`);
             if (item.children !== undefined && item.children.length > 0)
                 walk(item.children);
         }
@@ -32,17 +24,20 @@ export const structuralSignature = (items) => {
     walk(items);
     return parts.join(",");
 };
-export const treeItemMetadata = (item) => {
-    if (item.section === true) {
-        return { hideExpander: false, indentForDepth: false, indentForIcon: false };
+export const countDescendants = (items) => {
+    let total = 0;
+    for (const item of items) {
+        total += 1;
+        if (item.children !== undefined && item.children.length > 0)
+            total += countDescendants(item.children);
     }
-    return {
-        hideExpander: item.hideExpander ?? false,
-        indentForDepth: item.indentForDepth ?? true,
-        indentForIcon: item.indentForIcon ?? true,
-    };
+    return total;
 };
-const hasChildren = (item) => item.children !== undefined && item.children.length > 0;
+export const treeItemMetadata = (item) => ({
+    hideExpander: item.hideExpander ?? false,
+    indentForDepth: item.indentForDepth ?? true,
+    indentForIcon: item.indentForIcon ?? true,
+});
 const appendRecord = (item, result, includeChildren) => {
     const position = result.records.length;
     result.idToPosition.set(item.id, position);
@@ -50,9 +45,6 @@ const appendRecord = (item, result, includeChildren) => {
     result.records.push({
         id: item.id,
         value: item.value,
-        isHeader: item.section === true,
-        hasChildren: hasChildren(item),
-        children: item.children ?? [],
         metadata: treeItemMetadata(item),
     });
     if (includeChildren && item.children !== undefined) {
@@ -65,22 +57,10 @@ export const flattenListItems = (items, flattenTreeChildren) => {
         records: [],
         idToPosition: new Map(),
         positionToId: new Map(),
-        isTree: false,
-        isSectioned: false,
     };
     if (items === undefined)
         return result;
     for (const item of items) {
-        if (item.section === true) {
-            result.isSectioned = true;
-            if (item.children !== undefined) {
-                for (const child of item.children)
-                    appendRecord(child, result, true);
-            }
-            continue;
-        }
-        if (hasChildren(item))
-            result.isTree = true;
         appendRecord(item, result, flattenTreeChildren);
     }
     return result;

package/dist/utils/list-item-flatten.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-item-flatten.js","sourceRoot":"","sources":["../../src/utils/list-item-flatten.ts"],"names":[],"mappings":"AA2BA;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAO,KAAmC,EAAiB,EAAE;IACxF,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACvC,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI;YAAE,OAAO,UAAU,CAAC;QAC7C,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,GAAG,IAAI,CAAC;IAChF,CAAC;IACD,OAAO,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAO,KAAmC,EAAU,EAAE;IACrF,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,CAAC,IAAsB,EAAQ,EAAE;QAC1C,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;YACtB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC;YAC1E,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5E,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;gBAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrF,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,CAAC;IACZ,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAO,IAAoB,EAAoB,EAAE;IAC7E,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;IAChF,CAAC;IACD,OAAO;QACH,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,KAAK;QACxC,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI;QAC3C,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;KAC5C,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAO,IAAoB,EAAW,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;AAErH,MAAM,YAAY,GAAG,CAAO,IAAoB,EAAE,MAA2B,EAAE,eAAwB,EAAQ,EAAE;IAC7G,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;IACvC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC3C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAChB,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,QAAQ,EAAE,IAAI,CAAC,OAAO,KAAK,IAAI;QAC/B,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC;QAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;QAC7B,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC;KACnC,CAAC,CAAC;IACH,IAAI,eAAe,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACjD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ;YAAE,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IACpF,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,KAAmC,EACnC,mBAA4B,EACT,EAAE;IACrB,MAAM,MAAM,GAAwB;QAChC,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,IAAI,GAAG,EAAE;QACvB,YAAY,EAAE,IAAI,GAAG,EAAE;QACvB,MAAM,EAAE,KAAK;QACb,WAAW,EAAE,KAAK;KACrB,CAAC;IACF,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IACvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC;YAC1B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC9B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ;oBAAE,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACzE,CAAC;YACD,SAAS;QACb,CAAC;QACD,IAAI,WAAW,CAAC,IAAI,CAAC;YAAE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;QAC5C,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC"}
+{"version":3,"file":"list-item-flatten.js","sourceRoot":"","sources":["../../src/utils/list-item-flatten.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ItemNode } from \"../types.js\";\n\nexport type TreeItemMetadata = {\n    hideExpander: boolean;\n    indentForDepth: boolean;\n    indentForIcon: boolean;\n};\n\ntype FlattenedRecord<T = unknown> = {\n    id: string;\n    value: T;\n    metadata: TreeItemMetadata;\n};\n\ntype FlattenResult<T = unknown> = {\n    records: FlattenedRecord<T>[];\n    idToPosition: Map<string, number>;\n    positionToId: Map<number, string>;\n};\n\nexport type ListStructure = \"flat\" | \"tree\";\n\nexport const detectStructure = <T>(items: ItemNode<T>[] | undefined): ListStructure => {\n    if (items === undefined) return \"flat\";\n    for (const item of items) {\n        if (item.children !== undefined && item.children.length > 0) return \"tree\";\n    }\n    return \"flat\";\n};\n\nexport const structuralSignature = <T>(items: ItemNode<T>[] | undefined): string => {\n    if (items === undefined) return \"\";\n    const parts: string[] = [];\n    const walk = (list: ItemNode<T>[]): void => {\n        parts.push(\"[\");\n        for (const item of list) {\n            const hidden = item.hideExpander === true;\n            parts.push(`${item.id}|${hidden ? 1 : 0}`);\n            if (item.children !== undefined && item.children.length > 0) walk(item.children);\n        }\n        parts.push(\"]\");\n    };\n    walk(items);\n    return parts.join(\",\");\n};\n\nexport const countDescendants = <T>(items: ItemNode<T>[]): number => {\n    let total = 0;\n    for (const item of items) {\n        total += 1;\n        if (item.children !== undefined && item.children.length > 0) total += countDescendants(item.children);\n    }\n    return total;\n};\n\nexport const treeItemMetadata = <T>(item: ItemNode<T>): TreeItemMetadata => ({\n    hideExpander: item.hideExpander ?? false,\n    indentForDepth: item.indentForDepth ?? true,\n    indentForIcon: item.indentForIcon ?? true,\n});\n\nconst appendRecord = <T>(item: ItemNode<T>, result: FlattenResult<T>, includeChildren: boolean): void => {\n    const position = result.records.length;\n    result.idToPosition.set(item.id, position);\n    result.positionToId.set(position, item.id);\n    result.records.push({\n        id: item.id,\n        value: item.value,\n        metadata: treeItemMetadata(item),\n    });\n    if (includeChildren && item.children !== undefined) {\n        for (const child of item.children) appendRecord(child, result, includeChildren);\n    }\n};\n\nexport const flattenListItems = <T>(\n    items: ItemNode<T>[] | undefined,\n    flattenTreeChildren: boolean,\n): FlattenResult<T> => {\n    const result: FlattenResult<T> = {\n        records: [],\n        idToPosition: new Map(),\n        positionToId: new Map(),\n    };\n    if (items === undefined) return result;\n    for (const item of items) {\n        appendRecord(item, result, flattenTreeChildren);\n    }\n    return result;\n};\n"]}

package/package.json

@@ -1,55 +1,54 @@
 {
-    "name": "@gtkx/components",
-    "version": "0.21.0",
-    "description": "Hand-written higher-level GTKX components: list, grid, column, drop-down, menu, and constraint-layout abstractions over the generated bindings",
-    "keywords": [
-        "gtkx",
-        "gtk",
-        "gtk4",
-        "adwaita",
-        "react",
-        "components",
-        "linux",
-        "desktop"
-    ],
-    "homepage": "https://gtkx.dev",
-    "bugs": {
-        "url": "https://github.com/gtkx-org/gtkx/issues"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/gtkx-org/gtkx.git",
-        "directory": "packages/components"
-    },
-    "license": "MPL-2.0",
-    "author": "Eugenio Depalo <eugeniodepalo@gmail.com>",
-    "type": "module",
-    "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "source": "./src/index.ts",
-            "types": "./dist/index.d.ts",
-            "default": "./dist/index.js"
-        }
-    },
-    "sideEffects": false,
-    "files": [
-        "dist",
-        "src"
-    ],
-    "scripts": {
-        "build": "tsc -b"
-    },
-    "engines": {
-        "node": ">=24"
-    },
-    "dependencies": {
-        "@gtkx/react": "workspace:*"
-    },
-    "devDependencies": {
-        "@gtkx/vitest": "workspace:*"
-    },
-    "peerDependencies": {
-        "react": "^19"
+  "name": "@gtkx/components",
+  "version": "1.0.0-rc.1",
+  "description": "High-level GTKX components for declarative collection views, menus, and containers with attach-time placement",
+  "keywords": [
+    "gtkx",
+    "gtk",
+    "gtk4",
+    "adwaita",
+    "react",
+    "components",
+    "linux",
+    "desktop"
+  ],
+  "homepage": "https://gtkx.dev",
+  "bugs": {
+    "url": "https://github.com/gtkx-org/gtkx/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gtkx-org/gtkx.git",
+    "directory": "packages/components"
+  },
+  "license": "MPL-2.0",
+  "author": "Eugenio Depalo <eugeniodepalo@gmail.com>",
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
-}
+  },
+  "sideEffects": false,
+  "files": [
+    "dist",
+    "src"
+  ],
+  "engines": {
+    "node": ">=24"
+  },
+  "dependencies": {
+    "@gtkx/utils": "1.0.0-rc.1",
+    "@gtkx/react": "1.0.0-rc.1"
+  },
+  "peerDependencies": {
+    "react": "^19"
+  },
+  "scripts": {
+    "build": "tsc -b tsconfig.lib.json",
+    "typecheck": "tsc -b --emitDeclarationOnly",
+    "release": "tsx ../../scripts/release-package.ts"
+  }
+}

package/src/cell.tsx

@@ -0,0 +1,144 @@
+import type * as GObject from "@gtkx/gi/gobject";
+import type * as Gtk from "@gtkx/gi/gtk";
+import { GtkTreeExpander } from "@gtkx/jsx/gtk";
+import { createPortal } from "@gtkx/react";
+import { Fragment, memo, type ReactNode, useCallback, useSyncExternalStore } from "react";
+import type { RenderItemProps } from "./types.js";
+import type { CellContainerStore, CellEntry } from "./utils/cell-container-store.js";
+import type { ItemResolver } from "./utils/item-resolver.js";
+import type { TreeItemMetadata } from "./utils/list-item-flatten.js";
+
+export type CellRenderer<T, S> = (
+    value: T | S | undefined,
+    treeRow: Gtk.TreeListRow | null,
+    position: number,
+) => ReactNode;
+
+interface CellProps<T, S> {
+    container: GObject.Object;
+    store: CellContainerStore;
+    resolver: ItemResolver<T, S>;
+    render: CellRenderer<T, S>;
+}
+
+interface CellRenderHostProps<T, S> {
+    store: CellContainerStore;
+    resolver: ItemResolver<T, S>;
+    render: CellRenderer<T, S>;
+}
+
+interface TreeExpanderCellProps {
+    treeRow: Gtk.TreeListRow;
+    metadata: TreeItemMetadata;
+    children: ReactNode;
+}
+
+const TreeExpanderCell = ({ treeRow, metadata, children }: TreeExpanderCellProps): ReactNode => (
+    <GtkTreeExpander
+        ref={(expander: Gtk.TreeExpander | null) => {
+            if (expander !== null) expander.setListRow(treeRow);
+        }}
+        hideExpander={metadata.hideExpander}
+        indentForDepth={metadata.indentForDepth}
+        indentForIcon={metadata.indentForIcon}
+    >
+        {children}
+    </GtkTreeExpander>
+);
+
+const Cell = memo(<T, S>({ container, store, resolver, render }: CellProps<T, S>): ReactNode => {
+    const subscribe = useCallback(
+        (onChange: () => void) => store.subscribePosition(container, onChange),
+        [store, container],
+    );
+    const getSnapshot = useCallback((): CellEntry => store.getPosition(container), [store, container]);
+    const entry = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+
+    if (entry.position < 0) return null;
+    const resolved = resolver.resolve(entry.position, entry.treeRow);
+    if (!resolved.present) return null;
+    const content = render(resolved.value, entry.treeRow, entry.position);
+    const portalled =
+        entry.treeRow !== null && !resolved.isHeader ? (
+            <TreeExpanderCell treeRow={entry.treeRow} metadata={resolved.metadata}>
+                {content}
+            </TreeExpanderCell>
+        ) : (
+            content
+        );
+    return createPortal(portalled, container, store.keyFor(container));
+}) as <T, S>(props: CellProps<T, S>) => ReactNode;
+
+export const CellRenderHost = <T, S>({ store, resolver, render }: CellRenderHostProps<T, S>): ReactNode => {
+    const containers = useSyncExternalStore(
+        store.subscribeSet,
+        store.getContainersSnapshot,
+        store.getContainersSnapshot,
+    );
+    return (
+        <Fragment>
+            {containers.map((container) => (
+                <Cell
+                    key={store.keyFor(container)}
+                    container={container}
+                    store={store}
+                    resolver={resolver}
+                    render={render}
+                />
+            ))}
+        </Fragment>
+    );
+};
+
+export type TreeRenderContext = {
+    controlled: boolean;
+    expandedIds: Set<string>;
+    rowId: (row: Gtk.TreeListRow) => string | undefined;
+};
+
+export const createTreeRenderContext = (
+    expandedIds: string[] | null | undefined,
+    rowId: (row: Gtk.TreeListRow) => string | undefined,
+): TreeRenderContext => ({
+    controlled: expandedIds !== undefined && expandedIds !== null,
+    expandedIds: new Set(expandedIds ?? []),
+    rowId,
+});
+
+const treeFields = (
+    treeRow: Gtk.TreeListRow | null,
+    context: TreeRenderContext | undefined,
+): { depth?: number; isExpanded?: boolean } => {
+    if (treeRow === null) return {};
+    const depth = treeRow.getDepth();
+    if (context === undefined || !treeRow.isExpandable()) return { depth };
+    const isExpanded = context.controlled
+        ? context.expandedIds.has(context.rowId(treeRow) ?? "")
+        : treeRow.getExpanded();
+    return { depth, isExpanded };
+};
+
+export const itemRenderer =
+    <T, S>(render: (props: RenderItemProps<T>) => ReactNode, context?: TreeRenderContext): CellRenderer<T, S> =>
+    (value, treeRow, position) =>
+        render({ item: value as T, index: position, ...treeFields(treeRow, context) });
+
+const headerRenderer =
+    <T, S>(renderHeader: ((info: { section: S }) => ReactNode) | null | undefined): CellRenderer<T, S> =>
+    (value) =>
+        renderHeader ? renderHeader({ section: value as S }) : null;
+
+interface HeaderRenderHostProps<T, S> {
+    useHeader: boolean;
+    store: CellContainerStore;
+    resolver: ItemResolver<T, S>;
+    renderHeader: ((info: { section: S }) => ReactNode) | null | undefined;
+}
+
+export const HeaderRenderHost = <T, S>({
+    useHeader,
+    store,
+    resolver,
+    renderHeader,
+}: HeaderRenderHostProps<T, S>): ReactNode =>
+    useHeader ? <CellRenderHost store={store} resolver={resolver} render={headerRenderer<T, S>(renderHeader)} /> : null;