Merge pull request #5731 from marmelab/Fix-ReferenceInput-does-not-sh…

…ow-loaded-while-data-is-loading Fix ReferenceInput does not show loader while possible values and reference record are loading
marmelab · Jan 4, 2021 · 549af03 · 549af03
2 parents 127a968 + 82c04da
commit 549af03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/ra-core/src/controller/input/ReferenceInputController.spec.tsx b/packages/ra-core/src/controller/input/ReferenceInputController.spec.tsx
@@ -216,7 +216,7 @@ describe('<ReferenceInputController />', () => {
             choices: [{ id: 1 }],
             error: null,
             filter: { q: '' },
-            loading: false,
+            loading: true,
             pagination: { page: 1, perPage: 25 },
             sort: { field: 'title', order: 'ASC' },
             warning: null,

diff --git a/packages/ra-core/src/controller/input/useReferenceInputController.ts b/packages/ra-core/src/controller/input/useReferenceInputController.ts
@@ -199,7 +199,7 @@ export const useReferenceInputController = (
         // kept for backwards compatibility
         // @deprecated to be removed in 4.0
         error: dataStatus.error,
-        loading: dataStatus.waiting,
+        loading: !possibleValuesLoaded || !referenceLoaded,
         filter: filterValues,
         setFilter,
         pagination,