@ai-matrx/records-ui 0.109.5 → 0.109.7

package/dist/index.cjs

@@ -22236,7 +22236,7 @@ function useRowFollowsItsMove(args) {
   const lastIds = (0, import_react116.useRef)(args.rowIds);
   const frame = (0, import_react116.useRef)(0);
   (0, import_react116.useEffect)(() => () => cancelAnimationFrame(frame.current), []);
-  const noteWrite = (0, import_react116.useCallback)((rowId) => {
+  const noteWrite = (0, import_react116.useCallback)((rowId, key) => {
     const box = latest.current.box.current;
     if (!box) return;
     const el = rowEl(box, rowId);
@@ -22245,7 +22245,7 @@ function useRowFollowsItsMove(args) {
       held.current = null;
       return;
     }
-    held.current = { rowId, top: el.getBoundingClientRect().top, index, at: Date.now() };
+    held.current = { rowId, key, top: el.getBoundingClientRect().top, index, at: Date.now() };
   }, []);
   (0, import_react116.useLayoutEffect)(() => {
     if (args.rowIds === lastIds.current) return;
@@ -22265,6 +22265,7 @@ function useRowFollowsItsMove(args) {
     }
     if (index === pending.index) return;
     held.current = null;
+    latest.current.onMoved?.(pending.rowId, pending.key);
     const el = rowEl(box, pending.rowId);
     if (!el) {
       bringIntoView(box, pending.rowId, index, args.rowIds);
@@ -23274,6 +23275,9 @@ function GridBody({
   const openingKey = openingSort ? `${openingSort.id}:${openingSort.direction}` : "none";
   const address = useViewAddress();
   const addressSeed = (0, import_react123.useRef)(address?.initial ?? null);
+  const addressSort = (0, import_react123.useRef)(
+    address?.initial?.sort ? { id: address.initial.sort.field, direction: address.initial.sort.direction } : null
+  );
   const [query, setQuery] = (0, import_react123.useState)(() => ({
     page: addressSeed.current?.page ?? 1,
     pageSize,
@@ -23288,11 +23292,15 @@ function GridBody({
     if (seed && fields.data) addressSeed.current = null;
     setQuery((held) => ({
       ...held,
-      sort: seed?.sort ? { id: seed.sort.field, direction: seed.sort.direction } : openingSort,
+      sort: addressSort.current ?? openingSort,
       page: seed?.page ?? 1
     }));
     setSeatedOn(openingKey);
   }, [openingKey]);
+  (0, import_react123.useEffect)(() => {
+    const held = addressSort.current;
+    if (held && (query.sort?.id !== held.id || query.sort?.direction !== held.direction)) addressSort.current = null;
+  }, [query.sort]);
   const columnSort = query.sort;
   const overrideKey = sortOverride ? `${sortOverride.field}:${sortOverride.direction}` : "";
   const overrideSeen = (0, import_react123.useRef)(overrideKey);
@@ -23335,6 +23343,7 @@ function GridBody({
     if (resetSeen.current === resetEpoch) return;
     resetSeen.current = resetEpoch;
     addressSeed.current = null;
+    addressSort.current = null;
     setQuery((held) => ({ ...held, sort: openingSort, search: "", anyOf: "", columnFilters: {}, page: 1 }));
   }, [resetEpoch]);
   const [page, setPage] = (0, import_react123.useState)(0);
@@ -23466,6 +23475,7 @@ function GridBody({
   const canWrite = Boolean(editable) && (rights.write || askPerRow && rowIds.some(mayWriteRow));
   const readOnly = !editable || Boolean(host.rights) && !rights.write && !rights.structure;
   const gridBox = (0, import_react123.useRef)(null);
+  const lastExit = (0, import_react123.useRef)(null);
   const pushWritten = (0, import_react123.useRef)(null);
   const sheetController = (0, import_react123.useRef)(null);
   const versions = useRecordVersions(client, rows);
@@ -23486,7 +23496,10 @@ function GridBody({
      * Enter or Cmd-Z works without a click. Sheets and Airtable.
      */
     ...merged ? {
-      onEnded: (exit, from, how) => sheetController.current?.endEdit(exit, { rowId: from.rowId, columnId: from.key }, how)
+      onEnded: (exit, from, how) => {
+        lastExit.current = { rowId: from.rowId, key: from.key, exit };
+        sheetController.current?.endEdit(exit, { rowId: from.rowId, columnId: from.key }, how);
+      }
     } : {}
   });
   const editingNow = (0, import_react123.useRef)(editing);
@@ -23514,7 +23527,15 @@ function GridBody({
     sort: sortedField ? { key: sortedField.key, name: fieldName(sortedField) } : null,
     say: (line) => undo.say(line, false, true)
   });
-  const rowMove = useRowFollowsItsMove({ box: gridBox, rowIds });
+  const rowMove = useRowFollowsItsMove({
+    box: gridBox,
+    rowIds,
+    onMoved: (rowId, key) => {
+      const exit = lastExit.current;
+      if (!exit || exit.rowId !== rowId || exit.key !== key) return;
+      if (exit.exit === "down" || exit.exit === "stay") sheetController.current?.select({ rowId, columnId: key });
+    }
+  });
   pushWritten.current = (write) => {
     const field2 = (fields.data ?? []).find((f) => f.key === write.key);
     const name = changedRecordName(table.data, rows.find((r) => r.id === write.rowId)?.document ?? {}, write.key, write.after);
@@ -23522,7 +23543,7 @@ function GridBody({
       label: `Changed ${field2 ? fieldName(field2) : (0, import_text_case10.humanizeIdentifier)(write.key)} on ${name}`,
       cells: [{ rowId: write.rowId, key: write.key, before: write.before ?? null, after: write.after ?? null, version: write.version }]
     });
-    rowMove.noteWrite(write.rowId);
+    rowMove.noteWrite(write.rowId, write.key);
     noteWriteForView(write, name);
   };
   const storeLayout = useStoreGridLayout(tableId);