Fix select state placeholder duplication

commercelayer · Aug 8, 2024 · b6daee0 · b6daee0
1 parent 67b2461
commit b6daee0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/packages/react-components/src/components/addresses/AddressStateSelector.tsx b/packages/react-components/src/components/addresses/AddressStateSelector.tsx
@@ -186,7 +186,6 @@ export function AddressStateSelector(props: Props): JSX.Element {
   const classNameComputed = !isEmptyStates()
     ? `${className} ${selectClassName} ${hasError ? errorClassName : ''}`
     : `${className} ${inputClassName} ${hasError ? errorClassName : ''}`
-
   return !isEmptyStates() ? (
     <BaseSelect
       {...p}

diff --git a/packages/react-components/src/components/utils/BaseSelect.tsx b/packages/react-components/src/components/utils/BaseSelect.tsx
@@ -1,7 +1,6 @@
 import React, { type ForwardRefRenderFunction } from 'react'
 import Parent from './Parent'
 import { type BaseSelectComponentProps } from '#typings'
-import { findIndex } from 'lodash'
 
 export type BaseSelectProps = BaseSelectComponentProps
 
@@ -16,10 +15,11 @@ const BaseSelect: ForwardRefRenderFunction<any, BaseSelectProps> = (
     value = '',
     ...p
   } = props
-  if (findIndex(options, placeholder) === -1) {
-    options.unshift(placeholder)
-  } else {
-    options[0] = placeholder
+  if (placeholder != null) {
+    const isPlaceholderInOptions = options.some((option) => option.value === placeholder.value)
+    if (!isPlaceholderInOptions) {
+      options.unshift(placeholder)
+    }
   }
   const Options = options.map((o, k) => {
     const { label, ...option } = o