use getInitialValue

downshift-js · Aug 1, 2023 · 48cc29b · 48cc29b
1 parent 5ce3acd
commit 48cc29b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/src/hooks/useCombobox/index.js b/src/hooks/useCombobox/index.js
@@ -11,7 +11,7 @@ import {
   useControlPropsValidator,
   useElementIds,
   getItemAndIndex,
-  getFocusOnOpenValue,
+  getInitialValue,
 } from '../utils'
 import {
   getInitialState,
@@ -32,8 +32,6 @@ function useCombobox(userProps = {}) {
     ...userProps,
   }
   const {
-    initialIsOpen,
-    defaultIsOpen,
     items,
     scrollIntoView,
     environment,
@@ -107,7 +105,7 @@ function useCombobox(userProps = {}) {
   })
   // Focus the input on first render if required.
   useEffect(() => {
-    const focusOnOpen = getFocusOnOpenValue(initialIsOpen, defaultIsOpen, isOpen)
+    const focusOnOpen = getInitialValue(props, 'isOpen')
 
     if (focusOnOpen && inputRef.current) {
       inputRef.current.focus()

diff --git a/src/hooks/utils.js b/src/hooks/utils.js
@@ -619,18 +619,6 @@ const commonDropdownPropTypes = {
   scrollIntoView: PropTypes.func,
 }
 
-function getFocusOnOpenValue(initialIsOpen, defaultIsOpen, isOpenProp) {
-  if (isOpenProp !== undefined) {
-    return isOpenProp
-  }
-
-  if (initialIsOpen !== undefined) {
-    return initialIsOpen
-  }
-
-  return !!defaultIsOpen
-}
-
 export {
   useControlPropsValidator,
   useScrollIntoView,
@@ -652,5 +640,4 @@ export {
   getChangesOnSelection,
   commonDropdownPropTypes,
   commonPropTypes,
-  getFocusOnOpenValue
 }