make sure props desconstruction is equivalent with previous renderOpe…

…ner function since that's where sharedProps is applied
Khan · Nov 22, 2024 · e02ada1 · e02ada1
1 parent 2f163c8
commit e02ada1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/packages/wonder-blocks-dropdown/src/components/multi-select.tsx b/packages/wonder-blocks-dropdown/src/components/multi-select.tsx
@@ -192,32 +192,33 @@ type Props = AriaProps &
  */
 const MultiSelect = (props: Props) => {
     const {
-        alignment = "left",
-        disabled = false,
-        error = false,
+        id,
         light = false,
-        shortcuts = false,
-        selectedValues = [],
-        opened,
-        onToggle,
-        onChange,
-        children,
+        opener,
+        testId,
+        alignment = "left",
+        dropdownStyle,
         implicitAllEnabled,
         isFilterable,
-        dropdownId,
+        labels: propLabels,
+        onChange,
+        onToggle,
+        opened,
+        selectedValues = [],
+        shortcuts = false,
         style,
         className,
-        dropdownStyle,
         "aria-invalid": ariaInvalid,
         "aria-required": ariaRequired,
-        id,
-        testId,
-        opener,
+        disabled = false,
+        error = false,
+        children,
+        dropdownId,
         ...sharedProps
     } = props;
 
     // Merge custom labels with the default ones
-    const labels = {...defaultLabels, ...props.labels};
+    const labels = {...defaultLabels, ...propLabels};
 
     // Whether or not the dropdown is open.
     const [open, setOpen] = React.useState(false);
@@ -483,6 +484,7 @@ const MultiSelect = (props: Props) => {
                     ) : (
                         <SelectOpener
                             {...sharedProps}
+                            error={error}
                             disabled={isDisabled}
                             id={uniqueOpenerId}
                             aria-controls={dropdownId}

diff --git a/packages/wonder-blocks-dropdown/src/components/single-select.tsx b/packages/wonder-blocks-dropdown/src/components/single-select.tsx
@@ -211,34 +211,34 @@ type Props = AriaProps &
 const SingleSelect = (props: Props) => {
     const selectedIndex = React.useRef(0);
     const {
+        children,
+        error = false,
+        id,
+        opener,
+        light = false,
+        placeholder,
+        selectedValue,
+        testId,
         alignment = "left",
         autoFocus = true,
-        disabled = false,
+        dropdownStyle,
         enableTypeAhead = true,
-        error = false,
-        light = false,
+        isFilterable,
         labels = {
             clearSearch: defaultLabels.clearSearch,
             filter: defaultLabels.filter,
             noResults: defaultLabels.noResults,
             someResults: defaultLabels.someSelected,
         },
-        opened,
-        onToggle,
-        selectedValue,
         onChange,
-        isFilterable,
-        children,
-        id,
-        opener,
-        placeholder,
-        testId,
-        dropdownId,
-        dropdownStyle,
+        onToggle,
+        opened,
         style,
         className,
         "aria-invalid": ariaInvalid,
         "aria-required": ariaRequired,
+        disabled = false,
+        dropdownId,
         ...sharedProps
     } = props;