Merge pull request #3971 from natrim/patch-19

[RFR][v3] useSuggestions - don't crash on empty value
marmelab · Nov 13, 2019 · a0e0893 · a0e0893
2 parents 83a86f1 + f34364c
commit a0e0893
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/ra-core/src/form/useSuggestions.spec.ts b/packages/ra-core/src/form/useSuggestions.spec.ts
@@ -31,6 +31,12 @@ describe('getSuggestions', () => {
             { id: 1, value: 'one' },
             { id: 2, value: 'two' },
         ]);
+        expect(
+            getSuggestions({
+                ...defaultOptions,
+                choices: [{ id: 0, value: '0' }, { id: 1, value: 'one' }],
+            })('0')
+        ).toEqual([{ id: 0, value: '0' }]);
     });
 
     it('should filter choices according to the filter argument when it contains RegExp reserved characters', () => {
@@ -108,4 +114,10 @@ describe('getSuggestions', () => {
             { id: 2, value: 'two' },
         ]);
     });
+
+    it('should return all choices on empty/falsy values', () => {
+        expect(getSuggestions(defaultOptions)(undefined)).toEqual(choices);
+        expect(getSuggestions(defaultOptions)(false)).toEqual(choices);
+        expect(getSuggestions(defaultOptions)(null)).toEqual(choices);
+    });
 });
diff --git a/packages/ra-core/src/form/useSuggestions.ts b/packages/ra-core/src/form/useSuggestions.ts
@@ -84,7 +84,8 @@ const useSuggestions = ({
 
 export default useSuggestions;
 
-const escapeRegExp = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+const escapeRegExp = value =>
+    value ? value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') : ''; // $& means the whole matched string
 
 interface Options extends UseChoicesOptions {
     choices: any[];