Issue #1 - Fixed calculated grouping not working with the "Select All…

…" option enabled. (#4) Issue #2 - Changed how the "Select All" option is unchecked if not all values are selected.
sthomas1618 · Mar 28, 2018 · 4cca61a · 4cca61a
1 parent 0909a14
commit 4cca61a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/select/SimpleSelect.js b/src/select/SimpleSelect.js
@@ -350,20 +350,25 @@ class SimpleSelect extends Component {
   blur = () => { this.input.blur() }
 
   groupOptions() {
-    const { groups, groupByKey, options } = this.props
+    const { allOption, allowSelectAll, groups, groupByKey, options } = this.props
 
     if (groups && groups.length > 0 && groupByKey) {
       const orderedOptions = _.orderBy(options, groupByKey)
       const parentGroups = []
 
+      if (allowSelectAll && !_.includes(parentGroups, allOption)) {
+        parentGroups.push(allOption)
+      }
+
       orderedOptions.forEach((option) => {
         const group = _.find(groups, [groupByKey, option[groupByKey]])
-        if (!_.includes(parentGroups, group)) {
-          group.options = []
-          parentGroups.push(group)
+        if (group) {
+          if (!_.includes(parentGroups, group)) {
+            group.options = []
+            parentGroups.push(group)
+          }
+          group.options.push(option)
         }
-
-        group.options.push(option)
       })
       return parentGroups
     }

diff --git a/src/select/multiselect/MultiSelect.js b/src/select/multiselect/MultiSelect.js
@@ -45,8 +45,9 @@ class MultiSelect extends Component {
 
     if (containsVal) {
       newValues = option === allOption ? [] :
-        _.filter(valueObjs, val => (allowSelectAll ?
-          val[valKey] !== option[valKey] && val !== allOption : val[valKey] !== option[valKey]))
+      _.filter(valueObjs, val => (
+        allowSelectAll ? val[valKey] !== option[valKey] && val[valueKey] !== allOption[valueKey]
+          : val[valKey] !== option[valKey]))
     } else if (isGroup) {
       newValues = [...valueObjs, ...option.options]
     } else if (option === allOption) {

diff --git a/stories/index.js b/stories/index.js
@@ -135,7 +135,7 @@ stories.add('with MultiSelect and pre-formed grouping', () => (
   />
 ))
 
-stories.add('with MultiSelect and calculated grouping', () => (
+stories.add('with MultiSelect and calculated grouping and select all', () => (
   <BasicMultiSelect
     options={terms}
     labelKey="value"
@@ -150,6 +150,7 @@ stories.add('with MultiSelect and calculated grouping', () => (
     clearable={boolean('Clearable', false)}
     placeholder={text('Placeholder', 'Select value...')}
     openOnClick={boolean('Open On Click', true)}
+    allowSelectAll={boolean('Allow Select All', true)}
   />
 ))