@wordrhyme/auto-crud 1.10.0 → 1.11.1

package/README.md

@@ -265,7 +265,10 @@ interface AutoCrudTableProps<TSchema> {
     hidden?: string[]; // 隐藏的列
     overrides?: Record<string, any>; // 列覆盖配置
     getRowId?: (record: z.output<TSchema>) => string; // 稳定行标识；展开时必填
-    expandedRow?: (record: z.output<TSchema>) => React.ReactNode; // 展开行内容
+    expandedRow?: (
+      record: z.output<TSchema>,
+      row: Row<z.output<TSchema>>,
+    ) => React.ReactNode; // 展开行内容，row 提供已解析的单元格上下文
     filterModes?: FilterMode | FilterMode[]; // 过滤模式
     batchFields?: (string | BatchUpdateField)[]; // 批量更新字段
     /** @deprecated 新代码请使用 actions.batch */
@@ -298,8 +301,9 @@ interface AutoCrudTableProps<TSchema> {
 
 #### 展开行详情
 
-配置 `table.expandedRow` 后，表格自动添加展开箭头。默认全部收起，允许同时展开多行。
+配置 `table.expandedRow` 后，表格自动添加展开箭头。默认全部收起，允许同时展开多行。设置 `table.defaultExpanded: true` 可在首次展示时展开全部行；刷新保留用户的展开选择。该选项仅用于初始化，不控制当前展开状态。
 必须提供 TanStack Table 的 `getRowId`，使用稳定且唯一的业务主键，避免分页、排序后展开错位。
+展开内容可使用 `cqw` 单位，以表格可视区域的宽度为基准，避免宽表中的详情被横向裁切。
 
 ```tsx
 <AutoCrudTable
@@ -317,9 +321,11 @@ interface AutoCrudTableProps<TSchema> {
 明细数据及其字段权限由业务组件和现有服务负责。
 
 详情区域跨全部可见列，不计入分页条数，也不参与主表选择或导出。
-数据更新时，展开状态遵循 TanStack Table 默认重置行为。
+未启用 `defaultExpanded` 时，数据更新后的展开状态遵循 TanStack Table 默认重置行为。
 `AutoTable` 同样支持 `getRowId` 和 `expandedRow`；直接使用 `DataTable` 时，需自行配置 TanStack 展开能力及触发按钮。
 
+`expandedRow` 的第二个参数是当前 TanStack `Row`，可通过 `row.getAllCells()` 读取已解析的列和单元格上下文，复用字段渲染器及数据源标签。只接收订单数据的单参数回调仍可使用。
+
 ### `useAutoCrudResource()`
 
 连接数据源到组件的 Hook。
@@ -667,10 +673,22 @@ table={{
 
 ## 🔧 工具栏操作配置
 
-`toolbar` 数组控制页面顶部右侧工具栏的按钮，设计思路完全对齐行操作 `actions`。旧 prop `toolbarActions` 仍兼容读取，但新代码请使用 `toolbar`。
+`toolbar` 数组控制工具栏操作，设计思路完全对齐行操作 `actions`。旧 prop `toolbarActions` 仍兼容读取，但新代码请使用 `toolbar`。
 
 内置操作类型：`refresh`（刷新）、`create`（新建）、`import`（导入）、`export`（导出）。
 
+刷新固定显示在搜索筛选行右侧，顺序为 `[排序] [刷新] [列设置]`；其 `label`、`onClick`、`component` 和隐藏配置仍由 `toolbar` 控制。其余操作保留在上方工具栏，没有可见操作时不占空行。
+
+直接使用 `AutoTable` 时，可通过 `toolbarExtra` 插入排序与列设置之间的控件：
+
+```tsx
+<AutoTable
+  schema={schema}
+  data={rows}
+  toolbarExtra={<Button onClick={refresh}>刷新</Button>}
+/>
+```
+
 ### 只添加自定义按钮（内置保持默认）
 
 只传 `type: "custom"` 项时，所有内置按钮（刷新、导入、导出、新建）保持原样，custom 项按 `position` 插入首部或尾部。
@@ -686,12 +704,13 @@ table={{
     { type: 'custom', component: <Button variant="outline">批量标签</Button> }, // 默认 position: "end"
   ]}
 />
-// 渲染顺序: 分类管理 · [刷新] · [导入] · [导出] · [新建] · 批量标签
+// 上方工具栏: 分类管理 · [导入] · [导出] · [新建] · 批量标签
+// 搜索筛选行右侧: [排序] · [刷新] · [列设置]
 ```
 
 ### 调整内置按钮顺序
 
-数组中只要包含任意内置 `type`，就会**完全接管工具栏** —— 未列出的内置按钮**直接隐藏**，渲染顺序**严格按数组**。
+数组中只要包含任意内置 `type`，就会**完全接管工具栏** —— 未列出的内置按钮**直接隐藏**。刷新保持在搜索筛选行，其他按钮的渲染顺序**严格按数组**。
 
 ```tsx
 <AutoCrudTable

package/dist/index.cjs

@@ -581,6 +581,7 @@ function DataTable({ table, actionBar, pagination, expandedRow, children, classN
 			children,
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "overflow-hidden rounded-md border",
+				style: expandedRow ? { containerType: "inline-size" } : void 0,
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.Table, {
 					className: classNames?.table,
 					style: hasWidthCap ? {
@@ -622,7 +623,7 @@ function DataTable({ table, actionBar, pagination, expandedRow, children, classN
 								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.TableCell, {
 									colSpan: row.getVisibleCells().length,
 									className: classNames?.td,
-									children: expandedRow(row.original)
+									children: expandedRow(row.original, row)
 								})
 							})] }, row.id)) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.TableRow, {
 								className: classNames?.tr,
@@ -4429,7 +4430,7 @@ const filterModeConfig = {
 		tooltip: "Linear-style command filters"
 	}
 };
-function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, pagination, total, overrides, classNames, enableRowSelection = true, exclude, filterOnly, actions, pinnedColumns, filterMode, search = false, onDeleteSelected, onUpdateSelected, batchUpdateFields, actionBarExtra, actionBarActions, deleteConfirmation, initialSorting, enableExport = true, showDefaultExport = true, onSelectedCountChange, onSelectedRowsChange, getSelectedRows }) {
+function AutoTable({ schema, data, getRowId, expandedRow, defaultExpanded = false, pageCount = 1, pagination, total, overrides, classNames, enableRowSelection = true, exclude, filterOnly, actions, pinnedColumns, filterMode, search = false, toolbarExtra, onDeleteSelected, onUpdateSelected, batchUpdateFields, actionBarExtra, actionBarActions, deleteConfirmation, initialSorting, enableExport = true, showDefaultExport = true, onSelectedCountChange, onSelectedRowsChange, getSelectedRows }) {
 	if (expandedRow && !getRowId) throw new Error("AutoTable requires getRowId when expandedRow is provided.");
 	const enableExpansion = !!expandedRow;
 	const modes = filterMode ? Array.isArray(filterMode) ? filterMode : [filterMode] : DEFAULT_MODES;
@@ -4505,6 +4506,7 @@ function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, paginat
 	]);
 	const stableInitialState = (0, react.useMemo)(() => ({
 		sorting: initialSorting,
+		expanded: enableExpansion && defaultExpanded ? true : {},
 		columnPinning: pinnedColumns ?? {
 			left: [...enableExpansion ? [expandColumnId] : [], ...enableRowSelection ? ["select"] : []],
 			right: actions ? ["actions"] : []
@@ -4514,6 +4516,7 @@ function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, paginat
 		pinnedColumns,
 		enableRowSelection,
 		enableExpansion,
+		defaultExpanded,
 		expandColumnId,
 		actions
 	]);
@@ -4524,6 +4527,7 @@ function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, paginat
 		getRowId,
 		getRowCanExpand: () => enableExpansion,
 		getExpandedRowModel: enableExpansion ? expandedRowModel : void 0,
+		autoResetExpanded: defaultExpanded ? false : void 0,
 		pageCount,
 		...total !== void 0 ? { rowCount: total } : {},
 		enableAdvancedFilter,
@@ -4645,6 +4649,7 @@ function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, paginat
 							table,
 							align: "end"
 						}),
+						toolbarExtra,
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(DataTableViewOptions, {
 							table,
 							align: "end"
@@ -7762,6 +7767,60 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 		rowActionDefaults,
 		openComponent
 	]);
+	const normalizedToolbarActions = resolvedToolbarActions.length > 0 ? resolveOwnerToolbarActions(resolvedToolbarActions) : [];
+	const renderBuiltinButton = (type, overrides) => {
+		if (type === "refresh") {
+			const onRefresh = overrides?.onClick ?? toolbarRefresh;
+			const label = overrides?.label ?? locale.toolbar.refresh;
+			if (!onRefresh) return null;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Button, {
+				variant: "outline",
+				size: "icon-sm",
+				"aria-label": label,
+				title: label,
+				onClick: onRefresh,
+				disabled: resource.tableData.isFetching,
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.RefreshCw, { className: resource.tableData.isFetching ? "h-4 w-4 animate-spin" : "h-4 w-4" })
+			}, "refresh");
+		}
+		if (type === "import" && canImport) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.Button, {
+			variant: "outline",
+			size: "sm",
+			onClick: overrides?.onClick ?? toolbarOpenImport,
+			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Download, { className: "mr-2 h-4 w-4" }), overrides?.label ?? locale.toolbar.import]
+		}, "import");
+		if (type === "export" && canExport) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.Button, {
+			variant: "outline",
+			size: "sm",
+			onClick: overrides?.onClick ?? toolbarExportData,
+			disabled: exporting || selectedCount === 0 && !resource.handlers.export,
+			children: [exporting ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Loader2, { className: "mr-2 h-4 w-4 animate-spin" }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Upload, { className: "mr-2 h-4 w-4" }), overrides?.label ?? (selectedCount > 0 ? locale.toolbar.exportSelected(selectedCount) : locale.toolbar.export)]
+		}, "export");
+		if (type === "create" && can.create) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Button, {
+			onClick: overrides?.onClick ?? toolbarOpenCreate,
+			children: overrides?.label ?? locale.toolbar.create
+		}, "create");
+		return null;
+	};
+	const renderToolbarComponent = (component) => typeof component === "function" ? component(toolbarContext) : component;
+	const renderToolbarAction = (action$1, index$1) => {
+		if (action$1.type === "custom") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Fragment, { children: renderToolbarComponent(action$1.component) }, `custom-${index$1}`);
+		if (!(() => {
+			switch (action$1.type) {
+				case "refresh": return !!(resource.handlers.refresh || action$1.onClick || action$1.component);
+				case "import": return canImport;
+				case "export": return canExport;
+				case "create": return can.create;
+			}
+		})()) return null;
+		if (action$1.component) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Fragment, { children: renderToolbarComponent(action$1.component) }, action$1.type);
+		return renderBuiltinButton(action$1.type, {
+			onClick: action$1.onClick,
+			label: action$1.label
+		});
+	};
+	const toolbarNodes = normalizedToolbarActions.filter((action$1) => action$1.type !== "refresh").map(renderToolbarAction).filter((node) => node !== null);
+	const refreshNodes = normalizedToolbarActions.filter((action$1) => action$1.type === "refresh").map(renderToolbarAction);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "space-y-4",
 		children: [
@@ -7775,80 +7834,12 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 					children: description
 				})]
 			}),
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+			toolbarNodes.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "flex items-center justify-end gap-4",
-				children: (() => {
-					const renderBuiltinButton = (type, overrides) => {
-						if (type === "refresh") {
-							const onRefresh = overrides?.onClick ?? toolbarRefresh;
-							const label = overrides?.label ?? locale.toolbar.refresh;
-							if (!onRefresh) return null;
-							return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Button, {
-								variant: "outline",
-								size: "icon-sm",
-								"aria-label": label,
-								title: label,
-								onClick: onRefresh,
-								disabled: resource.tableData.isFetching,
-								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.RefreshCw, { className: resource.tableData.isFetching ? "h-4 w-4 animate-spin" : "h-4 w-4" })
-							}, "refresh");
-						}
-						if (type === "import" && canImport) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.Button, {
-							variant: "outline",
-							size: "sm",
-							onClick: overrides?.onClick ?? toolbarOpenImport,
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Download, { className: "mr-2 h-4 w-4" }), overrides?.label ?? locale.toolbar.import]
-						}, "import");
-						if (type === "export" && canExport) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.Button, {
-							variant: "outline",
-							size: "sm",
-							onClick: overrides?.onClick ?? toolbarExportData,
-							disabled: exporting || selectedCount === 0 && !resource.handlers.export,
-							children: [exporting ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Loader2, { className: "mr-2 h-4 w-4 animate-spin" }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Upload, { className: "mr-2 h-4 w-4" }), overrides?.label ?? (selectedCount > 0 ? locale.toolbar.exportSelected(selectedCount) : locale.toolbar.export)]
-						}, "export");
-						if (type === "create" && can.create) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Button, {
-							onClick: overrides?.onClick ?? toolbarOpenCreate,
-							children: overrides?.label ?? locale.toolbar.create
-						}, "create");
-						return null;
-					};
-					const renderToolbarComponent = (component) => typeof component === "function" ? component(toolbarContext) : component;
-					if (!resolvedToolbarActions || resolvedToolbarActions.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: "flex items-center gap-2" });
-					if (!resolvedToolbarActions.some((i) => i.type !== "custom")) {
-						const startNodes = resolvedToolbarActions.filter((i) => i.type === "custom" && i.position === "start").map((a, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Fragment, { children: renderToolbarComponent(a.component) }, `start-${i}`));
-						const endNodes = resolvedToolbarActions.filter((i) => i.type === "custom" && i.position !== "start").map((a, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Fragment, { children: renderToolbarComponent(a.component) }, `end-${i}`));
-						return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: "flex items-center gap-2",
-							children: [
-								startNodes,
-								renderBuiltinButton("refresh"),
-								renderBuiltinButton("import"),
-								renderBuiltinButton("export"),
-								renderBuiltinButton("create"),
-								endNodes
-							]
-						});
-					}
-					return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "flex items-center gap-2",
-						children: resolvedToolbarActions.map((action$1, index$1) => {
-							if (action$1.type === "custom") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Fragment, { children: renderToolbarComponent(action$1.component) }, `custom-${index$1}`);
-							if (!(() => {
-								switch (action$1.type) {
-									case "refresh": return !!(resource.handlers.refresh || action$1.onClick || action$1.component);
-									case "import": return canImport;
-									case "export": return canExport;
-									case "create": return can.create;
-								}
-							})()) return null;
-							if (action$1.component) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Fragment, { children: renderToolbarComponent(action$1.component) }, action$1.type);
-							return renderBuiltinButton(action$1.type, {
-								onClick: action$1.onClick,
-								label: action$1.label
-							});
-						})
-					});
-				})()
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "flex items-center gap-2",
+					children: toolbarNodes
+				})
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AutoTable, {
 				data: resource.tableData.data,
@@ -7861,12 +7852,14 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 				...resource.tableData.total !== void 0 ? { total: resource.tableData.total } : {},
 				getRowId: tableConfig?.getRowId,
 				expandedRow: tableConfig?.expandedRow,
+				defaultExpanded: tableConfig?.defaultExpanded,
 				overrides: tableOverrides,
 				classNames: tableConfig?.classNames,
 				exclude: hiddenColumns.filter((key) => !filterOnly.includes(key)),
 				filterOnly,
 				filterMode: tableConfig?.filterModes,
 				search: searchConfig,
+				toolbarExtra: refreshNodes,
 				actions: tableRowActions,
 				onDeleteSelected: can.delete ? resource.handlers.deleteMany : void 0,
 				onUpdateSelected: can.update ? resource.handlers.updateMany : void 0,

package/dist/index.d.cts

@@ -658,8 +658,8 @@ interface DataTableProps<TData> extends ComponentProps<'div'> {
   pagination?: TablePaginationOptions;
   classNames?: DataTableClassNames;
   actionBar?: ReactNode;
-  /** Content mounted below an expanded row. */
-  expandedRow?: (record: TData) => ReactNode;
+  /** Content mounted below an expanded row; row provides resolved cell contexts. */
+  expandedRow?: (record: TData, row: Row<TData>) => ReactNode;
 }
 declare function DataTable<TData>({
   table,
@@ -873,6 +873,8 @@ interface AutoTableProps<T extends z.ZodObject<z.ZodRawShape>> extends Pick<Data
   data: z.infer<T>[];
   /** Stable row identity; required when expandedRow is provided. */
   getRowId?: TableOptions<z.infer<T>>['getRowId'];
+  /** Initially expand all rows. Defaults to false; only applies with expandedRow. */
+  defaultExpanded?: boolean;
   pageCount?: number;
   pagination?: TablePaginationOptions;
   /** Total rows matching the current search and filters. */
@@ -900,6 +902,8 @@ interface AutoTableProps<T extends z.ZodObject<z.ZodRawShape>> extends Pick<Data
   search?: boolean | {
     placeholder?: string;
   };
+  /** Extra table controls rendered between sorting and column visibility. */
+  toolbarExtra?: React.ReactNode;
   /** 批量删除回调 */
   onDeleteSelected?: (rows: z.infer<T>[]) => void;
   /** 批量更新回调 */
@@ -930,6 +934,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   data,
   getRowId,
   expandedRow,
+  defaultExpanded,
   pageCount,
   pagination,
   total,
@@ -942,6 +947,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   pinnedColumns,
   filterMode,
   search,
+  toolbarExtra,
   onDeleteSelected,
   onUpdateSelected,
   batchUpdateFields,
@@ -1426,7 +1432,7 @@ interface AutoCrudTableProps<TSchema extends z.ZodObject<z.ZodRawShape>> {
     batchActions?: BatchActionConfig<z.output<TSchema>>;
     /** 默认排序 */
     defaultSort?: any[];
-  } & Pick<AutoTableProps<TSchema>, 'getRowId' | 'expandedRow'>;
+  } & Pick<AutoTableProps<TSchema>, 'getRowId' | 'expandedRow' | 'defaultExpanded'>;
   /** 表单配置 */
   form?: {
     /** 表单覆盖配置（兼容旧 API，优先级低于 fieldOverrides） */

package/dist/index.d.ts

@@ -658,8 +658,8 @@ interface DataTableProps<TData> extends ComponentProps<'div'> {
   pagination?: TablePaginationOptions;
   classNames?: DataTableClassNames;
   actionBar?: ReactNode;
-  /** Content mounted below an expanded row. */
-  expandedRow?: (record: TData) => ReactNode;
+  /** Content mounted below an expanded row; row provides resolved cell contexts. */
+  expandedRow?: (record: TData, row: Row<TData>) => ReactNode;
 }
 declare function DataTable<TData>({
   table,
@@ -873,6 +873,8 @@ interface AutoTableProps<T extends z.ZodObject<z.ZodRawShape>> extends Pick<Data
   data: z.infer<T>[];
   /** Stable row identity; required when expandedRow is provided. */
   getRowId?: TableOptions<z.infer<T>>['getRowId'];
+  /** Initially expand all rows. Defaults to false; only applies with expandedRow. */
+  defaultExpanded?: boolean;
   pageCount?: number;
   pagination?: TablePaginationOptions;
   /** Total rows matching the current search and filters. */
@@ -900,6 +902,8 @@ interface AutoTableProps<T extends z.ZodObject<z.ZodRawShape>> extends Pick<Data
   search?: boolean | {
     placeholder?: string;
   };
+  /** Extra table controls rendered between sorting and column visibility. */
+  toolbarExtra?: React.ReactNode;
   /** 批量删除回调 */
   onDeleteSelected?: (rows: z.infer<T>[]) => void;
   /** 批量更新回调 */
@@ -930,6 +934,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   data,
   getRowId,
   expandedRow,
+  defaultExpanded,
   pageCount,
   pagination,
   total,
@@ -942,6 +947,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   pinnedColumns,
   filterMode,
   search,
+  toolbarExtra,
   onDeleteSelected,
   onUpdateSelected,
   batchUpdateFields,
@@ -1426,7 +1432,7 @@ interface AutoCrudTableProps<TSchema extends z.ZodObject<z.ZodRawShape>> {
     batchActions?: BatchActionConfig<z.output<TSchema>>;
     /** 默认排序 */
     defaultSort?: any[];
-  } & Pick<AutoTableProps<TSchema>, 'getRowId' | 'expandedRow'>;
+  } & Pick<AutoTableProps<TSchema>, 'getRowId' | 'expandedRow' | 'defaultExpanded'>;
   /** 表单配置 */
   form?: {
     /** 表单覆盖配置（兼容旧 API，优先级低于 fieldOverrides） */

package/dist/index.js

@@ -566,6 +566,7 @@ function DataTable({ table, actionBar, pagination, expandedRow, children, classN
 			children,
 			/* @__PURE__ */ jsx("div", {
 				className: "overflow-hidden rounded-md border",
+				style: expandedRow ? { containerType: "inline-size" } : void 0,
 				children: /* @__PURE__ */ jsxs(Table$1, {
 					className: classNames?.table,
 					style: hasWidthCap ? {
@@ -607,7 +608,7 @@ function DataTable({ table, actionBar, pagination, expandedRow, children, classN
 								children: /* @__PURE__ */ jsx(TableCell, {
 									colSpan: row.getVisibleCells().length,
 									className: classNames?.td,
-									children: expandedRow(row.original)
+									children: expandedRow(row.original, row)
 								})
 							})] }, row.id)) : /* @__PURE__ */ jsx(TableRow, {
 								className: classNames?.tr,
@@ -4414,7 +4415,7 @@ const filterModeConfig = {
 		tooltip: "Linear-style command filters"
 	}
 };
-function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, pagination, total, overrides, classNames, enableRowSelection = true, exclude, filterOnly, actions, pinnedColumns, filterMode, search = false, onDeleteSelected, onUpdateSelected, batchUpdateFields, actionBarExtra, actionBarActions, deleteConfirmation, initialSorting, enableExport = true, showDefaultExport = true, onSelectedCountChange, onSelectedRowsChange, getSelectedRows }) {
+function AutoTable({ schema, data, getRowId, expandedRow, defaultExpanded = false, pageCount = 1, pagination, total, overrides, classNames, enableRowSelection = true, exclude, filterOnly, actions, pinnedColumns, filterMode, search = false, toolbarExtra, onDeleteSelected, onUpdateSelected, batchUpdateFields, actionBarExtra, actionBarActions, deleteConfirmation, initialSorting, enableExport = true, showDefaultExport = true, onSelectedCountChange, onSelectedRowsChange, getSelectedRows }) {
 	if (expandedRow && !getRowId) throw new Error("AutoTable requires getRowId when expandedRow is provided.");
 	const enableExpansion = !!expandedRow;
 	const modes = filterMode ? Array.isArray(filterMode) ? filterMode : [filterMode] : DEFAULT_MODES;
@@ -4490,6 +4491,7 @@ function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, paginat
 	]);
 	const stableInitialState = useMemo(() => ({
 		sorting: initialSorting,
+		expanded: enableExpansion && defaultExpanded ? true : {},
 		columnPinning: pinnedColumns ?? {
 			left: [...enableExpansion ? [expandColumnId] : [], ...enableRowSelection ? ["select"] : []],
 			right: actions ? ["actions"] : []
@@ -4499,6 +4501,7 @@ function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, paginat
 		pinnedColumns,
 		enableRowSelection,
 		enableExpansion,
+		defaultExpanded,
 		expandColumnId,
 		actions
 	]);
@@ -4509,6 +4512,7 @@ function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, paginat
 		getRowId,
 		getRowCanExpand: () => enableExpansion,
 		getExpandedRowModel: enableExpansion ? expandedRowModel : void 0,
+		autoResetExpanded: defaultExpanded ? false : void 0,
 		pageCount,
 		...total !== void 0 ? { rowCount: total } : {},
 		enableAdvancedFilter,
@@ -4630,6 +4634,7 @@ function AutoTable({ schema, data, getRowId, expandedRow, pageCount = 1, paginat
 							table,
 							align: "end"
 						}),
+						toolbarExtra,
 						/* @__PURE__ */ jsx(DataTableViewOptions, {
 							table,
 							align: "end"
@@ -7747,6 +7752,60 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 		rowActionDefaults,
 		openComponent
 	]);
+	const normalizedToolbarActions = resolvedToolbarActions.length > 0 ? resolveOwnerToolbarActions(resolvedToolbarActions) : [];
+	const renderBuiltinButton = (type, overrides) => {
+		if (type === "refresh") {
+			const onRefresh = overrides?.onClick ?? toolbarRefresh;
+			const label = overrides?.label ?? locale.toolbar.refresh;
+			if (!onRefresh) return null;
+			return /* @__PURE__ */ jsx(Button, {
+				variant: "outline",
+				size: "icon-sm",
+				"aria-label": label,
+				title: label,
+				onClick: onRefresh,
+				disabled: resource.tableData.isFetching,
+				children: /* @__PURE__ */ jsx(RefreshCw, { className: resource.tableData.isFetching ? "h-4 w-4 animate-spin" : "h-4 w-4" })
+			}, "refresh");
+		}
+		if (type === "import" && canImport) return /* @__PURE__ */ jsxs(Button, {
+			variant: "outline",
+			size: "sm",
+			onClick: overrides?.onClick ?? toolbarOpenImport,
+			children: [/* @__PURE__ */ jsx(Download, { className: "mr-2 h-4 w-4" }), overrides?.label ?? locale.toolbar.import]
+		}, "import");
+		if (type === "export" && canExport) return /* @__PURE__ */ jsxs(Button, {
+			variant: "outline",
+			size: "sm",
+			onClick: overrides?.onClick ?? toolbarExportData,
+			disabled: exporting || selectedCount === 0 && !resource.handlers.export,
+			children: [exporting ? /* @__PURE__ */ jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" }) : /* @__PURE__ */ jsx(Upload, { className: "mr-2 h-4 w-4" }), overrides?.label ?? (selectedCount > 0 ? locale.toolbar.exportSelected(selectedCount) : locale.toolbar.export)]
+		}, "export");
+		if (type === "create" && can.create) return /* @__PURE__ */ jsx(Button, {
+			onClick: overrides?.onClick ?? toolbarOpenCreate,
+			children: overrides?.label ?? locale.toolbar.create
+		}, "create");
+		return null;
+	};
+	const renderToolbarComponent = (component) => typeof component === "function" ? component(toolbarContext) : component;
+	const renderToolbarAction = (action$1, index$1) => {
+		if (action$1.type === "custom") return /* @__PURE__ */ jsx(React.Fragment, { children: renderToolbarComponent(action$1.component) }, `custom-${index$1}`);
+		if (!(() => {
+			switch (action$1.type) {
+				case "refresh": return !!(resource.handlers.refresh || action$1.onClick || action$1.component);
+				case "import": return canImport;
+				case "export": return canExport;
+				case "create": return can.create;
+			}
+		})()) return null;
+		if (action$1.component) return /* @__PURE__ */ jsx(React.Fragment, { children: renderToolbarComponent(action$1.component) }, action$1.type);
+		return renderBuiltinButton(action$1.type, {
+			onClick: action$1.onClick,
+			label: action$1.label
+		});
+	};
+	const toolbarNodes = normalizedToolbarActions.filter((action$1) => action$1.type !== "refresh").map(renderToolbarAction).filter((node) => node !== null);
+	const refreshNodes = normalizedToolbarActions.filter((action$1) => action$1.type === "refresh").map(renderToolbarAction);
 	return /* @__PURE__ */ jsxs("div", {
 		className: "space-y-4",
 		children: [
@@ -7760,80 +7819,12 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 					children: description
 				})]
 			}),
-			/* @__PURE__ */ jsx("div", {
+			toolbarNodes.length > 0 && /* @__PURE__ */ jsx("div", {
 				className: "flex items-center justify-end gap-4",
-				children: (() => {
-					const renderBuiltinButton = (type, overrides) => {
-						if (type === "refresh") {
-							const onRefresh = overrides?.onClick ?? toolbarRefresh;
-							const label = overrides?.label ?? locale.toolbar.refresh;
-							if (!onRefresh) return null;
-							return /* @__PURE__ */ jsx(Button, {
-								variant: "outline",
-								size: "icon-sm",
-								"aria-label": label,
-								title: label,
-								onClick: onRefresh,
-								disabled: resource.tableData.isFetching,
-								children: /* @__PURE__ */ jsx(RefreshCw, { className: resource.tableData.isFetching ? "h-4 w-4 animate-spin" : "h-4 w-4" })
-							}, "refresh");
-						}
-						if (type === "import" && canImport) return /* @__PURE__ */ jsxs(Button, {
-							variant: "outline",
-							size: "sm",
-							onClick: overrides?.onClick ?? toolbarOpenImport,
-							children: [/* @__PURE__ */ jsx(Download, { className: "mr-2 h-4 w-4" }), overrides?.label ?? locale.toolbar.import]
-						}, "import");
-						if (type === "export" && canExport) return /* @__PURE__ */ jsxs(Button, {
-							variant: "outline",
-							size: "sm",
-							onClick: overrides?.onClick ?? toolbarExportData,
-							disabled: exporting || selectedCount === 0 && !resource.handlers.export,
-							children: [exporting ? /* @__PURE__ */ jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" }) : /* @__PURE__ */ jsx(Upload, { className: "mr-2 h-4 w-4" }), overrides?.label ?? (selectedCount > 0 ? locale.toolbar.exportSelected(selectedCount) : locale.toolbar.export)]
-						}, "export");
-						if (type === "create" && can.create) return /* @__PURE__ */ jsx(Button, {
-							onClick: overrides?.onClick ?? toolbarOpenCreate,
-							children: overrides?.label ?? locale.toolbar.create
-						}, "create");
-						return null;
-					};
-					const renderToolbarComponent = (component) => typeof component === "function" ? component(toolbarContext) : component;
-					if (!resolvedToolbarActions || resolvedToolbarActions.length === 0) return /* @__PURE__ */ jsx("div", { className: "flex items-center gap-2" });
-					if (!resolvedToolbarActions.some((i) => i.type !== "custom")) {
-						const startNodes = resolvedToolbarActions.filter((i) => i.type === "custom" && i.position === "start").map((a, i) => /* @__PURE__ */ jsx(React.Fragment, { children: renderToolbarComponent(a.component) }, `start-${i}`));
-						const endNodes = resolvedToolbarActions.filter((i) => i.type === "custom" && i.position !== "start").map((a, i) => /* @__PURE__ */ jsx(React.Fragment, { children: renderToolbarComponent(a.component) }, `end-${i}`));
-						return /* @__PURE__ */ jsxs("div", {
-							className: "flex items-center gap-2",
-							children: [
-								startNodes,
-								renderBuiltinButton("refresh"),
-								renderBuiltinButton("import"),
-								renderBuiltinButton("export"),
-								renderBuiltinButton("create"),
-								endNodes
-							]
-						});
-					}
-					return /* @__PURE__ */ jsx("div", {
-						className: "flex items-center gap-2",
-						children: resolvedToolbarActions.map((action$1, index$1) => {
-							if (action$1.type === "custom") return /* @__PURE__ */ jsx(React.Fragment, { children: renderToolbarComponent(action$1.component) }, `custom-${index$1}`);
-							if (!(() => {
-								switch (action$1.type) {
-									case "refresh": return !!(resource.handlers.refresh || action$1.onClick || action$1.component);
-									case "import": return canImport;
-									case "export": return canExport;
-									case "create": return can.create;
-								}
-							})()) return null;
-							if (action$1.component) return /* @__PURE__ */ jsx(React.Fragment, { children: renderToolbarComponent(action$1.component) }, action$1.type);
-							return renderBuiltinButton(action$1.type, {
-								onClick: action$1.onClick,
-								label: action$1.label
-							});
-						})
-					});
-				})()
+				children: /* @__PURE__ */ jsx("div", {
+					className: "flex items-center gap-2",
+					children: toolbarNodes
+				})
 			}),
 			/* @__PURE__ */ jsx(AutoTable, {
 				data: resource.tableData.data,
@@ -7846,12 +7837,14 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 				...resource.tableData.total !== void 0 ? { total: resource.tableData.total } : {},
 				getRowId: tableConfig?.getRowId,
 				expandedRow: tableConfig?.expandedRow,
+				defaultExpanded: tableConfig?.defaultExpanded,
 				overrides: tableOverrides,
 				classNames: tableConfig?.classNames,
 				exclude: hiddenColumns.filter((key) => !filterOnly.includes(key)),
 				filterOnly,
 				filterMode: tableConfig?.filterModes,
 				search: searchConfig,
+				toolbarExtra: refreshNodes,
 				actions: tableRowActions,
 				onDeleteSelected: can.delete ? resource.handlers.deleteMany : void 0,
 				onUpdateSelected: can.update ? resource.handlers.updateMany : void 0,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud",
   "type": "module",
-  "version": "1.10.0",
+  "version": "1.11.1",
   "description": "Schema-first CRUD components with auto-generated tables and forms",
   "author": "wordrhyme",
   "license": "MIT",
@@ -70,9 +70,9 @@
     "nanoid": "^5.1.6",
     "tailwind-merge": "^3.5.0",
     "vaul": "^1.1.2",
+    "@wordrhyme/shadcn": "2.0.1",
     "@wordrhyme/formily-shadcn": "2.1.1",
-    "@wordrhyme/shadcn-ui": "2.1.1",
-    "@wordrhyme/shadcn": "2.0.1"
+    "@wordrhyme/shadcn-ui": "2.1.1"
   },
   "devDependencies": {
     "@storybook/react": "^8.6.18",
@@ -95,9 +95,9 @@
     "vitest": "^3.2.4",
     "@internal/eslint-config": "0.3.0",
     "@internal/prettier-config": "0.0.1",
-    "@internal/vitest-config": "0.1.0",
     "@internal/tsdown-config": "0.1.0",
-    "@internal/tsconfig": "0.1.0"
+    "@internal/tsconfig": "0.1.0",
+    "@internal/vitest-config": "0.1.0"
   },
   "prettier": "@internal/prettier-config",
   "scripts": {