ding-react-admin 2.5.0 → 2.5.2

package/dist/src/crud/fields/ReferenceField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReferenceField.d.ts","sourceRoot":"","sources":["../../../../src/crud/fields/ReferenceField.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3C,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,cAAc,EACf,MAAM,UAAU,CAAC;AAWlB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAChD,cAAc,GAAG;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,wDAAwD;IACxD,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,wEAAwE;IACxE,aAAa,CAAC,EAAE,CACd,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,YAAY,GAAG,SAAS,EAChC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,KACnB,IAAI,CAAC;IACV,4EAA4E;IAC5E,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,mEAAmE;IACnE,oBAAoB,CAAC,EAAE,mBAAmB,CAAC;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mFAAmF;IACnF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAsIJ,wBAAgB,cAAc,CAAC,EAC7B,MAAM,EACN,IAAI,EACJ,KAAK,EACL,SAAS,EACT,OAAO,EACP,WAAoB,EACpB,WAAkB,EAClB,QAAQ,EACR,KAAK,EACL,MAAM,EACN,UAAU,EACV,QAAQ,EAAE,YAAY,EACtB,SAAS,EACT,MAAM,EACN,UAAU,EACV,aAAa,EACb,IAAW,EACX,YAAY,EACZ,aAAoB,EACpB,aAAa,EACb,oBAAoB,EACpB,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,gBAAuB,EACvB,qBAAqB,EACrB,aAAa,GACd,EAAE,mBAAmB,2CA6CrB"}
+{"version":3,"file":"ReferenceField.d.ts","sourceRoot":"","sources":["../../../../src/crud/fields/ReferenceField.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3C,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACZ,UAAU,EACV,cAAc,EACf,MAAM,UAAU,CAAC;AAWlB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,MAAM,mBAAmB,GAAG,gBAAgB,GAChD,cAAc,GAAG;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,wDAAwD;IACxD,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,wEAAwE;IACxE,aAAa,CAAC,EAAE,CACd,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,YAAY,GAAG,SAAS,EAChC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,KACnB,IAAI,CAAC;IACV,4EAA4E;IAC5E,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,mEAAmE;IACnE,oBAAoB,CAAC,EAAE,mBAAmB,CAAC;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mFAAmF;IACnF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAwIJ,wBAAgB,cAAc,CAAC,EAC7B,MAAM,EACN,IAAI,EACJ,KAAK,EACL,SAAS,EACT,OAAO,EACP,WAAoB,EACpB,WAAkB,EAClB,QAAQ,EACR,KAAK,EACL,MAAM,EACN,UAAU,EACV,QAAQ,EAAE,YAAY,EACtB,SAAS,EACT,MAAM,EACN,UAAU,EACV,aAAa,EACb,IAAW,EACX,YAAY,EACZ,aAAoB,EACpB,aAAa,EACb,oBAAoB,EACpB,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,gBAAuB,EACvB,qBAAqB,EACrB,aAAa,GACd,EAAE,mBAAmB,2CA6CrB"}

package/dist/src/layouts/AdminLayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdminLayout.d.ts","sourceRoot":"","sources":["../../../src/layouts/AdminLayout.tsx"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,gBAAgB,EAA+B,MAAM,UAAU,CAAC;AAC9E,OAAO,2BAA2B,CAAC;AAuKnC,wBAAgB,WAAW,CAAC,EAC1B,QAAQ,EACR,KAAe,EACf,cAAoB,EACpB,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,eAAe,EACf,SAAoB,EACpB,wBAA4C,EAC5C,SAAgB,EAChB,OAAO,EACP,SAAiB,GAClB,EAAE,gBAAgB,2CAmWlB"}
+{"version":3,"file":"AdminLayout.d.ts","sourceRoot":"","sources":["../../../src/layouts/AdminLayout.tsx"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,gBAAgB,EAA+B,MAAM,UAAU,CAAC;AAC9E,OAAO,2BAA2B,CAAC;AAuKnC,wBAAgB,WAAW,CAAC,EAC1B,QAAQ,EACR,KAAe,EACf,cAAoB,EACpB,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,eAAe,EACf,SAAoB,EACpB,wBAA4C,EAC5C,SAAgB,EAChB,OAAO,EACP,SAAiB,GAClB,EAAE,gBAAgB,2CAmWlB"}

package/dist/src/layouts/navFilter.d.ts

@@ -13,5 +13,7 @@ export declare function flattenNavLeaves(items: NavItem[], options?: {
     group?: string;
 }): FlatNavItem[];
 export declare function filterFlatNavItems(items: FlatNavItem[], query: string): FlatNavItem[];
+/** Menu key for a parent row so it never collides with a child that shares `path`. */
+export declare function navSubmenuKey(path: string): string;
 export declare function collectSubmenuKeys(items: NavItem[]): string[];
 //# sourceMappingURL=navFilter.d.ts.map

package/dist/src/layouts/navFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navFilter.d.ts","sourceRoot":"","sources":["../../../src/layouts/navFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAKpE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,EAAE,CAyBzE;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,OAAO,EAAE,EAChB,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3B,WAAW,EAAE,CAqBf;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,EAAE,MAAM,GACZ,WAAW,EAAE,CASf;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAY7D"}
+{"version":3,"file":"navFilter.d.ts","sourceRoot":"","sources":["../../../src/layouts/navFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,CAKpE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,EAAE,CAyBzE;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,OAAO,EAAE,EAChB,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3B,WAAW,EAAE,CAqBf;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,WAAW,EAAE,EACpB,KAAK,EAAE,MAAM,GACZ,WAAW,EAAE,CASf;AAED,sFAAsF;AACtF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAY7D"}

package/dist/src/types.d.ts

@@ -5,7 +5,7 @@ export type ThemeDensity = "comfortable" | "compact";
 /**
  * Sidebar / app-hub navigation row. Maps to Ant Design `Menu` items.
  *
- * - **`children`** — nested submenu; parent rows should use a `path` that you **do not** navigate to as a leaf (for example `/catalog`), unless you define that route.
+ * - **`children`** — nested submenu. The menu key is `${path}__submenu` so it does not collide with a child that reuses `path`.
  * - **`label`** — string or any React node (badges, extra markup).
  * - **`Icon`** — optional; omit on group-only rows if you prefer text-only labels.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ding-react-admin",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "type": "module",
   "license": "MIT",
   "description": "Composable admin shell (Ant Design + React Router): quick-start AdminApp or build your own layout.",

package/src/crud/fields/FileField.tsx

@@ -38,7 +38,7 @@ function FileFieldInput({
   const showClear = clearable && hasUploadValue(value);
 
   return (
-    <Space direction="vertical" size="middle" style={{ width: "100%" }}>
+    <Space orientation="vertical" size="middle" style={{ width: "100%" }}>
       {fileName ? (
         <Space>
           <PaperClipOutlined />

package/src/crud/fields/ImageField.tsx

@@ -38,7 +38,7 @@ function ImageFieldInput({
   const showClear = clearable && hasUploadValue(value);
 
   return (
-    <Space direction="vertical" size="middle" style={{ width: "100%" }}>
+    <Space orientation="vertical" size="middle" style={{ width: "100%" }}>
       {previewUrl ? (
         <Image
           src={previewUrl}

package/src/crud/fields/ReferenceField.tsx

@@ -142,8 +142,10 @@ function ReferenceFieldSelect({
       {...referenceSelectDropdownProps({ popupMatchSelectWidth, popupMinWidth })}
       value={referenceSelectDisplayValue(selectedLoading, selectValue, undefined)}
       onChange={(next) => {
-        onChange(next);
-        onValueChange?.(next, optionForValue(next), { name: fieldName });
+        // Ant Design clear emits undefined; RHF Controller ignores that.
+        const value = next ?? null;
+        onChange(value);
+        onValueChange?.(value, optionForValue(next), { name: fieldName });
       }}
       options={selectOptions}
       loading={selectState.loading}
@@ -151,7 +153,7 @@ function ReferenceFieldSelect({
       showSearch={search}
       filterOption={search ? false : undefined}
       onSearch={search ? setSearchText : undefined}
-      onDropdownVisibleChange={(open) => {
+      onOpenChange={(open) => {
         setDropdownOpen(open);
         if (!open) setSearchText(undefined);
       }}

package/src/crud/fields/ReferenceManyField.tsx

@@ -106,14 +106,14 @@ function ReferenceManyFieldSelect({
       {...referenceSelectDropdownProps({ popupMatchSelectWidth, popupMinWidth })}
       mode="multiple"
       value={referenceSelectDisplayValue(selectedLoading, selectValue, [])}
-      onChange={onChange}
+      onChange={(next) => onChange(next ?? [])}
       options={selectOptions}
       loading={selectState.loading}
       notFoundContent={referenceSelectNotFoundContent(selectState.loading)}
       showSearch={search}
       filterOption={search ? false : undefined}
       onSearch={search ? setSearchText : undefined}
-      onDropdownVisibleChange={(open) => {
+      onOpenChange={(open) => {
         setDropdownOpen(open);
         if (!open) setSearchText(undefined);
       }}

package/src/crud/fields/SelectField.tsx

@@ -37,7 +37,7 @@ export function SelectField({
       {({ value, onChange, disabled }) => (
         <Select
           value={value as string | number | (string | number)[] | undefined}
-          onChange={onChange}
+          onChange={(next) => onChange(next ?? null)}
           options={choices}
           mode={mode}
           allowClear={allowClear}

package/src/crud/filters/ReferenceFilter.tsx

@@ -139,7 +139,7 @@ function ReferenceFilterInput({
       showSearch={search}
       filterOption={search ? false : undefined}
       onSearch={search ? setSearchText : undefined}
-      onDropdownVisibleChange={(open) => {
+      onOpenChange={(open) => {
         setDropdownOpen(open);
         if (!open) setSearchText(undefined);
       }}

package/src/layouts/AdminLayout.tsx

@@ -26,6 +26,7 @@ import { useThemeMode } from "../context/AppThemeProvider";
 import {
   collectSubmenuKeys,
   filterNavItems,
+  navSubmenuKey,
 } from "./navFilter";
 import { navItemsToAntdItems } from "./navMenuItems";
 import { filterNavByPermission } from "../permissions/resourcePermissions";
@@ -70,7 +71,7 @@ function ancestorKeysForActivePath(
     for (const node of nodes) {
       if (node.children?.length) {
         const sub = dfs(node.children);
-        if (sub !== null) return [node.path, ...sub];
+        if (sub !== null) return [navSubmenuKey(node.path), ...sub];
       } else if (node.path === pathname) {
         return [];
       }

package/src/layouts/navFilter.ts

@@ -83,12 +83,17 @@ export function filterFlatNavItems(
   });
 }
 
+/** Menu key for a parent row so it never collides with a child that shares `path`. */
+export function navSubmenuKey(path: string): string {
+  return `${path}__submenu`;
+}
+
 export function collectSubmenuKeys(items: NavItem[]): string[] {
   const keys: string[] = [];
   function walk(nodes: NavItem[]) {
     for (const node of nodes) {
       if (node.children?.length) {
-        keys.push(node.path);
+        keys.push(navSubmenuKey(node.path));
         walk(node.children);
       }
     }

package/src/layouts/navMenuItems.tsx

@@ -1,7 +1,7 @@
 import type { MenuProps } from "antd";
 import { NavMenuLabel } from "../components/NavMenuLabel";
 import type { NavItem } from "../types";
-import { getNavItemLabel } from "./navFilter";
+import { getNavItemLabel, navSubmenuKey } from "./navFilter";
 
 export function navItemsToAntdItems(
   items: NavItem[],
@@ -36,7 +36,7 @@ export function navItemsToAntdItems(
 
     if (item.children?.length) {
       return {
-        key: item.path,
+        key: navSubmenuKey(item.path),
         icon,
         label,
         ...itemTitle,

package/src/types.ts

@@ -8,7 +8,7 @@ export type ThemeDensity = "comfortable" | "compact";
 /**
  * Sidebar / app-hub navigation row. Maps to Ant Design `Menu` items.
  *
- * - **`children`** — nested submenu; parent rows should use a `path` that you **do not** navigate to as a leaf (for example `/catalog`), unless you define that route.
+ * - **`children`** — nested submenu. The menu key is `${path}__submenu` so it does not collide with a child that reuses `path`.
  * - **`label`** — string or any React node (badges, extra markup).
  * - **`Icon`** — optional; omit on group-only rows if you prefer text-only labels.
  */