Merge 1a7d718 into 1a7b2f3

sanusart · Dec 15, 2019 · ba28b9a · ba28b9a
2 parents 1a7b2f3 + 1a7d718
commit ba28b9a
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v3.8.0
+*  FEATURE (select some): extend inner method 'selectAll' to accept parameter of list of items to select ref #57 [View](https://github.com/sanusart/react-dropdown-select/commit/ec36702adb66c3af552d9acc96b381ca228949ea)
+
 ### v3.7.0
 *  Corrected onChange callback in Select component (#56) [View](https://github.com/sanusart/react-dropdown-select/commit/86c716ab6f47882755024d436136281f2ed79f97)
 *  build [View](https://github.com/sanusart/react-dropdown-select/commit/0a90bf8cb28b711009cd2afa504022ecf4f8042a)

diff --git a/dist/react-dropdown-select.js b/dist/react-dropdown-select.js
diff --git a/docs/src/examples/CustomContentAndDropdown.js b/docs/src/examples/CustomContentAndDropdown.js
@@ -29,7 +29,16 @@ export class CustomContentAndDropdown extends React.Component {
                 Clear all
               </Button>
             ) : (
-              <Button onClick={methods.selectAll}>Select all</Button>
+              <React.Fragment>
+                <Button onClick={() => methods.selectAll(
+                  [
+                    props.options[0],
+                    props.options[1],
+                    props.options[3]
+                  ]
+                )}>Select 1st, 2nd and 4th</Button>
+                <Button onClick={methods.selectAll}>Select all</Button>
+              </React.Fragment>
             )}
           </Buttons>
           <input

diff --git a/docs/src/pages/methods.md b/docs/src/pages/methods.md
@@ -13,7 +13,7 @@ title: 'methods'
 | getInputSize()                 | -                                                                                  | number    | input character count                                                                                          |
 | toggleSelectAll()              | -                                                                                  | undefined |                                                                                                                |
 | clearAll()                     | -                                                                                  | undefined |                                                                                                                |
-| selectAll()                    | -                                                                                  | undefined | will select all values except disabled                                                                         |
+| selectAll([])                  | -                                                                                  | undefined | will select all values except disabled or a list of values provided as first parameter                         |
 | isSelected(item)               | **item**: object                                                                   | boolean   |                                                                                                                |
 | searchResults()                | -                                                                                  | array     | returns array of items matching `/item.label/i` regex, if `searchBy` prop is used - matches against it's value |
 | selectRef()                    | -                                                                                  | DOM node  | returns DOM element of &lt;Select/&gt;                                                                         |

diff --git a/lib/index.js b/lib/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dropdown-select",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "Customizable dropdown select for react",
   "main": "dist/react-dropdown-select.js",
   "module": "lib/index.js",
@@ -14,9 +14,9 @@
     "test": "jest --bail && npm run prepublishOnly && bundlesize",
     "test:watch": "jest --bail --watch && npm run prepublishOnly && bundlesize",
     "coveralls": "jest --coverage && cat ./coverage/lcov.info | coveralls",
-    "build": "webpack",
+    "build": "webpack && npm run transpile",
     "transpile": "babel src -d lib",
-    "prepublishOnly": "npm run build && npm run transpile",
+    "prepublishOnly": "npm run build",
     "version": "replace \"vPLACEHOLDER\" \"v$npm_package_version\" ./CHANGELOG.md && git add .",
     "preversion": "sh change-log-builder.sh",
     "release:patch": "npm version patch -m \"v%s \nSee changelog: https://github.com/sanusart/react-dropdown-select/blob/master/CHANGELOG.md\"",

diff --git a/src/index.js b/src/index.js
@@ -285,11 +285,13 @@ export class Select extends Component {
     });
   };
 
-  selectAll = () => {
+  selectAll = (valuesList=[]) => {
     this.props.onSelectAll();
-    return this.setState({
-      values: this.props.options.filter((option) => !option.disabled)
-    });
+    const values = valuesList.length > 0
+      ? valuesList
+      : this.props.options.filter((option) => !option.disabled);
+
+    this.setState({ values });
   };
 
   isSelected = (option) =>

diff --git a/types.d.ts b/types.d.ts
@@ -16,7 +16,7 @@ export interface IMethods {
   getInputSize: () => number;
   toggleSelectAll: () => void;
   clearAll: () => void;
-  selectAll: () => void;
+  selectAll: (items?: IItemRenderer['item'][]) => void;
   searchResults: () => void;
   getSelectRef: () => React.RefObject;
   isSelected: (item: IItemRenderer['item']) => boolean;