Merge branch 'master' of https://github.com/medly/medly-components in…

…to feature-pagination
phoenixTW · Oct 6, 2020 · 9f84caa · 9f84caa
2 parents ae3426c + 2e396bb
commit 9f84caa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/core/src/components/MultiSelect/MultiSelect.tsx b/packages/core/src/components/MultiSelect/MultiSelect.tsx
@@ -59,7 +59,7 @@ export const MultiSelect: FC<MultiSelectProps> & WithStyle = React.memo(
                     setInputValue(value);
                     const newOptions = filterOptions(options, value);
                     newOptions.length && value ? setOptions(newOptions) : updateToDefaultOptions();
-                    !areOptionsVisible && showOptions();
+                    !areOptionsVisible && setOptionsVisibilityState(true);
                 },
                 [areOptionsVisible, options, updateToDefaultOptions]
             ),

diff --git a/packages/core/src/components/SingleSelect/SingleSelect.tsx b/packages/core/src/components/SingleSelect/SingleSelect.tsx
@@ -47,9 +47,9 @@ export const SingleSelect: FC<SelectProps> & WithStyle = React.memo(
 
         const showOptions = useCallback(() => {
                 setOptionsVisibilityState(true);
-                inputRef.current.setSelectionRange && inputRef.current.setSelectionRange(inputValue.length, inputValue.length);
+                isSearchable && setInputValue('');
                 inputRef.current.focus();
-            }, [inputValue]),
+            }, [isSearchable, inputValue]),
             hideOptions = useCallback(() => {
                 setOptionsVisibilityState(false);
                 inputRef.current && inputRef.current.blur();
@@ -64,7 +64,7 @@ export const SingleSelect: FC<SelectProps> & WithStyle = React.memo(
                         newOptions = filterOptions(getUpdatedOptions(defaultOptions, selectedOption), target.value);
                     setInputValue(target.value);
                     newOptions.length && target.value ? setOptions(newOptions) : updateToDefaultOptions();
-                    !areOptionsVisible && showOptions();
+                    !areOptionsVisible && setOptionsVisibilityState(true);
                 },
                 [areOptionsVisible, defaultOptions, selectedOption, updateToDefaultOptions]
             ),