@stcn52/pro 0.2.0 → 0.2.1

package/dist/index.d.cts

@@ -2491,7 +2491,7 @@ type AttachmentUploadProps = {
         size: number;
     }, progress: (pct: number) => void): Promise<void> | void;
     onRemove(relationId: string): void;
-    /** Names the record in the remove copy; the host already holds it. */
+    /** Record identity: changing it cancels pending reads and resets attachment dialogs. */
     entityId?: string;
     /** Raised for the two failures no callback can carry: a refused file and a broken read. */
     onNotify?: Notify;
@@ -2502,7 +2502,8 @@ type AttachmentUploadProps = {
  * already linked to this record with a confirmed unlink. It reads the bytes
  * itself — the bar cannot pass 88% until the read finishes — and hands the
  * finished file to the host, which owns the store write.
- */ declare function AttachmentUpload({ files, label, maxSizeMb, onUpload, onRemove, entityId, onNotify, }: AttachmentUploadProps): react.JSX.Element;
+ */
+declare function AttachmentUpload(props: AttachmentUploadProps): react.JSX.Element;
 
 /** One kind the picker can link to; `kind` is the host's own collection name. */
 type LinkTarget = {

package/dist/index.d.ts

@@ -2491,7 +2491,7 @@ type AttachmentUploadProps = {
         size: number;
     }, progress: (pct: number) => void): Promise<void> | void;
     onRemove(relationId: string): void;
-    /** Names the record in the remove copy; the host already holds it. */
+    /** Record identity: changing it cancels pending reads and resets attachment dialogs. */
     entityId?: string;
     /** Raised for the two failures no callback can carry: a refused file and a broken read. */
     onNotify?: Notify;
@@ -2502,7 +2502,8 @@ type AttachmentUploadProps = {
  * already linked to this record with a confirmed unlink. It reads the bytes
  * itself — the bar cannot pass 88% until the read finishes — and hands the
  * finished file to the host, which owns the store write.
- */ declare function AttachmentUpload({ files, label, maxSizeMb, onUpload, onRemove, entityId, onNotify, }: AttachmentUploadProps): react.JSX.Element;
+ */
+declare function AttachmentUpload(props: AttachmentUploadProps): react.JSX.Element;
 
 /** One kind the picker can link to; `kind` is the host's own collection name. */
 type LinkTarget = {

package/dist/index.js

@@ -89,7 +89,10 @@ function useControllableState(options) {
   });
   const setValue = useCallback((next) => {
     const resolved = typeof next === "function" ? next(currentRef.current) : next;
-    if (!controlledRef.current) setUncontrolled(resolved);
+    if (!controlledRef.current) {
+      currentRef.current = resolved;
+      setUncontrolled(resolved);
+    }
     onChangeRef.current?.(resolved);
   }, []);
   return [current, setValue];
@@ -2326,7 +2329,7 @@ function SelectionBar({
                   "aria-expanded": moreOpen,
                   onClick: () => setMoreOpen(true),
                   children: [
-                    /* @__PURE__ */ jsx(Icon, { name: "menu", size: 14 }),
+                    /* @__PURE__ */ jsx(Icon, { name: "more", size: 14 }),
                     " ",
                     locale === "zh-CN" ? "\u66F4\u591A" : "More"
                   ]
@@ -2356,7 +2359,8 @@ function buildBulkCommands({
   more,
   onNotify,
   onEditProperties,
-  onClear
+  onClear,
+  onComplete
 }) {
   const count = keys.length;
   const many = count === 1 ? noun.one : noun.many;
@@ -2364,7 +2368,8 @@ function buildBulkCommands({
     if (!count) return;
     const finish = () => {
       onNotify?.(message2);
-      onClear();
+      if (onComplete) onComplete(keys);
+      else onClear();
     };
     const result = run();
     if (result) return result.then(finish);
@@ -4069,6 +4074,7 @@ function BulkBar({
   someSelected,
   onToggleAll,
   onClear,
+  onComplete,
   onEditProperties,
   onExportSelection,
   onDelete,
@@ -4100,7 +4106,8 @@ function BulkBar({
     ],
     onNotify,
     onEditProperties,
-    onClear
+    onClear,
+    onComplete
   });
   return /* @__PURE__ */ jsx(
     SelectionBar,
@@ -4122,6 +4129,7 @@ function BulkBar({
 
 // src/components/table/geometry.ts
 var LEADING_WIDTH = 44;
+var COMPACT_ACTIONS_WIDTH = 96;
 function widthStyle(width) {
   if (width === void 0) return void 0;
   return { width: typeof width === "number" ? `${width}px` : width };
@@ -4156,6 +4164,7 @@ function pinStyle(pin, direction = "ltr") {
 }
 function SkeletonRows({
   columns,
+  compact,
   rows,
   widths,
   selectable,
@@ -4212,7 +4221,16 @@ function SkeletonRows({
       },
       column.id
     )),
-    hasRowActions ? /* @__PURE__ */ jsx("td", { className: cx("pro-table__actions-col", pinned && "is-fixed-right-first") }) : null,
+    hasRowActions ? /* @__PURE__ */ jsx(
+      "td",
+      {
+        className: cx(
+          "pro-table__actions-col",
+          pinned && (compact ? pinClass({ side: "right"}, true) : "is-fixed-right-first")
+        ),
+        style: pinned && compact ? pinStyle({ side: "right", offset: 0 }, direction) : void 0
+      }
+    ) : null,
     /* @__PURE__ */ jsx("td", { className: "pro-table__filler" }),
     hasHeaderTools ? /* @__PURE__ */ jsx("td", { className: "pro-table__tool-col" }) : null
   ] }, `skeleton-${rowIndex}`)) });
@@ -4235,7 +4253,7 @@ function ColumnMenu({
     close();
   };
   const items = [
-    ...column.sortable && onSortChange ? [
+    ...(column.sortable || column.sorter) && onSortChange ? [
       {
         id: "sort",
         label: "Sort by",
@@ -4489,10 +4507,10 @@ function TableHead({
                         "aria-label": `Sort by ${typeof column.header === "string" ? column.header : column.id}`,
                         children: [
                           column.header,
-                          /* @__PURE__ */ jsxs("span", { className: "pro-table__sort-icon", "aria-hidden": "true", children: [
-                            /* @__PURE__ */ jsx(Icon, { name: sorted && current?.direction === "desc" ? "angle-down" : "angle-up", size: 9 }),
-                            /* @__PURE__ */ jsx(Icon, { name: sorted && current?.direction === "asc" ? "angle-up" : "angle-down", size: 9 })
-                          ] })
+                          /* @__PURE__ */ jsx("span", { className: "pro-table__sort-icon", "aria-hidden": "true", children: current ? /* @__PURE__ */ jsx(Icon, { name: current.direction === "asc" ? "angle-up" : "angle-down", size: 9 }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+                            /* @__PURE__ */ jsx(Icon, { name: "angle-up", size: 9 }),
+                            /* @__PURE__ */ jsx(Icon, { name: "angle-down", size: 9 })
+                          ] }) })
                         ]
                       }
                     ) : column.header,
@@ -4639,17 +4657,22 @@ function nextCell(key, cell, rowCount, colCount) {
   else return null;
   return next;
 }
-function CellCommands({ actions, row }) {
+function CellCommands({
+  actions,
+  row,
+  disabled
+}) {
   if (actions.length === 0) return null;
   return /* @__PURE__ */ jsx("span", { className: "pro-table__cell-actions", children: actions.map((action) => /* @__PURE__ */ jsx(Tooltip, { label: action.label, children: /* @__PURE__ */ jsx(
     "button",
     {
       type: "button",
+      disabled,
       className: "pro-table__cell-action",
       "aria-label": action.label,
       onClick: (event) => {
         event.stopPropagation();
-        action.onSelect(row);
+        if (!disabled) action.onSelect(row);
       },
       children: /* @__PURE__ */ jsx(Icon, { name: action.icon, size: 14 })
     }
@@ -4833,12 +4856,13 @@ function TableRow({
               {
                 className: cx(
                   "pro-table__cell",
+                  column.ellipsis === false && "pro-table__cell--wrap",
                   column.align === "center" && "pro-table__cell--center",
                   column.align === "right" && "pro-table__cell--right"
                 ),
                 children: [
                   /* @__PURE__ */ jsx(CellContent, { value: column.render(row, index), ellipsis: column.ellipsis }),
-                  column.actions?.length ? /* @__PURE__ */ jsx(CellCommands, { actions: column.actions, row }) : null
+                  column.actions?.length ? /* @__PURE__ */ jsx(CellCommands, { actions: column.actions, row, disabled }) : null
                 ]
               }
             )
@@ -4850,7 +4874,11 @@ function TableRow({
           /* @__PURE__ */ jsx(
             "td",
             {
-              className: cx("pro-table__actions-col", pinned && "is-fixed-right-first"),
+              className: cx(
+                "pro-table__actions-col",
+                pinned && (compact ? pinClass({ side: "right"}, true) : "is-fixed-right-first")
+              ),
+              style: pinned && compact ? pinStyle({ side: "right", offset: 0 }, direction) : void 0,
               onClick: (event) => event.stopPropagation(),
               children: compact ? /* @__PURE__ */ jsx("div", { className: "pro-table__cell pro-table__cell--actions", children: rowActions(row) }) : /* @__PURE__ */ jsx("span", { className: "pro-table__row-actions", children: rowActions(row) })
             }
@@ -5012,6 +5040,44 @@ function DataTable({
   const { direction, locale } = useProConfig();
   const { leaves: columns, headers } = useMemo(() => tableColumns(suppliedColumns), [suppliedColumns]);
   const selectionName = useId();
+  const selectionMounted = useRef(false);
+  useLayoutEffect(() => {
+    selectionMounted.current = true;
+    return () => {
+      selectionMounted.current = false;
+    };
+  }, []);
+  const latestSelection = useRef({
+    selectedKeys,
+    onSelectedKeysChange,
+    suppliedRows,
+    rowKey,
+    getChildren,
+    isRowSelectable,
+    onNotify
+  });
+  useLayoutEffect(() => {
+    latestSelection.current = {
+      selectedKeys,
+      onSelectedKeysChange,
+      suppliedRows,
+      rowKey,
+      getChildren,
+      isRowSelectable,
+      onNotify
+    };
+  });
+  const clearSelection = (completed) => {
+    if (!selectionMounted.current) return;
+    const current = latestSelection.current;
+    const locked = new Set(
+      flattenRecords(tableRecords(current.suppliedRows, current.rowKey, current.getChildren), null).filter(({ row }) => current.isRowSelectable?.(row) === false).map(({ key }) => key)
+    );
+    const processed2 = completed ? new Set(completed) : void 0;
+    current.onSelectedKeysChange?.(
+      current.selectedKeys.filter((key) => locked.has(key) || processed2 !== void 0 && !processed2.has(key))
+    );
+  };
   const [scrollTop, setScrollTop] = useState(0);
   const [focusedKey, setFocusedKey] = useState(null);
   const [headerHeight, setHeaderHeight] = useState(44);
@@ -5134,7 +5200,7 @@ function DataTable({
   const columnsCount = columns.length + (selectable ? 1 : 0) + (showIndex ? 1 : 0) + (rowActions ? 1 : 0) + (headerTools ? 1 : 0) + (hasExpansion ? 1 : 0) + 1;
   const pinned = columns.some((column) => column.fixed !== void 0);
   const leadingWidth = (selectable ? LEADING_WIDTH : 0) + (showIndex ? LEADING_WIDTH : 0) + (hasExpansion ? LEADING_WIDTH : 0);
-  const pins = pinOffsets(columns, leadingWidth, 0);
+  const pins = pinOffsets(columns, leadingWidth, compact && rowActions ? COMPACT_ACTIONS_WIDTH : 0);
   const lastLeft = [...columns].reverse().find((column) => column.fixed === "left")?.id;
   const firstRight = columns.find((column) => column.fixed === "right")?.id;
   const rootRef = useRef(null);
@@ -5195,7 +5261,9 @@ function DataTable({
   const rowHeight = suppliedHeight !== void 0 && Number.isFinite(suppliedHeight) && suppliedHeight > 0 ? suppliedHeight : compact ? 36 : 45;
   const overscan = suppliedOverscan !== void 0 && Number.isFinite(suppliedOverscan) ? Math.max(0, Math.floor(suppliedOverscan)) : 3;
   const viewportHeight = typeof scroll?.y === "number" && Number.isFinite(scroll.y) && scroll.y > 0 ? scroll.y : 300;
-  const windowed = Boolean(virtual && !groupBy && !expandedRowRender && !columns.some((column) => column.onCell));
+  const windowed = Boolean(
+    virtual && !groupBy && !expandedRowRender && !columns.some((column) => column.onCell || column.ellipsis === false)
+  );
   const start = windowed ? Math.min(
     Math.max(0, rows.length - Math.ceil(viewportHeight / rowHeight)),
     Math.max(0, Math.floor((scrollTop - (showHeader ? headerHeight : 0)) / rowHeight) - overscan)
@@ -5282,9 +5350,10 @@ function DataTable({
         widths: loadingColumns,
         selectable,
         showIndex,
+        compact,
         hasRowActions: Boolean(rowActions),
         hasHeaderTools: Boolean(headerTools),
-        hasExpansion: Boolean(expandedRowRender),
+        hasExpansion,
         pinned,
         pins,
         lastLeft,
@@ -5321,6 +5390,7 @@ function DataTable({
     const indexes = Array.from({ length: end - start }, (_, index) => start + index);
     const focusedIndex = focusedKey === null ? -1 : visibleRecords.findIndex((record) => record.key === focusedKey);
     if (windowed && focusedIndex >= 0 && !indexes.includes(focusedIndex)) indexes.push(focusedIndex);
+    if (windowed && cursor && rows.length > 0 && !indexes.includes(cursorRow)) indexes.push(cursorRow);
     indexes.sort((a, b) => a - b);
     const spacer = (height, key) => /* @__PURE__ */ jsx("tr", { "aria-hidden": "true", children: /* @__PURE__ */ jsx("td", { colSpan: columnsCount, style: { height, padding: 0, border: 0 } }) }, key);
     body = /* @__PURE__ */ jsxs("tbody", { children: [
@@ -5368,17 +5438,14 @@ function DataTable({
               allSelected,
               someSelected,
               onToggleAll: toggleAll,
-              onClear: () => onSelectedKeysChange?.(
-                selectedKeys.filter(
-                  (key) => flattenRecords(records, null).some(
-                    ({ row }) => rowKey(row) === key && isRowSelectable?.(row) === false
-                  )
-                )
-              ),
+              onClear: () => clearSelection(),
+              onComplete: clearSelection,
               onEditProperties,
               onExportSelection,
               onDelete,
-              onNotify
+              onNotify: (message2) => {
+                if (selectionMounted.current) latestSelection.current.onNotify?.(message2);
+              }
             }
           ) : null,
           /* @__PURE__ */ jsxs(
@@ -5401,7 +5468,7 @@ function DataTable({
                   showIndex ? /* @__PURE__ */ jsx("col", { style: { width: LEADING_WIDTH } }) : null,
                   hasExpansion ? /* @__PURE__ */ jsx("col", { style: { width: LEADING_WIDTH } }) : null,
                   columns.map((column) => /* @__PURE__ */ jsx("col", { style: { width: column.width } }, column.id)),
-                  rowActions ? /* @__PURE__ */ jsx("col", { style: { width: compact ? 96 : 0 } }) : null,
+                  rowActions ? /* @__PURE__ */ jsx("col", { style: { width: compact ? COMPACT_ACTIONS_WIDTH : 0 } }) : null,
                   /* @__PURE__ */ jsx("col", {}),
                   headerTools ? /* @__PURE__ */ jsx("col", { style: { width: LEADING_WIDTH } }) : null
                 ] }),
@@ -10458,7 +10525,10 @@ function isPromise(value) {
 function clamp(pct) {
   return Number.isFinite(pct) ? Math.max(0, Math.min(100, Math.round(pct))) : 0;
 }
-function AttachmentUpload({
+function AttachmentUpload(props) {
+  return /* @__PURE__ */ jsx(AttachmentUploadSession, { ...props }, props.entityId);
+}
+function AttachmentUploadSession({
   files,
   label,
   maxSizeMb = DEFAULT_MAX_MB,
@@ -11380,7 +11450,14 @@ function EntityDialog({
   const fieldValue = (id) => Object.hasOwn(values, id) && typeof values[id] === "string" ? values[id] : "";
   const dirty = Object.keys(values).some((key) => values[key] !== baseline[key]);
   const errors = Object.fromEntries(
-    [...fields, ...asideFields].filter((field) => field.required && !fieldValue(field.id).trim()).map((field) => [field.id, zh ? `\u8BF7\u586B\u5199${field.label}` : `${field.label} is required`])
+    [...fields, ...asideFields].flatMap((field) => {
+      const value = fieldValue(field.id);
+      if (field.required && !value.trim())
+        return [[field.id, zh ? `\u8BF7\u586B\u5199${field.label}` : `${field.label} is required`]];
+      if (field.kind === "select" && value && !field.options?.some((option) => option.value === value))
+        return [[field.id, zh ? `\u8BF7\u9009\u62E9\u6709\u6548\u7684${field.label}` : `Choose a valid ${field.label}`]];
+      return [];
+    })
   );
   const invalid = Object.keys(errors).length > 0;
   const idPrefix = useId();
@@ -13056,7 +13133,7 @@ function AssigneeCell({ field, row, rowKey }) {
         disabled,
         className: "pro-assignee-cell__assign",
         "aria-label": field.assignLabel?.(row) ?? `Assign ${rowKey}`,
-        tabIndex: -1,
+        tabIndex: field.onAssign ? 0 : -1,
         onClick: (event) => {
           event.stopPropagation();
           if (field.onAssign) {
@@ -13249,6 +13326,7 @@ function ListWorkbench({
   const [deleteError, setDeleteError] = useState(false);
   const [sessionIdentity, setSessionIdentity] = useState(identity);
   const [hiddenColumns, setHiddenColumns] = useState([]);
+  const [unfrozenColumns, setUnfrozenColumns] = useState([]);
   const [columnsOpen, setColumnsOpen] = useState(false);
   const [columnAnchor, setColumnAnchor] = useState(null);
   const [settingsOpen, setSettingsOpen] = useState(false);
@@ -13263,6 +13341,12 @@ function ListWorkbench({
   const editable = Boolean(editFields && entityKind && onEdit);
   const createSheet = Boolean(editFields && entityKind && onCreate);
   const filteredEmpty = Boolean(view.q || view.rules.length);
+  const [session, setSession] = useState({ identity });
+  if (session.identity !== identity) setSession({ identity });
+  const boardSession = useRef(session);
+  useLayoutEffect(() => {
+    boardSession.current = session;
+  }, [session]);
   const latest = useRef({ onImport, onNotify, onSelectionChange, selection, disabled });
   useLayoutEffect(() => {
     latest.current = { onImport, onNotify, onSelectionChange, selection, disabled };
@@ -13291,6 +13375,7 @@ function ListWorkbench({
     setBulkEditOpen(false);
     setBulkConfirm(false);
     setHiddenColumns([]);
+    setUnfrozenColumns([]);
   }
   if (disabled && columnsOpen) setColumnsOpen(false);
   if (disabled && settingsOpen) setSettingsOpen(false);
@@ -13356,7 +13441,9 @@ function ListWorkbench({
       };
     }
     return column;
-  }).map((column) => frozen.includes(column.id) ? { ...column, fixed: "left" } : column);
+  }).map(
+    (column) => frozen.includes(column.id) ? { ...column, fixed: "left" } : unfrozenColumns.includes(column.id) ? { ...column, fixed: void 0 } : column
+  );
   const groupValue = useMemo(() => {
     if (!view.group) return void 0;
     return (row) => {
@@ -13367,7 +13454,15 @@ function ListWorkbench({
   }, [view.group]);
   const exportCsv = (keys = []) => {
     if (disabled) return;
-    const source = keys.length > 0 ? sorted.filter((row) => keys.includes(rowKey(row))) : sorted;
+    const selected = new Set(keys);
+    const source = selected.size > 0 ? rows.filter((row) => selected.has(rowKey(row))) : sorted;
+    if (selected.size > 0 && source.length !== selected.size) {
+      notify(
+        "error",
+        zh ? "\u90E8\u5206\u6240\u9009\u8BB0\u5F55\u672A\u52A0\u8F7D\uFF0C\u8BF7\u52A0\u8F7D\u5B8C\u6574\u6570\u636E\u540E\u91CD\u8BD5\u3002" : "Some selected records are not loaded. Load all selected records and retry."
+      );
+      return;
+    }
     try {
       if (onExport) download(`${slug}.csv`, onExport(source));
       else exportRowsToCsv(slug, source);
@@ -13650,7 +13745,7 @@ function ListWorkbench({
       {
         title: `No ${noun.many} to show`,
         hint: emptyBoardText ?? "Nothing matches the current filters. Clear them to see the full board.",
-        action: /* @__PURE__ */ jsx(Button, { variant: "default", onClick: () => update({ rules: [], page: 1 }), children: "Clear filters" })
+        action: /* @__PURE__ */ jsx(Button, { variant: "default", onClick: () => update({ q: "", rules: [], page: 1 }), children: "Clear filters" })
       }
     ) : /* @__PURE__ */ jsxs(Fragment, { children: [
       selection.length > 0 ? /* @__PURE__ */ jsx(
@@ -13660,9 +13755,14 @@ function ListWorkbench({
           count: selection.length,
           clearLabel: "Cancel",
           onClear: () => onSelectionChange([]),
-          allSelected: selection.length === rows.length,
-          someSelected: selection.some((key) => rows.some((row) => rowKey(row) === key)),
-          onToggleAll: () => onSelectionChange(selection.length === rows.length ? [] : rows.map(rowKey)),
+          allSelected: sorted.length > 0 && sorted.every((row) => selection.includes(rowKey(row))),
+          someSelected: !sorted.every((row) => selection.includes(rowKey(row))) && selection.some((key) => sorted.some((row) => rowKey(row) === key)),
+          onToggleAll: () => {
+            const keys = sorted.map(rowKey);
+            onSelectionChange(
+              keys.every((key) => selection.includes(key)) ? selection.filter((key) => !keys.includes(key)) : [.../* @__PURE__ */ new Set([...selection, ...keys])]
+            );
+          },
           ...buildBulkCommands({
             bulk,
             keys: selection,
@@ -13676,9 +13776,16 @@ function ListWorkbench({
                 onSelect: () => exportCsv(selection)
               }
             ],
-            onNotify: (message2) => notify("success", message2),
+            onNotify: (message2) => {
+              if (live.current && boardSession.current === session) notify("success", message2);
+            },
             onEditProperties: bulk?.properties ? () => setBulkEditOpen(true) : void 0,
-            onClear: () => onSelectionChange([])
+            onClear: () => onSelectionChange([]),
+            onComplete: (keys) => {
+              if (!live.current || boardSession.current !== session) return;
+              const processed = new Set(keys);
+              latest.current.onSelectionChange(latest.current.selection.filter((key) => !processed.has(key)));
+            }
           })
         }
       ) : null,
@@ -13718,6 +13825,10 @@ function ListWorkbench({
         onSortChange: sortFields.length ? (sort) => update({ sort }) : void 0,
         onColumnCommand: (command) => {
           if (command.kind === "freeze") {
+            if (command.fixed === null && columns.find((column) => column.id === command.columnId)?.fixed) {
+              if (onColumnCommand) onColumnCommand(command);
+              else setUnfrozenColumns((current) => [.../* @__PURE__ */ new Set([...current, command.columnId])]);
+            }
             update({
               frozen: command.fixed === null ? frozen.filter((id) => id !== command.columnId) : [...frozen.filter((id) => id !== command.columnId), command.columnId]
             });
@@ -13779,7 +13890,10 @@ function ListWorkbench({
         )
       }
     ),
-    /* @__PURE__ */ jsx(
+    view.group || view.view === "board" && boardView ? /* @__PURE__ */ jsxs("div", { className: "pro-row", style: { justifyContent: "space-between" }, children: [
+      footerLeft ?? /* @__PURE__ */ jsx("span", { className: "pro-text-sm", children: title }),
+      /* @__PURE__ */ jsx("span", { className: "pro-text-sm", children: zh ? `\u5171 ${total} \u6761` : `Total: ${total}` })
+    ] }) : /* @__PURE__ */ jsx(
       Pagination,
       {
         page,
@@ -13846,6 +13960,7 @@ function ListWorkbench({
                 onSelect: () => {
                   update({ q: "", rules: [], sort: null, group: null, preview: "auto", page: 1 });
                   setHiddenColumns([]);
+                  setUnfrozenColumns([]);
                 }
               }
             ]
@@ -16897,6 +17012,10 @@ function FormRoot({
   const store = stores.get(instance);
   if (!store) throw new Error("Form requires an instance created by useForm");
   const config = useProConfig();
+  const latestSubmit = useRef({ disabled: disabled ?? config.disabled, onFinish });
+  useLayoutEffect(() => {
+    latestSubmit.current = { disabled: disabled ?? config.disabled, onFinish };
+  }, [disabled, config.disabled, onFinish]);
   const initial = useRef(initialValues);
   const submitting = useRef(false);
   const generation = useRef(0);
@@ -16938,9 +17057,9 @@ function FormRoot({
         }
         return;
       }
-      if (generation.current !== current) return;
+      if (generation.current !== current || latestSubmit.current.disabled) return;
       try {
-        await onFinish?.(values);
+        await latestSubmit.current.onFinish?.(values);
       } catch (error) {
         if (generation.current !== current) return;
         setSubmitError(true);