Bump lodash.mergewith from 4.6.0 to 4.6.2

Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.0 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>

docs/row-selection.md

@@ -1,6 +1,6 @@
 
 # Row selection
-`react-bootstrap-table2` supports the row selection feature. By passing prop `selectRow` to enable row selection. When you enable this feature, `react-bootstrap-table2` will prepend a new selection column.
+`react-bootstrap-table2` supports the row selection feature. By passing prop `selectRow` to enable row selection. When you enable this feature, `react-bootstrap-table2` will prepend a new selection column. 
 
 ## Required
 * [mode (**required**)](#mode)
@@ -11,8 +11,6 @@
 * [classes)](#classes)
 * [bgColor](#bgColor)
 * [nonSelectable)](#nonSelectable)
-* [nonSelectableStyle](#nonSelectableStyle)
-* [nonSelectableClasses](#nonSelectableClasses)
 * [clickToSelect)](#clickToSelect)
 * [clickToExpand)](#clickToExpand)
 * [clickToEdit](#clickToEdit)
@@ -141,54 +139,6 @@ const selectRow = {
 };
 ```
 
-### <a name='nonSelectableStyle'>selectRow.nonSelectableStyle - [Object | Function]</a>
-This prop allow you to customize the non selectable rows. `selectRow.nonSelectableStyle` accepts an style object
-and a callback function for more flexible customization.
-
-### Style Object
-
-```js
-const selectRow = {
-  mode: 'checkbox',
-  nonSelectable: [1, 3 ,5],
-  nonSelectableStyle: { backgroundColor: 'gray' }
-};
-```
-
-### Callback Function
-
-```js
-const selectRow = {
-  mode: 'checkbox',
-  nonSelectable: [1, 3 ,5],
-  nonSelectableStyle: (row, rowIndex) => { return ...; }
-};
-```
-
-### <a name='nonSelectableClasses'>selectRow.nonSelectableClasses - [String | Function]</a>
-This prop allow you to set a custom class for the non selectable rows, or use a callback function for more
-flexible customization
-
-### String
-
-```js
-const selectRow = {
-  mode: 'checkbox',
-  nonSelectable: [1, 3 ,5],
-  nonSelectableClasses: 'my-class'
-};
-```
-
-### Callback Function
-
-```js
-const selectRow = {
-  mode: 'checkbox',
-  nonSelectable: [1, 3 ,5],
-  nonSelectableClasses: (row, rowIndex) => { return ...; }
-};
-```
-
 ### <a name='clickToSelect'>selectRow.clickToSelect - [Bool]</a>
 Allow user to select row by clicking on the row.
 
@@ -199,7 +149,7 @@ const selectRow = {
 };
 ```
 
-> Note: When you also enable [cellEdit](./cell-edit.md), the `selectRow.clickToSelect` will deactivate the functionality of cell editing
+> Note: When you also enable [cellEdit](./cell-edit.md), the `selectRow.clickToSelect` will deactivate the functionality of cell editing   
 > If you want to click on row to select row and edit cell simultaneously, you are suppose to enable [`selectRow.clickToEdit`](#clickToEdit)
 
 ### <a name='clickToExpand'>selectRow.clickToExpand - [Bool]</a>
@@ -357,7 +307,7 @@ const selectRow = {
   mode: 'checkbox',
   onSelectAll: (isSelect, rows, e) => {
     if (isSelect && SOME_CONDITION) {
-      return [1, 3, 4];  // finally, key 1, 3, 4 will being selected
+      return [1, 3, 4];  // finally, key 1, 3, 4 will being selected 
     }
   }
 };

packages/react-bootstrap-table2-example/examples/row-selection/non-selectable-rows-class.js

@@ -1,61 +0,0 @@
-import React from 'react';
-
-import BootstrapTable from 'react-bootstrap-table-next';
-import Code from 'components/common/code-block';
-import { productsGenerator } from 'utils/common';
-
-const products = productsGenerator();
-
-const columns = [{
-  dataField: 'id',
-  text: 'Product ID'
-}, {
-  dataField: 'name',
-  text: 'Product Name'
-}, {
-  dataField: 'price',
-  text: 'Product Price'
-}];
-
-const selectRow = {
-  mode: 'checkbox',
-  clickToSelect: true,
-  nonSelectable: [0, 2, 4],
-  nonSelectableClasses: 'row-index-bigger-than-2101'
-};
-
-const sourceCode = `\
-import BootstrapTable from 'react-bootstrap-table-next';
-
-const columns = [{
-  dataField: 'id',
-  text: 'Product ID'
-}, {
-  dataField: 'name',
-  text: 'Product Name'
-}, {
-  dataField: 'price',
-  text: 'Product Price'
-}];
-
-const selectRow = {
-  mode: 'checkbox',
-  clickToSelect: true,
-  nonSelectable: [0, 2, 4],
-  nonSelectableClasses: 'row-index-bigger-than-2101'
-};
-
-<BootstrapTable
-  keyField='id'
-  data={ products }
-  columns={ columns }
-  selectRow={ selectRow }
-/>
-`;
-
-export default () => (
-  <div>
-    <BootstrapTable keyField="id" data={ products } columns={ columns } selectRow={ selectRow } />
-    <Code>{ sourceCode }</Code>
-  </div>
-);

packages/react-bootstrap-table2-example/examples/row-selection/non-selectable-rows-style.js

@@ -1,61 +0,0 @@
-import React from 'react';
-
-import BootstrapTable from 'react-bootstrap-table-next';
-import Code from 'components/common/code-block';
-import { productsGenerator } from 'utils/common';
-
-const products = productsGenerator();
-
-const columns = [{
-  dataField: 'id',
-  text: 'Product ID'
-}, {
-  dataField: 'name',
-  text: 'Product Name'
-}, {
-  dataField: 'price',
-  text: 'Product Price'
-}];
-
-const selectRow = {
-  mode: 'checkbox',
-  clickToSelect: true,
-  nonSelectable: [0, 2, 4],
-  nonSelectableStyle: { backgroundColor: 'gray' }
-};
-
-const sourceCode = `\
-import BootstrapTable from 'react-bootstrap-table-next';
-
-const columns = [{
-  dataField: 'id',
-  text: 'Product ID'
-}, {
-  dataField: 'name',
-  text: 'Product Name'
-}, {
-  dataField: 'price',
-  text: 'Product Price'
-}];
-
-const selectRow = {
-  mode: 'checkbox',
-  clickToSelect: true,
-  nonSelectable: [0, 2, 4],
-  nonSelectableStyle: { backgroundColor: 'gray' }
-};
-
-<BootstrapTable
-  keyField='id'
-  data={ products }
-  columns={ columns }
-  selectRow={ selectRow }
-/>
-`;
-
-export default () => (
-  <div>
-    <BootstrapTable keyField="id" data={ products } columns={ columns } selectRow={ selectRow } />
-    <Code>{ sourceCode }</Code>
-  </div>
-);

packages/react-bootstrap-table2-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap-table2-example",
-  "version": "1.0.34",
+  "version": "1.0.32",
   "description": "",
   "main": "index.js",
   "private": true,

packages/react-bootstrap-table2-example/stories/index.js

@@ -152,8 +152,6 @@ import HeaderStyleTable from 'examples/row-selection/header-style';
 import HideSelectAllTable from 'examples/row-selection/hide-select-all';
 import CustomSelectionTable from 'examples/row-selection/custom-selection';
 import NonSelectableRowsTable from 'examples/row-selection/non-selectable-rows';
-import NonSelectableRowsStyleTable from 'examples/row-selection/non-selectable-rows-style';
-import NonSelectableRowsClassTable from 'examples/row-selection/non-selectable-rows-class';
 import SelectionBgColorTable from 'examples/row-selection/selection-bgcolor';
 import SelectionHooks from 'examples/row-selection/selection-hooks';
 import HideSelectionColumnTable from 'examples/row-selection/hide-selection-column';
@@ -412,8 +410,6 @@ storiesOf('Row Selection', module)
   .add('Custom Selection', () => <CustomSelectionTable />)
   .add('Selection Background Color', () => <SelectionBgColorTable />)
   .add('Not Selectabled Rows', () => <NonSelectableRowsTable />)
-  .add('Not Selectabled Rows Style', () => <NonSelectableRowsStyleTable />)
-  .add('Not Selectabled Rows Class', () => <NonSelectableRowsClassTable />)
   .add('Selection Hooks', () => <SelectionHooks />)
   .add('Hide Selection Column', () => <HideSelectionColumnTable />)
   .add('Custom Selection Column Style', () => <SelectionColumnStyleTable />)

packages/react-bootstrap-table2-filter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap-table2-filter",
-  "version": "1.3.0",
+  "version": "1.2.0",
   "description": "it's a column filter addon for react-bootstrap-table2",
   "main": "./lib/index.js",
   "repository": {

packages/react-bootstrap-table2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap-table-next",
-  "version": "3.3.1",
+  "version": "3.2.1",
   "description": "Next generation of react-bootstrap-table",
   "main": "./lib/index.js",
   "repository": {

packages/react-bootstrap-table2/src/bootstrap-table.js

@@ -182,8 +182,6 @@ BootstrapTable.propTypes = {
     style: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
     classes: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
     nonSelectable: PropTypes.array,
-    nonSelectableStyle: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
-    nonSelectableClasses: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
     bgColor: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
     hideSelectColumn: PropTypes.bool,
     selectionRenderer: PropTypes.func,

packages/react-bootstrap-table2/src/filters.js

@@ -21,7 +21,6 @@ const Filters = (props) => {
   columns.forEach((column, i) => {
     filterColumns.push(<FiltersCell
       index={ i }
-      key={ column.dataField }
       column={ column }
       currFilters={ currFilters }
       onExternalFilter={ onExternalFilter }

packages/react-bootstrap-table2/src/row-expand/expand-cell.js

@@ -44,7 +44,7 @@ export default class ExpandCell extends Component {
     if (tabIndex !== -1) attrs.tabIndex = tabIndex;
 
     return (
-      <td className="expand-cell" onClick={ this.handleClick } { ...attrs }>
+      <td onClick={ this.handleClick } { ...attrs }>
         {
           expandColumnRenderer ? expandColumnRenderer({
             expandable,

packages/react-bootstrap-table2/src/row-expand/expand-header-cell.js

@@ -28,7 +28,7 @@ export default class ExpansionHeaderCell extends Component {
     };
 
     return (
-      <th className="expand-cell-header" data-row-selection { ...attrs }>
+      <th data-row-selection { ...attrs }>
         {
           expandHeaderColumnRenderer ?
             expandHeaderColumnRenderer({ isAnyExpands }) :

packages/react-bootstrap-table2/src/row-selection/row-consumer.js

@@ -9,7 +9,6 @@ export default (Component) => {
     const key = props.value;
     const selected = _.contains(selectRow.selected, key);
     const selectable = !selectRow.nonSelectable || !_.contains(selectRow.nonSelectable, key);
-    const notSelectable = _.contains(selectRow.nonSelectable, key);
 
     let {
       style,
@@ -39,22 +38,6 @@ export default (Component) => {
       }
     }
 
-    if (notSelectable) {
-      const notSelectableStyle = _.isFunction(selectRow.nonSelectableStyle)
-        ? selectRow.nonSelectableStyle(props.row, props.rowIndex)
-        : selectRow.nonSelectableStyle;
-
-      const notSelectableClasses = _.isFunction(selectRow.nonSelectableClasses)
-        ? selectRow.nonSelectableClasses(props.row, props.rowIndex)
-        : selectRow.nonSelectableClasses;
-
-      style = {
-        ...style,
-        ...notSelectableStyle
-      };
-      className = cs(className, notSelectableClasses) || undefined;
-    }
-
     return (
       <Component
         { ...props }

packages/react-bootstrap-table2/src/row-selection/selection-cell.js

@@ -86,7 +86,7 @@ export default class SelectionCell extends Component {
       <BootstrapContext.Consumer>
         {
           ({ bootstrap4 }) => (
-            <td className="selection-cell" onClick={ this.handleClick } { ...attrs }>
+            <td onClick={ this.handleClick } { ...attrs }>
               {
                 selectionRenderer ? selectionRenderer({
                   mode: inputType,

packages/react-bootstrap-table2/src/row-selection/selection-header-cell.js

@@ -112,7 +112,7 @@ export default class SelectionHeaderCell extends Component {
               );
             }
             return (
-              <th className="selection-cell-header" data-row-selection { ...attrs }>{ content }</th>
+              <th data-row-selection { ...attrs }>{ content }</th>
             );
           }
         }

packages/react-bootstrap-table2/test/row-selection/__snapshots__/selection-cell.test.js.snap

@@ -2,7 +2,6 @@
 
 exports[`<SelectionCell /> render should render component correctly 1`] = `
 <td
-  className="selection-cell"
   onClick={[Function]}
 >
   <input

yarn.lock

@@ -5371,8 +5371,9 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
 lodash.mergewith@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
+  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
 lodash.restparam@^3.0.0:
   version "3.6.1"