ding-react-admin 2.2.0 → 2.2.2

package/dist/src/components/AppHub.d.ts

@@ -10,6 +10,8 @@ export type AppHubProps = {
     className?: string;
     /** Max width of the centered hub content. Default `960`. */
     maxWidth?: number;
+    /** When true, shows a centered spinner instead of the app grid. */
+    loading?: boolean;
 };
-export declare function AppHub({ apps, menuItems, onAppClick, onMenuClick, menuSearchPlaceholder, className, maxWidth, }: AppHubProps): import("react/jsx-runtime").JSX.Element;
+export declare function AppHub({ apps, menuItems, onAppClick, onMenuClick, menuSearchPlaceholder, className, maxWidth, loading, }: AppHubProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=AppHub.d.ts.map

package/dist/src/components/AppHub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppHub.d.ts","sourceRoot":"","sources":["../../../src/components/AppHub.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGxC,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,8EAA8E;IAC9E,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACpC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,MAAM,CAAC,EACrB,IAAI,EACJ,SAAS,EACT,UAAU,EACV,WAAW,EACX,qBAAmD,EACnD,SAAS,EACT,QAAc,GACf,EAAE,WAAW,2CA2Gb"}
+{"version":3,"file":"AppHub.d.ts","sourceRoot":"","sources":["../../../src/components/AppHub.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGxC,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,8EAA8E;IAC9E,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACpC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,wBAAgB,MAAM,CAAC,EACrB,IAAI,EACJ,SAAS,EACT,UAAU,EACV,WAAW,EACX,qBAAmD,EACnD,SAAS,EACT,QAAc,EACd,OAAe,GAChB,EAAE,WAAW,2CA+Gb"}

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,eAAe,EACf,YAAY,EACZ,UAAU,EACV,cAAc,EACf,MAAM,UAAU,CAAC;AAOlB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,MAAM,mBAAmB,GAAG,eAAe,GAC/C,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;AAgIJ,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,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,2CA4CrB"}
+{"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,eAAe,EACf,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,eAAe,GAC/C,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,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,2CA4CrB"}

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

@@ -1 +1 @@
-{"version":3,"file":"ReferenceManyField.d.ts","sourceRoot":"","sources":["../../../../src/crud/fields/ReferenceManyField.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAO5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,MAAM,uBAAuB,GAAG,eAAe,GACnD,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,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,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,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAkHJ,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,SAAS,EACT,OAAO,EACP,WAAoB,EACpB,WAAkB,EAClB,QAAQ,EACR,KAAK,EACL,MAAM,EACN,UAAiB,EACjB,SAAS,EACT,QAAQ,EAAE,YAAY,EACtB,IAAW,EACX,YAAY,EACZ,aAAoB,EACpB,aAAa,EACb,oBAAoB,EACpB,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,gBAAuB,EACvB,qBAAqB,EACrB,aAAa,GACd,EAAE,uBAAuB,2CAyCzB"}
+{"version":3,"file":"ReferenceManyField.d.ts","sourceRoot":"","sources":["../../../../src/crud/fields/ReferenceManyField.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAW5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,MAAM,MAAM,uBAAuB,GAAG,eAAe,GACnD,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,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,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,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAuHJ,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,SAAS,EACT,OAAO,EACP,WAAoB,EACpB,WAAkB,EAClB,QAAQ,EACR,KAAK,EACL,MAAM,EACN,UAAiB,EACjB,SAAS,EACT,QAAQ,EAAE,YAAY,EACtB,IAAW,EACX,YAAY,EACZ,aAAoB,EACpB,aAAa,EACb,oBAAoB,EACpB,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,gBAAuB,EACvB,qBAAqB,EACrB,aAAa,GACd,EAAE,uBAAuB,2CAyCzB"}

package/dist/src/crud/filters/ReferenceFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReferenceFilter.d.ts","sourceRoot":"","sources":["../../../../src/crud/filters/ReferenceFilter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAM9E,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG;IAChD,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AA0BF,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,KAAK,EACL,OAAO,EACP,QAAQ,GACT,EAAE,iBAAiB,QA2BnB;AAED,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAChD,cAAc,GAAG;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AA6DJ,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,KAAK,EACL,SAAS,EACT,OAAO,EACP,WAAoB,EACpB,WAAkB,EAClB,QAAQ,EACR,MAAM,EACN,IAAW,EACX,aAAoB,EACpB,qBAAqB,EACrB,aAAa,GACd,EAAE,oBAAoB,QAgDtB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,oBAAoB,2CAE9D"}
+{"version":3,"file":"ReferenceFilter.d.ts","sourceRoot":"","sources":["../../../../src/crud/filters/ReferenceFilter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAU9E,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG;IAChD,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AA0BF,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,KAAK,EACL,OAAO,EACP,QAAQ,GACT,EAAE,iBAAiB,QA2BnB;AAED,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAChD,cAAc,GAAG;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAwEJ,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,KAAK,EACL,SAAS,EACT,OAAO,EACP,WAAoB,EACpB,WAAkB,EAClB,QAAQ,EACR,MAAM,EACN,IAAW,EACX,aAAoB,EACpB,qBAAqB,EACrB,aAAa,GACd,EAAE,oBAAoB,QAgDtB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,oBAAoB,2CAE9D"}

package/dist/src/crud/utils/choiceSelectionUtils.d.ts

@@ -7,4 +7,11 @@ export declare function collectSelectedRecords(selectedValues: unknown | unknown
 export declare function resolveOptionLabel(record: Record<string, unknown>, optionLabel: string | ((record: Record<string, unknown>) => string)): string;
 export declare function recordsToOptions(records: Record<string, unknown>[], optionLabel: string | ((record: Record<string, unknown>) => string), optionValue: string): ChoiceOption[];
 export declare function mergeOptions(existing: ChoiceOption[], incoming: ChoiceOption[]): ChoiceOption[];
+/** Selected ids that do not yet have a matching option (label still unresolved). */
+export declare function unresolvedSelectedIds(selectedIds: unknown[], knownOptions: ChoiceOption[]): unknown[];
+/**
+ * Keep options for currently selected ids when replacing the dropdown list
+ * (e.g. closing a lazy select) so selected labels do not flash back to raw ids.
+ */
+export declare function keepSelectedOptions(previous: ChoiceOption[], selectedIds: unknown[], embeddedOptions?: ChoiceOption[]): ChoiceOption[];
 //# sourceMappingURL=choiceSelectionUtils.d.ts.map

package/dist/src/crud/utils/choiceSelectionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"choiceSelectionUtils.d.ts","sourceRoot":"","sources":["../../../../src/crud/utils/choiceSelectionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,wBAAgB,cAAc,CAC5B,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,GAClB,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOlC;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,MAAM,GAAG,SAAS,CAS7B;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAKrB;AAED,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,SAAS,EAC/C,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAUX;AAED,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,SAAS,EAC/C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,EAChF,WAAW,EAAE,MAAM,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CA4B3B;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,GAClE,MAAM,CAGR;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAClC,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,EACnE,WAAW,EAAE,MAAM,GAClB,YAAY,EAAE,CAMhB;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,YAAY,EAAE,EACxB,QAAQ,EAAE,YAAY,EAAE,GACvB,YAAY,EAAE,CAKhB"}
+{"version":3,"file":"choiceSelectionUtils.d.ts","sourceRoot":"","sources":["../../../../src/crud/utils/choiceSelectionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,wBAAgB,cAAc,CAC5B,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,GAClB,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOlC;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,MAAM,GAAG,SAAS,CAS7B;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAKrB;AAED,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,SAAS,EAC/C,WAAW,EAAE,MAAM,GAClB,OAAO,EAAE,CAUX;AAED,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,SAAS,EAC/C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,EAChF,WAAW,EAAE,MAAM,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CA4B3B;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,GAClE,MAAM,CAGR;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAClC,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,EACnE,WAAW,EAAE,MAAM,GAClB,YAAY,EAAE,CAMhB;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,YAAY,EAAE,EACxB,QAAQ,EAAE,YAAY,EAAE,GACvB,YAAY,EAAE,CAKhB;AAED,oFAAoF;AACpF,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,OAAO,EAAE,EACtB,YAAY,EAAE,YAAY,EAAE,GAC3B,OAAO,EAAE,CAIX;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,YAAY,EAAE,EACxB,WAAW,EAAE,OAAO,EAAE,EACtB,eAAe,GAAE,YAAY,EAAO,GACnC,YAAY,EAAE,CAKhB"}

package/dist/src/crud/utils/referenceSelectSelectedProps.d.ts

@@ -0,0 +1,6 @@
+import { SelectProps } from 'antd';
+/** Select loading/disabled while selected labels resolve via getOne. */
+export declare function referenceSelectSelectedProps(listLoading: boolean, selectedLoading: boolean, disabled?: boolean): Pick<SelectProps, "loading" | "disabled">;
+/** Omit the raw id from the Select while the selected label is still loading. */
+export declare function referenceSelectDisplayValue<T>(selectedLoading: boolean, value: T, empty: T): T;
+//# sourceMappingURL=referenceSelectSelectedProps.d.ts.map

package/dist/src/crud/utils/referenceSelectSelectedProps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"referenceSelectSelectedProps.d.ts","sourceRoot":"","sources":["../../../../src/crud/utils/referenceSelectSelectedProps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAExC,wEAAwE;AACxE,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,OAAO,EACpB,eAAe,EAAE,OAAO,EACxB,QAAQ,CAAC,EAAE,OAAO,GACjB,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,UAAU,CAAC,CAK3C;AAED,iFAAiF;AACjF,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,eAAe,EAAE,OAAO,EACxB,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,CAAC,GACP,CAAC,CAEH"}

package/dist/src/crud/utils/useChoices.d.ts

@@ -28,6 +28,7 @@ export type UseChoicesOptions = {
 export declare function useChoices(loader: ChoicesLoader | undefined, reference: string | undefined, optionLabel?: string | ((record: Record<string, unknown>) => string), optionValue?: string, search?: string, hookOptions?: UseChoicesOptions): {
     options: ChoiceOption[];
     loading: boolean;
+    selectedLoading: boolean;
     labelForValue: (value: unknown) => string;
     labelsForValues: (values: unknown[]) => string;
     optionForValue: (value: unknown) => ChoiceOption | undefined;

package/dist/src/crud/utils/useChoices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChoices.d.ts","sourceRoot":"","sources":["../../../../src/crud/utils/useChoices.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAY5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,iGAAiG;IACjG,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,mEAAmE;IACnE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;IACrC;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACtE;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAyEF,wBAAgB,UAAU,CACxB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,GAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAU,EAC5E,WAAW,SAAO,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,GAAE,iBAAsB;;;2BAqLzB,OAAO,KAAG,MAAM;8BAQf,OAAO,EAAE,KAAG,MAAM;4BAQnB,OAAO,KAAG,YAAY,GAAG,SAAS;;EAa7C"}
+{"version":3,"file":"useChoices.d.ts","sourceRoot":"","sources":["../../../../src/crud/utils/useChoices.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAc5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,iGAAiG;IACjG,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,mEAAmE;IACnE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;IACrC;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACtE;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAyEF,wBAAgB,UAAU,CACxB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,GAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAU,EAC5E,WAAW,SAAO,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,GAAE,iBAAsB;;;;2BA6OzB,OAAO,KAAG,MAAM;8BAQf,OAAO,EAAE,KAAG,MAAM;4BAQnB,OAAO,KAAG,YAAY,GAAG,SAAS;;EAc7C"}

package/package.json

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

package/src/components/AppHub.tsx

@@ -1,4 +1,4 @@
-import { Card, Col, List, Row, Space, Typography, theme } from "antd";
+import { Card, Col, List, Row, Space, Spin, Typography, theme } from "antd";
 import { useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import {
@@ -19,6 +19,8 @@ export type AppHubProps = {
   className?: string;
   /** Max width of the centered hub content. Default `960`. */
   maxWidth?: number;
+  /** When true, shows a centered spinner instead of the app grid. */
+  loading?: boolean;
 };
 
 export function AppHub({
@@ -29,6 +31,7 @@ export function AppHub({
   menuSearchPlaceholder = "Search menus across apps…",
   className,
   maxWidth = 960,
+  loading = false,
 }: AppHubProps) {
   const navigate = useNavigate();
   const { token } = theme.useToken();
@@ -70,7 +73,7 @@ export function AppHub({
         paddingInline: token.paddingMD,
       }}
     >
-      {menuItems?.length ? (
+      {menuItems?.length && !loading ? (
         <div style={{ maxWidth: 480, margin: "0 auto 24px" }}>
           <NavMenuSearch
             value={query}
@@ -81,7 +84,11 @@ export function AppHub({
         </div>
       ) : null}
 
-      {isSearching ? (
+      {loading ? (
+        <div style={{ display: "flex", justifyContent: "center", padding: token.paddingXL }}>
+          <Spin size="large" />
+        </div>
+      ) : isSearching ? (
         <List
           bordered
           dataSource={menuResults}

package/src/crud/fields/ReferenceField.tsx

@@ -11,6 +11,10 @@ import type {
 import { valueAsId, resolveOptionLabel } from "../utils/choiceSelectionUtils";
 import { referenceSelectDropdownProps } from "../utils/referenceSelectDropdownProps";
 import { referenceSelectNotFoundContent } from "../utils/referenceSelectNotFoundContent";
+import {
+  referenceSelectDisplayValue,
+  referenceSelectSelectedProps,
+} from "../utils/referenceSelectSelectedProps";
 import { useChoices } from "../utils/useChoices";
 import { FieldWrapper } from "./FieldWrapper";
 import { ReferenceInputActions } from "./ReferenceInputActions";
@@ -88,19 +92,25 @@ function ReferenceFieldSelect({
   const active = dropdownOpen || Boolean(searchText);
   const selectValue = valueAsId(value, optionValue);
 
-  const { options, loading, optionForValue, reload } = useChoices(
-    choices,
-    reference,
-    optionLabel,
-    optionValue,
-    search ? searchText : undefined,
-    {
-      lazy,
-      active,
-      selectedValues: value,
-      selectedRecords,
-      fetchSelected,
-    },
+  const { options, loading, selectedLoading, optionForValue, reload } =
+    useChoices(
+      choices,
+      reference,
+      optionLabel,
+      optionValue,
+      search ? searchText : undefined,
+      {
+        lazy,
+        active,
+        selectedValues: value,
+        selectedRecords,
+        fetchSelected,
+      },
+    );
+  const selectState = referenceSelectSelectedProps(
+    loading,
+    selectedLoading,
+    disabled,
   );
 
   const selectOptions = useMemo(
@@ -130,14 +140,14 @@ function ReferenceFieldSelect({
   const select = (
     <Select
       {...referenceSelectDropdownProps({ popupMatchSelectWidth, popupMinWidth })}
-      value={selectValue}
+      value={referenceSelectDisplayValue(selectedLoading, selectValue, undefined)}
       onChange={(next) => {
         onChange(next);
         onValueChange?.(next, optionForValue(next), { name: fieldName });
       }}
       options={selectOptions}
-      loading={loading}
-      notFoundContent={referenceSelectNotFoundContent(loading)}
+      loading={selectState.loading}
+      notFoundContent={referenceSelectNotFoundContent(selectState.loading)}
       showSearch={search}
       filterOption={search ? false : undefined}
       onSearch={search ? setSearchText : undefined}
@@ -146,7 +156,7 @@ function ReferenceFieldSelect({
         if (!open) setSearchText(undefined);
       }}
       allowClear={allowClear}
-      disabled={disabled}
+      disabled={selectState.disabled}
       optionFilterProp="label"
       style={{ width: "100%", minWidth: 160, ...inputStyle }}
     />
@@ -165,7 +175,7 @@ function ReferenceFieldSelect({
         referenceDefaultValues={referenceDefaultValues}
         referenceModalWidth={referenceModalWidth}
         selectedId={selectValue}
-        disabled={disabled}
+        disabled={selectState.disabled}
         onCreated={applyRecord}
         onUpdated={() => void reload()}
       />

package/src/crud/fields/ReferenceManyField.tsx

@@ -5,6 +5,10 @@ import type { BaseSourceProps, FieldRules, ReferenceProps } from "../types";
 import { valuesAsIds } from "../utils/choiceSelectionUtils";
 import { referenceSelectDropdownProps } from "../utils/referenceSelectDropdownProps";
 import { referenceSelectNotFoundContent } from "../utils/referenceSelectNotFoundContent";
+import {
+  referenceSelectDisplayValue,
+  referenceSelectSelectedProps,
+} from "../utils/referenceSelectSelectedProps";
 import { useChoices } from "../utils/useChoices";
 import { FieldWrapper } from "./FieldWrapper";
 import { ReferenceInputActions } from "./ReferenceInputActions";
@@ -68,7 +72,7 @@ function ReferenceManyFieldSelect({
   const active = dropdownOpen || Boolean(searchText);
   const selectValue = valuesAsIds(value, optionValue);
 
-  const { options, loading, reload } = useChoices(
+  const { options, loading, selectedLoading, reload } = useChoices(
     choices,
     reference,
     optionLabel,
@@ -82,6 +86,11 @@ function ReferenceManyFieldSelect({
       fetchSelected,
     },
   );
+  const selectState = referenceSelectSelectedProps(
+    loading,
+    selectedLoading,
+    disabled,
+  );
 
   const selectOptions = useMemo(
     () =>
@@ -96,11 +105,11 @@ function ReferenceManyFieldSelect({
     <Select
       {...referenceSelectDropdownProps({ popupMatchSelectWidth, popupMinWidth })}
       mode="multiple"
-      value={selectValue}
+      value={referenceSelectDisplayValue(selectedLoading, selectValue, [])}
       onChange={onChange}
       options={selectOptions}
-      loading={loading}
-      notFoundContent={referenceSelectNotFoundContent(loading)}
+      loading={selectState.loading}
+      notFoundContent={referenceSelectNotFoundContent(selectState.loading)}
       showSearch={search}
       filterOption={search ? false : undefined}
       onSearch={search ? setSearchText : undefined}
@@ -109,7 +118,7 @@ function ReferenceManyFieldSelect({
         if (!open) setSearchText(undefined);
       }}
       allowClear={allowClear}
-      disabled={disabled}
+      disabled={selectState.disabled}
       optionFilterProp="label"
       style={{ width: "100%" }}
     />
@@ -127,7 +136,7 @@ function ReferenceManyFieldSelect({
         referenceTitle={referenceTitle}
         referenceDefaultValues={referenceDefaultValues}
         referenceModalWidth={referenceModalWidth}
-        disabled={disabled}
+        disabled={selectState.disabled}
         onCreated={(record) => {
           const id = record[optionValue];
           const current = Array.isArray(selectValue) ? selectValue : [];

package/src/crud/filters/ReferenceFilter.tsx

@@ -5,6 +5,10 @@ import { useRegisterFilter } from "../context/FilterContext";
 import { useChoices } from "../utils/useChoices";
 import { referenceSelectDropdownProps } from "../utils/referenceSelectDropdownProps";
 import { referenceSelectNotFoundContent } from "../utils/referenceSelectNotFoundContent";
+import {
+  referenceSelectDisplayValue,
+  referenceSelectSelectedProps,
+} from "../utils/referenceSelectSelectedProps";
 
 export type SelectFilterProps = BaseSourceProps & {
   choices: ChoiceOption[];
@@ -98,7 +102,7 @@ function ReferenceFilterInput({
   const [dropdownOpen, setDropdownOpen] = useState(false);
   const active = dropdownOpen || Boolean(searchText);
 
-  const { options, loading } = useChoices(
+  const { options, loading, selectedLoading } = useChoices(
     choices,
     reference,
     optionLabel,
@@ -106,6 +110,12 @@ function ReferenceFilterInput({
     search ? searchText : undefined,
     { lazy, active, selectedValues: value, fetchSelected },
   );
+  const selectState = referenceSelectSelectedProps(loading, selectedLoading);
+  const selectValue = value as
+    | string
+    | number
+    | (string | number)[]
+    | undefined;
 
   return (
     <Select
@@ -113,14 +123,19 @@ function ReferenceFilterInput({
       allowClear
       mode={multiple ? "multiple" : undefined}
       placeholder={label ?? source}
-      value={value as string | number | (string | number)[] | undefined}
+      value={referenceSelectDisplayValue(
+        selectedLoading,
+        selectValue,
+        (multiple ? [] : undefined) as typeof selectValue,
+      )}
       onChange={onChange}
       options={options.map((o) => ({
         label: o.label,
         value: o.value as string | number,
       }))}
-      loading={loading}
-      notFoundContent={referenceSelectNotFoundContent(loading)}
+      loading={selectState.loading}
+      disabled={selectState.disabled}
+      notFoundContent={referenceSelectNotFoundContent(selectState.loading)}
       showSearch={search}
       filterOption={search ? false : undefined}
       onSearch={search ? setSearchText : undefined}

package/src/crud/utils/choiceSelectionUtils.test.ts

@@ -2,8 +2,10 @@ import { describe, expect, it } from "vitest";
 import {
   collectSelectedRecords,
   isRecordObject,
+  keepSelectedOptions,
   normalizeSelectedIds,
   recordsToOptions,
+  unresolvedSelectedIds,
   valueAsId,
   valuesAsIds,
 } from "./choiceSelectionUtils";
@@ -42,4 +44,25 @@ describe("choiceSelectionUtils", () => {
       },
     ]);
   });
+
+  it("finds selected ids that do not yet have options", () => {
+    const options = [{ label: "One", value: "1" }];
+    expect(unresolvedSelectedIds(["1", "2"], [])).toEqual(["1", "2"]);
+    expect(unresolvedSelectedIds(["1", "2"], options)).toEqual(["2"]);
+    expect(unresolvedSelectedIds(["1"], options)).toEqual([]);
+    expect(unresolvedSelectedIds([], options)).toEqual([]);
+  });
+
+  it("keeps selected options when replacing a lazy dropdown list", () => {
+    const previous = [
+      { label: "One", value: "1" },
+      { label: "Two", value: "2" },
+    ];
+    const embedded = [{ label: "Embedded", value: "3" }];
+    expect(keepSelectedOptions(previous, ["2"], embedded)).toEqual([
+      { label: "Embedded", value: "3" },
+      { label: "Two", value: "2" },
+    ]);
+    expect(keepSelectedOptions(previous, [], [])).toEqual([]);
+  });
 });

package/src/crud/utils/choiceSelectionUtils.ts

@@ -114,3 +114,28 @@ export function mergeOptions(
   for (const option of incoming) byValue.set(option.value, option);
   return Array.from(byValue.values());
 }
+
+/** Selected ids that do not yet have a matching option (label still unresolved). */
+export function unresolvedSelectedIds(
+  selectedIds: unknown[],
+  knownOptions: ChoiceOption[],
+): unknown[] {
+  return selectedIds.filter(
+    (value) => !knownOptions.some((option) => option.value === value),
+  );
+}
+
+/**
+ * Keep options for currently selected ids when replacing the dropdown list
+ * (e.g. closing a lazy select) so selected labels do not flash back to raw ids.
+ */
+export function keepSelectedOptions(
+  previous: ChoiceOption[],
+  selectedIds: unknown[],
+  embeddedOptions: ChoiceOption[] = [],
+): ChoiceOption[] {
+  const keep = previous.filter((option) =>
+    selectedIds.some((value) => option.value === value),
+  );
+  return mergeOptions(embeddedOptions, keep);
+}

package/src/crud/utils/referenceSelectSelectedProps.ts

@@ -0,0 +1,22 @@
+import type { SelectProps } from "antd";
+
+/** Select loading/disabled while selected labels resolve via getOne. */
+export function referenceSelectSelectedProps(
+  listLoading: boolean,
+  selectedLoading: boolean,
+  disabled?: boolean,
+): Pick<SelectProps, "loading" | "disabled"> {
+  return {
+    loading: listLoading || selectedLoading,
+    disabled: Boolean(disabled || selectedLoading),
+  };
+}
+
+/** Omit the raw id from the Select while the selected label is still loading. */
+export function referenceSelectDisplayValue<T>(
+  selectedLoading: boolean,
+  value: T,
+  empty: T,
+): T {
+  return selectedLoading ? empty : value;
+}

package/src/crud/utils/useChoices.ts

@@ -1,13 +1,15 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useDataProvider } from "../../context/DataProvider";
 import type { Identifier } from "../../data/dataProviderTypes";
 import type { ChoiceOption, ChoicesLoader } from "../types";
 import {
   collectSelectedRecords,
+  keepSelectedOptions,
   mergeOptions,
   normalizeSelectedIds,
   recordsToOptions,
   resolveOptionLabel,
+  unresolvedSelectedIds,
 } from "./choiceSelectionUtils";
 
 const choicesCache = new Map<string, ChoiceOption[]>();
@@ -174,6 +176,19 @@ export function useChoices(
     return !choicesCache.has(cacheKey);
   });
 
+  const [selectedLoading, setSelectedLoading] = useState(() =>
+    Boolean(
+      fetchSelected &&
+        reference &&
+        unresolvedSelectedIds(normalizedSelected, embeddedOptions).length,
+    ),
+  );
+
+  const optionsRef = useRef(options);
+  optionsRef.current = options;
+  const normalizedSelectedRef = useRef(normalizedSelected);
+  normalizedSelectedRef.current = normalizedSelected;
+
   useEffect(() => {
     if (!embeddedOptions.length) return;
     setOptions((prev) => mergeOptions(prev, embeddedOptions));
@@ -192,7 +207,16 @@ export function useChoices(
       const key = loaderKey(effectiveLoader, search);
       const cached = choicesCache.get(key);
       if (cached && !search) {
-        setOptions(mergeOptions(embeddedOptions, cached));
+        setOptions((prev) =>
+          mergeOptions(
+            keepSelectedOptions(
+              prev,
+              normalizedSelectedRef.current,
+              embeddedOptions,
+            ),
+            cached,
+          ),
+        );
         setLoading(false);
         return;
       }
@@ -200,7 +224,13 @@ export function useChoices(
 
     setLoading(true);
     if (lazy) {
-      setOptions(embeddedOptions);
+      setOptions((prev) =>
+        keepSelectedOptions(
+          prev,
+          normalizedSelectedRef.current,
+          embeddedOptions,
+        ),
+      );
     }
 
     try {
@@ -212,12 +242,27 @@ export function useChoices(
         search,
         useCache,
       );
-      setOptions(mergeOptions(embeddedOptions, result));
+      setOptions((prev) =>
+        mergeOptions(
+          keepSelectedOptions(
+            prev,
+            normalizedSelectedRef.current,
+            embeddedOptions,
+          ),
+          result,
+        ),
+      );
     } catch {
       if (!normalizedSelected.length && !embeddedOptions.length) {
         setOptions([]);
       } else if (lazy) {
-        setOptions(embeddedOptions);
+        setOptions((prev) =>
+          keepSelectedOptions(
+            prev,
+            normalizedSelectedRef.current,
+            embeddedOptions,
+          ),
+        );
       }
     } finally {
       setLoading(false);
@@ -241,20 +286,30 @@ export function useChoices(
 
   useEffect(() => {
     if (lazy && !active && !search) {
-      setOptions(embeddedOptions);
+      setOptions((prev) =>
+        keepSelectedOptions(prev, normalizedSelected, embeddedOptions),
+      );
       setLoading(false);
     }
-  }, [lazy, active, search, embeddedOptions]);
+  }, [lazy, active, search, embeddedOptions, normalizedSelected]);
 
   useEffect(() => {
-    if (!fetchSelected || !reference || !normalizedSelected.length) return;
+    if (!fetchSelected || !reference || !normalizedSelected.length) {
+      setSelectedLoading(false);
+      return;
+    }
 
-    const idsToFetch = normalizedSelected.filter(
-      (value) => !embeddedOptions.some((option) => option.value === value),
+    const idsToFetch = unresolvedSelectedIds(
+      normalizedSelected,
+      mergeOptions(embeddedOptions, optionsRef.current),
     );
-    if (!idsToFetch.length) return;
+    if (!idsToFetch.length) {
+      setSelectedLoading(false);
+      return;
+    }
 
     let cancelled = false;
+    setSelectedLoading(true);
 
     void (async () => {
       const resolved: ChoiceOption[] = [];
@@ -274,14 +329,17 @@ export function useChoices(
           });
         }
       }
-      if (cancelled || !resolved.length) return;
-
-      setOptions((prev) => {
-        const missing = resolved.filter(
-          (option) => !prev.some((existing) => existing.value === option.value),
-        );
-        return missing.length ? mergeOptions(prev, missing) : prev;
-      });
+      if (cancelled) return;
+
+      if (resolved.length) {
+        setOptions((prev) => {
+          const missing = resolved.filter(
+            (option) => !prev.some((existing) => existing.value === option.value),
+          );
+          return missing.length ? mergeOptions(prev, missing) : prev;
+        });
+      }
+      setSelectedLoading(false);
     })();
 
     return () => {
@@ -322,6 +380,7 @@ export function useChoices(
   return {
     options,
     loading,
+    selectedLoading,
     labelForValue,
     labelsForValues,
     optionForValue,