Fix select all in multiselect (#135)

* fix * cleane * review --------- Co-authored-by: Aleksej Tre <[email protected]>
Cado-Labs · Jul 5, 2023 · e36264a · e36264a
1 parent 32f611c
commit e36264a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@cadolabs/sphere-ui",
- "version": "5.0.0",
+ "version": "5.0.1",
  "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
@@ -58,12 +58,19 @@ export const MultiSelect = React.forwardRef(({
  }
 
  const handleSelectAll = () => {
- const newValue = options.map(option => {
- if (optionValue) return option[optionValue]
- if (option.hasOwnProperty("value")) return option.value
- return option
- })
-
+ const prepareOptions = options => options.map(option => {
+ if (optionValue) {
+ return option[optionValue]
+ } else if (option.hasOwnProperty("value")) {
+ return option.value
+ } else if (option.items) {
+ return prepareOptions(option.items)
+ } else {
+ return option
+ }
+ }).flat()
+
+ const newValue = prepareOptions(options)
  onFooterButtonClick(newValue)
  }