fix select all for grouped options (#157)

Cado-Labs · Jan 17, 2024 · 9e6bb3b · 9e6bb3b
1 parent 9311c1a
commit 9e6bb3b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@cadolabs/sphere-ui",
- "version": "5.1.1",
+ "version": "5.1.2",
  "main": "dist/index.js",
  "license": "MIT",
  "repository": "https://github.com/Cado-Labs/sphere-ui",

diff --git a/src/components/MultiSelect/index.js b/src/components/MultiSelect/index.js
@@ -63,8 +63,8 @@ export const MultiSelect = React.forwardRef(({
  return option[optionValue]
  } else if (option.hasOwnProperty("value")) {
  return option.value
- } else if (option.items) {
- return prepareOptions(option.items)
+ } else if (optionGroupChildren && option[optionGroupChildren]) {
+ return prepareOptions(option[optionGroupChildren])
  } else {
  return option
  }

diff --git a/storybook/stories/form/MultiSelect/multiSelect.js b/storybook/stories/form/MultiSelect/multiSelect.js
@@ -19,31 +19,31 @@ function MultiSelectExample () {
  {
  label: 'Germany',
  code: 'DE',
- items: [
- { label: 'Berlin', value: 'Berlin' },
- { label: 'Frankfurt', value: 'Frankfurt' },
- { label: 'Hamburg', value: 'Hamburg' },
- { label: 'Munich', value: 'Munich' }
+ cities: [
+ { city: 'Berlin', value: 'Berlin' },
+ { city: 'Frankfurt', value: 'Frankfurt' },
+ { city: 'Hamburg', value: 'Hamburg' },
+ { city: 'Munich', value: 'Munich' }
  ]
  },
  {
  label: 'USA',
  code: 'US',
- items: [
- { label: 'Chicago', value: 'Chicago' },
- { label: 'Los Angeles', value: 'Los Angeles' },
- { label: 'New York', value: 'New York' },
- { label: 'San Francisco', value: 'San Francisco' }
+ cities: [
+ { city: 'Chicago', value: 'Chicago' },
+ { city: 'Los Angeles', value: 'Los Angeles' },
+ { city: 'New York', value: 'New York' },
+ { city: 'San Francisco', value: 'San Francisco' }
  ]
  },
  {
  label: 'Japan',
  code: 'JP',
- items: [
- { label: 'Kyoto', value: 'Kyoto' },
- { label: 'Osaka', value: 'Osaka' },
- { label: 'Tokyo', value: 'Tokyo' },
- { label: 'Yokohama', value: 'Yokohama' }
+ cities: [
+ { city: 'Kyoto', value: 'Kyoto' },
+ { city: 'Osaka', value: 'Osaka' },
+ { city: 'Tokyo', value: 'Tokyo' },
+ { city: 'Yokohama', value: 'Yokohama' }
  ]
  }
  ];
@@ -68,9 +68,9 @@ function MultiSelectExample () {
  value={selectedCities}
  options={groupedCities}
  onChange={(e) => setSelectedCities(e.value)}
- optionLabel="label"
+ optionLabel="city"
  optionGroupLabel="label"
- optionGroupChildren="items"
+ optionGroupChildren="cities"
  placeholder="Select Cities"
  display="chip"
  className="w-full md:w-20rem"