@ai-matrx/records-ui 0.115.36 → 0.115.37

package/dist/index.js

@@ -13399,7 +13399,7 @@ function SplitRecordDialog({ tableId, record, document: document2, open, onOpenC
     let madeName = recordNameIn(table.data ?? null, madeDoc, "New record");
     if (titleKey !== null && !titleHeld) {
       const named = `${record.name} (split)`;
-      const renamed = await client.recordUpdate({ record_id: created, patch: { [titleKey]: named } });
+      const renamed = await (0, recordVersions_exports.updateRecordAt)(client, { record_id: created, patch: { [titleKey]: named }, version: await (0, recordVersions_exports.readVersionNow)(client, created) });
       if (renamed.ok) {
         madeName = named;
         onChanged?.();
@@ -19036,7 +19036,8 @@ function useGridDrillQuestion(args) {
   const source = useMemo28(() => ({ kind: "table", id: tableId }), [tableId]);
   const saved = useMemo28(() => questionFromGrouping(presentation.grouping), [presentation.grouping]);
   const url = useDrillUrlState({ fallback: saved });
-  const requested = args.enabled && (url.question.by.length > (args.plainGroupingIsRows ? 1 : 0) || url.question.across !== null || url.question.where.length > 0 || // `!= null`: a question read by a design-system that does not know the window or the comparison
+  const requested = args.enabled && // Up to three levels are ROWS under nested headers on the merged grid (Airtable's group levels).
+  (url.question.by.length > (args.plainGroupingIsRows ? 3 : 0) || url.question.across !== null || url.question.where.length > 0 || // `!= null`: a question read by a design-system that does not know the window or the comparison
   // yet has them UNDEFINED, and `undefined !== null` asked for drill metadata on every plain grid.
   url.question.window != null || url.question.compare != null);
   const { def } = useDrillDefinition(requested ? source : null);
@@ -23005,7 +23006,7 @@ function SortPanel({
 }
 
 // src/Grid.tsx
-import { pageSortsFor, thenSortsOf } from "@ai-matrx/records/first-page";
+import { pageSortFor as pageSortFor2, pageSortsFor, thenSortsOf } from "@ai-matrx/records/first-page";
 
 // src/gridValueFilter.ts
 import { useMemo as useMemo32, useRef as useRef31 } from "react";
@@ -24788,10 +24789,17 @@ function GridBody({
     return viewSorts[0]?.field === seatedSort.id ? thenSortsOf(viewSorts, list, seatedSort.id, unsortable) : [];
   }, [seatedSort, manual, fields.data, heldThen, viewSorts]);
   const thenKey = JSON.stringify(thenSorts);
+  const groupThenKeys = rowGroupKey ? (presentation.grouping?.then ?? []).map((t) => t.field).join("|") : "";
   const pageSort = useMemo38(
-    () => storePaged ? groupedPageSort(fields.data ?? [], rowGroupKey, pageSortsFor(fields.data ?? [], seatedSort, thenSorts)) : [],
+    () => {
+      if (!storePaged) return [];
+      const sorted = groupedPageSort(fields.data ?? [], rowGroupKey, pageSortsFor(fields.data ?? [], seatedSort, thenSorts));
+      if (!rowGroupKey || groupThenKeys === "") return sorted;
+      const inner2 = groupThenKeys.split("|").flatMap((key) => pageSortFor2(fields.data ?? [], { id: key, direction: "asc" }));
+      return [...sorted.slice(0, 1), ...inner2, ...sorted.slice(1).filter((s) => !inner2.some((i) => i.field === s.field))];
+    },
     // eslint-disable-next-line react-hooks/exhaustive-deps -- thenKey stands for thenSorts
-    [storePaged, fields.data, seatedSort, rowGroupKey, thenKey]
+    [storePaged, fields.data, seatedSort, rowGroupKey, thenKey, groupThenKeys]
   );
   const fullSorts = useMemo38(
     () => seatedSort ? [{ field: seatedSort.id, direction: seatedSort.direction }, ...thenSorts] : [],
@@ -25994,12 +26002,15 @@ function GridBody({
     if (field2 === null && !onPresentationChange) return null;
     const rowsGrouped = merged;
     const aggregates = rowsGrouped ? void 0 : view && Object.keys(view.aggregates ?? {}).length > 0 ? view.aggregates : field2 ? { [field2]: { kind: "count" } } : void 0;
-    const facts = rowsGrouped ? groupFactsFor(groupFacts, fields.data ?? [], chosenSummaries) : void 0;
+    const topFacts = rowsGrouped ? groupFactsFor(groupFacts, fields.data ?? [], chosenSummaries) : void 0;
+    const facts = topFacts ? (group) => group.ancestors ? void 0 : topFacts(group) : void 0;
+    const thenKeys = rowsGrouped ? (view?.then ?? []).map((t) => t.field) : [];
     return {
       columnId: field2,
       rowNoun: "record",
+      ...thenKeys.length > 0 ? { thenColumnIds: thenKeys } : {},
       ...aggregates ? { aggregates } : {},
-      ...rowsGrouped ? { renderLabel: groupLabel2, order: "first-seen", emptyLabel: "No value" } : {},
+      ...rowsGrouped ? { renderLabel: (group) => group.ancestors ? void 0 : groupLabel2(group), order: "first-seen", emptyLabel: "No value" } : {},
       ...facts ? { groupFacts: facts } : {},
       ...!rowsGrouped && view?.order ? { order: view.order } : {},
       ...view?.collapsed ? { collapsed: view.collapsed } : {},
@@ -26020,6 +26031,15 @@ function GridBody({
             }
           });
         },
+        // NESTED GROUPS: the second and third level are the view's `grouping.then` (the store allows three levels).
+        ...rowsGrouped ? {
+          onThenColumnIdsChange: (ids) => {
+            const current = presentation.grouping;
+            if (!current) return;
+            const { then: _was, collapsed: _shut, ...rest } = current;
+            writeLook({ ...presentation, grouping: ids.length > 0 ? { ...rest, then: ids.slice(0, 2).map((field3) => ({ field: field3 })) } : rest });
+          }
+        } : {},
         onCollapsedChange: (collapsed) => {
           const current = presentation.grouping;
           if (!current) return;
@@ -38982,6 +39002,7 @@ function ViewBar({ tableId, activeViewId, onActiveView, seed, settings, onViews,
     return (initialViews.find((v) => v.id === activeViewId) ?? defaultViewOf(initialViews) ?? initialViews[0]).id;
   });
   const readOnMount = useRef50(initialViews === void 0);
+  const pendingPick = useRef50(null);
   const [naming, setNaming] = useState109(false);
   const [draftName, setDraftName] = useState109("");
   const [open, setOpen] = useState109(false);
@@ -39058,7 +39079,9 @@ function ViewBar({ tableId, activeViewId, onActiveView, seed, settings, onViews,
   }, [load]);
   useEffect89(() => {
     if (!views || views.length === 0) return;
-    const chosen = views.find((v) => v.id === (activeViewId ?? active)) ?? defaultViewOf(views) ?? views[0];
+    const wanted = pendingPick.current;
+    pendingPick.current = null;
+    const chosen = views.find((v) => v.id === (wanted ?? activeViewId ?? active)) ?? defaultViewOf(views) ?? views[0];
     if (chosen.id !== active) setActive(chosen.id);
     onActiveView?.(chosen);
   }, [views, activeViewId]);
@@ -39073,6 +39096,7 @@ function ViewBar({ tableId, activeViewId, onActiveView, seed, settings, onViews,
     setNamingPersonal(false);
     setDraftName("");
     setActive(written.data);
+    pendingPick.current = written.data;
     await load();
   }
   async function rename(view, name) {
@@ -39143,6 +39167,7 @@ function ViewBar({ tableId, activeViewId, onActiveView, seed, settings, onViews,
       return;
     }
     setActive(written.data);
+    pendingPick.current = written.data;
     await load();
   }
   async function archive(view) {