(({
React.useEffect(() => {
if (settledTotal != null) onTotalChangeRef.current?.(settledTotal);
}, [settledTotal]);
+ // objectstack#26679 — the rows on show, for a host that steps through them.
+ // Keyed on the ids in their order (never on the identity of `data` or of
+ // the callback, AGENTS.md #10), so an equal refetch reports nothing new; a
+ // load in flight keeps the last answer, as the count does.
+ const onRowsChangeRef = React.useRef(onRowsChange);
+ React.useEffect(() => {
+ onRowsChangeRef.current = onRowsChange;
+ });
+ const rowSequenceShown = paginate && surfaceDrawsFetchedRows;
+ const shownRowsSettled = rowSequenceShown ? !loading && !loadError : true;
+ const shownRowsKey = rowSequenceShown
+ ? JSON.stringify(data.map((row: any) => row?.id ?? row?._id ?? null))
+ : '[]';
+ const shownRowsRef = React.useRef(data);
+ shownRowsRef.current = rowSequenceShown ? data : [];
+ React.useEffect(() => {
+ if (!shownRowsSettled) return;
+ onRowsChangeRef.current?.(shownRowsRef.current);
+ }, [shownRowsKey, shownRowsSettled]);
return (
+ ({
+ find: vi.fn(async () => ({ data: ROWS, total: ROWS.length })),
+ findOne: vi.fn(),
+ create: vi.fn(),
+ update: vi.fn(),
+ delete: vi.fn(),
+ getObjectSchema: vi.fn(async (name: string) => (name === OBJECT ? objectDef : null)),
+ }) as any;
+
+function mount(schemaExtra: Record) {
+ const dataSource = makeDataSource();
+ const onRowsChange = vi.fn();
+ render(
+
+
+ ,
+ );
+ return { dataSource, onRowsChange };
+}
+
+const lastIds = (fn: ReturnType) =>
+ (fn.mock.calls.at(-1)?.[0] as Array<{ id: string }> | undefined)?.map((r) => r.id);
+
+afterEach(() => cleanup());
+
+describe('ListView onRowsChange (objectstack#26679)', () => {
+ it('a paged grid reports the rows it shows, in their shown order', async () => {
+ const { dataSource, onRowsChange } = mount({ viewType: 'grid' });
+ await waitFor(() => expect(dataSource.find).toHaveBeenCalled());
+ await waitFor(() => expect(lastIds(onRowsChange)).toEqual(['l_3', 'l_1', 'l_2']));
+ });
+
+ it('control: a board has no single row order and reports no rows', async () => {
+ const { dataSource, onRowsChange } = mount({
+ viewType: 'kanban',
+ options: { kanban: { groupBy: 'status' } },
+ });
+ await waitFor(() => expect(dataSource.find).toHaveBeenCalled());
+ await waitFor(() => expect(onRowsChange).toHaveBeenCalled());
+ expect(onRowsChange.mock.calls.every(([rows]) => rows.length === 0)).toBe(true);
+ });
+});
diff --git a/ui/packages/react/src/context/RelatedRecordActionsContext.tsx b/ui/packages/react/src/context/RelatedRecordActionsContext.tsx
index 1990465b4a9..066dd2f6c15 100644
--- a/ui/packages/react/src/context/RelatedRecordActionsContext.tsx
+++ b/ui/packages/react/src/context/RelatedRecordActionsContext.tsx
@@ -63,8 +63,12 @@ export interface RelatedRowActionDef {
* optional: an omitted handler hides its affordance in the list.
*/
export interface RelatedRecordHandlers {
- /** Open the child record's detail page (查看详情). */
- onView?: (recordId: string | number, record?: unknown) => void;
+ /**
+ * Open the child record's detail page (查看详情). `siblings` are the ids of
+ * the rows the list shows beside it, in its order (objectstack#26679): a
+ * host that opens the record in a drawer steps through them with ↑ ↓.
+ */
+ onView?: (recordId: string | number, record?: unknown, siblings?: ReadonlyArray) => void;
/**
* Open a create form for a new child record. The host pre-links it to the
* parent (via the relationship field + parent id passed to `resolve`), so no
diff --git a/ui/packages/react/src/hooks/__tests__/navigationOverlayConsumers.onRowClickArity-9357.test.ts b/ui/packages/react/src/hooks/__tests__/navigationOverlayConsumers.onRowClickArity-9357.test.ts
index e625892d530..a5c58264f3e 100644
--- a/ui/packages/react/src/hooks/__tests__/navigationOverlayConsumers.onRowClickArity-9357.test.ts
+++ b/ui/packages/react/src/hooks/__tests__/navigationOverlayConsumers.onRowClickArity-9357.test.ts
@@ -219,7 +219,7 @@ function readSource(rel: string): string {
* the criterion.
*/
const HOOK_CALL = /useNavigationOverlay\s*\(/;
-const IN_SITES: Array<{ rel: string; member: string; why: string; hop: RegExp; after?: string }> = [
+const IN_SITES: Array<{ rel: string; member: string; why: string; hop: RegExp; after?: string; arity?: number }> = [
{ rel: 'packages/plugin-grid/src/ObjectGrid.tsx', member: 'onRowClick',
why: 'fed to useNavigationOverlay as its onRowClick', hop: HOOK_CALL },
{ rel: 'packages/plugin-kanban/src/ObjectKanban.tsx', member: 'onRowClick',
@@ -242,9 +242,13 @@ const IN_SITES: Array<{ rel: string; member: string; why: string; hop: RegExp; a
why: 'the onRowClick arm of `props.onRowClick ?? props.onCardClick`', hop: HOOK_CALL },
{ rel: 'packages/plugin-list/src/ObjectGallery.tsx', member: 'onCardClick',
why: 'the onCardClick arm of the same `??`', hop: HOOK_CALL },
+ // Three since objectstack#26679: after the modifier payload, the rows the
+ // list shows (the drawer's sibling set). Optional like the second, so the
+ // payload this card pins is still declared and no caller is forced to pass
+ // either.
{ rel: 'packages/plugin-detail/src/RelatedList.tsx', member: 'onRowClick',
why: 'placed on the object-gallery schema it renders, reaching ObjectGallery props',
- hop: /type: 'object-gallery'/ },
+ hop: /type: 'object-gallery'/, arity: 3 },
// ⭐ objectui#7804's `objectql.ts` slice closed the remaining hole on this
// exact path. `RelatedList` above is IN *because* it writes `onRowClick` onto
// the `object-gallery` NODE — and until that slice the node type declared
@@ -367,12 +371,15 @@ describe('objectui#9357 — the arity counter, before it is pointed at the tree'
});
describe('objectui#9357 — consumers on the modifier-forwarding path declare the payload', () => {
- it.each(IN_SITES)('$rel declares two parameters for $member ($why)', ({ rel, member, after }) => {
+ it.each(IN_SITES)('$rel declares two parameters for $member ($why)', ({ rel, member, after, arity = 2 }) => {
const params = declParams(readSource(rel), member, after);
expect(params, `${rel} :: ${member} — no inline function-type declaration found`).not.toBeNull();
- expect(params, `${rel} :: ${member}`).toHaveLength(2);
- // The second parameter is optional, so no existing caller is forced to pass it.
- expect(params![1], `${rel} :: ${member} second parameter must stay optional`).toMatch(/^\w+\?:/);
+ expect(params, `${rel} :: ${member}`).toHaveLength(arity);
+ // The second parameter is optional, so no existing caller is forced to pass
+ // it — and so is any after it.
+ for (const param of params!.slice(1)) {
+ expect(param, `${rel} :: ${member} parameters after the first must stay optional`).toMatch(/^\w+\?:/);
+ }
});
it('every IN site carries its own forwarding hop — the criterion, not the name', () => {