Publish

- react-bootstrap-table2-editor@1.2.2
 - react-bootstrap-table2-example@1.0.10
 - react-bootstrap-table2-filter@1.1.0
 - react-bootstrap-table2-paginator@1.0.4
 - react-bootstrap-table-next@1.4.1

README.md

@@ -1,43 +1,56 @@
 # react-bootstrap-table2
+
 [![Build Status](https://travis-ci.org/react-bootstrap-table/react-bootstrap-table2.svg?branch=master)](https://travis-ci.org/react-bootstrap-table/react-bootstrap-table2)  
-Rebuilt [react-bootstrap-table](https://github.com/AllenFang/react-bootstrap-table)
+Rebuilt of [react-bootstrap-table](https://github.com/AllenFang/react-bootstrap-table)
 
-> `react-bootstrap-table2`'s npm module name is [**`react-bootstrap-table-next`**](https://www.npmjs.com/package/react-bootstrap-table-next) due to some guys already used it   
+> Note that `react-bootstrap-table2`'s npm module name is [**`react-bootstrap-table-next`**](https://www.npmjs.com/package/react-bootstrap-table-next) due to the name being already taken.
 
-`react-bootstrap-table2` separate some functionalities from core modules to other modules like following:
+`react-bootstrap-table2` separates some functionalities from its core modules to other modules as listed in the following:
 
-* [`react-bootstrap-table-next`](https://www.npmjs.com/package/react-bootstrap-table-next)
-* [`react-bootstrap-table2-filter`](https://www.npmjs.com/package/react-bootstrap-table2-filter)
-* [`react-bootstrap-table2-editor`](https://www.npmjs.com/package/react-bootstrap-table2-editor)
-* [`react-bootstrap-table2-paginator`](https://www.npmjs.com/package/react-bootstrap-table2-paginator)
-* [`react-bootstrap-table2-overlay`](https://www.npmjs.com/package/react-bootstrap-table2-overlay)
-* [`react-bootstrap-table2-toolkit`](https://www.npmjs.com/package/react-bootstrap-table2-toolkit)
+- [`react-bootstrap-table-next`](https://www.npmjs.com/package/react-bootstrap-table-next)
+- [`react-bootstrap-table2-filter`](https://www.npmjs.com/package/react-bootstrap-table2-filter)
+- [`react-bootstrap-table2-editor`](https://www.npmjs.com/package/react-bootstrap-table2-editor)
+- [`react-bootstrap-table2-paginator`](https://www.npmjs.com/package/react-bootstrap-table2-paginator)
+- [`react-bootstrap-table2-overlay`](https://www.npmjs.com/package/react-bootstrap-table2-overlay)
+- [`react-bootstrap-table2-toolkit`](https://www.npmjs.com/package/react-bootstrap-table2-toolkit)
 
-This can help your application with less bundled size and also help us have clean design to avoid handling to much logic in kernel module(SRP).
+Not only does this reduce the bundle size of your apps but also helps us have a cleaner design to avoid handling too much logic in the kernel module(SRP).
 
 ## Migration
-If you are the user from legacy [`react-bootstrap-table`](https://github.com/AllenFang/react-bootstrap-table/), please have a look on [this](./docs/migration.md).
+
+If you are coming from the legacy [`react-bootstrap-table`](https://github.com/AllenFang/react-bootstrap-table/), please check out the [migration guide](./docs/migration.md).
 
 ## Usage
+
 See [getting started](https://react-bootstrap-table.github.io/react-bootstrap-table2/docs/getting-started.html).
 
 ## Online Demo
+
 See `react-bootstrap-table2` [storybook](https://react-bootstrap-table.github.io/react-bootstrap-table2/storybook/index.html).
 
 ## Roadmap
+
 See [release plans](https://react-bootstrap-table.github.io/react-bootstrap-table2/blog/2018/01/24/release-plan.html).
 
 ## Development
-Please check [development guide](./docs/development.md).
 
-## How should I run storybook example in my local?
+Please check the [development guide](./docs/development.md).
+
+## Running storybook example on your local machine
 
 ```sh
+# Clone the repo
 $ git clone https://github.com/react-bootstrap-table/react-bootstrap-table2.git
+
+# change dir to the cloned repo
 $ cd react-bootstrap-table2
+
+# Install all dependencies with yarn
 $ yarn install
+
+# Start the stroybook server, then go to localhost:6006
 $ yarn storybook
-$ Go to localhost:6006
+
 ```
 
 **Storybook examples: [`packages/react-bootstrap-table2-example/examples`](https://github.com/react-bootstrap-table/react-bootstrap-table2/tree/master/packages/react-bootstrap-table2-example/examples)**

docs/README.md

@@ -17,6 +17,7 @@
 * [hover](#hover)
 * [condensed](#condensed)
 * [id](#id)
+* [tabIndexCell](#tabIndexCell)
 * [classes](#classes)
 * [wrapperClasses](#wrapperClasses)
 * [headerClasses](#headerClasses)
@@ -112,6 +113,10 @@ Same as bootstrap `.table-condensed` class for making a table more compact by cu
 
 ### <a name='id'>id - [String]</a>
 Customize id on `table` element.
+
+### <a name='tabIndexCell'>tabIndexCell - [Bool]</a>
+Enable the `tabIndex` attribute on `<td>` element.
+
 ### <a name='classes'>classes - [String]</a>
 Customize class on `table` element.
 

docs/cell-edit.md

@@ -62,6 +62,24 @@ const cellEdit = {
 }
 ```
 
+If you want to perform a async `beforeSaveCell`, you can do it like that:
+
+```js
+const cellEdit: {
+  // omit...
+  beforeSaveCell(oldValue, newValue, row, column, done) {
+    setTimeout(() => {
+      if (confirm('Do you want to accep this change?')) {
+        done(); // contine to save the changes
+      } else {
+        done(false); // reject the changes
+      }
+    }, 0);
+    return { async: true };
+  }
+};
+```
+
 ### <a name='afterSaveCell'>cellEdit.afterSaveCell - [Function]</a>
 This callback function will be called after updating cell.
 

docs/columns.md

@@ -379,17 +379,27 @@ A new `String` will be the result of element headerAlign.
 
 
 ## <a name='events'>column.events - [Object]</a>
-You can assign any [HTML Event](https://www.w3schools.com/tags/ref_eventattributes.asp) on table column via event property:
+You can assign any [HTML Event](https://www.w3schools.com/tags/ref_eventattributes.asp) on table column via `events` property.   
+
+`react-bootstrap-table2` currently only support following events which will receive some specific information:
+
+* onClick
+* onDoubleClick
+* onMouseEnter
+* onMouseLeave
+* onContextMenu
 
 ```js
 {
   // omit...
   events: {
-    onClick: e => { ... }
+    onClick: (e, column, columnIndex, row, rowIndex) => { ... },
   }
 }
 ```
 
+If the events is not listed above, the callback function will only pass the `event` object.
+
 ## <a name='headerEvents'>column.headerEvents - [Object]</a>
 `headerEvents` same as [`column.events`](#events) but this is for header column.
 
@@ -543,6 +553,28 @@ The return value can be a bool or an object. If your validation is pass, return
 }
 ```
 
+If you want to perform a asycn validation, you can do it like this:
+```js
+{
+  // omit...
+  validator: (newValue, row, column, done) => {
+    settimeout(() => {
+      // async validation ok
+      return done();
+
+      // async validation not ok
+      return done({
+        valid: false,
+        message: 'SOME_REASON_HERE'
+      });
+
+    }, 2000);
+    return { async: true };
+  }
+}
+```
+
+
 ## <a name='editCellStyle'>column.editCellStyle - [Object | Function]</a>
 You can use `column.editCellStyle` to custom the style of `<td>` when cell editing. It like most of customizable functionality, it also accept a callback function with following params:
 

docs/development.md

@@ -3,7 +3,7 @@
 ### Setup
 ```bash
 $ git clone https://github.com/react-bootstrap-table/react-bootstrap-table2.git
-$ cd react-bootstrap-table
+$ cd react-bootstrap-table2
 $ npm install
 $ lerna bootstrap  # ./node_modules/.bin/lerna bootstrap
 ```

docs/row-expand.md

@@ -14,6 +14,7 @@
 * [onExpandAll](#onExpandAll)
 * [showExpandColumn](#showExpandColumn)
 * [onlyOneExpanding](#onlyOneExpanding)
+* [expandByColumnOnly](#expandByColumnOnly)
 * [expandColumnRenderer](#expandColumnRenderer)
 * [expandHeaderColumnRenderer](#expandHeaderColumnRenderer)
 
@@ -138,3 +139,14 @@ const expandRow = {
   onlyOneExpanding: true
 };
 ```
+
+### <a name='expandByColumnOnly'>expandRow.expandByColumnOnly - [Bool]</a>
+Default is `false`. If you want to restrict user to expand/collapse row via clicking the expand column only, you can enable it. 
+
+```js
+const expandRow = {
+  renderer: (row) => ...,
+  showExpandColumn: true,
+  expandByColumnOnly: true
+};
+```

docs/row-selection.md

@@ -12,6 +12,7 @@
 * [bgColor](#bgColor)
 * [nonSelectable)](#nonSelectable)
 * [clickToSelect)](#clickToSelect)
+* [clickToExpand)](#clickToExpand)
 * [clickToEdit](#clickToEdit)
 * [onSelect](#onSelect)
 * [onSelectAll](#onSelectAll)
@@ -148,6 +149,16 @@ const selectRow = {
 > 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>
+Default is false, enable it will let user able to expand and select row when user clicking on the row.
+
+```js
+const selectRow = {
+  mode: 'checkbox',
+  clickToExpand: true
+};
+```
+
 ### <a name='clickToEdit'>selectRow.clickToEdit - [Bool]</a>
 Able to click to edit cell and select row
 
@@ -200,18 +211,44 @@ const selectRow = {
 };
 ```
 
+> If you want to reject current select action, just return `false`:
+
+```js
+const selectRow = {
+  mode: 'checkbox',
+  onSelect: (row, isSelect, rowIndex, e) => {
+    if (SOME_CONDITION) {
+      return false;
+    }
+  }
+};
+```
+
 ### <a name='onSelectAll'>selectRow.onSelectAll - [Function]</a>
 This callback function will be called when select/unselect all and it only work when you configure [`selectRow.mode`](#mode) as `checkbox`.
 
 ```js
 const selectRow = {
   mode: 'checkbox',
-  onSelectAll: (isSelect, results, e) => {
+  onSelectAll: (isSelect, rows, e) => {
     // ...
   }
 };
 ```
 
+> If you want to control the final selection result, just return a row key array:
+
+```js
+const selectRow = {
+  mode: 'checkbox',
+  onSelectAll: (isSelect, rows, e) => {
+    if (isSelect && SOME_CONDITION) {
+      return [1, 3, 4];  // finally, key 1, 3, 4 will being selected 
+    }
+  }
+};
+```
+
 ### <a name='hideSelectColumn'>selectRow.hideSelectColumn - [Bool]</a>
 Default is `false`, if you don't want to have a selection column, give this prop as `true`
 

enzyme-setup.js

@@ -1,4 +1,4 @@
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from 'enzyme-adapter-react-16.3';
 import { configure } from 'enzyme';
 
 const configureEnzyme = () => {

package.json

@@ -50,8 +50,8 @@
     "babel-preset-stage-0": "6.24.1",
     "babel-register": "6.24.1",
     "css-loader": "0.28.1",
-    "enzyme": "3.3.0",
-    "enzyme-adapter-react-16": "1.1.1",
+    "enzyme": "3.4.0",
+    "enzyme-adapter-react-16.3": "1.0.0",
     "enzyme-to-json": "3.3.4",
     "eslint": "4.5.0",
     "eslint-config-airbnb": "15.1.0",
@@ -82,8 +82,8 @@
   "dependencies": {
     "classnames": "2.2.5",
     "prop-types": "15.5.10",
-    "react": "16.3.2",
-    "react-dom": "16.3.2",
+    "react": "16.4.0",
+    "react-dom": "16.4.0",
     "underscore": "1.9.1"
   },
   "jest": {

packages/react-bootstrap-table2-editor/index.js

@@ -1,16 +1,16 @@
 import createContext from './src/context';
-import editingCellFactory from './src/editing-cell';
+import withRowLevelCellEdit from './src/row-consumer';
+import createEditingCell from './src/editing-cell-consumer';
 import {
   EDITTYPE,
-  CLICK_TO_CELL_EDIT,
   DBCLICK_TO_CELL_EDIT,
   DELAY_FOR_DBCLICK
 } from './src/const';
 
 export default (options = {}) => ({
   createContext,
-  editingCellFactory,
-  CLICK_TO_CELL_EDIT,
+  createEditingCell,
+  withRowLevelCellEdit,
   DBCLICK_TO_CELL_EDIT,
   DELAY_FOR_DBCLICK,
   options

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

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap-table2-editor",
-  "version": "1.1.0",
+  "version": "1.2.2",
   "description": "it's the editor addon for react-bootstrap-table2",
   "main": "./lib/index.js",
   "scripts": {

packages/react-bootstrap-table2-editor/src/context.js

@@ -4,15 +4,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { CLICK_TO_CELL_EDIT, DBCLICK_TO_CELL_EDIT } from './const';
 
+const CellEditContext = React.createContext();
+
 export default (
   _,
   dataOperator,
   isRemoteCellEdit,
   handleCellChange
 ) => {
-  let EditingCell;
-  const CellEditContext = React.createContext();
-
   class CellEditProvider extends React.Component {
     static propTypes = {
       data: PropTypes.array.isRequired,
@@ -32,7 +31,7 @@ export default (
 
     constructor(props) {
       super(props);
-      EditingCell = props.cellEdit.editingCellFactory(_, props.cellEdit.options.onStartEdit);
+      this.doUpdate = this.doUpdate.bind(this);
       this.startEditing = this.startEditing.bind(this);
       this.escapeEditing = this.escapeEditing.bind(this);
       this.completeEditing = this.completeEditing.bind(this);
@@ -57,11 +56,36 @@ export default (
     }
 
     handleCellUpdate(row, column, newValue) {
-      const { keyField, cellEdit, data } = this.props;
-      const { beforeSaveCell, afterSaveCell } = cellEdit.options;
+      const { cellEdit } = this.props;
+      const { beforeSaveCell } = cellEdit.options;
       const oldValue = _.get(row, column.dataField);
+      const beforeSaveCellDone = (result = true) => {
+        if (result) {
+          this.doUpdate(row, column, newValue);
+        } else {
+          this.escapeEditing();
+        }
+      };
+      if (_.isFunction(beforeSaveCell)) {
+        const result = beforeSaveCell(
+          oldValue,
+          newValue,
+          row,
+          column,
+          beforeSaveCellDone
+        );
+        if (_.isObject(result) && result.async) {
+          return;
+        }
+      }
+      this.doUpdate(row, column, newValue);
+    }
+
+    doUpdate(row, column, newValue) {
+      const { keyField, cellEdit, data } = this.props;
+      const { afterSaveCell } = cellEdit.options;
       const rowId = _.get(row, keyField);
-      if (_.isFunction(beforeSaveCell)) beforeSaveCell(oldValue, newValue, row, column);
+      const oldValue = _.get(row, column.dataField);
       if (isRemoteCellEdit()) {
         handleCellChange(rowId, column.dataField, newValue);
       } else {
@@ -102,8 +126,6 @@ export default (
       const {
         cellEdit: {
           options: { nonEditableRows, errorMessage, ...optionsRest },
-          editingCellFactory,
-          createContext,
           ...cellEditRest
         }
       } = this.props;
@@ -112,7 +134,6 @@ export default (
         ...optionsRest,
         ...cellEditRest,
         ...this.state,
-        EditingCell,
         nonEditableRows: _.isDefined(nonEditableRows) ? nonEditableRows() : [],
         onStart: this.startEditing,
         onEscape: this.escapeEditing,
@@ -121,7 +142,7 @@ export default (
 
       return (
         <CellEditContext.Provider
-          value={ { cellEdit: newCellEdit } }
+          value={ { ...newCellEdit } }
         >
           { this.props.children }
         </CellEditContext.Provider>
@@ -129,7 +150,8 @@ export default (
     }
   }
   return {
-    Provider: CellEditProvider,
-    Consumer: CellEditContext.Consumer
+    Provider: CellEditProvider
   };
 };
+
+export const Consumer = CellEditContext.Consumer;

packages/react-bootstrap-table2-editor/src/editing-cell-consumer.js

@@ -0,0 +1,44 @@
+/* eslint react/prop-types: 0 */
+import React from 'react';
+import { Consumer } from './context';
+import createEditingCell from './editing-cell';
+
+export default (_, onStartEdit) => {
+  const EditingCell = createEditingCell(_, onStartEdit);
+  const renderWithEditingCell = (props, cellEdit) => {
+    const content = _.get(props.row, props.column.dataField);
+    let editCellstyle = props.column.editCellStyle || {};
+    let editCellclasses = props.column.editCellClasses;
+    if (_.isFunction(props.column.editCellStyle)) {
+      editCellstyle = props.column.editCellStyle(
+        content,
+        props.row,
+        props.rowIndex,
+        props.columnIndex
+      );
+    }
+    if (_.isFunction(props.column.editCellClasses)) {
+      editCellclasses = props.column.editCellClasses(
+        content,
+        props.row,
+        props.rowIndex,
+        props.columnIndex)
+      ;
+    }
+
+    return (
+      <EditingCell
+        { ...props }
+        className={ editCellclasses }
+        style={ editCellstyle }
+        { ...cellEdit }
+      />
+    );
+  };
+
+  return props => (
+    <Consumer>
+      { cellEdit => renderWithEditingCell(props, cellEdit) }
+    </Consumer>
+  );
+};

packages/react-bootstrap-table2-editor/src/editing-cell.js

@@ -44,6 +44,8 @@ export default (_, onStartEdit) =>
       this.handleClick = this.handleClick.bind(this);
       this.handleKeyDown = this.handleKeyDown.bind(this);
       this.beforeComplete = this.beforeComplete.bind(this);
+      this.asyncbeforeCompete = this.asyncbeforeCompete.bind(this);
+      this.displayErrorMessage = this.displayErrorMessage.bind(this);
       this.state = {
         invalidMessage: null
       };
@@ -79,16 +81,41 @@ export default (_, onStartEdit) =>
       }, timeToCloseMessage);
     }
 
+    displayErrorMessage(message) {
+      this.setState(() => ({
+        invalidMessage: message
+      }));
+      this.createTimer();
+    }
+
+    asyncbeforeCompete(newValue) {
+      return (result = { valid: true }) => {
+        const { valid, message } = result;
+        const { onUpdate, row, column } = this.props;
+        if (!valid) {
+          this.displayErrorMessage(message);
+          return;
+        }
+        onUpdate(row, column, newValue);
+      };
+    }
+
     beforeComplete(newValue) {
       const { onUpdate, row, column } = this.props;
       if (_.isFunction(column.validator)) {
-        const validateForm = column.validator(newValue, row, column);
-        if (_.isObject(validateForm) && !validateForm.valid) {
-          this.setState(() => ({
-            invalidMessage: validateForm.message
-          }));
-          this.createTimer();
-          return;
+        const validateForm = column.validator(
+          newValue,
+          row,
+          column,
+          this.asyncbeforeCompete(newValue)
+        );
+        if (_.isObject(validateForm)) {
+          if (validateForm.async) {
+            return;
+          } else if (!validateForm.valid) {
+            this.displayErrorMessage(validateForm.message);
+            return;
+          }
         }
       }
       onUpdate(row, column, newValue);

packages/react-bootstrap-table2-editor/src/editor-indicator.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 
 const EditorIndicator = ({ invalidMessage }) =>
   (
-    <div className="alert alert-danger fade in">
+    <div className="alert alert-danger in" role="alert">
       <strong>{ invalidMessage }</strong>
     </div>
   );

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

@@ -0,0 +1,43 @@
+/* eslint react/prop-types: 0 */
+import React from 'react';
+import { DELAY_FOR_DBCLICK, DBCLICK_TO_CELL_EDIT, CLICK_TO_CELL_EDIT } from './const';
+import { Consumer } from './context';
+
+export default (Component, selectRowEnabled) => {
+  const renderWithCellEdit = (props, cellEdit) => {
+    const key = props.value;
+    const editableRow = !(
+      cellEdit.nonEditableRows.length > 0 &&
+      cellEdit.nonEditableRows.indexOf(key) > -1
+    );
+
+    const attrs = {};
+
+    if (selectRowEnabled && cellEdit.mode === DBCLICK_TO_CELL_EDIT) {
+      attrs.DELAY_FOR_DBCLICK = DELAY_FOR_DBCLICK;
+    }
+
+    return (
+      <Component
+        { ...props }
+        { ...attrs }
+        editingRowIdx={ cellEdit.ridx }
+        editingColIdx={ cellEdit.cidx }
+        editable={ editableRow }
+        onStart={ cellEdit.onStart }
+        clickToEdit={ cellEdit.mode === CLICK_TO_CELL_EDIT }
+        dbclickToEdit={ cellEdit.mode === DBCLICK_TO_CELL_EDIT }
+      />
+    );
+  };
+  function withConsumer(props) {
+    return (
+      <Consumer>
+        { cellEdit => renderWithCellEdit(props, cellEdit) }
+      </Consumer>
+    );
+  }
+
+  withConsumer.displayName = 'WithCellEditingRowConsumer';
+  return withConsumer;
+};

packages/react-bootstrap-table2-editor/test/context.test.js

@@ -3,14 +3,13 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import _ from 'react-bootstrap-table-next/src/utils';
 import dataOperator from 'react-bootstrap-table-next/src/store/operators';
-import BootstrapTable from 'react-bootstrap-table-next/src/bootstrap-table';
 
 import {
   CLICK_TO_CELL_EDIT,
   DBCLICK_TO_CELL_EDIT,
   DELAY_FOR_DBCLICK
 } from '../src/const';
-import createCellEditContext from '../src/context';
+import createCellEditContext, { Consumer } from '../src/context';
 import cellEditFactory from '../index';
 
 describe('CellEditContext', () => {
@@ -42,14 +41,7 @@ describe('CellEditContext', () => {
 
   const defaultSelectRow = undefined;
 
-  const mockBase = jest.fn((props => (
-    <BootstrapTable
-      data={ data }
-      columns={ columns }
-      keyField={ keyField }
-      { ...props }
-    />
-  )));
+  const mockBase = jest.fn((() => null));
 
   const handleCellChange = jest.fn();
 
@@ -75,11 +67,11 @@ describe('CellEditContext', () => {
         selectRow={ selectRow }
         data={ data }
       >
-        <CellEditContext.Consumer>
+        <Consumer>
           {
             cellEditProps => mockBase(cellEditProps)
           }
-        </CellEditContext.Consumer>
+        </Consumer>
       </CellEditContext.Provider>
     );
   }
@@ -94,10 +86,6 @@ describe('CellEditContext', () => {
       expect(CellEditContext.Provider).toBeDefined();
     });
 
-    it('should have correct Consumer property after calling createCellEditContext', () => {
-      expect(CellEditContext.Consumer).toBeDefined();
-    });
-
     it('should have correct state.ridx', () => {
       expect(wrapper.state().ridx).toBeNull();
     });
@@ -113,14 +101,11 @@ describe('CellEditContext', () => {
     it('should pass correct cell editing props to children element', () => {
       expect(wrapper.length).toBe(1);
       expect(JSON.stringify(mockBase.mock.calls[0])).toEqual(JSON.stringify([{
-        cellEdit: {
-          ...defaultCellEdit,
-          CLICK_TO_CELL_EDIT,
-          DBCLICK_TO_CELL_EDIT,
-          DELAY_FOR_DBCLICK,
-          ...wrapper.state(),
-          nonEditableRows: []
-        }
+        ...defaultCellEdit,
+        DBCLICK_TO_CELL_EDIT,
+        DELAY_FOR_DBCLICK,
+        ...wrapper.state(),
+        nonEditableRows: []
       }]));
     });
   });
@@ -250,7 +235,8 @@ describe('CellEditContext', () => {
 
       it('should call cellEdit.beforeSaveCell correctly', () => {
         expect(beforeSaveCell).toHaveBeenCalledTimes(1);
-        expect(beforeSaveCell).toHaveBeenCalledWith(oldValue, newValue, row, column);
+        expect(beforeSaveCell)
+          .toHaveBeenCalledWith(oldValue, newValue, row, column, expect.anything());
       });
     });
 

packages/react-bootstrap-table2-editor/test/editing-cell-consumer.test.js

@@ -0,0 +1,147 @@
+import 'jsdom-global/register';
+import React from 'react';
+import { mount, shallow } from 'enzyme';
+import _ from 'react-bootstrap-table-next/src/utils';
+
+import cellEditFactory from '..';
+import { CLICK_TO_CELL_EDIT } from '../src/const';
+import createCellEditContext from '../src/context';
+import bindEditingCell from '../src/editing-cell-consumer';
+
+describe('Editing Cell Consumer', () => {
+  let wrapper;
+  let cellEdit;
+  const data = [{
+    id: 1,
+    name: 'A'
+  }, {
+    id: 2,
+    name: 'B'
+  }];
+  let columns;
+  const rowIndex = 1;
+  const row = { id: 1, name: 'A' };
+  const keyField = 'id';
+  const columnIndex = 1;
+
+  const { Provider } = createCellEditContext(_);
+  const WithCellEditComponent = bindEditingCell(_);
+
+  beforeEach(() => {
+    columns = [{
+      dataField: 'id',
+      text: 'ID'
+    }, {
+      dataField: 'name',
+      text: 'Name'
+    }];
+  });
+
+  describe('if column.editCellClasses is defined as string', () => {
+    beforeEach(() => {
+      cellEdit = cellEditFactory({ mode: CLICK_TO_CELL_EDIT });
+      columns[1].editCellClasses = 'test-class-1';
+      wrapper = shallow(
+        <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+          <WithCellEditComponent
+            row={ row }
+            column={ columns[1] }
+            rowIndex={ rowIndex }
+            columnIndex={ columnIndex }
+          />
+        </Provider>
+      );
+      wrapper = wrapper.render();
+    });
+
+    it('should inject className target component correctly', () => {
+      expect(wrapper.hasClass(`${columns[1].editCellClasses}`)).toBeTruthy();
+    });
+  });
+
+  describe('if column.editCellStyle is defined as object', () => {
+    beforeEach(() => {
+      cellEdit = cellEditFactory({ mode: CLICK_TO_CELL_EDIT });
+      columns[1].editCellStyle = { color: 'pink' };
+      wrapper = mount(
+        <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+          <WithCellEditComponent
+            row={ row }
+            column={ columns[1] }
+            rowIndex={ rowIndex }
+            columnIndex={ columnIndex }
+          />
+        </Provider>
+      );
+    });
+
+    it('should inject style target component correctly', () => {
+      expect(wrapper.find('.react-bootstrap-table-editing-cell').prop('style')).toEqual(columns[1].editCellStyle);
+    });
+  });
+
+  describe('if column.editCellClasses is defined as function', () => {
+    const className = 'test-class-1';
+
+    beforeEach(() => {
+      cellEdit = cellEditFactory({ mode: CLICK_TO_CELL_EDIT });
+      columns[1].editCellClasses = jest.fn().mockReturnValue(className);
+      wrapper = mount(
+        <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+          <WithCellEditComponent
+            row={ row }
+            column={ columns[1] }
+            rowIndex={ rowIndex }
+            columnIndex={ columnIndex }
+          />
+        </Provider>
+      );
+    });
+
+    it('should inject empty className and style to target component', () => {
+      expect(wrapper.find(className)).toBeTruthy();
+    });
+
+    it('should call column.editCellClasses function correctly', () => {
+      expect(columns[1].editCellClasses).toHaveBeenCalledTimes(1);
+      expect(columns[1].editCellClasses).toHaveBeenCalledWith(
+        _.get(row, columns[1].dataField),
+        row,
+        rowIndex,
+        columnIndex
+      );
+    });
+  });
+
+  describe('if column.editCellStyle is defined as function', () => {
+    const style = { color: 'blue' };
+    beforeEach(() => {
+      cellEdit = cellEditFactory({ mode: CLICK_TO_CELL_EDIT });
+      columns[1].editCellStyle = jest.fn().mockReturnValue(style);
+      wrapper = mount(
+        <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+          <WithCellEditComponent
+            row={ row }
+            column={ columns[1] }
+            rowIndex={ rowIndex }
+            columnIndex={ columnIndex }
+          />
+        </Provider>
+      );
+    });
+
+    it('should inject style target component correctly', () => {
+      expect(wrapper.find('.react-bootstrap-table-editing-cell').prop('style')).toEqual(style);
+    });
+
+    it('should call column.editCellStyle function correctly', () => {
+      expect(columns[1].editCellStyle).toHaveBeenCalledTimes(1);
+      expect(columns[1].editCellStyle).toHaveBeenCalledWith(
+        _.get(row, columns[1].dataField),
+        row,
+        rowIndex,
+        columnIndex
+      );
+    });
+  });
+});

packages/react-bootstrap-table2-editor/test/row-consumer.test.js

@@ -0,0 +1,138 @@
+import 'jsdom-global/register';
+import React from 'react';
+import { mount } from 'enzyme';
+import _ from 'react-bootstrap-table-next/src/utils';
+import op from 'react-bootstrap-table-next/src/store/operators';
+
+import cellEditFactory from '..';
+import { CLICK_TO_CELL_EDIT, DBCLICK_TO_CELL_EDIT, DELAY_FOR_DBCLICK } from '../src/const';
+import createCellEditContext from '../src/context';
+import withRowLevelCellEdit from '../src/row-consumer';
+
+describe('Row Consumer', () => {
+  let wrapper;
+  let cellEdit;
+  const data = [{
+    id: 1,
+    name: 'A'
+  }, {
+    id: 2,
+    name: 'B'
+  }];
+  const row = { id: 1, name: 'A' };
+  const keyField = 'id';
+  const value = _.get(row, keyField);
+
+  const { Provider } = createCellEditContext(_, op, false, jest.fn());
+  const BaseComponent = () => null;
+
+  describe('if cellEdit.nonEditableRows is undefined', () => {
+    beforeEach(() => {
+      const WithCellEditComponent = withRowLevelCellEdit(
+        props => <BaseComponent { ...props } />,
+        false
+      );
+      cellEdit = cellEditFactory({ mode: CLICK_TO_CELL_EDIT });
+      wrapper = mount(
+        <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+          <WithCellEditComponent value={ value } />
+        </Provider>
+      );
+    });
+
+    it('should inject correct props to target component', () => {
+      expect(wrapper.find(BaseComponent)).toHaveLength(1);
+      expect(wrapper.find(BaseComponent).prop('editingRowIdx')).toBeNull();
+      expect(wrapper.find(BaseComponent).prop('editingColIdx')).toBeNull();
+      expect(wrapper.find(BaseComponent).prop('editable')).toBeTruthy();
+    });
+  });
+
+  describe('if cellEdit.nonEditableRows is defined', () => {
+    const nonEditableRows = jest.fn().mockReturnValue([value]);
+    describe('if value prop is match in one of cellEdit.nonEditableRows', () => {
+      beforeEach(() => {
+        const WithCellEditComponent = withRowLevelCellEdit(
+          props => <BaseComponent { ...props } />,
+          false
+        );
+        cellEdit = cellEditFactory({ mode: CLICK_TO_CELL_EDIT, nonEditableRows });
+        wrapper = mount(
+          <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+            <WithCellEditComponent value={ value } />
+          </Provider>
+        );
+      });
+
+      it('should inject correct editable prop as false to target component', () => {
+        expect(wrapper.find(BaseComponent)).toHaveLength(1);
+        expect(wrapper.find(BaseComponent).prop('editable')).toBeFalsy();
+      });
+    });
+
+    describe('if value prop is not match in one of cellEdit.nonEditableRows', () => {
+      beforeEach(() => {
+        const WithCellEditComponent = withRowLevelCellEdit(
+          props => <BaseComponent { ...props } />,
+          false
+        );
+        cellEdit = cellEditFactory({ mode: CLICK_TO_CELL_EDIT, nonEditableRows });
+        wrapper = mount(
+          <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+            <WithCellEditComponent value={ 2 } />
+          </Provider>
+        );
+      });
+
+      it('should inject correct editable prop as false to target component', () => {
+        expect(wrapper.find(BaseComponent)).toHaveLength(1);
+        expect(wrapper.find(BaseComponent).prop('editable')).toBeTruthy();
+      });
+    });
+  });
+
+  describe(`if selectRowEnabled argument is true and cellEdit.mode is ${DBCLICK_TO_CELL_EDIT}`, () => {
+    beforeEach(() => {
+      const WithCellEditComponent = withRowLevelCellEdit(
+        props => <BaseComponent { ...props } />,
+        true
+      );
+      cellEdit = cellEditFactory({ mode: DBCLICK_TO_CELL_EDIT });
+      wrapper = mount(
+        <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+          <WithCellEditComponent value={ value } />
+        </Provider>
+      );
+    });
+
+    it('should inject correct DELAY_FOR_DBCLICK prop to target component', () => {
+      expect(wrapper.find(BaseComponent)).toHaveLength(1);
+      expect(wrapper.find(BaseComponent).prop('DELAY_FOR_DBCLICK')).toEqual(DELAY_FOR_DBCLICK);
+    });
+  });
+
+  describe('if cellEdit.ridx and cellEdit.cidx are defined', () => {
+    const ridx = 0;
+    const cidx = 1;
+    beforeEach(() => {
+      const WithCellEditComponent = withRowLevelCellEdit(
+        props => <BaseComponent { ...props } />,
+        false
+      );
+      cellEdit = cellEditFactory({ mode: CLICK_TO_CELL_EDIT });
+      wrapper = mount(
+        <Provider data={ data } keyField={ keyField } cellEdit={ cellEdit }>
+          <WithCellEditComponent value={ value } />
+        </Provider>
+      );
+      wrapper.instance().startEditing(ridx, cidx);
+      wrapper.update();
+    });
+
+    it('should inject correct editable prop as false to target component', () => {
+      expect(wrapper.find(BaseComponent)).toHaveLength(1);
+      expect(wrapper.find(BaseComponent).prop('editingRowIdx')).toEqual(ridx);
+      expect(wrapper.find(BaseComponent).prop('editingColIdx')).toEqual(cidx);
+    });
+  });
+});

packages/react-bootstrap-table2-example/examples/basic/large-table.js

@@ -1,10 +1,9 @@
 import React from 'react';
 
 import BootstrapTable from 'react-bootstrap-table-next';
-import cellEditFactory from 'react-bootstrap-table2-editor';
 import { productsGenerator } from 'utils/common';
 
-const products = productsGenerator(5000);
+const products = productsGenerator(3000);
 
 const columns = [{
   dataField: 'id',
@@ -17,16 +16,25 @@ const columns = [{
   text: 'Product Price'
 }];
 
+const expandRow = {
+  showExpandColumn: true,
+  renderer: row => (
+    <div>
+      <p>{ `This Expand row is belong to rowKey ${row.id}` }</p>
+      <p>You can render anything here, also you can add additional data on every row object</p>
+      <p>expandRow.renderer callback will pass the origin row object to you</p>
+    </div>
+  )
+};
+
 export default () => (
   <div>
     <BootstrapTable
       keyField="id"
       data={ products }
       columns={ columns }
-      selectRow={ { mode: 'checkbox' } }
-      cellEdit={ cellEditFactory({
-        mode: 'click'
-      }) }
+      selectRow={ { mode: 'checkbox', clickToSelect: true } }
+      expandRow={ expandRow }
     />
   </div>
 );

packages/react-bootstrap-table2-example/examples/basic/tabindex-column.js

@@ -0,0 +1,54 @@
+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 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'
+}];
+
+<BootstrapTable
+  keyField='id'
+  data={ products }
+  columns={ columns }
+  selectRow={ { mode: 'checkbox' } }
+  tabIndexCell
+/>
+`;
+
+export default () => (
+  <div>
+    <BootstrapTable
+      keyField="id"
+      data={ products }
+      columns={ columns }
+      selectRow={ { mode: 'checkbox' } }
+      tabIndexCell
+    />
+    <Code>{ sourceCode }</Code>
+  </div>
+);

packages/react-bootstrap-table2-example/examples/cell-edit/cell-edit-async-hooks-table.js

@@ -0,0 +1,86 @@
+/* eslint no-unused-vars: 0 */
+/* eslint no-console: 0 */
+/* eslint no-alert: 0 */
+import React from 'react';
+
+import BootstrapTable from 'react-bootstrap-table-next';
+import cellEditFactory from 'react-bootstrap-table2-editor';
+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 sourceCode = `\
+import BootstrapTable from 'react-bootstrap-table-next';
+import cellEditFactory from 'react-bootstrap-table2-editor';
+
+const columns = [{
+  dataField: 'id',
+  text: 'Product ID'
+}, {
+  dataField: 'name',
+  text: 'Product Name'
+}, {
+  dataField: 'price',
+  text: 'Product Price'
+}];
+
+function beforeSaveCell(oldValue, newValue, row, column, done) {
+  setTimeout(() => {
+    if (confirm('Do you want to accep this change?')) {
+      done(true);
+    } else {
+      done(false);
+    }
+  }, 0);
+  return { async: true };
+}
+
+<BootstrapTable
+  keyField="id"
+  data={ products }
+  columns={ columns }
+  cellEdit={ cellEditFactory({
+    mode: 'click',
+    beforeSaveCell
+  }) }
+/>
+`;
+
+function beforeSaveCell(oldValue, newValue, row, column, done) {
+  setTimeout(() => {
+    if (confirm('Do you want to accep this change?')) {
+      done(true);
+    } else {
+      done(false);
+    }
+  }, 0);
+  return { async: true };
+}
+
+export default () => (
+  <div>
+    <h2>You will get a confirm prompt when you try to save a cell</h2>
+    <BootstrapTable
+      keyField="id"
+      data={ products }
+      columns={ columns }
+      cellEdit={ cellEditFactory({
+        mode: 'click',
+        beforeSaveCell
+      }) }
+    />
+    <Code>{ sourceCode }</Code>
+  </div>
+);

packages/react-bootstrap-table2-example/examples/cell-edit/cell-edit-async-validator-table.js

@@ -0,0 +1,101 @@
+/* eslint no-unused-vars: 0 */
+import React from 'react';
+import BootstrapTable from 'react-bootstrap-table-next';
+import cellEditFactory from 'react-bootstrap-table2-editor';
+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',
+  validator: (newValue, row, column, done) => {
+    setTimeout(() => {
+      if (isNaN(newValue)) {
+        return done({
+          valid: false,
+          message: 'Price should be numeric'
+        });
+      }
+      if (newValue < 2000) {
+        return done({
+          valid: false,
+          message: 'Price should bigger than 2000'
+        });
+      }
+      return done();
+    }, 2000);
+    return {
+      async: true
+    };
+  }
+}];
+
+const sourceCode = `\
+import BootstrapTable from 'react-bootstrap-table-next';
+import cellEditFactory from 'react-bootstrap-table2-editor';
+
+const columns = [{
+  dataField: 'id',
+  text: 'Product ID'
+}, {
+  dataField: 'name',
+  text: 'Product Name'
+}, {
+  dataField: 'price',
+  text: 'Product Price',
+  validator: (newValue, row, column, done) => {
+    setTimeout(() => {
+      if (isNaN(newValue)) {
+        return done({
+          valid: false,
+          message: 'Price should be numeric'
+        });
+      }
+      if (newValue < 2000) {
+        return done({
+          valid: false,
+          message: 'Price should bigger than 2000'
+        });
+      }
+      return done();
+    }, 2000);
+    return {
+      async: true
+    };
+  }
+}];
+
+<BootstrapTable
+  keyField="id"
+  data={ products }
+  columns={ columns }
+  cellEdit={ cellEditFactory({
+    mode: 'click',
+    blurToSave: true
+  }) }
+/>
+`;
+
+export default () => (
+  <div>
+    <h3>Product Price should bigger than $2000</h3>
+    <BootstrapTable
+      keyField="id"
+      data={ products }
+      columns={ columns }
+      cellEdit={ cellEditFactory({
+        mode: 'click',
+        blurToSave: true
+      }) }
+    />
+    <Code>{ sourceCode }</Code>
+  </div>
+);

packages/react-bootstrap-table2-example/examples/cell-edit/dbclick-to-edit-with-selection-table.js

@@ -0,0 +1,69 @@
+import React from 'react';
+
+import BootstrapTable from 'react-bootstrap-table-next';
+import cellEditFactory from 'react-bootstrap-table2-editor';
+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,
+  clickToEdit: true
+};
+
+const sourceCode = `\
+import BootstrapTable from 'react-bootstrap-table-next';
+import cellEditFactory from 'react-bootstrap-table2-editor';
+
+const columns = [{
+  dataField: 'id',
+  text: 'Product ID'
+}, {
+  dataField: 'name',
+  text: 'Product Name'
+}, {
+  dataField: 'price',
+  text: 'Product Price'
+}];
+
+const selectRow = {
+  mode: 'checkbox',
+  clickToSelect: true,
+  clickToEdit: true
+};
+
+<BootstrapTable
+  keyField="id"
+  data={ products }
+  columns={ columns }
+  selectRow={ selectRow }
+  cellEdit={ cellEditFactory({ mode: 'dbclick' }) }
+/>
+`;
+
+export default () => (
+  <div>
+    <h3>Double click to edit cell</h3>
+    <BootstrapTable
+      keyField="id"
+      data={ products }
+      columns={ columns }
+      selectRow={ selectRow }
+      cellEdit={ cellEditFactory({ mode: 'dbclick' }) }
+    />
+    <Code>{ sourceCode }</Code>
+  </div>
+);

packages/react-bootstrap-table2-example/examples/column-filter/select-filter-preserve-option-order.js

@@ -0,0 +1,70 @@
+/* eslint max-len: 0 */
+import React from 'react';
+import BootstrapTable from 'react-bootstrap-table-next';
+import filterFactory, { selectFilter } from 'react-bootstrap-table2-filter';
+import Code from 'components/common/code-block';
+import { productsQualityGenerator } from 'utils/common';
+
+const products = productsQualityGenerator(6);
+
+const selectOptions = [
+  { value: 0, label: 'good' },
+  { value: 1, label: 'Bad' },
+  { value: 2, label: 'unknown' }
+];
+
+const columns = [{
+  dataField: 'id',
+  text: 'Product ID'
+}, {
+  dataField: 'name',
+  text: 'Product Name'
+}, {
+  dataField: 'quality',
+  text: 'Product Quailty',
+  formatter: cell => selectOptions.find(opt => opt.value === cell).label,
+  filter: selectFilter({
+    options: selectOptions
+  })
+}];
+
+const sourceCode = `\
+import BootstrapTable from 'react-bootstrap-table-next';
+import filterFactory, { selectFilter } from 'react-bootstrap-table2-filter';
+
+const selectOptions = [
+  { value: 0, label: 'good' },
+  { value: 1, label: 'Bad' },
+  { value: 2, label: 'unknown' }
+];
+
+const columns = [{
+  dataField: 'id',
+  text: 'Product ID'
+}, {
+  dataField: 'name',
+  text: 'Product Name'
+}, {
+  dataField: 'quality',
+  text: 'Product Quailty',
+  formatter: cell => selectOptions.find(opt => opt.value === cell).label,
+  filter: selectFilter({
+    options: selectOptions
+  })
+}];
+
+<BootstrapTable keyField='id' data={ products } columns={ columns } filter={ filterFactory() } />
+`;
+
+export default () => (
+  <div>
+    <h3><code>selectFilter.options</code> accept an Array and we keep that order when rendering the options</h3>
+    <BootstrapTable
+      keyField="id"
+      data={ products }
+      columns={ columns }
+      filter={ filterFactory() }
+    />
+    <Code>{ sourceCode }</Code>
+  </div>
+);

packages/react-bootstrap-table2-example/examples/columns/column-event-table.js

@@ -1,5 +1,6 @@
 /* eslint no-unused-vars: 0 */
 /* eslint no-alert: 0 */
+/* eslint no-console: 0 */
 import React from 'react';
 
 import BootstrapTable from 'react-bootstrap-table-next';
@@ -12,7 +13,22 @@ const columns = [{
   dataField: 'id',
   text: 'Product ID',
   events: {
-    onClick: () => alert('Click on Product ID field')
+    onClick: (e, column, columnIndex, row, rowIndex) => {
+      console.log(e);
+      console.log(column);
+      console.log(columnIndex);
+      console.log(row);
+      console.log(rowIndex);
+      alert('Click on Product ID field');
+    },
+    onMouseEnter: (e, column, columnIndex, row, rowIndex) => {
+      console.log(e);
+      console.log(column);
+      console.log(columnIndex);
+      console.log(row);
+      console.log(rowIndex);
+      console.log('onMouseEnter on Product ID field');
+    }
   }
 }, {
   dataField: 'name',
@@ -29,7 +45,22 @@ const columns = [{
   dataField: 'id',
   text: 'Product ID',
   events: {
-    onClick: () => alert('Click on Product ID field')
+    onClick: (e, column, columnIndex, row, rowIndex) => {
+      console.log(e);
+      console.log(column);
+      console.log(columnIndex);
+      console.log(row);
+      console.log(rowIndex);
+      alert('Click on Product ID field');
+    },
+    onMouseEnter: (e, column, columnIndex, row, rowIndex) => {
+      console.log(e);
+      console.log(column);
+      console.log(columnIndex);
+      console.log(row);
+      console.log(rowIndex);
+      console.log('onMouseEnter on Product ID field');
+    }
   }
 }, {
   dataField: 'name',
@@ -44,7 +75,7 @@ const columns = [{
 
 export default () => (
   <div>
-    <h3>Try to Click on Product ID columns</h3>
+    <h3>Try to Click or Mouse over on Product ID columns</h3>
     <BootstrapTable keyField="id" data={ products } columns={ columns } />
     <Code>{ sourceCode }</Code>
   </div>

packages/react-bootstrap-table2-example/examples/row-expand/expand-by-column-only.js

@@ -0,0 +1,77 @@
+import React from 'react';
+
+import BootstrapTable from 'react-bootstrap-table-next';
+import Code from 'components/common/code-block';
+import { productsExpandRowsGenerator } from 'utils/common';
+
+const products = productsExpandRowsGenerator();
+
+const columns = [{
+  dataField: 'id',
+  text: 'Product ID'
+}, {
+  dataField: 'name',
+  text: 'Product Name'
+}, {
+  dataField: 'price',
+  text: 'Product Price'
+}];
+
+const expandRow = {
+  renderer: row => (
+    <div>
+      <p>{ `This Expand row is belong to rowKey ${row.id}` }</p>
+      <p>You can render anything here, also you can add additional data on every row object</p>
+      <p>expandRow.renderer callback will pass the origin row object to you</p>
+    </div>
+  ),
+  showExpandColumn: true,
+  expandByColumnOnly: true
+};
+
+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 expandRow = {
+  renderer: row => (
+    <div>
+      <p>{ \`This Expand row is belong to rowKey $\{row.id}\` }</p>
+      <p>You can render anything here, also you can add additional data on every row object</p>
+      <p>expandRow.renderer callback will pass the origin row object to you</p>
+    </div>
+  ),
+  showExpandColumn: true,
+  expandByColumnOnly: true
+};
+
+<BootstrapTable
+  keyField='id'
+  data={ products }
+  columns={ columns }
+  expandRow={ expandRow }
+/>
+`;
+
+export default () => (
+  <div>
+    <h3>Only able to expand row via clicking expand column(indicator)</h3>
+    <BootstrapTable
+      keyField="id"
+      data={ products }
+      columns={ columns }
+      expandRow={ expandRow }
+    />
+    <Code>{ sourceCode }</Code>
+  </div>
+);

packages/react-bootstrap-table2-example/examples/row-selection/selection-advance-management.js

@@ -0,0 +1,88 @@
+/* eslint no-alert: 0 */
+/* eslint consistent-return: 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 sourceCode = `\
+import BootstrapTable from 'react-bootstrap-table-next';
+
+class AdvSelectionManagment extends React.Component {
+  handleOnSelect = (row, isSelect) => {
+    if (isSelect && row.id < 3) {
+      alert('Oops, You can not select Product ID which less than 3');
+      return false; // return false to deny current select action
+    }
+    return true; // return true or dont return to approve current select action
+  }
+
+  handleOnSelectAll = (isSelect, rows) => {
+    if (isSelect) {
+      return rows.filter(r => r.id >= 3).map(r => r.id);
+    }
+  }
+
+  render() {
+    const selectRow = {
+      mode: 'checkbox',
+      clickToSelect: true,
+      onSelect: this.handleOnSelect,
+      onSelectAll: this.handleOnSelectAll
+    };
+    return (
+      <div>
+        <h3>You can not select Product ID less than 3</h3>
+        <BootstrapTable keyField="id" data={ products } columns={ columns } selectRow={ selectRow } />
+        <Code>{ sourceCode }</Code>
+      </div>
+    );
+  }
+}
+`;
+
+export default class AdvSelectionManagment extends React.Component {
+  handleOnSelect = (row, isSelect) => {
+    if (isSelect && row.id < 3) {
+      alert('Oops, You can not select Product ID which less than 3');
+      return false; // return false to deny current select action
+    }
+    return true; // return true or dont return to approve current select action
+  }
+
+  handleOnSelectAll = (isSelect, rows) => {
+    if (isSelect) {
+      return rows.filter(r => r.id >= 3).map(r => r.id);
+    }
+  }
+
+  render() {
+    const selectRow = {
+      mode: 'checkbox',
+      clickToSelect: true,
+      onSelect: this.handleOnSelect,
+      onSelectAll: this.handleOnSelectAll
+    };
+    return (
+      <div>
+        <h3>You can not select Product ID less than 3</h3>
+        <BootstrapTable keyField="id" data={ products } columns={ columns } selectRow={ selectRow } />
+        <Code>{ sourceCode }</Code>
+      </div>
+    );
+  }
+}

packages/react-bootstrap-table2-example/examples/row-selection/selection-with-expansion.js

@@ -0,0 +1,88 @@
+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,
+  clickToExpand: true
+};
+
+const expandRow = {
+  showExpandColumn: true,
+  renderer: row => (
+    <div>
+      <p>{ `This Expand row is belong to rowKey ${row.id}` }</p>
+      <p>You can render anything here, also you can add additional data on every row object</p>
+      <p>expandRow.renderer callback will pass the origin row object to you</p>
+    </div>
+  )
+};
+
+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,
+  clickToExpand: true
+};
+
+const expandRow = {
+  showExpandColumn: true,
+  renderer: row => (
+    <div>
+      <p>{ \`This Expand row is belong to rowKey $\{row.id}\` }</p>
+      <p>You can render anything here, also you can add additional data on every row object</p>
+      <p>expandRow.renderer callback will pass the origin row object to you</p>
+    </div>
+  )
+};
+
+<BootstrapTable
+  keyField='id'
+  data={ products }
+  columns={ columns }
+  selectRow={ selectRow }
+  expandRow={ expandRow }
+/>
+`;
+
+export default () => (
+  <div>
+    <BootstrapTable
+      keyField="id"
+      data={ products }
+      columns={ columns }
+      selectRow={ selectRow }
+      expandRow={ expandRow }
+    />
+    <Code>{ sourceCode }</Code>
+  </div>
+);

packages/react-bootstrap-table2-example/examples/rows/row-event.js

@@ -1,5 +1,5 @@
 /* eslint no-unused-vars: 0 */
-/* eslint no-alert: 0 */
+/* eslint no-console: 0 */
 import React from 'react';
 
 import BootstrapTable from 'react-bootstrap-table-next';
@@ -21,7 +21,10 @@ const columns = [{
 
 const rowEvents = {
   onClick: (e, row, rowIndex) => {
-    alert(`clicked on row with index: ${rowIndex}`);
+    console.log(`clicked on row with index: ${rowIndex}`);
+  },
+  onMouseEnter: (e, row, rowIndex) => {
+    console.log(`enter on row with index: ${rowIndex}`);
   }
 };
 
@@ -41,7 +44,10 @@ const columns = [{
 
 const rowEvents = {
   onClick: (e, row, rowIndex) => {
-    alert(\`clicked on row with index: \${rowIndex}\`);
+    console.log(\`clicked on row with index: \${rowIndex}\`);
+  },
+  onMouseEnter: (e, row, rowIndex) => {
+    console.log(\`enter on row with index: \${rowIndex}\`);
   }
 };
 
@@ -50,7 +56,7 @@ const rowEvents = {
 
 export default () => (
   <div>
-    <h3>Try to click on any rows</h3>
+    <h3>Try to click or hover on any rows</h3>
     <BootstrapTable keyField="id" data={ products } columns={ columns } rowEvents={ rowEvents } />
     <Code>{ sourceCode }</Code>
   </div>

packages/react-bootstrap-table2-example/examples/welcome.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import Typed from 'typed.js';
 
+const PROJECT_NAME = 'react-bootstrap-table2';
+
 export default class Welcome extends React.Component {
   componentDidMount() {
     // type.js config
@@ -21,14 +23,21 @@ export default class Welcome extends React.Component {
     return (
       <div>
         <div className="welcome">
-          <h1 className="welcome-title">react-bootstrap-table2</h1>
+          <div className="welcome-title">
+            <span className="welcome-title-logo">
+              <img src="images/logo-color-square.svg" alt={ `${PROJECT_NAME}-logo` } />
+            </span>
+            <h1>
+              {PROJECT_NAME}
+            </h1>
+          </div>
           <span
             className="welcome-sub-title"
             ref={ (el) => { this.el = el; } }
           />
         </div>
-        <a href="https://github.com/react-bootstrap-table/react-bootstrap-table2" className="github-corner" aria-label="View source on Github">
-          <svg width="80" height="80" viewBox="0 0 250 250" style={ { fill: '#009688', color: '#fff', position: 'absolute', top: '0', border: '0', right: '0' } } aria-hidden="true">
+        <a href={ `https://github.com/react-bootstrap-table/${PROJECT_NAME}` } className="github-corner" aria-label="View source on Github">
+          <svg width="80" height="80" viewBox="0 0 250 250" style={ { fill: '#0058B7', color: '#fff', position: 'absolute', top: '0', border: '0', right: '0' } } aria-hidden="true">
             <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z" />
             <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style={ { transformOrigin: '130px 106px' } } className="octo-arm" />
             <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" className="octo-body" />

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

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

packages/react-bootstrap-table2-example/public/images/logo-color-square.svg

@@ -0,0 +1 @@
+<svg id="layer_1" data-name="layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72"><defs><style>.cls-1{fill:#059ae6;}.cls-2{fill:#0058b7;}</style></defs><title>logo square</title><polygon class="cls-1" points="22.76 59 22.76 64.35 49.24 51.13 49.24 43.88 44.45 41.5 44.45 48.17 22.76 59"/><polygon class="cls-2" points="22.76 20.87 22.76 47.98 27.55 45.59 27.55 23.83 44.45 15.39 44.45 23.02 33.06 28.71 33.06 31.9 49.24 39.97 49.24 34.62 40.58 30.3 49.24 25.98 49.24 7.65 22.76 20.87"/></svg>

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

@@ -14,6 +14,7 @@ import CustomizedIdClassesTable from 'examples/basic/customized-id-classes';
 import CaptionTable from 'examples/basic/caption-table';
 import LargeTable from 'examples/basic/large-table';
 import ExposedAPITable from 'examples/basic/exposed-function';
+import TabIndexCellTable from 'examples/basic/tabindex-column';
 
 // bootstrap 4
 import Bootstrap4DefaultSortTable from 'examples/bootstrap4/sort';
@@ -54,6 +55,7 @@ import CustomFilterValue from 'examples/column-filter/custom-filter-value';
 import SelectFilter from 'examples/column-filter/select-filter';
 import SelectFilterWithDefaultValue from 'examples/column-filter/select-filter-default-value';
 import SelectFilterComparator from 'examples/column-filter/select-filter-like-comparator';
+import SelectFilterWithPreservedOptionsOrder from 'examples/column-filter/select-filter-preserve-option-order';
 import CustomSelectFilter from 'examples/column-filter/custom-select-filter';
 import MultiSelectFilter from 'examples/column-filter/multi-select-filter';
 import MultiSelectFilterDefaultValue from 'examples/column-filter/multi-select-filter-default-value';
@@ -96,12 +98,15 @@ import RowLevelEditableTable from 'examples/cell-edit/row-level-editable-table';
 import ColumnLevelEditableTable from 'examples/cell-edit/column-level-editable-table';
 import CellLevelEditable from 'examples/cell-edit/cell-level-editable-table';
 import CellEditHooks from 'examples/cell-edit/cell-edit-hooks-table';
+import AsyncCellEditHooks from 'examples/cell-edit/cell-edit-async-hooks-table';
 import CellEditValidator from 'examples/cell-edit/cell-edit-validator-table';
+import AsyncCellEditValidator from 'examples/cell-edit/cell-edit-async-validator-table';
 import CellEditStyleTable from 'examples/cell-edit/cell-edit-style-table';
 import CellEditClassTable from 'examples/cell-edit/cell-edit-class-table';
 import AutoSelectTextInput from 'examples/cell-edit/auto-select-text-input-table';
 import EditorStyleTable from 'examples/cell-edit/editor-style-table';
 import EditorClassTable from 'examples/cell-edit/editor-class-table';
+import DBClickEditWithSelection from 'examples/cell-edit/dbclick-to-edit-with-selection-table';
 import DropdownEditorTable from 'examples/cell-edit/dropdown-editor-table';
 import TextareaEditorTable from 'examples/cell-edit/textarea-editor-table';
 import CheckboxEditorTable from 'examples/cell-edit/checkbox-editor-table';
@@ -114,7 +119,9 @@ import MultipleSelectionTable from 'examples/row-selection/multiple-selection';
 import ClickToSelectTable from 'examples/row-selection/click-to-select';
 import DefaultSelectTable from 'examples/row-selection/default-select';
 import SelectionManagement from 'examples/row-selection/selection-management';
+import AdvanceSelectionManagement from 'examples/row-selection/selection-advance-management';
 import ClickToSelectWithCellEditTable from 'examples/row-selection/click-to-select-with-cell-edit';
+import SelectionWithExpansionTable from 'examples/row-selection/selection-with-expansion';
 import SelectionNoDataTable from 'examples/row-selection/selection-no-data';
 import SelectionStyleTable from 'examples/row-selection/selection-style';
 import SelectionClassTable from 'examples/row-selection/selection-class';
@@ -130,6 +137,7 @@ import BasicRowExpand from 'examples/row-expand';
 import RowExpandManagement from 'examples/row-expand/expand-management';
 import NonExpandableRows from 'examples/row-expand/non-expandable-rows';
 import ExpandColumn from 'examples/row-expand/expand-column';
+import OnlyExpandByColumn from 'examples/row-expand/expand-by-column-only.js';
 import ExpandOnlyOne from 'examples/row-expand/expand-only-one';
 import CustomExpandColumn from 'examples/row-expand/custom-expand-column';
 import ExpandHooks from 'examples/row-expand/expand-hooks';
@@ -192,7 +200,8 @@ storiesOf('Basic Table', module)
   .add('Customized id and class table', () => <CustomizedIdClassesTable />)
   .add('Table with caption', () => <CaptionTable />)
   .add('Large Table', () => <LargeTable />)
-  .add('Exposed API', () => <ExposedAPITable />);
+  .add('Exposed API', () => <ExposedAPITable />)
+  .add('Enable tabIndex on Cell', () => <TabIndexCellTable />);
 
 storiesOf('Bootstrap 4', module)
   .addDecorator(bootstrapStyle(BOOTSTRAP_VERSION.FOUR))
@@ -255,6 +264,7 @@ storiesOf('Column Filter', module)
   .add('Programmatically Multi Select Filter', () => <ProgrammaticallyMultiSelectFilter />)
   .add('Custom Filter', () => <CustomFilter />)
   .add('Advance Custom Filter', () => <AdvanceCustomFilter />)
+  .add('Preserved Option Order on Select Filter', () => <SelectFilterWithPreservedOptionsOrder />)
   .add('Clear All Filters', () => <ClearAllFilters />);
 
 storiesOf('Work on Rows', module)
@@ -283,12 +293,15 @@ storiesOf('Cell Editing', module)
   .add('Column Level Editable', () => <ColumnLevelEditableTable />)
   .add('Cell Level Editable', () => <CellLevelEditable />)
   .add('Rich Hook Functions', () => <CellEditHooks />)
+  .add('Async Hook Functions', () => <AsyncCellEditHooks />)
   .add('Validation', () => <CellEditValidator />)
+  .add('Async Validation', () => <AsyncCellEditValidator />)
   .add('Auto Select Text Input', () => <AutoSelectTextInput />)
   .add('Custom Cell Style', () => <CellEditStyleTable />)
   .add('Custom Cell Classes', () => <CellEditClassTable />)
   .add('Custom Editor Classes', () => <EditorClassTable />)
   .add('Custom Editor Style', () => <EditorStyleTable />)
+  .add('DoubleClick to Edit with Selection', () => <DBClickEditWithSelection />)
   .add('Dropdown Editor', () => <DropdownEditorTable />)
   .add('Textarea Editor', () => <TextareaEditorTable />)
   .add('Checkbox Editor', () => <CheckboxEditorTable />)
@@ -302,7 +315,9 @@ storiesOf('Row Selection', module)
   .add('Click to Select', () => <ClickToSelectTable />)
   .add('Default Select', () => <DefaultSelectTable />)
   .add('Selection Management', () => <SelectionManagement />)
+  .add('Advance Selection Management', () => <AdvanceSelectionManagement />)
   .add('Click to Select and Edit Cell', () => <ClickToSelectWithCellEditTable />)
+  .add('Row Select and Expand', () => <SelectionWithExpansionTable />)
   .add('Selection without Data', () => <SelectionNoDataTable />)
   .add('Selection Style', () => <SelectionStyleTable />)
   .add('Selection Class', () => <SelectionClassTable />)
@@ -319,6 +334,7 @@ storiesOf('Row Expand', module)
   .add('Expand Management', () => <RowExpandManagement />)
   .add('Non Expandabled Rows', () => <NonExpandableRows />)
   .add('Expand Indicator', () => <ExpandColumn />)
+  .add('Only Expand by Indicator', () => <OnlyExpandByColumn />)
   .add('Expand Only One Row at The Same Time', () => <ExpandOnlyOne />)
   .add('Custom Expand Indicator', () => <CustomExpandColumn />)
   .add('Expand Hooks', () => <ExpandHooks />);

packages/react-bootstrap-table2-example/stories/stylesheet/welcome/_index.scss

@@ -1,3 +1,5 @@
+$logo-size: 96px;
+
 .welcome {
   margin-top: 70px;
   text-align: center;
@@ -5,7 +7,22 @@
 
   &-title {
     color: $grey-900;
+    width: 100%;
+
+    display: inline-flex;
+    justify-content: center;
+    align-content: center;
+
+    &-logo {
+      position: relative;
+      top: -8px;
+      right: -12px;
+
+      width: $logo-size;
+      height: $logo-size;
+    }
   }
+
   &-sub-title {
     font-size: 30px;
     color: $grey-500;

packages/react-bootstrap-table2-filter/README.md

@@ -115,6 +115,27 @@ const qualityFilter = selectFilter({
 // omit...
 ```
 
+> Note, the selectOptions can be an array also: 
+
+```js
+const selectOptions = [
+  { value: 0, label: 'good' },
+  { value: 1, label: 'Bad' },
+  { value: 2, label: 'unknown' }
+];
+const columns = [
+  ..., {
+  dataField: 'quality',
+  text: 'Product Quailty',
+  formatter: cell => selectOptions.find(opt => opt.value === cell).label,
+  filter: selectFilter({
+    options: selectOptions
+  })
+}];
+```
+
+The benifit is `react-bootstrap-table2` will render the select options by the order of array.
+
 ## MultiSelect Filter
 
 A quick example: 
@@ -288,3 +309,4 @@ Following properties is valid in `FILTER_TYPES`:
 * SELECT
 * NUMBER
 * DATE
+* MULTISELECT

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

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

packages/react-bootstrap-table2-filter/src/components/select.js

@@ -7,6 +7,17 @@ import { LIKE, EQ } from '../comparison';
 import { FILTER_TYPE } from '../const';
 
 function optionsEquals(currOpts, prevOpts) {
+  if (Array.isArray(currOpts)) {
+    for (let i = 0; i < currOpts.length; i += 1) {
+      if (
+        currOpts[i].value !== prevOpts[i].value ||
+        currOpts[i].label !== prevOpts[i].label
+      ) {
+        return false;
+      }
+    }
+    return currOpts.length === prevOpts.length;
+  }
   const keys = Object.keys(currOpts);
   for (let i = 0; i < keys.length; i += 1) {
     if (currOpts[keys[i]] !== prevOpts[keys[i]]) {
@@ -16,11 +27,21 @@ function optionsEquals(currOpts, prevOpts) {
   return Object.keys(currOpts).length === Object.keys(prevOpts).length;
 }
 
+function getOptionValue(options, key) {
+  if (Array.isArray(options)) {
+    const result = options
+      .filter(({ label }) => label === key)
+      .map(({ value }) => value);
+    return result[0];
+  }
+  return options[key];
+}
+
 class SelectFilter extends Component {
   constructor(props) {
     super(props);
     this.filter = this.filter.bind(this);
-    const isSelected = props.options[props.defaultValue] !== undefined;
+    const isSelected = getOptionValue(props.options, props.defaultValue) !== undefined;
     this.state = { isSelected };
   }
 
@@ -66,9 +87,14 @@ class SelectFilter extends Component {
         <option key="-1" value="">{ placeholder || `Select ${column.text}...` }</option>
       ));
     }
-    Object.keys(options).forEach(key =>
-      optionTags.push(<option key={ key } value={ key }>{ options[key] }</option>)
-    );
+    if (Array.isArray(options)) {
+      options.forEach(({ value, label }) =>
+        optionTags.push(<option key={ value } value={ value }>{ label }</option>));
+    } else {
+      Object.keys(options).forEach(key =>
+        optionTags.push(<option key={ key } value={ key }>{ options[key] }</option>)
+      );
+    }
     return optionTags;
   }
 
@@ -128,7 +154,7 @@ class SelectFilter extends Component {
 SelectFilter.propTypes = {
   onFilter: PropTypes.func.isRequired,
   column: PropTypes.object.isRequired,
-  options: PropTypes.object.isRequired,
+  options: PropTypes.oneOfType([PropTypes.object, PropTypes.array]).isRequired,
   comparator: PropTypes.oneOf([LIKE, EQ]),
   placeholder: PropTypes.string,
   style: PropTypes.object,

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

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap-table2-paginator",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "it's the pagination addon for react-bootstrap-table2",
   "main": "./lib/index.js",
   "repository": {

packages/react-bootstrap-table2-paginator/src/pagination-total.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 const PaginationTotal = props => (
   <span className="react-bootstrap-table-pagination-total">
-    &nbsp;Showing rows { props.from } to&nbsp;{ props.to + 1 } of&nbsp;{ props.dataSize }
+    &nbsp;Showing rows { props.from } to&nbsp;{ props.to } of&nbsp;{ props.dataSize }
   </span>
 );
 

packages/react-bootstrap-table2/package.json

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

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

@@ -3,129 +3,106 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import cs from 'classnames';
 
 import _ from './utils';
-import Row from './row';
-import ExpandRow from './row-expand/expand-row';
-import RowSection from './row-section';
+import SimpleRow from './row/simple-row';
+import RowAggregator from './row/aggregate-row';
+import RowSection from './row/row-section';
 import Const from './const';
+import withRowSelection from './row-selection/row-consumer';
+import withRowExpansion from './row-expand/row-consumer';
 
-const Body = (props) => {
-  const {
-    columns,
-    data,
-    keyField,
-    isEmpty,
-    noDataIndication,
-    visibleColumnSize,
-    cellEdit,
-    selectRow,
-    selectedRowKeys,
-    rowStyle,
-    rowClasses,
-    rowEvents,
-    expandRow
-  } = props;
-
-  const {
-    bgColor,
-    nonSelectable
-  } = selectRow;
-
-  let content;
-
-  if (isEmpty) {
-    const indication = _.isFunction(noDataIndication) ? noDataIndication() : noDataIndication;
-    if (!indication) {
-      return null;
+class Body extends React.Component {
+  constructor(props) {
+    super(props);
+    if (props.cellEdit.createContext) {
+      this.EditingCell = props.cellEdit.createEditingCell(_, props.cellEdit.options.onStartEdit);
     }
-    content = <RowSection content={ indication } colSpan={ visibleColumnSize } />;
-  } else {
-    const nonEditableRows = cellEdit.nonEditableRows || [];
-    content = data.map((row, index) => {
-      const key = _.get(row, keyField);
-      const editable = !(nonEditableRows.length > 0 && nonEditableRows.indexOf(key) > -1);
-
-      const selected = selectRow.mode !== Const.ROW_SELECT_DISABLED
-        ? selectedRowKeys.includes(key)
-        : null;
-
-      const attrs = rowEvents || {};
-      let style = _.isFunction(rowStyle) ? rowStyle(row, index) : rowStyle;
-      let classes = (_.isFunction(rowClasses) ? rowClasses(row, index) : rowClasses);
-      if (selected) {
-        const selectedStyle = _.isFunction(selectRow.style)
-          ? selectRow.style(row, index)
-          : selectRow.style;
-
-        const selectedClasses = _.isFunction(selectRow.classes)
-          ? selectRow.classes(row, index)
-          : selectRow.classes;
-
-        style = {
-          ...style,
-          ...selectedStyle
-        };
-        classes = cs(classes, selectedClasses);
-
-        if (bgColor) {
-          style = style || {};
-          style.backgroundColor = _.isFunction(bgColor) ? bgColor(row, index) : bgColor;
-        }
-      }
-
-      const selectable = !nonSelectable || !nonSelectable.includes(key);
-      const expandable = expandRow && !expandRow.nonExpandable.includes(key);
-      const expanded = expandRow && expandRow.expanded.includes(key);
-
-      const result = [
-        <Row
-          key={ key }
-          row={ row }
-          keyField={ keyField }
-          rowIndex={ index }
-          columns={ columns }
-          cellEdit={ cellEdit }
-          editable={ editable }
-          selectable={ selectable }
-          expandable={ expandable }
-          selected={ selected }
-          expanded={ expanded }
-          selectRow={ selectRow }
-          expandRow={ expandRow }
-          style={ style }
-          className={ classes }
-          attrs={ attrs }
-        />
-      ];
-
-      if (expanded) {
-        result.push((
-          <ExpandRow
-            key={ `${key}-expanding` }
-            colSpan={ visibleColumnSize }
-          >
-            { expandRow.renderer(row) }
-          </ExpandRow>
-        ));
-      }
-
-      return result;
-    });
   }
 
-  return (
-    <tbody>{ content }</tbody>
-  );
-};
+  render() {
+    const {
+      columns,
+      data,
+      tabIndexCell,
+      keyField,
+      isEmpty,
+      noDataIndication,
+      visibleColumnSize,
+      cellEdit,
+      selectRow,
+      rowStyle,
+      rowClasses,
+      rowEvents,
+      expandRow
+    } = this.props;
+
+    let content;
+
+    if (isEmpty) {
+      const indication = _.isFunction(noDataIndication) ? noDataIndication() : noDataIndication;
+      if (!indication) {
+        return null;
+      }
+      content = <RowSection content={ indication } colSpan={ visibleColumnSize } />;
+    } else {
+      let RowComponent = SimpleRow;
+      const selectRowEnabled = selectRow.mode !== Const.ROW_SELECT_DISABLED;
+      const expandRowEnabled = !!expandRow.renderer;
+
+      const additionalRowProps = {};
+      if (expandRowEnabled) {
+        RowComponent = withRowExpansion(RowAggregator, visibleColumnSize);
+      }
+
+      if (selectRowEnabled) {
+        RowComponent = withRowSelection(expandRowEnabled ? RowComponent : RowAggregator);
+      }
+
+      if (cellEdit.createContext) {
+        RowComponent = cellEdit.withRowLevelCellEdit(RowComponent, selectRowEnabled, keyField, _);
+        additionalRowProps.EditingCellComponent = this.EditingCell;
+      }
+
+      if (selectRowEnabled || expandRowEnabled) {
+        additionalRowProps.expandRow = expandRow;
+        additionalRowProps.selectRow = selectRow;
+      }
+
+      content = data.map((row, index) => {
+        const key = _.get(row, keyField);
+        const baseRowProps = {
+          key,
+          row,
+          tabIndexCell,
+          columns,
+          keyField,
+          cellEdit,
+          value: key,
+          rowIndex: index,
+          visibleColumnSize,
+          attrs: rowEvents || {},
+          ...additionalRowProps
+        };
+
+        baseRowProps.style = _.isFunction(rowStyle) ? rowStyle(row, index) : rowStyle;
+        baseRowProps.className = (_.isFunction(rowClasses) ? rowClasses(row, index) : rowClasses);
+
+        return <RowComponent { ...baseRowProps } />;
+      });
+    }
+
+    return (
+      <tbody>{ content }</tbody>
+    );
+  }
+}
 
 Body.propTypes = {
   keyField: PropTypes.string.isRequired,
   data: PropTypes.array.isRequired,
   columns: PropTypes.array.isRequired,
-  selectRow: PropTypes.object,
-  selectedRowKeys: PropTypes.array
+  selectRow: PropTypes.object
 };
 
 export default Body;

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

@@ -9,20 +9,18 @@ import Caption from './caption';
 import Body from './body';
 import PropsBaseResolver from './props-resolver';
 import Const from './const';
-import { getSelectionSummary } from './store/selection';
 
 class BootstrapTable extends PropsBaseResolver(Component) {
   constructor(props) {
     super(props);
     this.validateProps();
     if (props.registerExposedAPI) {
-      const getData = () => this.getData();
-      props.registerExposedAPI(getData);
+      props.registerExposedAPI(this.getData);
     }
   }
 
   // Exposed APIs
-  getData = () => {
+  getData() {
     return this.props.data;
   }
 
@@ -44,8 +42,10 @@ class BootstrapTable extends PropsBaseResolver(Component) {
       data,
       columns,
       keyField,
+      tabIndexCell,
       id,
       classes,
+      bootstrap4,
       striped,
       hover,
       bordered,
@@ -56,7 +56,9 @@ class BootstrapTable extends PropsBaseResolver(Component) {
       rowClasses,
       wrapperClasses,
       rowEvents,
-      selected
+      selectRow,
+      expandRow,
+      cellEdit
     } = this.props;
 
     const tableWrapperClass = cs('react-bootstrap-table', wrapperClasses);
@@ -65,23 +67,10 @@ class BootstrapTable extends PropsBaseResolver(Component) {
       'table-striped': striped,
       'table-hover': hover,
       'table-bordered': bordered,
-      'table-condensed': condensed
+      [(bootstrap4 ? 'table-sm' : 'table-condensed')]: condensed
     }, classes);
 
-    const cellSelectionInfo = this.resolveSelectRowProps({
-      onRowSelect: this.props.onRowSelect
-    });
-
-    const { allRowsSelected, allRowsNotSelected } = getSelectionSummary(data, keyField, selected);
-    const headerCellSelectionInfo = this.resolveSelectRowPropsForHeader({
-      onAllRowsSelect: this.props.onAllRowsSelect,
-      selected,
-      allRowsSelected,
-      allRowsNotSelected
-    });
-
     const tableCaption = (caption && <Caption>{ caption }</Caption>);
-    const expandRow = this.resolveExpandRowProps();
 
     return (
       <div className={ tableWrapperClass }>
@@ -95,19 +84,19 @@ class BootstrapTable extends PropsBaseResolver(Component) {
             onSort={ this.props.onSort }
             onFilter={ this.props.onFilter }
             onExternalFilter={ this.props.onExternalFilter }
-            selectRow={ headerCellSelectionInfo }
+            selectRow={ selectRow }
             expandRow={ expandRow }
           />
           <Body
             data={ data }
             keyField={ keyField }
+            tabIndexCell={ tabIndexCell }
             columns={ columns }
             isEmpty={ this.isEmpty() }
             visibleColumnSize={ this.visibleColumnSize() }
             noDataIndication={ noDataIndication }
-            cellEdit={ this.props.cellEdit || {} }
-            selectRow={ cellSelectionInfo }
-            selectedRowKeys={ selected }
+            cellEdit={ cellEdit }
+            selectRow={ selectRow }
             expandRow={ expandRow }
             rowStyle={ rowStyle }
             rowClasses={ rowClasses }
@@ -131,6 +120,7 @@ BootstrapTable.propTypes = {
   striped: PropTypes.bool,
   bordered: PropTypes.bool,
   hover: PropTypes.bool,
+  tabIndexCell: PropTypes.bool,
   id: PropTypes.string,
   classes: PropTypes.string,
   wrapperClasses: PropTypes.string,
@@ -143,8 +133,13 @@ BootstrapTable.propTypes = {
   filter: PropTypes.object,
   cellEdit: PropTypes.object,
   selectRow: PropTypes.shape({
-    mode: PropTypes.oneOf([Const.ROW_SELECT_SINGLE, Const.ROW_SELECT_MULTIPLE]).isRequired,
+    mode: PropTypes.oneOf([
+      Const.ROW_SELECT_SINGLE,
+      Const.ROW_SELECT_MULTIPLE,
+      Const.ROW_SELECT_DISABLED
+    ]).isRequired,
     clickToSelect: PropTypes.bool,
+    clickToExpand: PropTypes.bool,
     clickToEdit: PropTypes.bool,
     hideSelectAll: PropTypes.bool,
     onSelect: PropTypes.func,
@@ -157,22 +152,18 @@ BootstrapTable.propTypes = {
     selectionRenderer: PropTypes.func,
     selectionHeaderRenderer: PropTypes.func
   }),
-  onRowSelect: PropTypes.func,
-  onAllRowsSelect: PropTypes.func,
   expandRow: PropTypes.shape({
-    renderer: PropTypes.func.isRequired,
+    renderer: PropTypes.func,
     expanded: PropTypes.array,
     onExpand: PropTypes.func,
     onExpandAll: PropTypes.func,
     nonExpandable: PropTypes.array,
     showExpandColumn: PropTypes.bool,
     onlyOneExpanding: PropTypes.bool,
+    expandByColumnOnly: PropTypes.bool,
     expandColumnRenderer: PropTypes.func,
     expandHeaderColumnRenderer: PropTypes.func
   }),
-  onRowExpand: PropTypes.func,
-  onAllRowExpand: PropTypes.func,
-  isAnyExpands: PropTypes.bool,
   rowStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
   rowEvents: PropTypes.object,
   rowClasses: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
@@ -202,7 +193,21 @@ BootstrapTable.defaultProps = {
   bordered: true,
   hover: false,
   condensed: false,
-  noDataIndication: null
+  noDataIndication: null,
+  selectRow: {
+    mode: Const.ROW_SELECT_DISABLED,
+    selected: [],
+    hideSelectColumn: true
+  },
+  expandRow: {
+    renderer: undefined,
+    expanded: [],
+    nonExpandable: []
+  },
+  cellEdit: {
+    mode: null,
+    nonEditableRows: []
+  }
 };
 
 export default BootstrapTable;

packages/react-bootstrap-table2/src/cell-event-delegater.js

@@ -0,0 +1,32 @@
+const events = [
+  'onClick',
+  'onDoubleClick',
+  'onMouseEnter',
+  'onMouseLeave',
+  'onContextMenu'
+];
+
+export default ExtendBase =>
+  class CellEventDelegater extends ExtendBase {
+    constructor(props) {
+      super(props);
+      this.createDefaultEventHandler = this.createDefaultEventHandler.bind(this);
+    }
+
+    createDefaultEventHandler(cb) {
+      return (e) => {
+        const { column, columnIndex } = this.props;
+        cb(e, column, columnIndex);
+      };
+    }
+
+    delegate(attrs = {}) {
+      const newAttrs = { ...attrs };
+      Object.keys(attrs).forEach((attr) => {
+        if (events.includes(attr)) {
+          newAttrs[attr] = this.createDefaultEventHandler(attrs[attr]);
+        }
+      });
+      return newAttrs;
+    }
+  };

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

@@ -2,9 +2,10 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
+import eventDelegater from './cell-event-delegater';
 import _ from './utils';
 
-class Cell extends Component {
+class Cell extends eventDelegater(Component) {
   constructor(props) {
     super(props);
     this.handleEditingCell = this.handleEditingCell.bind(this);
@@ -34,7 +35,8 @@ class Cell extends Component {
       !_.isEqual(this.props.style, nextProps.style) ||
       !_.isEqual(this.props.column.formatExtraData, nextProps.column.formatExtraData) ||
       !_.isEqual(this.props.column.events, nextProps.column.events) ||
-      !_.isEqual(this.props.column.attrs, nextProps.column.attrs);
+      !_.isEqual(this.props.column.attrs, nextProps.column.attrs) ||
+      this.props.tabIndex !== nextProps.tabIndex;
     return shouldUpdate;
   }
 
@@ -72,7 +74,7 @@ class Cell extends Component {
       formatter,
       formatExtraData
     } = column;
-    const attrs = { ...rest };
+    const attrs = this.delegate({ ...rest });
     let content = column.isDummyField ? null : _.get(row, dataField);
 
     if (formatter) {

packages/react-bootstrap-table2/src/contexts/index.js

@@ -4,8 +4,8 @@ import React, { Component } from 'react';
 import _ from '../utils';
 import createDataContext from './data-context';
 import createSortContext from './sort-context';
-import createSelectionContext from './selection-context';
-import createRowExpandContext from './row-expand-context';
+import SelectionContext from './selection-context';
+import RowExpandContext from './row-expand-context';
 import remoteResolver from '../props-resolver/remote-resolver';
 import { BootstrapContext } from './bootstrap';
 import dataOperator from '../store/operators';
@@ -22,11 +22,11 @@ const withContext = Base =>
       }
 
       if (props.selectRow) {
-        this.SelectionContext = createSelectionContext(dataOperator);
+        this.SelectionContext = SelectionContext;
       }
 
       if (props.expandRow) {
-        this.RowExpandContext = createRowExpandContext(dataOperator);
+        this.RowExpandContext = RowExpandContext;
       }
 
       if (props.cellEdit && props.cellEdit.createContext) {
@@ -54,27 +54,31 @@ const withContext = Base =>
       }
     }
 
+    componentWillReceiveProps(nextProps) {
+      if (!nextProps.pagination && this.props.pagination) {
+        this.PaginationContext = null;
+      }
+      if (nextProps.pagination && !this.props.pagination) {
+        this.PaginationContext = nextProps.pagination.createContext(
+          this.isRemotePagination, this.handleRemotePageChange);
+      }
+    }
+
     renderBase() {
       return (
         rootProps,
-        cellEditProps,
         filterProps,
         searchProps,
         sortProps,
         paginationProps,
-        expandProps,
-        selectionProps
       ) => (
         <Base
           ref={ n => this.table = n }
           { ...this.props }
-          { ...selectionProps }
           { ...sortProps }
-          { ...cellEditProps }
           { ...filterProps }
           { ...searchProps }
           { ...paginationProps }
-          { ...expandProps }
           data={ rootProps.getData(filterProps, searchProps, sortProps, paginationProps) }
         />
       );
@@ -83,12 +87,10 @@ const withContext = Base =>
     renderWithSelectionCtx(base, baseProps) {
       return (
         rootProps,
-        cellEditProps,
         filterProps,
         searchProps,
         sortProps,
-        paginationProps,
-        expandProps
+        paginationProps
       ) => (
         <this.SelectionContext.Provider
           { ...baseProps }
@@ -96,20 +98,15 @@ const withContext = Base =>
           selectRow={ this.props.selectRow }
           data={ rootProps.getData(filterProps, searchProps, sortProps, paginationProps) }
         >
-          <this.SelectionContext.Consumer>
-            {
-              selectionProps => base(
-                rootProps,
-                cellEditProps,
-                filterProps,
-                searchProps,
-                sortProps,
-                paginationProps,
-                expandProps,
-                selectionProps
-              )
-            }
-          </this.SelectionContext.Consumer>
+          {
+            base(
+              rootProps,
+              filterProps,
+              searchProps,
+              sortProps,
+              paginationProps
+            )
+          }
         </this.SelectionContext.Provider>
       );
     }
@@ -117,7 +114,6 @@ const withContext = Base =>
     renderWithRowExpandCtx(base, baseProps) {
       return (
         rootProps,
-        cellEditProps,
         filterProps,
         searchProps,
         sortProps,
@@ -129,19 +125,15 @@ const withContext = Base =>
           expandRow={ this.props.expandRow }
           data={ rootProps.getData(filterProps, searchProps, sortProps, paginationProps) }
         >
-          <this.RowExpandContext.Consumer>
-            {
-              expandProps => base(
-                rootProps,
-                cellEditProps,
-                filterProps,
-                searchProps,
-                sortProps,
-                paginationProps,
-                expandProps
-              )
-            }
-          </this.RowExpandContext.Consumer>
+          {
+            base(
+              rootProps,
+              filterProps,
+              searchProps,
+              sortProps,
+              paginationProps
+            )
+          }
         </this.RowExpandContext.Provider>
       );
     }
@@ -149,7 +141,6 @@ const withContext = Base =>
     renderWithPaginationCtx(base) {
       return (
         rootProps,
-        cellEditProps,
         filterProps,
         searchProps,
         sortProps
@@ -164,7 +155,6 @@ const withContext = Base =>
             {
               paginationProps => base(
                 rootProps,
-                cellEditProps,
                 filterProps,
                 searchProps,
                 sortProps,
@@ -179,7 +169,6 @@ const withContext = Base =>
     renderWithSortCtx(base, baseProps) {
       return (
         rootProps,
-        cellEditProps,
         filterProps,
         searchProps
       ) => (
@@ -194,7 +183,6 @@ const withContext = Base =>
             {
               sortProps => base(
                 rootProps,
-                cellEditProps,
                 filterProps,
                 searchProps,
                 sortProps,
@@ -208,7 +196,6 @@ const withContext = Base =>
     renderWithSearchCtx(base, baseProps) {
       return (
         rootProps,
-        cellEditProps,
         filterProps
       ) => (
         <this.SearchContext.Provider
@@ -221,7 +208,6 @@ const withContext = Base =>
             {
               searchProps => base(
                 rootProps,
-                cellEditProps,
                 filterProps,
                 searchProps
               )
@@ -232,10 +218,7 @@ const withContext = Base =>
     }
 
     renderWithFilterCtx(base, baseProps) {
-      return (
-        rootProps,
-        cellEditProps
-      ) => (
+      return rootProps => (
         <this.FilterContext.Provider
           { ...baseProps }
           ref={ n => this.filterContext = n }
@@ -245,7 +228,6 @@ const withContext = Base =>
             {
               filterProps => base(
                 rootProps,
-                cellEditProps,
                 filterProps
               )
             }
@@ -262,11 +244,7 @@ const withContext = Base =>
           cellEdit={ this.props.cellEdit }
           data={ rootProps.getData() }
         >
-          <this.CellEditContext.Consumer>
-            {
-              cellEditProps => base(rootProps, cellEditProps)
-            }
-          </this.CellEditContext.Consumer>
+          { base(rootProps) }
         </this.CellEditContext.Provider>
       );
     }

packages/react-bootstrap-table2/src/contexts/row-expand-context.js

@@ -1,92 +1,91 @@
 /* eslint react/prop-types: 0 */
 import React from 'react';
 import PropTypes from 'prop-types';
+import dataOperator from '../store/operators';
 
-export default (
-  dataOperator
-) => {
-  const RowExpandContext = React.createContext();
+const RowExpandContext = React.createContext();
 
-  class RowExpandProvider extends React.Component {
-    static propTypes = {
-      children: PropTypes.node.isRequired,
-      data: PropTypes.array.isRequired,
-      keyField: PropTypes.string.isRequired
-    }
+class RowExpandProvider extends React.Component {
+  static propTypes = {
+    children: PropTypes.node.isRequired,
+    data: PropTypes.array.isRequired,
+    keyField: PropTypes.string.isRequired
+  }
 
-    state = { expanded: this.props.expandRow.expanded || [] };
+  state = { expanded: this.props.expandRow.expanded || [] };
 
-    componentWillReceiveProps(nextProps) {
-      if (nextProps.expandRow) {
-        this.setState(() => ({
-          expanded: nextProps.expandRow.expanded || this.state.expanded
-        }));
-      }
-    }
-
-    handleRowExpand = (rowKey, expanded, rowIndex, e) => {
-      const { data, keyField, expandRow: { onExpand, onlyOneExpanding } } = this.props;
-
-      let currExpanded = [...this.state.expanded];
-
-      if (expanded) {
-        if (onlyOneExpanding) currExpanded = [rowKey];
-        else currExpanded.push(rowKey);
-      } else {
-        currExpanded = currExpanded.filter(value => value !== rowKey);
-      }
-
-      if (onExpand) {
-        const row = dataOperator.getRowByRowId(data, keyField, rowKey);
-        onExpand(row, expanded, rowIndex, e);
-      }
-      this.setState(() => ({ expanded: currExpanded }));
-    }
-
-    handleAllRowExpand = (e, expandAll) => {
-      const {
-        data,
-        keyField,
-        expandRow: {
-          onExpandAll,
-          nonExpandable
-        }
-      } = this.props;
-      const { expanded } = this.state;
-
-      let currExpanded;
-
-      if (expandAll) {
-        currExpanded = expanded.concat(dataOperator.expandableKeys(data, keyField, nonExpandable));
-      } else {
-        currExpanded = expanded.filter(s => typeof data.find(d => d[keyField] === s) === 'undefined');
-      }
-
-      if (onExpandAll) {
-        onExpandAll(expandAll, dataOperator.getExpandedRows(data, keyField, currExpanded), e);
-      }
-
-      this.setState(() => ({ expanded: currExpanded }));
-    }
-
-    render() {
-      const { data, keyField } = this.props;
-      return (
-        <RowExpandContext.Provider
-          value={ {
-            isAnyExpands: dataOperator.isAnyExpands(data, keyField, this.state.expanded),
-            expanded: this.state.expanded,
-            onRowExpand: this.handleRowExpand,
-            onAllRowExpand: this.handleAllRowExpand
-          } }
-        >
-          { this.props.children }
-        </RowExpandContext.Provider>
-      );
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.expandRow) {
+      this.setState(() => ({
+        expanded: nextProps.expandRow.expanded || this.state.expanded
+      }));
     }
   }
-  return {
-    Provider: RowExpandProvider,
-    Consumer: RowExpandContext.Consumer
-  };
+
+  handleRowExpand = (rowKey, expanded, rowIndex, e) => {
+    const { data, keyField, expandRow: { onExpand, onlyOneExpanding } } = this.props;
+
+    let currExpanded = [...this.state.expanded];
+
+    if (expanded) {
+      if (onlyOneExpanding) currExpanded = [rowKey];
+      else currExpanded.push(rowKey);
+    } else {
+      currExpanded = currExpanded.filter(value => value !== rowKey);
+    }
+
+    if (onExpand) {
+      const row = dataOperator.getRowByRowId(data, keyField, rowKey);
+      onExpand(row, expanded, rowIndex, e);
+    }
+    this.setState(() => ({ expanded: currExpanded }));
+  }
+
+  handleAllRowExpand = (e, expandAll) => {
+    const {
+      data,
+      keyField,
+      expandRow: {
+        onExpandAll,
+        nonExpandable
+      }
+    } = this.props;
+    const { expanded } = this.state;
+
+    let currExpanded;
+
+    if (expandAll) {
+      currExpanded = expanded.concat(dataOperator.expandableKeys(data, keyField, nonExpandable));
+    } else {
+      currExpanded = expanded.filter(s => typeof data.find(d => d[keyField] === s) === 'undefined');
+    }
+
+    if (onExpandAll) {
+      onExpandAll(expandAll, dataOperator.getExpandedRows(data, keyField, currExpanded), e);
+    }
+
+    this.setState(() => ({ expanded: currExpanded }));
+  }
+
+  render() {
+    const { data, keyField } = this.props;
+    return (
+      <RowExpandContext.Provider
+        value={ {
+          ...this.props.expandRow,
+          expanded: this.state.expanded,
+          isAnyExpands: dataOperator.isAnyExpands(data, keyField, this.state.expanded),
+          onRowExpand: this.handleRowExpand,
+          onAllRowExpand: this.handleAllRowExpand
+        } }
+      >
+        { this.props.children }
+      </RowExpandContext.Provider>
+    );
+  }
+}
+
+export default {
+  Provider: RowExpandProvider,
+  Consumer: RowExpandContext.Consumer
 };

packages/react-bootstrap-table2/src/contexts/selection-context.js

@@ -3,84 +3,88 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Const from '../const';
 
-export default (
-  dataOperator
-) => {
-  const SelectionContext = React.createContext();
+import dataOperator from '../store/operators';
+import { getSelectionSummary } from '../store/selection';
 
-  class SelectionProvider extends React.Component {
-    static propTypes = {
-      children: PropTypes.node.isRequired,
-      data: PropTypes.array.isRequired,
-      keyField: PropTypes.string.isRequired
+const SelectionContext = React.createContext();
+class SelectionProvider extends React.Component {
+  static propTypes = {
+    children: PropTypes.node.isRequired,
+    data: PropTypes.array.isRequired,
+    keyField: PropTypes.string.isRequired
+  }
+
+  constructor(props) {
+    super(props);
+    if (props.registerExposedAPI) {
+      const getSelected = () => this.getSelected();
+      props.registerExposedAPI(getSelected);
     }
+  }
 
-    constructor(props) {
-      super(props);
-      if (props.registerExposedAPI) {
-        const getSelected = () => this.getSelected();
-        props.registerExposedAPI(getSelected);
-      }
+  state = { selected: this.props.selectRow.selected || [] };
+
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.selectRow) {
+      this.setState(() => ({
+        selected: nextProps.selectRow.selected || this.state.selected
+      }));
     }
+  }
 
-    state = { selected: (this.props.selectRow && this.props.selectRow.selected) || [] };
+  // exposed API
+  getSelected() {
+    return this.state.selected;
+  }
 
-    componentWillReceiveProps(nextProps) {
-      if (nextProps.selectRow) {
-        this.setState(() => ({
-          selected: nextProps.selectRow.selected || this.state.selected
-        }));
-      }
-    }
+  handleRowSelect = (rowKey, checked, rowIndex, e) => {
+    const { data, keyField, selectRow: { mode, onSelect } } = this.props;
+    const { ROW_SELECT_SINGLE } = Const;
 
-    // exposed API
-    getSelected() {
-      return this.state.selected;
-    }
-
-    handleRowSelect = (rowKey, checked, rowIndex, e) => {
-      const { data, keyField, selectRow: { mode, onSelect } } = this.props;
-      const { ROW_SELECT_SINGLE } = Const;
-
-      let currSelected = [...this.state.selected];
-
-      if (mode === ROW_SELECT_SINGLE) { // when select mode is radio
-        currSelected = [rowKey];
-      } else if (checked) { // when select mode is checkbox
-        currSelected.push(rowKey);
-      } else {
-        currSelected = currSelected.filter(value => value !== rowKey);
-      }
+    let currSelected = [...this.state.selected];
 
+    this.setState(() => {
+      let result = true;
       if (onSelect) {
         const row = dataOperator.getRowByRowId(data, keyField, rowKey);
-        onSelect(row, checked, rowIndex, e);
+        result = onSelect(row, checked, rowIndex, e);
       }
+      if (result === true || result === undefined) {
+        if (mode === ROW_SELECT_SINGLE) { // when select mode is radio
+          currSelected = [rowKey];
+        } else if (checked) { // when select mode is checkbox
+          currSelected.push(rowKey);
+        } else {
+          currSelected = currSelected.filter(value => value !== rowKey);
+        }
+      }
+      return { selected: currSelected };
+    });
+  }
 
-      this.setState(() => ({ selected: currSelected }));
+  handleAllRowsSelect = (e, isUnSelect) => {
+    const {
+      data,
+      keyField,
+      selectRow: {
+        onSelectAll,
+        nonSelectable
+      }
+    } = this.props;
+    const { selected } = this.state;
+
+    let currSelected;
+
+    if (!isUnSelect) {
+      currSelected = selected.concat(dataOperator.selectableKeys(data, keyField, nonSelectable));
+    } else {
+      currSelected = selected.filter(s => typeof data.find(d => d[keyField] === s) === 'undefined');
     }
 
-    handleAllRowsSelect = (e, isUnSelect) => {
-      const {
-        data,
-        keyField,
-        selectRow: {
-          onSelectAll,
-          nonSelectable
-        }
-      } = this.props;
-      const { selected } = this.state;
-
-      let currSelected;
-
-      if (!isUnSelect) {
-        currSelected = selected.concat(dataOperator.selectableKeys(data, keyField, nonSelectable));
-      } else {
-        currSelected = selected.filter(s => typeof data.find(d => d[keyField] === s) === 'undefined');
-      }
-
+    this.setState(() => {
+      let result;
       if (onSelectAll) {
-        onSelectAll(
+        result = onSelectAll(
           !isUnSelect,
           dataOperator.getSelectedRows(
             data,
@@ -89,27 +93,50 @@ export default (
           ),
           e
         );
+        if (Array.isArray(result)) {
+          currSelected = result;
+        }
       }
-
-      this.setState(() => ({ selected: currSelected }));
-    }
-
-    render() {
-      return (
-        <SelectionContext.Provider
-          value={ {
-            selected: this.state.selected,
-            onRowSelect: this.handleRowSelect,
-            onAllRowsSelect: this.handleAllRowsSelect
-          } }
-        >
-          { this.props.children }
-        </SelectionContext.Provider>
-      );
-    }
+      return { selected: currSelected };
+    });
   }
-  return {
-    Provider: SelectionProvider,
-    Consumer: SelectionContext.Consumer
-  };
+
+  render() {
+    const {
+      allRowsSelected,
+      allRowsNotSelected
+    } = getSelectionSummary(
+      this.props.data,
+      this.props.keyField,
+      this.state.selected
+    );
+
+    let checkedStatus;
+
+    // checkbox status depending on selected rows counts
+    if (allRowsSelected) checkedStatus = Const.CHECKBOX_STATUS_CHECKED;
+    else if (allRowsNotSelected) checkedStatus = Const.CHECKBOX_STATUS_UNCHECKED;
+    else checkedStatus = Const.CHECKBOX_STATUS_INDETERMINATE;
+
+    return (
+      <SelectionContext.Provider
+        value={ {
+          ...this.props.selectRow,
+          selected: this.state.selected,
+          onRowSelect: this.handleRowSelect,
+          onAllRowsSelect: this.handleAllRowsSelect,
+          allRowsSelected,
+          allRowsNotSelected,
+          checkedStatus
+        } }
+      >
+        { this.props.children }
+      </SelectionContext.Provider>
+    );
+  }
+}
+
+export default {
+  Provider: SelectionProvider,
+  Consumer: SelectionContext.Consumer
 };

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

@@ -1,15 +1,14 @@
 /* eslint react/require-default-props: 0 */
 import React from 'react';
 import PropTypes from 'prop-types';
-import Const from './const';
 
 import HeaderCell from './header-cell';
 import SelectionHeaderCell from './row-selection/selection-header-cell';
 import ExpandHeaderCell from './row-expand/expand-header-cell';
+import withHeaderSelection from './row-selection/selection-header-cell-consumer';
+import withHeaderExpansion from './row-expand/expand-header-cell-consumer';
 
 const Header = (props) => {
-  const { ROW_SELECT_DISABLED } = Const;
-
   const {
     className,
     columns,
@@ -23,20 +22,24 @@ const Header = (props) => {
     bootstrap4
   } = props;
 
+  let SelectionHeaderCellComp = () => null;
+  let ExpansionHeaderCellComp = () => null;
+
+  if (expandRow.showExpandColumn) {
+    ExpansionHeaderCellComp = withHeaderExpansion(ExpandHeaderCell);
+  }
+
+  if (selectRow) {
+    SelectionHeaderCellComp = withHeaderSelection(SelectionHeaderCell);
+  }
+
   return (
     <thead>
       <tr className={ className }>
+        <ExpansionHeaderCellComp />
         {
-          (expandRow && expandRow.showExpandColumn)
-            ? <ExpandHeaderCell
-              onAllRowExpand={ expandRow.onAllRowExpand }
-              anyExpands={ expandRow.isAnyExpands }
-              renderer={ expandRow.expandHeaderColumnRenderer }
-            /> : null
-        }
-        {
-          (selectRow.mode !== ROW_SELECT_DISABLED && !selectRow.hideSelectColumn)
-            ? <SelectionHeaderCell { ...selectRow } /> : null
+          !selectRow.hideSelectColumn ?
+            <SelectionHeaderCellComp /> : null
         }
         {
           columns.map((column, i) => {

packages/react-bootstrap-table2/src/props-resolver/expand-row-resolver.js

@@ -1,17 +0,0 @@
-export default ExtendBase =>
-  class ExpandRowResolver extends ExtendBase {
-    resolveExpandRowProps() {
-      const { expandRow, expanded, onRowExpand, onAllRowExpand, isAnyExpands } = this.props;
-      if (expandRow) {
-        return {
-          ...expandRow,
-          expanded,
-          onRowExpand,
-          onAllRowExpand,
-          isAnyExpands,
-          nonExpandable: expandRow.nonExpandable || []
-        };
-      }
-      return null;
-    }
-  };

packages/react-bootstrap-table2/src/props-resolver/index.js

@@ -1,11 +1,7 @@
 import ColumnResolver from './column-resolver';
-import ExpandRowResolver from './expand-row-resolver';
-import Const from '../const';
-import _ from '../utils';
 
 export default ExtendBase =>
-  class TableResolver extends
-    ExpandRowResolver(ColumnResolver(ExtendBase)) {
+  class TableResolver extends ColumnResolver(ExtendBase) {
     validateProps() {
       const { keyField } = this.props;
       if (!keyField) {
@@ -19,63 +15,4 @@ export default ExtendBase =>
     isEmpty() {
       return this.props.data.length === 0;
     }
-
-    /**
-     * props resolver for cell selection
-     * @param {Object} options - addtional options like callback which are about to merge into props
-     *
-     * @returns {Object} result - props for cell selections
-     * @returns {String} result.mode - input type of row selection or disabled.
-     */
-    resolveSelectRowProps(options) {
-      const { selectRow } = this.props;
-      const { ROW_SELECT_DISABLED } = Const;
-
-      if (_.isDefined(selectRow)) {
-        return {
-          ...selectRow,
-          ...options
-        };
-      }
-
-      return {
-        mode: ROW_SELECT_DISABLED
-      };
-    }
-
-    /**
-     * props resolver for header cell selection
-     * @param {Object} options - addtional options like callback which are about to merge into props
-     *
-     * @returns {Object} result - props for cell selections
-     * @returns {String} result.mode - input type of row selection or disabled.
-     * @returns {String} result.checkedStatus - checkbox status depending on selected rows counts
-     */
-    resolveSelectRowPropsForHeader(options = {}) {
-      const { selectRow } = this.props;
-      const { allRowsSelected, allRowsNotSelected, ...rest } = options;
-      const {
-        ROW_SELECT_DISABLED, CHECKBOX_STATUS_CHECKED,
-        CHECKBOX_STATUS_INDETERMINATE, CHECKBOX_STATUS_UNCHECKED
-      } = Const;
-
-      if (_.isDefined(selectRow)) {
-        let checkedStatus;
-
-        // checkbox status depending on selected rows counts
-        if (allRowsSelected) checkedStatus = CHECKBOX_STATUS_CHECKED;
-        else if (allRowsNotSelected) checkedStatus = CHECKBOX_STATUS_UNCHECKED;
-        else checkedStatus = CHECKBOX_STATUS_INDETERMINATE;
-
-        return {
-          ...selectRow,
-          ...rest,
-          checkedStatus
-        };
-      }
-
-      return {
-        mode: ROW_SELECT_DISABLED
-      };
-    }
   };

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

@@ -12,7 +12,8 @@ export default class ExpandCell extends Component {
     expanded: PropTypes.bool.isRequired,
     onRowExpand: PropTypes.func.isRequired,
     expandColumnRenderer: PropTypes.func,
-    rowIndex: PropTypes.number
+    rowIndex: PropTypes.number,
+    tabIndex: PropTypes.number
   }
 
   constructor() {
@@ -20,17 +21,29 @@ export default class ExpandCell extends Component {
     this.handleClick = this.handleClick.bind(this);
   }
 
+  shouldComponentUpdate(nextProps) {
+    const shouldUpdate =
+      this.props.rowIndex !== nextProps.rowIndex ||
+      this.props.expanded !== nextProps.expanded ||
+      this.props.rowKey !== nextProps.rowKey ||
+      this.props.tabIndex !== nextProps.tabIndex;
+
+    return shouldUpdate;
+  }
+
   handleClick(e) {
     const { rowKey, expanded, onRowExpand, rowIndex } = this.props;
 
-    onRowExpand(rowKey, expanded, rowIndex, e);
+    onRowExpand(rowKey, !expanded, rowIndex, e);
   }
 
   render() {
-    const { expanded, expandColumnRenderer } = this.props;
+    const { expanded, expandColumnRenderer, tabIndex } = this.props;
+    const attrs = {};
+    if (tabIndex !== -1) attrs.tabIndex = tabIndex;
 
     return (
-      <td onClick={ this.handleClick }>
+      <td onClick={ this.handleClick } { ...attrs }>
         {
           expandColumnRenderer ? expandColumnRenderer({
             expanded

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

@@ -0,0 +1,8 @@
+import React from 'react';
+import ExpansionContext from '../contexts/row-expand-context';
+
+export default Component => () => (
+  <ExpansionContext.Consumer>
+    { expandRow => <Component { ...expandRow } /> }
+  </ExpansionContext.Consumer>
+);

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

@@ -3,11 +3,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
-export default class SelectionHeaderCell extends Component {
+export default class ExpansionHeaderCell extends Component {
   static propTypes = {
-    anyExpands: PropTypes.bool.isRequired,
+    isAnyExpands: PropTypes.bool.isRequired,
     onAllRowExpand: PropTypes.func.isRequired,
-    renderer: PropTypes.func
+    expandHeaderColumnRenderer: PropTypes.func
   }
 
   constructor() {
@@ -16,13 +16,13 @@ export default class SelectionHeaderCell extends Component {
   }
 
   handleCheckBoxClick(e) {
-    const { anyExpands, onAllRowExpand } = this.props;
+    const { isAnyExpands, onAllRowExpand } = this.props;
 
-    onAllRowExpand(e, !anyExpands);
+    onAllRowExpand(e, !isAnyExpands);
   }
 
   render() {
-    const { anyExpands, renderer } = this.props;
+    const { isAnyExpands, expandHeaderColumnRenderer } = this.props;
     const attrs = {
       onClick: this.handleCheckBoxClick
     };
@@ -30,9 +30,9 @@ export default class SelectionHeaderCell extends Component {
     return (
       <th data-row-selection { ...attrs }>
         {
-          renderer ?
-            renderer({ isAnyExpands: anyExpands }) :
-            (anyExpands ? '(-)' : '(+)')
+          expandHeaderColumnRenderer ?
+            expandHeaderColumnRenderer({ isAnyExpands }) :
+            (isAnyExpands ? '(-)' : '(+)')
         }
       </th>
     );

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

@@ -0,0 +1,34 @@
+/* eslint react/prop-types: 0 */
+import React from 'react';
+import ExpandRow from './expand-row';
+import ExpansionContext from '../contexts/row-expand-context';
+
+export default (Component, visibleColumnSize) => {
+  const renderWithExpansion = (props, expandRow) => {
+    const key = props.value;
+
+    const expanded = expandRow.expanded.includes(key);
+    const expandable = !expandRow.nonExpandable || !expandRow.nonExpandable.includes(key);
+
+    return [
+      <Component
+        { ...props }
+        key={ key }
+        expanded={ expanded }
+        expandable={ expandable }
+        expandRow={ { ...expandRow } }
+      />,
+      expanded ? <ExpandRow
+        key={ `${key}-expanding` }
+        colSpan={ visibleColumnSize }
+      >
+        { expandRow.renderer(props.row) }
+      </ExpandRow> : null
+    ];
+  };
+  return props => (
+    <ExpansionContext.Consumer>
+      { expandRow => renderWithExpansion(props, expandRow) }
+    </ExpansionContext.Consumer>
+  );
+};

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

@@ -0,0 +1,63 @@
+/* eslint react/prop-types: 0 */
+import React from 'react';
+import cs from 'classnames';
+import _ from '../utils';
+import SelectionContext from '../contexts/selection-context';
+
+export default (Component) => {
+  const renderWithSelection = (props, selectRow) => {
+    const key = props.value;
+    const selected = selectRow.selected.includes(key);
+    const selectable = !selectRow.nonSelectable || !selectRow.nonSelectable.includes(key);
+
+    let {
+      style,
+      className
+    } = props;
+
+    if (selected) {
+      const selectedStyle = _.isFunction(selectRow.style)
+        ? selectRow.style(props.row, props.rowIndex)
+        : selectRow.style;
+
+      const selectedClasses = _.isFunction(selectRow.classes)
+        ? selectRow.classes(props.row, props.rowIndex)
+        : selectRow.classes;
+
+      style = {
+        ...style,
+        ...selectedStyle
+      };
+      className = cs(className, selectedClasses) || undefined;
+
+      if (selectRow.bgColor) {
+        style = style || {};
+        style.backgroundColor = _.isFunction(selectRow.bgColor)
+          ? selectRow.bgColor(props.row, props.rowIndex)
+          : selectRow.bgColor;
+      }
+    }
+
+    return (
+      <Component
+        { ...props }
+        style={ style }
+        className={ className }
+        selectRow={ selectRow }
+        selected={ selected }
+        selectable={ selectable }
+      />
+    );
+  };
+
+  function withConsumer(props) {
+    return (
+      <SelectionContext.Consumer>
+        { selectRow => renderWithSelection(props, selectRow) }
+      </SelectionContext.Consumer>
+    );
+  }
+
+  withConsumer.displayName = 'WithSelectionRowConsumer';
+  return withConsumer;
+};

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

@@ -15,6 +15,7 @@ export default class SelectionCell extends Component {
     onRowSelect: PropTypes.func,
     disabled: PropTypes.bool,
     rowIndex: PropTypes.number,
+    tabIndex: PropTypes.number,
     clickToSelect: PropTypes.bool,
     selectionRenderer: PropTypes.func
   }
@@ -25,9 +26,14 @@ export default class SelectionCell extends Component {
   }
 
   shouldComponentUpdate(nextProps) {
-    const { selected } = this.props;
+    const shouldUpdate =
+      this.props.rowIndex !== nextProps.rowIndex ||
+      this.props.selected !== nextProps.selected ||
+      this.props.disabled !== nextProps.disabled ||
+      this.props.rowKey !== nextProps.rowKey ||
+      this.props.tabIndex !== nextProps.tabIndex;
 
-    return nextProps.selected !== selected;
+    return shouldUpdate;
   }
 
   handleClick(e) {
@@ -56,14 +62,18 @@ export default class SelectionCell extends Component {
       mode: inputType,
       selected,
       disabled,
+      tabIndex,
       selectionRenderer
     } = this.props;
 
+    const attrs = {};
+    if (tabIndex !== -1) attrs.tabIndex = tabIndex;
+
     return (
       <BootstrapContext.Consumer>
         {
           ({ bootstrap4 }) => (
-            <td onClick={ this.handleClick }>
+            <td onClick={ this.handleClick } { ...attrs }>
               {
                 selectionRenderer ? selectionRenderer({
                   mode: inputType,

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

@@ -0,0 +1,8 @@
+import React from 'react';
+import SelectionContext from '../contexts/selection-context';
+
+export default Component => () => (
+  <SelectionContext.Consumer>
+    { selectRow => <Component { ...selectRow } /> }
+  </SelectionContext.Consumer>
+);

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

@@ -1,183 +0,0 @@
-/* eslint react/prop-types: 0 */
-/* eslint react/no-array-index-key: 0 */
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-import _ from './utils';
-import Cell from './cell';
-import SelectionCell from './row-selection/selection-cell';
-import ExpandCell from './row-expand/expand-cell';
-import eventDelegater from './row-event-delegater';
-import Const from './const';
-
-class Row extends eventDelegater(Component) {
-  render() {
-    const {
-      row,
-      columns,
-      keyField,
-      rowIndex,
-      className,
-      style,
-      attrs,
-      cellEdit,
-      selected,
-      selectRow,
-      expanded,
-      expandRow,
-      selectable,
-      editable: editableRow
-    } = this.props;
-
-    const {
-      mode,
-      onStart,
-      EditingCell,
-      ridx: editingRowIdx,
-      cidx: editingColIdx,
-      CLICK_TO_CELL_EDIT,
-      DBCLICK_TO_CELL_EDIT,
-      ...rest
-    } = cellEdit;
-
-    const key = _.get(row, keyField);
-    const { hideSelectColumn } = selectRow;
-    const { showExpandColumn } = expandRow || {};
-    const trAttrs = this.delegate(attrs);
-
-    return (
-      <tr style={ style } className={ className } { ...trAttrs }>
-        {
-          showExpandColumn ? (
-            <ExpandCell
-              { ...expandRow }
-              rowKey={ key }
-              rowIndex={ rowIndex }
-              expanded={ expanded }
-            />
-          ) : null
-        }
-        {
-          (selectRow.mode !== Const.ROW_SELECT_DISABLED && !hideSelectColumn)
-            ? (
-              <SelectionCell
-                { ...selectRow }
-                rowKey={ key }
-                rowIndex={ rowIndex }
-                selected={ selected }
-                disabled={ !selectable }
-              />
-            )
-            : null
-        }
-        {
-          columns.map((column, index) => {
-            if (!column.hidden) {
-              const { dataField } = column;
-              const content = _.get(row, dataField);
-              let editable = _.isDefined(column.editable) ? column.editable : true;
-              if (dataField === keyField || !editableRow) editable = false;
-              if (_.isFunction(column.editable)) {
-                editable = column.editable(content, row, rowIndex, index);
-              }
-              if (rowIndex === editingRowIdx && index === editingColIdx) {
-                let editCellstyle = column.editCellStyle || {};
-                let editCellclasses = column.editCellClasses;
-                if (_.isFunction(column.editCellStyle)) {
-                  editCellstyle = column.editCellStyle(content, row, rowIndex, index);
-                }
-                if (_.isFunction(column.editCellClasses)) {
-                  editCellclasses = column.editCellClasses(content, row, rowIndex, index);
-                }
-                return (
-                  <EditingCell
-                    key={ `${content}-${index}` }
-                    row={ row }
-                    rowIndex={ rowIndex }
-                    column={ column }
-                    columnIndex={ index }
-                    className={ editCellclasses }
-                    style={ editCellstyle }
-                    { ...rest }
-                  />
-                );
-              }
-              // render cell
-              let cellTitle;
-              let cellStyle = {};
-              const cellAttrs = {
-                ..._.isFunction(column.attrs)
-                  ? column.attrs(content, row, rowIndex, index)
-                  : column.attrs,
-                ...column.events
-              };
-
-              const cellClasses = _.isFunction(column.classes)
-                ? column.classes(content, row, rowIndex, index)
-                : column.classes;
-
-              if (column.style) {
-                cellStyle = _.isFunction(column.style)
-                  ? column.style(content, row, rowIndex, index)
-                  : column.style;
-                cellStyle = Object.assign({}, cellStyle) || {};
-              }
-
-
-              if (column.title) {
-                cellTitle = _.isFunction(column.title)
-                  ? column.title(content, row, rowIndex, index)
-                  : content;
-                cellAttrs.title = cellTitle;
-              }
-
-              if (column.align) {
-                cellStyle.textAlign =
-                  _.isFunction(column.align)
-                    ? column.align(content, row, rowIndex, index)
-                    : column.align;
-              }
-
-              if (cellClasses) cellAttrs.className = cellClasses;
-              if (!_.isEmptyObject(cellStyle)) cellAttrs.style = cellStyle;
-
-              return (
-                <Cell
-                  key={ `${content}-${index}` }
-                  row={ row }
-                  rowIndex={ rowIndex }
-                  columnIndex={ index }
-                  column={ column }
-                  onStart={ onStart }
-                  editable={ editable }
-                  clickToEdit={ mode === CLICK_TO_CELL_EDIT }
-                  dbclickToEdit={ mode === DBCLICK_TO_CELL_EDIT }
-                  { ...cellAttrs }
-                />
-              );
-            }
-            return false;
-          })
-        }
-      </tr>
-    );
-  }
-}
-
-Row.propTypes = {
-  row: PropTypes.object.isRequired,
-  rowIndex: PropTypes.number.isRequired,
-  columns: PropTypes.array.isRequired,
-  style: PropTypes.object,
-  className: PropTypes.string,
-  attrs: PropTypes.object
-};
-
-Row.defaultProps = {
-  editable: true,
-  style: {},
-  className: null,
-  attrs: {}
-};
-
-export default Row;

packages/react-bootstrap-table2/src/row/aggregate-row.js

@@ -0,0 +1,117 @@
+/* eslint react/prop-types: 0 */
+/* eslint no-plusplus: 0 */
+import React from 'react';
+import PropTypes from 'prop-types';
+import _ from '../utils';
+import ExpandCell from '../row-expand/expand-cell';
+import SelectionCell from '../row-selection/selection-cell';
+import shouldUpdater from './should-updater';
+import eventDelegater from './event-delegater';
+import RowPureContent from './row-pure-content';
+
+export default class RowAggregator extends shouldUpdater(eventDelegater(React.Component)) {
+  static propTypes = {
+    attrs: PropTypes.object,
+    style: PropTypes.object
+  }
+
+  static defaultProps = {
+    attrs: {},
+    style: {}
+  }
+
+  constructor(props) {
+    super(props);
+    this.clickNum = 0;
+    this.shouldUpdateRowContent = false;
+    this.createClickEventHandler = this.createClickEventHandler.bind(this);
+  }
+
+  shouldComponentUpdate(nextProps) {
+    if (
+      this.props.selected !== nextProps.selected ||
+      this.props.expanded !== nextProps.expanded ||
+      this.props.selectable !== nextProps.selectable ||
+      this.shouldUpdatedBySelfProps(nextProps)
+    ) {
+      this.shouldUpdateRowContent = this.shouldUpdateChild(nextProps);
+      return true;
+    }
+    this.shouldUpdateRowContent = this.shouldUpdateChild(nextProps);
+
+    return this.shouldUpdateRowContent;
+  }
+
+  render() {
+    const {
+      row,
+      columns,
+      keyField,
+      rowIndex,
+      style,
+      className,
+      attrs,
+      selectRow,
+      expandRow,
+      expanded,
+      selected,
+      selectable,
+      visibleColumnSize,
+      tabIndexCell,
+      ...rest
+    } = this.props;
+    const key = _.get(row, keyField);
+    const { hideSelectColumn, clickToSelect } = selectRow;
+    const { showExpandColumn } = expandRow;
+
+    const newAttrs = this.delegate({ ...attrs });
+    if (clickToSelect || !!expandRow.renderer) {
+      newAttrs.onClick = this.createClickEventHandler(newAttrs.onClick);
+    }
+
+    let tabIndexStart = (rowIndex * visibleColumnSize) + 1;
+
+    return (
+      <tr
+        style={ style }
+        className={ className }
+        { ...newAttrs }
+      >
+        {
+          showExpandColumn ? (
+            <ExpandCell
+              { ...expandRow }
+              rowKey={ key }
+              rowIndex={ rowIndex }
+              expanded={ expanded }
+              tabIndex={ tabIndexCell ? tabIndexStart++ : -1 }
+            />
+          ) : null
+        }
+        {
+          !hideSelectColumn
+            ? (
+              <SelectionCell
+                { ...selectRow }
+                rowKey={ key }
+                rowIndex={ rowIndex }
+                selected={ selected }
+                disabled={ !selectable }
+                tabIndex={ tabIndexCell ? tabIndexStart++ : -1 }
+              />
+            )
+            : null
+        }
+        <RowPureContent
+          row={ row }
+          columns={ columns }
+          keyField={ keyField }
+          rowIndex={ rowIndex }
+          shouldUpdate={ this.shouldUpdateRowContent }
+          tabIndexStart={ tabIndexCell ? tabIndexStart : -1 }
+          { ...rest }
+        />
+      </tr>
+    );
+  }
+}

packages/react-bootstrap-table2/src/row/event-delegater.js

@@ -1,5 +1,5 @@
-import _ from './utils';
-import Const from './const';
+import _ from '../utils';
+import Const from '../const';
 
 const events = [
   'onClick',
@@ -18,13 +18,6 @@ export default ExtendBase =>
       this.createClickEventHandler = this.createClickEventHandler.bind(this);
     }
 
-    createDefaultEventHandler(cb) {
-      return (e) => {
-        const { row, rowIndex } = this.props;
-        cb(e, row, rowIndex);
-      };
-    }
-
     createClickEventHandler(cb) {
       return (e) => {
         const {
@@ -37,27 +30,27 @@ export default ExtendBase =>
           expanded,
           expandRow,
           selectRow,
-          cellEdit: {
-            mode,
-            DBCLICK_TO_CELL_EDIT,
-            DELAY_FOR_DBCLICK
-          }
+          DELAY_FOR_DBCLICK
         } = this.props;
-
         const clickFn = () => {
           if (cb) {
             cb(e, row, rowIndex);
           }
           const key = _.get(row, keyField);
-          if (expandRow && expandable) {
-            expandRow.onRowExpand(key, !expanded, rowIndex, e);
+          if (expandRow && expandable && !expandRow.expandByColumnOnly) {
+            if (
+              (selectRow.mode !== Const.ROW_SELECT_DISABLED && selectRow.clickToExpand) ||
+              selectRow.mode === Const.ROW_SELECT_DISABLED
+            ) {
+              expandRow.onRowExpand(key, !expanded, rowIndex, e);
+            }
           }
-          if (selectRow.mode !== Const.ROW_SELECT_DISABLED && selectable) {
+          if (selectRow.clickToSelect && selectable) {
             selectRow.onRowSelect(key, !selected, rowIndex, e);
           }
         };
 
-        if (mode === DBCLICK_TO_CELL_EDIT && selectRow.clickToEdit) {
+        if (DELAY_FOR_DBCLICK) {
           this.clickNum += 1;
           _.debounce(() => {
             if (this.clickNum === 1) {
@@ -71,19 +64,18 @@ export default ExtendBase =>
       };
     }
 
+    createDefaultEventHandler(cb) {
+      return (e) => {
+        const { row, rowIndex } = this.props;
+        cb(e, row, rowIndex);
+      };
+    }
+
     delegate(attrs = {}) {
-      const newAttrs = {};
-      const { expandRow, selectRow } = this.props;
-      if (expandRow || (selectRow && selectRow.clickToSelect)) {
-        newAttrs.onClick = this.createClickEventHandler(attrs.onClick);
-      }
+      const newAttrs = { ...attrs };
       Object.keys(attrs).forEach((attr) => {
-        if (!newAttrs[attr]) {
-          if (events.includes(attr)) {
-            newAttrs[attr] = this.createDefaultEventHandler(attrs[attr]);
-          } else {
-            newAttrs[attr] = attrs[attr];
-          }
+        if (events.includes(attr)) {
+          newAttrs[attr] = this.createDefaultEventHandler(attrs[attr]);
         }
       });
       return newAttrs;

packages/react-bootstrap-table2/src/row/row-pure-content.js

@@ -0,0 +1,124 @@
+/* eslint react/prop-types: 0 */
+/* eslint react/no-array-index-key: 0 */
+/* eslint no-plusplus: 0 */
+import React from 'react';
+
+import _ from '../utils';
+import Cell from '../cell';
+
+export default class RowPureContent extends React.Component {
+  shouldComponentUpdate(nextProps) {
+    if (typeof nextProps.shouldUpdate !== 'undefined') {
+      return nextProps.shouldUpdate;
+    }
+    return true;
+  }
+
+  render() {
+    const {
+      row,
+      keyField,
+      columns,
+      rowIndex,
+      editable,
+      editingRowIdx,
+      editingColIdx,
+      onStart,
+      clickToEdit,
+      dbclickToEdit,
+      EditingCellComponent,
+      tabIndexStart
+    } = this.props;
+
+    let tabIndex = tabIndexStart;
+
+    return columns.map((column, index) => {
+      if (!column.hidden) {
+        const { dataField } = column;
+        const content = _.get(row, dataField);
+        if (rowIndex === editingRowIdx && index === editingColIdx) {
+          return (
+            <EditingCellComponent
+              key={ `${content}-${index}-editing` }
+              row={ row }
+              rowIndex={ rowIndex }
+              column={ column }
+              columnIndex={ index }
+            />
+          );
+        }
+        // render cell
+        let cellTitle;
+        let cellStyle = {};
+        let cellAttrs = {
+          ..._.isFunction(column.attrs)
+            ? column.attrs(content, row, rowIndex, index)
+            : column.attrs
+        };
+
+        if (column.events) {
+          const events = Object.assign({}, column.events);
+          Object.keys(Object.assign({}, column.events)).forEach((key) => {
+            const originFn = events[key];
+            events[key] = (...rest) => originFn(...rest, row, rowIndex);
+          });
+          cellAttrs = { ...cellAttrs, ...events };
+        }
+
+        const cellClasses = _.isFunction(column.classes)
+          ? column.classes(content, row, rowIndex, index)
+          : column.classes;
+
+        if (column.style) {
+          cellStyle = _.isFunction(column.style)
+            ? column.style(content, row, rowIndex, index)
+            : column.style;
+          cellStyle = Object.assign({}, cellStyle) || {};
+        }
+
+        if (column.title) {
+          cellTitle = _.isFunction(column.title)
+            ? column.title(content, row, rowIndex, index)
+            : content;
+          cellAttrs.title = cellTitle;
+        }
+
+        if (column.align) {
+          cellStyle.textAlign =
+            _.isFunction(column.align)
+              ? column.align(content, row, rowIndex, index)
+              : column.align;
+        }
+
+        if (cellClasses) cellAttrs.className = cellClasses;
+        if (!_.isEmptyObject(cellStyle)) cellAttrs.style = cellStyle;
+
+        let editableCell = _.isDefined(column.editable) ? column.editable : true;
+        if (column.dataField === keyField || !editable) editableCell = false;
+        if (_.isFunction(column.editable)) {
+          editableCell = column.editable(content, row, rowIndex, index);
+        }
+
+        if (tabIndexStart !== -1) {
+          cellAttrs.tabIndex = tabIndex++;
+        }
+
+        return (
+          <Cell
+            key={ `${content}-${index}` }
+            row={ row }
+            editable={ editableCell }
+            rowIndex={ rowIndex }
+            columnIndex={ index }
+            column={ column }
+            onStart={ onStart }
+            clickToEdit={ clickToEdit }
+            dbclickToEdit={ dbclickToEdit }
+            { ...cellAttrs }
+          />
+        );
+      }
+      return false;
+    });
+  }
+}

packages/react-bootstrap-table2/src/row/should-updater.js

@@ -0,0 +1,37 @@
+/* eslint react/prop-types: 0 */
+import _ from '../utils';
+
+export default ExtendBase =>
+  class RowShouldUpdater extends ExtendBase {
+    shouldUpdateByCellEditing(nextProps) {
+      if (!(this.props.clickToEdit || this.props.dbclickToEdit)) return false;
+      return (
+        nextProps.editingRowIdx === nextProps.rowIndex ||
+        (this.props.editingRowIdx === nextProps.rowIndex &&
+        nextProps.editingRowIdx === null)
+      );
+    }
+
+    shouldUpdatedBySelfProps(nextProps) {
+      return (
+        this.props.className !== nextProps.className ||
+        !_.isEqual(this.props.style, nextProps.style) ||
+        !_.isEqual(this.props.attrs, nextProps.attrs)
+      );
+    }
+
+    shouldUpdatedByNormalProps(nextProps) {
+      const shouldUpdate =
+        this.props.rowIndex !== nextProps.rowIndex ||
+        this.props.editable !== nextProps.editable ||
+        !_.isEqual(this.props.row, nextProps.row) ||
+        this.props.columns.length !== nextProps.columns.length;
+
+      return shouldUpdate;
+    }
+
+    shouldUpdateChild(nextProps) {
+      return this.shouldUpdateByCellEditing(nextProps) ||
+        this.shouldUpdatedByNormalProps(nextProps);
+    }
+  };

packages/react-bootstrap-table2/src/row/simple-row.js

@@ -0,0 +1,64 @@
+/* eslint react/prop-types: 0 */
+/* eslint react/no-array-index-key: 0 */
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+
+import RowPureContent from './row-pure-content';
+import eventDelegater from './event-delegater';
+import shouldUpdater from './should-updater';
+
+class SimpleRow extends shouldUpdater(eventDelegater(Component)) {
+  constructor(props) {
+    super(props);
+    this.shouldUpdateRowContent = false;
+  }
+
+  shouldComponentUpdate(nextProps) {
+    this.shouldUpdateRowContent = false;
+    this.shouldUpdateRowContent = this.shouldUpdateChild(nextProps);
+    if (this.shouldUpdateRowContent) return true;
+
+    return this.shouldUpdatedBySelfProps(nextProps);
+  }
+
+  render() {
+    const {
+      className,
+      style,
+      attrs,
+      visibleColumnSize,
+      tabIndexCell,
+      ...rest
+    } = this.props;
+    const trAttrs = this.delegate(attrs);
+    const tabIndexStart = (this.props.rowIndex * visibleColumnSize) + 1;
+
+    return (
+      <tr style={ style } className={ className } { ...trAttrs }>
+        <RowPureContent
+          shouldUpdate={ this.shouldUpdateRowContent }
+          tabIndexStart={ tabIndexCell ? tabIndexStart : -1 }
+          { ...rest }
+        />
+      </tr>
+    );
+  }
+}
+
+SimpleRow.propTypes = {
+  row: PropTypes.object.isRequired,
+  rowIndex: PropTypes.number.isRequired,
+  columns: PropTypes.array.isRequired,
+  style: PropTypes.object,
+  className: PropTypes.string,
+  attrs: PropTypes.object
+};
+
+SimpleRow.defaultProps = {
+  editable: true,
+  style: {},
+  className: null,
+  attrs: {}
+};
+
+export default SimpleRow;

packages/react-bootstrap-table2/src/store/selection.js

@@ -6,7 +6,7 @@ export const getSelectionSummary = (
   keyField,
   selected = []
 ) => {
-  let allRowsSelected = true;
+  let allRowsSelected = data.length > 0;
   let allRowsNotSelected = true;
 
   const rowKeys = data.map(d => d[keyField]);

packages/react-bootstrap-table2/test/body.test.js

@@ -1,11 +1,15 @@
+import 'jsdom-global/register';
 import React from 'react';
 import sinon from 'sinon';
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 
 import Body from '../src/body';
-import Row from '../src/row';
+import Row from '../src/row/simple-row';
+import RowAggregator from '../src/row/aggregate-row';
 import Const from '../src/const';
-import RowSection from '../src/row-section';
+import RowSection from '../src/row/row-section';
+import SelectionContext from '../src/contexts/selection-context';
+import ExpansionContext from '../src/contexts/row-expand-context';
 import mockBodyResolvedProps from './test-helpers/mock/body-resolved-props';
 
 describe('Body', () => {
@@ -169,92 +173,6 @@ describe('Body', () => {
         });
       });
     });
-
-    describe('when selectRow.style is defined', () => {
-      const selectedRowKey = data[0][keyField];
-      const selectedRowKeys = [selectedRowKey];
-      const selectedStyle = { backgroundColor: 'green', fontWeight: 'bold' };
-      const selectRow = { mode: 'radio', style: selectedStyle };
-
-      beforeEach(() => {
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            keyField="id"
-            columns={ columns }
-            data={ data }
-            rowStyle={ rowStyle }
-            selectRow={ selectRow }
-            selectedRowKeys={ selectedRowKeys }
-          />);
-      });
-
-      it('should rendering selected Row component with mixing selectRow.style correctly', () => {
-        const selectedRow = wrapper.find(Row).get(0);
-        expect(JSON.stringify(selectedRow.props.style)).toBe(JSON.stringify({
-          ...rowStyle,
-          ...selectedStyle
-        }));
-      });
-
-      describe('and selectRow.bgColor is also defined', () => {
-        beforeEach(() => {
-          selectRow.bgColor = 'gray';
-          wrapper = shallow(
-            <Body
-              { ...mockBodyResolvedProps }
-              keyField="id"
-              columns={ columns }
-              data={ data }
-              rowStyle={ rowStyle }
-              selectRow={ selectRow }
-              selectedRowKeys={ selectedRowKeys }
-            />);
-        });
-
-        it('should rendering selected Row component with mixing selectRow.style correctly', () => {
-          const selectedRow = wrapper.find(Row).get(0);
-          expect(JSON.stringify(selectedRow.props.style)).toBe(JSON.stringify({
-            ...rowStyle,
-            ...selectedStyle,
-            backgroundColor: selectRow.bgColor
-          }));
-        });
-
-        it('should render selected Row component with correct style.backgroundColor', () => {
-          const selectedRow = wrapper.find(Row).get(0);
-          expect(selectedRow.props.style.backgroundColor).toEqual(selectRow.bgColor);
-        });
-      });
-    });
-
-    describe('when selectRow.bgColor is defined', () => {
-      const selectedRowKey = data[0][keyField];
-      const selectedRowKeys = [selectedRowKey];
-      const selectRow = { mode: 'radio', bgColor: 'gray' };
-
-      beforeEach(() => {
-        selectRow.bgColor = 'gray';
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            keyField="id"
-            columns={ columns }
-            data={ data }
-            rowStyle={ rowStyle }
-            selectRow={ selectRow }
-            selectedRowKeys={ selectedRowKeys }
-          />);
-      });
-
-      it('should rendering selected Row component with correct style', () => {
-        const selectedRow = wrapper.find(Row).get(0);
-        expect(JSON.stringify(selectedRow.props.style)).toBe(JSON.stringify({
-          ...rowStyle,
-          backgroundColor: selectRow.bgColor
-        }));
-      });
-    });
   });
 
   describe('when rowClasses prop is defined', () => {
@@ -310,31 +228,6 @@ describe('Body', () => {
         });
       });
     });
-
-    describe('when selectRow.classes is defined', () => {
-      const selectedRowKey = data[0][keyField];
-      const selectedRowKeys = [selectedRowKey];
-      const selectedClasses = 'selected-classes';
-      const selectRow = { mode: 'radio', classes: selectedClasses };
-
-      beforeEach(() => {
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            keyField="id"
-            columns={ columns }
-            data={ data }
-            rowClasses={ rowClasses }
-            selectRow={ selectRow }
-            selectedRowKeys={ selectedRowKeys }
-          />);
-      });
-
-      it('should rendering selected Row component with mixing selectRow.classes correctly', () => {
-        const selectedRow = wrapper.find(Row).get(0);
-        expect(selectedRow.props.className).toBe(`${rowClasses} ${selectedClasses}`);
-      });
-    });
   });
 
   describe('when rowEvents prop is defined', () => {
@@ -361,11 +254,14 @@ describe('Body', () => {
     });
   });
 
-  describe('when cellEdit.nonEditableRows props is defined', () => {
-    const nonEditableRows = [data[1].id];
+  describe('when cellEdit.createContext props is defined', () => {
+    const EditingCellComponent = () => null;
+    const RowComponent = props => <Row { ...props } />;
     const cellEdit = {
-      mode: Const.CLICK_TO_CELL_EDIT,
-      nonEditableRows
+      options: { onStartEdit: jest.fn() },
+      createContext: jest.fn(),
+      createEditingCell: jest.fn().mockReturnValue(EditingCellComponent),
+      withRowLevelCellEdit: jest.fn().mockReturnValue(RowComponent)
     };
     beforeEach(() => {
       wrapper = shallow(
@@ -379,259 +275,82 @@ describe('Body', () => {
       );
     });
 
-    it('should render Row component with correct editable prop', () => {
+    it('should render Row Component correctly', () => {
       expect(wrapper.length).toBe(1);
-      const rows = wrapper.find(Row);
-      for (let i = 0; i < rows.length; i += 1) {
-        if (nonEditableRows.indexOf(rows.get(i).props.row[keyField]) > -1) {
-          expect(rows.get(i).props.editable).toBeFalsy();
-        } else {
-          expect(rows.get(i).props.editable).toBeTruthy();
-        }
-      }
+      expect(cellEdit.createEditingCell).toHaveBeenCalledTimes(1);
+      expect(cellEdit.withRowLevelCellEdit).toHaveBeenCalledTimes(1);
+      expect(wrapper.find(RowComponent)).toHaveLength(2);
+      const aRowElement = wrapper.find(RowComponent).get(0);
+      expect(aRowElement.props.EditingCellComponent).toBeDefined();
     });
   });
 
-  describe('when selectRow.mode is checkbox or radio (row was selectable)', () => {
+  describe('when selectRow.mode is ROW_SELECT_DISABLED or expandRow.renderer is undefined', () => {
+    beforeEach(() => {
+      wrapper = shallow(
+        <Body
+          { ...mockBodyResolvedProps }
+          data={ data }
+          columns={ columns }
+          keyField={ keyField }
+        />
+      );
+    });
+
+    it('shouldn\'t render RowAggregator component', () => {
+      expect(wrapper.find(RowAggregator)).toHaveLength(0);
+    });
+  });
+
+  describe('when selectRow.mode is defined correctly', () => {
     const selectRow = { mode: 'checkbox' };
-    const selectedRowKey = data[0][keyField];
-    const selectedRowKeys = [selectedRowKey];
 
     beforeEach(() => {
-      wrapper = shallow(
-        <Body
-          { ...mockBodyResolvedProps }
-          data={ data }
-          columns={ columns }
-          keyField={ keyField }
-          selectedRowKeys={ selectedRowKeys }
-          selectRow={ selectRow }
-        />
+      wrapper = mount(
+        <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+          <Body
+            { ...mockBodyResolvedProps }
+            data={ data }
+            columns={ columns }
+            keyField={ keyField }
+            selectRow={ selectRow }
+          />
+        </SelectionContext.Provider>
       );
     });
 
-    it('should render Row component with correct selected prop', () => {
-      const rows = wrapper.find(Row);
-      for (let i = 0; i < rows.length; i += 1) {
-        const row = rows.get(i);
-        expect(row.props.selected).toBe(selectedRowKeys.indexOf(row.props.row[keyField]) > -1);
-      }
-    });
+    it('should render RowAggregator component correctly', () => {
+      const rowAggregator = wrapper.find(RowAggregator);
 
-    describe('if selectRow.style is defined as an object', () => {
-      const style = { backgroundColor: 'red' };
-
-      beforeEach(() => {
-        selectRow.style = style;
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            data={ data }
-            columns={ columns }
-            keyField={ keyField }
-            selectedRowKeys={ selectedRowKeys }
-            selectRow={ selectRow }
-          />
-        );
-      });
-
-      it('should render Row component with correct style prop', () => {
-        expect(JSON.stringify(wrapper.find(Row).get(0).props.style)).toBe(JSON.stringify(style));
-      });
-    });
-
-    describe('if selectRow.style is defined as a function', () => {
-      const style = { backgroundColor: 'red' };
-      const styleCallBack = sinon.stub().returns(style);
-
-      beforeEach(() => {
-        selectRow.style = styleCallBack;
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            data={ data }
-            columns={ columns }
-            keyField={ keyField }
-            selectedRowKeys={ selectedRowKeys }
-            selectRow={ selectRow }
-          />
-        );
-      });
-
-      it('should calling style callback correctly', () => {
-        expect(styleCallBack.callCount).toBe(1);
-        expect(styleCallBack.calledWith(data[0]), 1);
-      });
-
-      it('should render Row component with correct style prop', () => {
-        expect(JSON.stringify(wrapper.find(Row).get(0).props.style)).toBe(JSON.stringify(style));
-      });
-    });
-
-    describe('if selectRow.classes is defined as a string', () => {
-      const className = 'custom-class';
-
-      beforeEach(() => {
-        selectRow.classes = className;
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            data={ data }
-            columns={ columns }
-            keyField={ keyField }
-            selectedRowKeys={ selectedRowKeys }
-            selectRow={ selectRow }
-          />
-        );
-      });
-
-      it('should render Row component with correct className prop', () => {
-        expect(wrapper.find(Row).get(0).props.className).toEqual(className);
-      });
-    });
-
-    describe('if selectRow.classes is defined as a function', () => {
-      const className = 'custom-class';
-      const classesCallBack = sinon.stub().returns(className);
-
-      beforeEach(() => {
-        selectRow.classes = classesCallBack;
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            data={ data }
-            columns={ columns }
-            keyField={ keyField }
-            selectedRowKeys={ selectedRowKeys }
-            selectRow={ selectRow }
-          />
-        );
-      });
-
-      it('should calling style callback correctly', () => {
-        expect(classesCallBack.callCount).toBe(1);
-        expect(classesCallBack.calledWith(data[0]), 1);
-      });
-
-      it('should render Row component with correct style prop', () => {
-        expect(wrapper.find(Row).get(0).props.className).toEqual(className);
-      });
-    });
-
-    describe('if selectRow.bgColor is defined as a string', () => {
-      const bgColor = 'red';
-
-      beforeEach(() => {
-        selectRow.bgColor = bgColor;
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            data={ data }
-            columns={ columns }
-            keyField={ keyField }
-            selectedRowKeys={ selectedRowKeys }
-            selectRow={ selectRow }
-          />
-        );
-      });
-
-      it('should render Row component with correct style.backgroundColor prop', () => {
-        expect(wrapper.find(Row).get(0).props.style).toEqual({ backgroundColor: bgColor });
-      });
-    });
-
-    describe('if selectRow.bgColor is defined as a string', () => {
-      const bgColor = 'red';
-      const bgColorCallBack = sinon.stub().returns(bgColor);
-
-      beforeEach(() => {
-        selectRow.bgColor = bgColorCallBack;
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            data={ data }
-            columns={ columns }
-            keyField={ keyField }
-            selectedRowKeys={ selectedRowKeys }
-            selectRow={ selectRow }
-          />
-        );
-      });
-
-      it('should calling selectRow.bgColor callback correctly', () => {
-        expect(bgColorCallBack.calledOnce).toBeTruthy();
-        expect(bgColorCallBack.calledWith(data[0]), 1).toBeTruthy();
-      });
-
-      it('should render Row component with correct style.backgroundColor prop', () => {
-        expect(wrapper.find(Row).get(0).props.style).toEqual({ backgroundColor: bgColor });
-      });
-    });
-
-    describe('if selectRow.bgColor defined and selectRow.style.backgroundColor defined', () => {
-      const bgColor = 'yellow';
-      const style = { backgroundColor: 'red' };
-
-      beforeEach(() => {
-        selectRow.style = style;
-        selectRow.bgColor = bgColor;
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            data={ data }
-            columns={ columns }
-            keyField={ keyField }
-            selectedRowKeys={ selectedRowKeys }
-            selectRow={ selectRow }
-          />
-        );
-      });
-
-      it('should take selectRow.bgColor as higher priority', () => {
-        expect(wrapper.find(Row).get(0).props.style.backgroundColor).toBe(bgColor);
-      });
-    });
-
-    describe('if selectRow.nonSelectable is defined', () => {
-      const nonSelectableRowIndex = 1;
-      const nonSelectable = [data[nonSelectableRowIndex][keyField]];
-
-      beforeEach(() => {
-        selectRow.nonSelectable = nonSelectable;
-        wrapper = shallow(
-          <Body
-            { ...mockBodyResolvedProps }
-            data={ data }
-            columns={ columns }
-            keyField={ keyField }
-            selectedRowKeys={ selectedRowKeys }
-            selectRow={ selectRow }
-          />
-        );
-      });
-
-      it('should render Row component with correct selectable prop', () => {
-        expect(wrapper.find(Row).get(0).props.selectable).toBeTruthy();
-        expect(wrapper.find(Row).get(nonSelectableRowIndex).props.selectable).toBeFalsy();
-      });
+      expect(rowAggregator.get(0).props.selectRow.mode)
+        .not.toEqual(Const.ROW_SELECT_DISABLED);
+      expect(rowAggregator.get(0).props.selected).toBeDefined();
+      expect(rowAggregator.get(0).props.selectable).toBeDefined();
     });
   });
 
-  describe('when selectRow.mode is ROW_SELECT_DISABLED (row was un-selectable)', () => {
+  describe('when expandRow.renderer is defined correctly', () => {
+    const expandRow = { renderer: jest.fn() };
+
     beforeEach(() => {
-      wrapper = shallow(
-        <Body
-          { ...mockBodyResolvedProps }
-          data={ data }
-          columns={ columns }
-          keyField={ keyField }
-          selectedRowKeys={ [] }
-        />
+      wrapper = mount(
+        <ExpansionContext.Provider data={ data } keyField={ keyField } expandRow={ expandRow }>
+          <Body
+            { ...mockBodyResolvedProps }
+            data={ data }
+            columns={ columns }
+            keyField={ keyField }
+            expandRow={ expandRow }
+          />
+        </ExpansionContext.Provider>
       );
     });
 
-    it('prop selected should be null', () => {
-      expect(wrapper.find(Row).get(0).props.selected).toBeNull();
+    it('should render RowAggregator component correctly', () => {
+      const rowAggregator = wrapper.find(RowAggregator);
+      expect(rowAggregator.get(0).props.expandRow.renderer).toEqual(expandRow.renderer);
+      expect(rowAggregator.get(0).props.expanded).toBeDefined();
+      expect(rowAggregator.get(0).props.expandable).toBeDefined();
     });
   });
 });

packages/react-bootstrap-table2/test/cell.test.js

@@ -198,6 +198,26 @@ describe('Cell', () => {
       });
     });
 
+    describe('when props.tabIndex is change', () => {
+      const column = { dataField: 'name', text: 'Product Name' };
+      beforeEach(() => {
+        props = {
+          row,
+          columnIndex: 1,
+          rowIndex: 1,
+          tabIndex: 5,
+          column
+        };
+        wrapper = shallow(
+          <Cell { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, tabIndex: 2 };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
+      });
+    });
+
     describe('if column.isDummyField is true', () => {
       describe('when content is change', () => {
         const column = { dataField: '', text: 'Product Name', isDummyField: true };

packages/react-bootstrap-table2/test/contexts/index.test.js

@@ -111,7 +111,10 @@ describe('Context', () => {
         createContext: jest.fn().mockReturnValue({
           Provider: CellEditContext.Provider,
           Consumer: CellEditContext.Consumer
-        })
+        }),
+        options: {},
+        createEditingCell: jest.fn().mockReturnValue(() => null),
+        withRowLevelCellEdit: jest.fn().mockReturnValue(() => null)
       };
       wrapper = shallow(
         <BootstrapTable

packages/react-bootstrap-table2/test/contexts/selection-context.test.js

@@ -4,7 +4,7 @@ import { shallow } from 'enzyme';
 
 import dataOperator from '../../src/store/operators';
 import BootstrapTable from '../../src/bootstrap-table';
-import createSelectionContext from '../../src/contexts/selection-context';
+import SelectionContext from '../../src/contexts/selection-context';
 
 describe('DataContext', () => {
   let wrapper;
@@ -42,7 +42,6 @@ describe('DataContext', () => {
   const defaultSelectRow = {
     mode: 'checkbox'
   };
-  const SelectionContext = createSelectionContext(dataOperator);
 
   function shallowContext(selectRow = defaultSelectRow) {
     return (
@@ -81,9 +80,13 @@ describe('DataContext', () => {
     it('should pass correct sort props to children element', () => {
       expect(wrapper.length).toBe(1);
       expect(mockBase).toHaveBeenCalledWith({
+        ...defaultSelectRow,
         selected: wrapper.state().selected,
         onRowSelect: wrapper.instance().handleRowSelect,
-        onAllRowsSelect: wrapper.instance().handleAllRowsSelect
+        onAllRowsSelect: wrapper.instance().handleAllRowsSelect,
+        allRowsNotSelected: true,
+        allRowsSelected: false,
+        checkedStatus: 'unchecked'
       });
     });
   });

packages/react-bootstrap-table2/test/header.test.js

@@ -1,8 +1,12 @@
+import 'jsdom-global/register';
 import React from 'react';
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 
 import HeaderCell from '../src/header-cell';
-import SelectionHeaderCell from '../src//row-selection/selection-header-cell';
+import SelectionHeaderCell from '../src/row-selection/selection-header-cell';
+import ExpandHeaderCell from '../src/row-expand/expand-header-cell';
+import SelectionContext from '../src/contexts/selection-context';
+import ExpansionContext from '../src/contexts/row-expand-context';
 import Header from '../src/header';
 import Const from '../src/const';
 import mockHeaderResolvedProps from './test-helpers/mock/header-resolved-props';
@@ -17,6 +21,16 @@ describe('Header', () => {
     text: 'Name'
   }];
 
+  const data = [{
+    id: 1,
+    name: 'A'
+  }, {
+    id: 2,
+    name: 'B'
+  }];
+
+  const keyField = 'id';
+
   describe('simplest header', () => {
     beforeEach(() => {
       wrapper = shallow(<Header { ...mockHeaderResolvedProps } columns={ columns } />);
@@ -89,12 +103,18 @@ describe('Header', () => {
     describe('when selectRow.mode is radio (single selection)', () => {
       beforeEach(() => {
         const selectRow = { mode: 'radio' };
-        wrapper = shallow(
-          <Header
-            { ...mockHeaderResolvedProps }
-            columns={ columns }
+        wrapper = mount(
+          <SelectionContext.Provider
+            data={ data }
+            keyField={ keyField }
             selectRow={ selectRow }
-          />
+          >
+            <Header
+              { ...mockHeaderResolvedProps }
+              columns={ columns }
+              selectRow={ selectRow }
+            />
+          </SelectionContext.Provider>
         );
       });
 
@@ -105,12 +125,18 @@ describe('Header', () => {
       describe('when selectRow.hideSelectColumn is true', () => {
         beforeEach(() => {
           const selectRow = { mode: 'radio', hideSelectColumn: true };
-          wrapper = shallow(
-            <Header
-              { ...mockHeaderResolvedProps }
-              columns={ columns }
+          wrapper = mount(
+            <SelectionContext.Provider
+              data={ data }
+              keyField={ keyField }
               selectRow={ selectRow }
-            />
+            >
+              <Header
+                { ...mockHeaderResolvedProps }
+                columns={ columns }
+                selectRow={ selectRow }
+              />
+            </SelectionContext.Provider>
           );
         });
 
@@ -146,12 +172,18 @@ describe('Header', () => {
     describe('when selectRow.mode is checkbox (multiple selection)', () => {
       beforeEach(() => {
         const selectRow = { mode: 'checkbox' };
-        wrapper = shallow(
-          <Header
-            { ...mockHeaderResolvedProps }
-            columns={ columns }
+        wrapper = mount(
+          <SelectionContext.Provider
+            data={ data }
+            keyField={ keyField }
             selectRow={ selectRow }
-          />
+          >
+            <Header
+              { ...mockHeaderResolvedProps }
+              columns={ columns }
+              selectRow={ selectRow }
+            />
+          </SelectionContext.Provider>
         );
       });
 
@@ -162,12 +194,18 @@ describe('Header', () => {
       describe('when selectRow.hideSelectColumn is true', () => {
         beforeEach(() => {
           const selectRow = { mode: 'checkbox', hideSelectColumn: true };
-          wrapper = shallow(
-            <Header
-              { ...mockHeaderResolvedProps }
-              columns={ columns }
+          wrapper = mount(
+            <SelectionContext.Provider
+              data={ data }
+              keyField={ keyField }
               selectRow={ selectRow }
-            />
+            >
+              <Header
+                { ...mockHeaderResolvedProps }
+                columns={ columns }
+                selectRow={ selectRow }
+              />
+            </SelectionContext.Provider>
           );
         });
 
@@ -177,4 +215,44 @@ describe('Header', () => {
       });
     });
   });
+
+  describe('expandRow', () => {
+    describe('when expandRow.showExpandColumn is false', () => {
+      beforeEach(() => {
+        wrapper = shallow(
+          <Header
+            { ...mockHeaderResolvedProps }
+            columns={ columns }
+          />
+        );
+      });
+
+      it('should not render <ExpandHeaderCell />', () => {
+        expect(wrapper.find(ExpandHeaderCell).length).toBe(0);
+      });
+    });
+
+    describe('when expandRow.showExpandColumn is true', () => {
+      beforeEach(() => {
+        const expandRow = { renderer: jest.fn(), expanded: [], showExpandColumn: true };
+        wrapper = mount(
+          <ExpansionContext.Provider
+            data={ data }
+            keyField={ keyField }
+            expandRow={ expandRow }
+          >
+            <Header
+              { ...mockHeaderResolvedProps }
+              columns={ columns }
+              expandRow={ expandRow }
+            />
+          </ExpansionContext.Provider>
+        );
+      });
+
+      it('should render <ExpandHeaderCell /> correctly', () => {
+        expect(wrapper.find(ExpandHeaderCell).length).toBe(1);
+      });
+    });
+  });
 });

packages/react-bootstrap-table2/test/props-resolver/index.test.js

@@ -1,10 +1,8 @@
 import React, { Component } from 'react';
-import sinon from 'sinon';
 import { shallow } from 'enzyme';
 
 import { extendTo } from '../test-helpers/mock-component';
 import baseResolver from '../../src/props-resolver/index';
-import Const from '../../src/const';
 
 describe('TableResolver', () => {
   const keyField = 'id';
@@ -71,231 +69,4 @@ describe('TableResolver', () => {
       });
     });
   });
-
-  describe('resolveSelectRowProps', () => {
-    let cellSelectionInfo;
-    let selectRow;
-
-    describe('if selectRow was not defined', () => {
-      beforeEach(() => {
-        const mockElement = React.createElement(BootstrapTableMock, {
-          data, keyField, columns
-        }, null);
-        wrapper = shallow(mockElement);
-        cellSelectionInfo = wrapper.instance().resolveSelectRowProps();
-      });
-
-      it('should return object', () => {
-        expect(cellSelectionInfo).toBeDefined();
-        expect(cellSelectionInfo.constructor).toEqual(Object);
-      });
-
-      it('should contain mode in ROW_SELECT_DISABLED', () => {
-        expect(cellSelectionInfo.mode).toEqual(Const.ROW_SELECT_DISABLED);
-      });
-    });
-
-    describe('if selectRow was defined', () => {
-      describe('when mode was defined', () => {
-        it('should return object which contains ROW_SELECT_SINGLE if mode is radio', () => {
-          selectRow = { mode: 'radio' };
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectRow
-          }, null);
-          wrapper = shallow(mockElement);
-          cellSelectionInfo = wrapper.instance().resolveSelectRowProps();
-
-          expect(cellSelectionInfo).toBeDefined();
-          expect(cellSelectionInfo.constructor).toEqual(Object);
-          expect(cellSelectionInfo.mode).toEqual(Const.ROW_SELECT_SINGLE);
-        });
-
-        it('should return object which contains ROW_SELECT_MULTIPLE if mode is checkbox', () => {
-          selectRow = { mode: 'checkbox' };
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectRow
-          }, null);
-          wrapper = shallow(mockElement);
-          cellSelectionInfo = wrapper.instance().resolveSelectRowProps();
-
-          expect(cellSelectionInfo).toBeDefined();
-          expect(cellSelectionInfo.constructor).toEqual(Object);
-          expect(cellSelectionInfo.mode).toEqual(Const.ROW_SELECT_MULTIPLE);
-        });
-      });
-
-      describe('when options were given', () => {
-        beforeEach(() => {
-          selectRow = {};
-          const mockOptions = {
-            foo: 'test',
-            bar: sinon.stub()
-          };
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectRow
-          }, null);
-          wrapper = shallow(mockElement);
-          cellSelectionInfo = wrapper.instance().resolveSelectRowProps(mockOptions);
-        });
-
-        it('should return object which contain options', () => {
-          expect(cellSelectionInfo).toEqual(expect.objectContaining({
-            foo: 'test',
-            bar: expect.any(Function)
-          }));
-        });
-      });
-    });
-  });
-
-  describe('resolveSelectRowPropsForHeader', () => {
-    let headerCellSelectionInfo;
-    let selectRow;
-
-    beforeEach(() => {
-      const mockElement = React.createElement(BootstrapTableMock, {
-        data, keyField, columns
-      }, null);
-      wrapper = shallow(mockElement);
-      headerCellSelectionInfo = wrapper.instance().resolveSelectRowPropsForHeader();
-    });
-
-    describe('if selectRow was not defined', () => {
-      it('should return object', () => {
-        expect(headerCellSelectionInfo).toBeDefined();
-        expect(headerCellSelectionInfo.constructor).toEqual(Object);
-      });
-
-      it('should contain mode in ROW_SELECT_DISABLED', () => {
-        expect(headerCellSelectionInfo.mode).toEqual(Const.ROW_SELECT_DISABLED);
-      });
-    });
-
-    describe('if selectRow was defined', () => {
-      describe('when mode was defined', () => {
-        it('should return object which contains ROW_SELECT_SINGLE if mode is radio', () => {
-          selectRow = { mode: 'radio' };
-          const selectedRowKeys = [];
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectedRowKeys, selectRow
-          }, null);
-          wrapper = shallow(mockElement);
-          headerCellSelectionInfo = wrapper.instance().resolveSelectRowPropsForHeader();
-
-          expect(headerCellSelectionInfo).toBeDefined();
-          expect(headerCellSelectionInfo.constructor).toEqual(Object);
-          expect(headerCellSelectionInfo.mode).toEqual(Const.ROW_SELECT_SINGLE);
-        });
-
-        it('should return object which contains ROW_SELECT_MULTIPLE if mode is checkbox', () => {
-          selectRow = { mode: 'checkbox' };
-          const selectedRowKeys = [];
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectedRowKeys, selectRow
-          }, null);
-          wrapper = shallow(mockElement);
-          headerCellSelectionInfo = wrapper.instance().resolveSelectRowPropsForHeader();
-
-          expect(headerCellSelectionInfo).toBeDefined();
-          expect(headerCellSelectionInfo.constructor).toEqual(Object);
-          expect(headerCellSelectionInfo.mode).toEqual(Const.ROW_SELECT_MULTIPLE);
-        });
-      });
-
-      describe('when options were given', () => {
-        beforeEach(() => {
-          selectRow = {};
-          const mockOptions = {
-            foo: 'test',
-            bar: sinon.stub(),
-            allRowsSelected: false,
-            selected: []
-          };
-          const selectedRowKeys = [];
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectedRowKeys, selectRow
-          }, null);
-          wrapper = shallow(mockElement);
-          headerCellSelectionInfo = wrapper.instance().resolveSelectRowPropsForHeader(mockOptions);
-        });
-
-        it('should return object which contain specified options', () => {
-          expect(headerCellSelectionInfo).toEqual(expect.objectContaining({
-            foo: 'test',
-            bar: expect.any(Function)
-          }));
-        });
-      });
-
-      describe('if options.allRowsSelected is true', () => {
-        beforeEach(() => {
-          selectRow = {};
-          const selectedRowKeys = [1, 2];
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectRow
-          }, null);
-
-          wrapper = shallow(mockElement);
-
-          headerCellSelectionInfo = wrapper.instance().resolveSelectRowPropsForHeader({
-            allRowsSelected: true,
-            selected: selectedRowKeys
-          });
-        });
-
-        it('should return checkedStatus which eqauls to checked', () => {
-          expect(headerCellSelectionInfo).toEqual(expect.objectContaining({
-            checkedStatus: Const.CHECKBOX_STATUS_CHECKED
-          }));
-        });
-      });
-
-      describe('if options.allRowsSelected and options.allRowsNotSelected both are false', () => {
-        beforeEach(() => {
-          selectRow = {};
-          const selectedRowKeys = [1];
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectRow
-          }, null);
-
-          wrapper = shallow(mockElement);
-          headerCellSelectionInfo = wrapper.instance().resolveSelectRowPropsForHeader({
-            allRowsSelected: false,
-            allRowsNotSelected: false,
-            selected: selectedRowKeys
-          });
-        });
-
-        it('should return checkedStatus which eqauls to indeterminate', () => {
-          expect(headerCellSelectionInfo).toEqual(expect.objectContaining({
-            checkedStatus: Const.CHECKBOX_STATUS_INDETERMINATE
-          }));
-        });
-      });
-
-      describe('if options.allRowsNotSelected is true', () => {
-        beforeEach(() => {
-          selectRow = {};
-          const selectedRowKeys = [];
-          const mockElement = React.createElement(BootstrapTableMock, {
-            data, keyField, columns, selectRow
-          }, null);
-
-          wrapper = shallow(mockElement);
-
-          headerCellSelectionInfo = wrapper.instance().resolveSelectRowPropsForHeader({
-            allRowsSelected: false,
-            allRowsNotSelected: true,
-            selected: selectedRowKeys
-          });
-        });
-
-        it('should return checkedStatus which eqauls to unchecked', () => {
-          expect(headerCellSelectionInfo).toEqual(expect.objectContaining({
-            checkedStatus: Const.CHECKBOX_STATUS_UNCHECKED
-          }));
-        });
-      });
-    });
-  });
 });

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

@@ -0,0 +1,414 @@
+import 'jsdom-global/register';
+import React from 'react';
+import { mount } from 'enzyme';
+
+import SelectionContext from '../../src/contexts/selection-context';
+import withSelectionConsumer from '../../src/row-selection/row-consumer';
+
+describe('withSelectionConsumer', () => {
+  let wrapper;
+  let selectRow;
+  const BaseComponent = () => null;
+  const WithSelectionComponent = withSelectionConsumer(props => <BaseComponent { ...props } />);
+
+  const data = [{
+    id: 1,
+    name: 'A'
+  }, {
+    id: 2,
+    name: 'B'
+  }, {
+    id: 3,
+    name: 'C'
+  }];
+  const rowIndex = 1;
+  const row = data[rowIndex];
+  const keyField = 'id';
+  const value = row[keyField];
+
+  describe('if current row is selected', () => {
+    beforeEach(() => {
+      selectRow = { mode: 'checkbox', selected: [data[rowIndex][keyField]] };
+      wrapper = mount(
+        <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+          <WithSelectionComponent
+            row={ row }
+            value={ value }
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+          />
+        </SelectionContext.Provider>
+      );
+    });
+
+    it('should inject selected prop as true to target component', () => {
+      expect(wrapper.find(BaseComponent)).toHaveLength(1);
+      expect(wrapper.find(BaseComponent).prop('selected')).toBeTruthy();
+    });
+  });
+
+  describe('if current row is not selected', () => {
+    beforeEach(() => {
+      selectRow = { mode: 'checkbox', selected: [] };
+      wrapper = mount(
+        <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+          <WithSelectionComponent
+            row={ row }
+            value={ value }
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+          />
+        </SelectionContext.Provider>
+      );
+    });
+
+    it('should inject selected prop as false to target component', () => {
+      expect(wrapper.find(BaseComponent)).toHaveLength(1);
+      expect(wrapper.find(BaseComponent).prop('selected')).toBeFalsy();
+    });
+  });
+
+  describe('if current row is selectable', () => {
+    beforeEach(() => {
+      selectRow = { mode: 'checkbox', nonSelectable: [] };
+      wrapper = mount(
+        <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+          <WithSelectionComponent
+            row={ row }
+            value={ value }
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+          />
+        </SelectionContext.Provider>
+      );
+    });
+
+    it('should inject selectable prop as true to target component', () => {
+      expect(wrapper.find(BaseComponent)).toHaveLength(1);
+      expect(wrapper.find(BaseComponent).prop('selectable')).toBeTruthy();
+    });
+  });
+
+  describe('if current row is non selectable', () => {
+    beforeEach(() => {
+      selectRow = { mode: 'checkbox', nonSelectable: [data[rowIndex][keyField]] };
+      wrapper = mount(
+        <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+          <WithSelectionComponent
+            row={ row }
+            value={ value }
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+          />
+        </SelectionContext.Provider>
+      );
+    });
+
+    it('should inject selectable prop as false to target component', () => {
+      expect(wrapper.find(BaseComponent)).toHaveLength(1);
+      expect(wrapper.find(BaseComponent).prop('selectable')).toBeFalsy();
+    });
+  });
+
+  describe('if current row is selected', () => {
+    const selectedStyle = { backgroundColor: 'green', fontWeight: 'bold' };
+    describe('when selectRow.style is defined as an object', () => {
+      beforeEach(() => {
+        selectRow = { mode: 'checkbox', selected: [data[rowIndex][keyField]], style: selectedStyle };
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <WithSelectionComponent
+              row={ row }
+              value={ value }
+              keyField={ keyField }
+              rowIndex={ rowIndex }
+            />
+          </SelectionContext.Provider>
+        );
+      });
+
+      it('should inject style prop correctly', () => {
+        expect(wrapper.find(BaseComponent)).toHaveLength(1);
+        expect(wrapper.find(BaseComponent).prop('style')).toEqual(selectedStyle);
+      });
+
+      describe('and props.style is also defined', () => {
+        const componentStype = { fontSize: '16px' };
+        beforeEach(() => {
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <WithSelectionComponent
+                row={ row }
+                value={ value }
+                keyField={ keyField }
+                rowIndex={ rowIndex }
+                style={ componentStype }
+              />
+            </SelectionContext.Provider>
+          );
+        });
+
+        it('should inject style prop correctly', () => {
+          expect(wrapper.find(BaseComponent)).toHaveLength(1);
+          expect(wrapper.find(BaseComponent).prop('style')).toEqual({
+            ...selectedStyle,
+            ...componentStype
+          });
+        });
+      });
+
+      describe('and selectRow.bgColor is also defined as an object', () => {
+        beforeEach(() => {
+          selectRow.bgColor = 'gray';
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <WithSelectionComponent
+                row={ row }
+                value={ value }
+                keyField={ keyField }
+                rowIndex={ rowIndex }
+              />
+            </SelectionContext.Provider>
+          );
+        });
+
+        it('should inject style prop with correct backgroundColor', () => {
+          expect(wrapper.find(BaseComponent)).toHaveLength(1);
+          expect(wrapper.find(BaseComponent).prop('style')).toEqual({
+            ...selectedStyle,
+            backgroundColor: selectRow.bgColor
+          });
+        });
+      });
+
+      describe('and selectRow.bgColor is also defined as a function', () => {
+        const color = 'gray';
+        beforeEach(() => {
+          selectRow.bgColor = jest.fn().mockReturnValue(color);
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <WithSelectionComponent
+                row={ row }
+                value={ value }
+                keyField={ keyField }
+                rowIndex={ rowIndex }
+              />
+            </SelectionContext.Provider>
+          );
+        });
+
+        it('should inject style prop with correct backgroundColor', () => {
+          expect(wrapper.find(BaseComponent)).toHaveLength(1);
+          expect(wrapper.find(BaseComponent).prop('style')).toEqual({
+            ...selectedStyle,
+            backgroundColor: color
+          });
+        });
+
+        it('should call selectRow.bgColor function correctly', () => {
+          expect(selectRow.bgColor).toHaveBeenCalledTimes(1);
+          expect(selectRow.bgColor).toHaveBeenCalledWith(row, rowIndex);
+        });
+      });
+    });
+
+    describe('when selectRow.style is defined as a function', () => {
+      beforeEach(() => {
+        selectRow = { mode: 'checkbox', selected: [data[rowIndex][keyField]], style: jest.fn().mockReturnValue(selectedStyle) };
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <WithSelectionComponent
+              row={ row }
+              value={ value }
+              keyField={ keyField }
+              rowIndex={ rowIndex }
+            />
+          </SelectionContext.Provider>
+        );
+      });
+
+      it('should inject style prop correctly', () => {
+        expect(wrapper.find(BaseComponent)).toHaveLength(1);
+        expect(wrapper.find(BaseComponent).prop('style')).toEqual(selectedStyle);
+      });
+
+      it('should call selectRow.style function correctly', () => {
+        expect(selectRow.style).toHaveBeenCalledTimes(1);
+        expect(selectRow.style).toHaveBeenCalledWith(row, rowIndex);
+      });
+
+      describe('and props.style is also defined', () => {
+        const componentStype = { fontSize: '16px' };
+        beforeEach(() => {
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <WithSelectionComponent
+                row={ row }
+                value={ value }
+                keyField={ keyField }
+                rowIndex={ rowIndex }
+                style={ componentStype }
+              />
+            </SelectionContext.Provider>
+          );
+        });
+
+        it('should inject style prop correctly', () => {
+          expect(wrapper.find(BaseComponent)).toHaveLength(1);
+          expect(wrapper.find(BaseComponent).prop('style')).toEqual({
+            ...selectedStyle,
+            ...componentStype
+          });
+        });
+      });
+
+      describe('and selectRow.bgColor is also defined as an object', () => {
+        beforeEach(() => {
+          selectRow.bgColor = 'gray';
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <WithSelectionComponent
+                row={ row }
+                value={ value }
+                keyField={ keyField }
+                rowIndex={ rowIndex }
+              />
+            </SelectionContext.Provider>
+          );
+        });
+
+        it('should inject style prop with correct backgroundColor', () => {
+          expect(wrapper.find(BaseComponent)).toHaveLength(1);
+          expect(wrapper.find(BaseComponent).prop('style')).toEqual({
+            ...selectedStyle,
+            backgroundColor: selectRow.bgColor
+          });
+        });
+      });
+
+      describe('and selectRow.bgColor is also defined as a function', () => {
+        const color = 'gray';
+        beforeEach(() => {
+          selectRow.bgColor = jest.fn().mockReturnValue(color);
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <WithSelectionComponent
+                row={ row }
+                value={ value }
+                keyField={ keyField }
+                rowIndex={ rowIndex }
+              />
+            </SelectionContext.Provider>
+          );
+        });
+
+        it('should inject style prop with correct backgroundColor', () => {
+          expect(wrapper.find(BaseComponent)).toHaveLength(1);
+          expect(wrapper.find(BaseComponent).prop('style')).toEqual({
+            ...selectedStyle,
+            backgroundColor: color
+          });
+        });
+
+        it('should call selectRow.bgColor function correctly', () => {
+          expect(selectRow.bgColor).toHaveBeenCalledTimes(1);
+          expect(selectRow.bgColor).toHaveBeenCalledWith(row, rowIndex);
+        });
+      });
+    });
+  });
+
+  describe('if current row is selected', () => {
+    const selectedClassName = 'select-classname';
+    describe('when selectRow.style is defined as an object', () => {
+      beforeEach(() => {
+        selectRow = { mode: 'checkbox', selected: [data[rowIndex][keyField]], classes: selectedClassName };
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <WithSelectionComponent
+              row={ row }
+              value={ value }
+              keyField={ keyField }
+              rowIndex={ rowIndex }
+            />
+          </SelectionContext.Provider>
+        );
+      });
+
+      it('should inject className prop correctly', () => {
+        expect(wrapper.find(BaseComponent)).toHaveLength(1);
+        expect(wrapper.find(BaseComponent).prop('className')).toEqual(selectedClassName);
+      });
+
+      describe('and props.className is also defined', () => {
+        const componentClassName = 'component-classname';
+        beforeEach(() => {
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <WithSelectionComponent
+                row={ row }
+                value={ value }
+                keyField={ keyField }
+                rowIndex={ rowIndex }
+                className={ componentClassName }
+              />
+            </SelectionContext.Provider>
+          );
+        });
+
+        it('should inject style prop correctly', () => {
+          expect(wrapper.find(BaseComponent)).toHaveLength(1);
+          expect(wrapper.find(BaseComponent).prop('className')).toEqual(`${componentClassName} ${selectedClassName}`);
+        });
+      });
+    });
+
+    describe('when selectRow.style is defined as a function', () => {
+      beforeEach(() => {
+        selectRow = { mode: 'checkbox', selected: [data[rowIndex][keyField]], classes: jest.fn().mockReturnValue(selectedClassName) };
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <WithSelectionComponent
+              row={ row }
+              value={ value }
+              keyField={ keyField }
+              rowIndex={ rowIndex }
+            />
+          </SelectionContext.Provider>
+        );
+      });
+
+      it('should inject className prop correctly', () => {
+        expect(wrapper.find(BaseComponent)).toHaveLength(1);
+        expect(wrapper.find(BaseComponent).prop('className')).toEqual(selectedClassName);
+      });
+
+      it('should call selectRow.classes function correctly', () => {
+        expect(selectRow.classes).toHaveBeenCalledTimes(1);
+        expect(selectRow.classes).toHaveBeenCalledWith(row, rowIndex);
+      });
+
+      describe('and props.className is also defined', () => {
+        const componentClassName = 'component-classname';
+        beforeEach(() => {
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <WithSelectionComponent
+                row={ row }
+                value={ value }
+                keyField={ keyField }
+                rowIndex={ rowIndex }
+                className={ componentClassName }
+              />
+            </SelectionContext.Provider>
+          );
+        });
+
+        it('should inject style prop correctly', () => {
+          expect(wrapper.find(BaseComponent)).toHaveLength(1);
+          expect(wrapper.find(BaseComponent).prop('className')).toEqual(`${componentClassName} ${selectedClassName}`);
+        });
+      });
+    });
+  });
+});

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

@@ -14,24 +14,106 @@ describe('<SelectionCell />', () => {
   let wrapper;
 
   describe('shouldComponentUpdate', () => {
-    const selected = true;
+    let props;
+    let nextProps;
 
-    describe('when selected prop has not been changed', () => {
-      it('should not update component', () => {
-        const nextProps = { selected };
+    describe('when selected prop has been changed', () => {
+      beforeEach(() => {
+        props = {
+          selected: false,
+          mode,
+          rowIndex,
+          disabled: false,
+          rowKey: 1
+        };
+        wrapper = shallow(
+          <SelectionCell { ...props } />
+        );
+      });
 
-        wrapper = shallow(<SelectionCell rowKey={ 1 } mode={ mode } selected={ selected } />);
-
-        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(false);
+      it('should return true', () => {
+        nextProps = { ...props, selected: true };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
       });
     });
 
-    describe('when selected prop has been changed', () => {
-      it('should update component', () => {
-        const nextProps = { selected: !selected };
+    describe('when rowIndex prop has been changed', () => {
+      beforeEach(() => {
+        props = {
+          selected: false,
+          mode,
+          rowIndex,
+          disabled: false,
+          rowKey: 1
+        };
+        wrapper = shallow(
+          <SelectionCell { ...props } />
+        );
+      });
 
-        wrapper = shallow(<SelectionCell rowKey={ 1 } mode={ mode } selected={ selected } />);
+      it('should return true', () => {
+        nextProps = { ...props, rowIndex: 2 };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
+      });
+    });
 
+    describe('when tabIndex prop has been changed', () => {
+      beforeEach(() => {
+        props = {
+          selected: false,
+          mode,
+          rowIndex,
+          disabled: false,
+          tabIndex: 0,
+          rowKey: 1
+        };
+        wrapper = shallow(
+          <SelectionCell { ...props } />
+        );
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, tabIndex: 2 };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
+      });
+    });
+
+    describe('when disabled prop has been changed', () => {
+      beforeEach(() => {
+        props = {
+          selected: false,
+          mode,
+          rowIndex,
+          disabled: false,
+          rowKey: 1
+        };
+        wrapper = shallow(
+          <SelectionCell { ...props } />
+        );
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, disabled: true };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
+      });
+    });
+
+    describe('when rowKey prop has been changed', () => {
+      beforeEach(() => {
+        props = {
+          selected: false,
+          mode,
+          rowIndex,
+          disabled: false,
+          rowKey: 1
+        };
+        wrapper = shallow(
+          <SelectionCell { ...props } />
+        );
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, rowKey: '1' };
         expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
       });
     });

packages/react-bootstrap-table2/test/row/aggregate-row.test.js

@@ -0,0 +1,295 @@
+import 'jsdom-global/register';
+import React from 'react';
+import { mount } from 'enzyme';
+import mockBodyResolvedProps from '../test-helpers/mock/body-resolved-props';
+import SelectionContext from '../../src/contexts/selection-context';
+import ExpansionContext from '../../src/contexts/row-expand-context';
+import bindSelection from '../../src/row-selection/row-consumer';
+import bindExpansion from '../../src/row-expand/row-consumer';
+import ExpandCell from '../../src/row-expand/expand-cell';
+import SelectionCell from '../../src/row-selection/selection-cell';
+import RowAggregator from '../../src/row/aggregate-row';
+
+describe('Row Aggregator', () => {
+  let wrapper;
+  let rowAggregator;
+  const RowAggregatorWithSelection = bindSelection(RowAggregator);
+  const RowAggregatorWithExpansion = bindExpansion(RowAggregator);
+
+  const data = [{
+    id: 1,
+    name: 'A'
+  }, {
+    id: 2,
+    name: 'B'
+  }, {
+    id: 3,
+    name: 'C'
+  }];
+  const columns = [{
+    dataField: 'id',
+    text: 'ID'
+  }, {
+    dataField: 'name',
+    text: 'Name'
+  }];
+  const rowIndex = 1;
+  const row = data[rowIndex];
+  const keyField = 'id';
+
+  const getBaseProps = () => ({
+    row,
+    value: row[keyField],
+    columns,
+    keyField,
+    rowIndex,
+    ...mockBodyResolvedProps
+  });
+
+  describe('when selectRow is enable', () => {
+    describe('if props.selectRow.hideSelectColumn is false', () => {
+      beforeEach(() => {
+        const selectRow = { mode: 'radio' };
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <RowAggregatorWithSelection { ...getBaseProps() } />
+          </SelectionContext.Provider>
+        );
+      });
+
+      it('should render RowAggregator correctly', () => {
+        rowAggregator = wrapper.find(RowAggregator);
+        expect(rowAggregator).toHaveLength(1);
+      });
+
+      it('should render selection column correctly', () => {
+        const selectionCell = wrapper.find(SelectionCell);
+        expect(selectionCell).toHaveLength(1);
+        expect(selectionCell.props().selected).toEqual(rowAggregator.props().selected);
+        expect(selectionCell.props().disabled).toEqual(!rowAggregator.props().selectable);
+      });
+    });
+
+    describe('if props.selectRow.hideSelectColumn is true', () => {
+      beforeEach(() => {
+        const selectRow = { mode: 'radio', hideSelectColumn: true };
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <RowAggregatorWithSelection { ...getBaseProps() } />
+          </SelectionContext.Provider>
+        );
+      });
+
+      it('should render RowAggregator correctly', () => {
+        rowAggregator = wrapper.find(RowAggregator);
+        expect(rowAggregator).toHaveLength(1);
+      });
+
+      it('should not render selection column', () => {
+        const selectionCell = wrapper.find(SelectionCell);
+        expect(selectionCell).toHaveLength(0);
+      });
+    });
+
+    describe('if props.selectRow.clickToSelect is defined', () => {
+      beforeEach(() => {
+        const selectRow = { mode: 'radio', clickToSelect: true };
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <RowAggregatorWithSelection { ...getBaseProps() } />
+          </SelectionContext.Provider>
+        );
+      });
+
+      it('should render RowAggregator correctly', () => {
+        rowAggregator = wrapper.find(RowAggregator);
+        expect(rowAggregator).toHaveLength(1);
+      });
+
+      it('should add onClick prop to Row Component', () => {
+        const tr = wrapper.find('tr');
+        expect(tr).toHaveLength(1);
+        expect(tr.props().onClick).toBeDefined();
+      });
+    });
+  });
+
+  describe('when expandRow is enable', () => {
+    describe('if props.expandRow.showExpandColumn is false', () => {
+      beforeEach(() => {
+        const expandRow = { renderer: jest.fn() };
+        wrapper = mount(
+          <ExpansionContext.Provider data={ data } keyField={ keyField } expandRow={ expandRow }>
+            <RowAggregatorWithExpansion { ...getBaseProps() } />
+          </ExpansionContext.Provider>
+        );
+      });
+
+      it('should render RowAggregator correctly', () => {
+        rowAggregator = wrapper.find(RowAggregator);
+        expect(rowAggregator).toHaveLength(1);
+      });
+
+      it('should not render expansion column', () => {
+        const expandCell = wrapper.find(ExpandCell);
+        expect(expandCell).toHaveLength(0);
+      });
+    });
+
+    describe('if props.expandRow.showExpandColumn is true', () => {
+      beforeEach(() => {
+        const expandRow = { renderer: jest.fn(), showExpandColumn: true };
+        wrapper = mount(
+          <ExpansionContext.Provider data={ data } keyField={ keyField } expandRow={ expandRow }>
+            <RowAggregatorWithExpansion { ...getBaseProps() } />
+          </ExpansionContext.Provider>
+        );
+      });
+
+      it('should render RowAggregator correctly', () => {
+        rowAggregator = wrapper.find(RowAggregator);
+        expect(rowAggregator).toHaveLength(1);
+      });
+
+      it('should render expansion column correctly', () => {
+        const expandCell = wrapper.find(ExpandCell);
+        expect(expandCell).toHaveLength(1);
+        expect(expandCell.props().expanded).toEqual(rowAggregator.props().expanded);
+      });
+    });
+  });
+
+  describe('createClickEventHandler', () => {
+    describe('if props.attrs.onClick is defined', () => {
+      const attrs = { onClick: jest.fn() };
+
+      beforeEach(() => {
+        const selectRow = { mode: 'radio' };
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <RowAggregatorWithSelection { ...getBaseProps() } attrs={ attrs } />
+          </SelectionContext.Provider>
+        );
+        wrapper.find('tr').simulate('click');
+      });
+
+      it('should call attrs.onClick correctly', () => {
+        expect(attrs.onClick).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('if props.selectRow.clickToSelect is true', () => {
+      const selectRow = { mode: 'radio', clickToSelect: true };
+      beforeEach(() => {
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <RowAggregatorWithSelection { ...getBaseProps() } />
+          </SelectionContext.Provider>
+        );
+        wrapper.find(RowAggregator).props().selectRow.onRowSelect = jest.fn();
+        wrapper.find('tr').simulate('click');
+      });
+
+      it('should call selectRow.onRowSelect correctly', () => {
+        expect(wrapper.find(RowAggregator).props().selectRow.onRowSelect).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('if props.selectRow.clickToSelect is true', () => {
+      describe('but selectable props is false', () => {
+        const selectRow = { mode: 'radio', clickToSelect: true, nonSelectable: [row[keyField]] };
+        beforeEach(() => {
+          wrapper = mount(
+            <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+              <RowAggregatorWithSelection { ...getBaseProps() } />
+            </SelectionContext.Provider>
+          );
+          wrapper.find(RowAggregator).props().selectRow.onRowSelect = jest.fn();
+          wrapper.find('tr').simulate('click');
+        });
+
+        it('should call selectRow.onRowSelect correctly', () => {
+          expect(wrapper.find(RowAggregator).props().selectRow.onRowSelect)
+            .toHaveBeenCalledTimes(0);
+        });
+      });
+    });
+
+    describe('if props.expandRow is not defined', () => {
+      describe('but expandable props is false', () => {
+        const expandRow = { renderer: jest.fn(), nonExpandable: [row[keyField]] };
+        beforeEach(() => {
+          wrapper = mount(
+            <ExpansionContext.Provider data={ data } keyField={ keyField } expandRow={ expandRow }>
+              <RowAggregatorWithExpansion { ...getBaseProps() } />
+            </ExpansionContext.Provider>
+          );
+          wrapper.find(RowAggregator).props().expandRow.onRowExpand = jest.fn();
+          wrapper.find('tr').simulate('click');
+        });
+
+        it('should call expandRow.onRowExpand correctly', () => {
+          expect(wrapper.find(RowAggregator).props().expandRow.onRowExpand)
+            .toHaveBeenCalledTimes(0);
+        });
+      });
+    });
+
+    describe('if props.expandRow is defined', () => {
+      const expandRow = { renderer: jest.fn() };
+      beforeEach(() => {
+        wrapper = mount(
+          <ExpansionContext.Provider data={ data } keyField={ keyField } expandRow={ expandRow }>
+            <RowAggregatorWithExpansion { ...getBaseProps() } />
+          </ExpansionContext.Provider>
+        );
+        wrapper.find(RowAggregator).props().expandRow.onRowExpand = jest.fn();
+        wrapper.find('tr').simulate('click');
+      });
+
+      it('should call expandRow.onRowExpand correctly', () => {
+        expect(wrapper.find(RowAggregator).props().expandRow.onRowExpand).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('if props.attrs.onClick and props.expandRow both are defined', () => {
+      const attrs = { onClick: jest.fn() };
+      const expandRow = { renderer: jest.fn() };
+
+      beforeEach(() => {
+        wrapper = mount(
+          <ExpansionContext.Provider data={ data } keyField={ keyField } expandRow={ expandRow }>
+            <RowAggregatorWithExpansion { ...getBaseProps() } attrs={ attrs } />
+          </ExpansionContext.Provider>
+        );
+        wrapper.find(RowAggregator).props().expandRow.onRowExpand = jest.fn();
+        wrapper.find('tr').simulate('click');
+      });
+
+      it('should call attrs.onClick and expandRow.onRowExpand correctly', () => {
+        expect(attrs.onClick).toHaveBeenCalledTimes(1);
+        expect(wrapper.find(RowAggregator).props().expandRow.onRowExpand).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('if props.attrs.onClick and props.selectRow.clickToSelect both are defined', () => {
+      const attrs = { onClick: jest.fn() };
+      const selectRow = { mode: 'radio', clickToSelect: true };
+
+      beforeEach(() => {
+        wrapper = mount(
+          <SelectionContext.Provider data={ data } keyField={ keyField } selectRow={ selectRow }>
+            <RowAggregatorWithSelection { ...getBaseProps() } attrs={ attrs } />
+          </SelectionContext.Provider>
+        );
+        wrapper.find(RowAggregator).props().selectRow.onRowSelect = jest.fn();
+        wrapper.find('tr').simulate('click');
+      });
+
+      it('should call attrs.onClick and selectRow.onRowSelect correctly', () => {
+        expect(attrs.onClick).toHaveBeenCalledTimes(1);
+        expect(wrapper.find(RowAggregator).props().selectRow.onRowSelect).toHaveBeenCalledTimes(1);
+      });
+    });
+  });
+});

packages/react-bootstrap-table2/test/row/row-pure-content.test.js

@@ -0,0 +1,624 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import Cell from '../../src/cell';
+import RowPureContent from '../../src/row/row-pure-content';
+import mockBodyResolvedProps from '../test-helpers/mock/body-resolved-props';
+
+let defaultColumns = [{
+  dataField: 'id',
+  text: 'ID'
+}, {
+  dataField: 'name',
+  text: 'Name'
+}, {
+  dataField: 'price',
+  text: 'Price'
+}];
+
+const keyField = 'id';
+const rowIndex = 1;
+
+describe('RowPureContent', () => {
+  let wrapper;
+
+  const row = {
+    id: 1,
+    name: 'A',
+    price: 1000
+  };
+
+  beforeEach(() => {
+    defaultColumns = [{
+      dataField: 'id',
+      text: 'ID'
+    }, {
+      dataField: 'name',
+      text: 'Name'
+    }, {
+      dataField: 'price',
+      text: 'Price'
+    }];
+  });
+
+  describe('shouldComponentUpdate', () => {
+    let props;
+    let nextProps;
+
+    describe('if nextProps.shouldUpdate is different with this.props.shouldUpdate', () => {
+      beforeEach(() => {
+        props = {
+          keyField,
+          columns: defaultColumns,
+          rowIndex: 1,
+          row,
+          shouldUpdate: false
+        };
+        wrapper = shallow(
+          <RowPureContent { ...props } />
+        );
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, shouldUpdate: true };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
+      });
+    });
+
+    describe('if nextProps.shouldUpdate is same with this.props.shouldUpdate', () => {
+      beforeEach(() => {
+        props = {
+          keyField,
+          columns: defaultColumns,
+          rowIndex: 1,
+          row,
+          shouldUpdate: false
+        };
+        wrapper = shallow(
+          <RowPureContent { ...props } />
+        );
+      });
+
+      it('should return false', () => {
+        nextProps = { ...props };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(false);
+      });
+    });
+  });
+
+  describe('simplest row', () => {
+    beforeEach(() => {
+      wrapper = shallow(
+        <RowPureContent
+          keyField={ keyField }
+          rowIndex={ rowIndex }
+          columns={ defaultColumns }
+          row={ row }
+        />
+      );
+    });
+
+    it('should render successfully', () => {
+      expect(wrapper.length).toBe(defaultColumns.length);
+      expect(wrapper.find(Cell).length).toBe(Object.keys(row).length);
+    });
+  });
+
+  describe('when tabIndexStart prop is -1', () => {
+    beforeEach(() => {
+      wrapper = shallow(
+        <RowPureContent
+          tabIndexStart={ -1 }
+          keyField={ keyField }
+          rowIndex={ rowIndex }
+          columns={ defaultColumns }
+          row={ row }
+        />
+      );
+    });
+
+    it('should not render tabIndex prop on Cell', () => {
+      wrapper.find(Cell).forEach((cell) => {
+        expect(cell.prop('tabIndex')).toBeUndefined();
+      });
+    });
+  });
+
+  describe('when tabIndexStart prop is not -1', () => {
+    const tabIndexStart = 4;
+    beforeEach(() => {
+      wrapper = shallow(
+        <RowPureContent
+          tabIndexStart={ tabIndexStart }
+          keyField={ keyField }
+          rowIndex={ rowIndex }
+          columns={ defaultColumns }
+          row={ row }
+        />
+      );
+    });
+
+    it('should render correct tabIndex prop on Cell', () => {
+      wrapper.find(Cell).forEach((cell, i) => {
+        expect(cell.prop('tabIndex')).toEqual(tabIndexStart + i);
+      });
+    });
+  });
+
+  describe('when editingRowIdx and editingColIdx prop is defined', () => {
+    const editingRowIdx = rowIndex;
+    const editingColIdx = 1;
+    const EditingCellComponent = () => null;
+    beforeEach(() => {
+      wrapper = shallow(
+        <RowPureContent
+          keyField={ keyField }
+          rowIndex={ rowIndex }
+          columns={ defaultColumns }
+          row={ row }
+          EditingCellComponent={ EditingCellComponent }
+          editingRowIdx={ editingRowIdx }
+          editingColIdx={ editingColIdx }
+        />);
+    });
+
+    it('should render EditingCell component correctly', () => {
+      const EditingCell = wrapper.find(EditingCellComponent);
+      expect(wrapper.length).toBe(defaultColumns.length);
+      expect(EditingCell).toHaveLength(1);
+      expect(EditingCell.prop('row')).toEqual(row);
+      expect(EditingCell.prop('rowIndex')).toEqual(editingRowIdx);
+      expect(EditingCell.prop('column')).toEqual(defaultColumns[editingColIdx]);
+      expect(EditingCell.prop('columnIndex')).toEqual(editingColIdx);
+    });
+  });
+
+  describe('when column.hidden is true', () => {
+    beforeEach(() => {
+      const newColumns = [{
+        dataField: 'id',
+        text: 'ID',
+        hidden: true
+      }, {
+        dataField: 'name',
+        text: 'Name'
+      }, {
+        dataField: 'price',
+        text: 'Price'
+      }];
+      wrapper = shallow(
+        <RowPureContent
+          keyField={ keyField }
+          rowIndex={ rowIndex }
+          columns={ newColumns }
+          row={ row }
+        />);
+    });
+
+    it('should not render column with hidden value true', () => {
+      expect(wrapper.find(Cell).length).toBe(2);
+    });
+  });
+
+  describe('when column.style prop is defined', () => {
+    let columns;
+    const columnIndex = 1;
+
+    beforeEach(() => {
+      columns = [...defaultColumns];
+    });
+
+    describe('when style is an object', () => {
+      beforeEach(() => {
+        columns[columnIndex].style = { backgroundColor: 'red' };
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      it('should render Cell correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props.style).toEqual(columns[columnIndex].style);
+      });
+    });
+
+    describe('when style is a function', () => {
+      const returnStyle = { backgroundColor: 'red' };
+      let styleCallBack;
+
+      beforeEach(() => {
+        styleCallBack = jest.fn().mockReturnValue(returnStyle);
+        columns[columnIndex].style = styleCallBack;
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      afterEach(() => { styleCallBack.mockClear(); });
+
+      it('should render Cell correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props.style).toEqual(returnStyle);
+      });
+
+      it('should call custom style function correctly', () => {
+        expect(styleCallBack).toHaveBeenCalledTimes(1);
+        expect(styleCallBack).toHaveBeenCalledWith(
+          row[columns[columnIndex].dataField], row, rowIndex, columnIndex);
+      });
+    });
+  });
+
+  describe('when column.classes prop is defined', () => {
+    let columns;
+    const columnIndex = 1;
+
+    beforeEach(() => {
+      columns = [...defaultColumns];
+    });
+
+    describe('when classes is an object', () => {
+      beforeEach(() => {
+        columns[columnIndex].classes = 'td-test-class';
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      it('should render Cell correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props.className)
+          .toEqual(columns[columnIndex].classes);
+      });
+    });
+
+    describe('when classes is a function', () => {
+      const returnClasses = 'td-test-class';
+      let classesCallBack;
+
+      beforeEach(() => {
+        classesCallBack = jest.fn().mockReturnValue(returnClasses);
+        columns[columnIndex].classes = classesCallBack;
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      afterEach(() => { classesCallBack.mockClear(); });
+
+      it('should render Cell correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props.className).toEqual(returnClasses);
+      });
+
+      it('should call custom classes function correctly', () => {
+        expect(classesCallBack).toHaveBeenCalledTimes(1);
+        expect(classesCallBack).toHaveBeenCalledWith(
+          row[columns[columnIndex].dataField], row, rowIndex, columnIndex);
+      });
+    });
+  });
+
+  describe('when column.title prop is defined', () => {
+    let columns;
+    const columnIndex = 1;
+
+    beforeEach(() => {
+      columns = [...defaultColumns];
+    });
+
+    describe('when title is an string', () => {
+      beforeEach(() => {
+        columns[columnIndex].title = true;
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      it('should render Cell correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props.title)
+          .toEqual(row[columns[columnIndex].dataField]);
+      });
+    });
+
+    describe('when title is a function', () => {
+      const returnTitle = 'test title';
+      let titleCallBack;
+
+      beforeEach(() => {
+        titleCallBack = jest.fn().mockReturnValue(returnTitle);
+        columns[columnIndex].title = titleCallBack;
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      afterEach(() => { titleCallBack.mockClear(); });
+
+      it('should render Cell correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props.title).toEqual(returnTitle);
+      });
+
+      it('should call custom title function correctly', () => {
+        expect(titleCallBack).toHaveBeenCalledTimes(1);
+        expect(titleCallBack).toHaveBeenCalledWith(
+          row[columns[columnIndex].dataField], row, rowIndex, columnIndex);
+      });
+    });
+  });
+
+  describe('when column.events prop is defined', () => {
+    let columns;
+    const columnIndex = 1;
+
+    beforeEach(() => {
+      columns = [...defaultColumns];
+      columns[columnIndex].events = {
+        onClick: jest.fn()
+      };
+
+      wrapper = shallow(
+        <RowPureContent
+          keyField={ keyField }
+          rowIndex={ rowIndex }
+          columns={ columns }
+          row={ row }
+        />
+      );
+    });
+
+    it('should attachs DOM event successfully', () => {
+      expect(wrapper.length).toBe(defaultColumns.length);
+      expect(wrapper.find(Cell).get(columnIndex).props.onClick).toBeDefined();
+    });
+  });
+
+  describe('when column.align prop is defined', () => {
+    let columns;
+    const columnIndex = 1;
+
+    beforeEach(() => {
+      columns = [...defaultColumns];
+    });
+
+    describe('when align is a string', () => {
+      beforeEach(() => {
+        columns[columnIndex].align = 'right';
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      it('should render Cell correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props.style.textAlign)
+          .toEqual(columns[columnIndex].align);
+      });
+    });
+
+    describe('when align is a function', () => {
+      const returnAlign = 'right';
+      let alignCallBack;
+
+      beforeEach(() => {
+        alignCallBack = jest.fn().mockReturnValue(returnAlign);
+        columns[columnIndex].align = alignCallBack;
+        wrapper = shallow(
+          <RowPureContent
+            { ...mockBodyResolvedProps }
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      afterEach(() => { alignCallBack.mockClear(); });
+
+      it('should render Cell correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props.style.textAlign).toEqual(returnAlign);
+      });
+
+      it('should call custom align function correctly', () => {
+        expect(alignCallBack).toHaveBeenCalledTimes(1);
+        expect(alignCallBack).toHaveBeenCalledWith(
+          row[columns[columnIndex].dataField], row, rowIndex, columnIndex);
+      });
+    });
+  });
+
+  describe('when column.attrs prop is defined', () => {
+    let columns;
+    const columnIndex = 1;
+
+    beforeEach(() => {
+      columns = [...defaultColumns];
+    });
+
+    describe('when attrs is an object', () => {
+      it('should render Cell correctly', () => {
+        columns[columnIndex].attrs = {
+          'data-test': 'test',
+          title: 'title',
+          className: 'attrs-class',
+          style: {
+            backgroundColor: 'attrs-style-test',
+            display: 'none',
+            textAlign: 'right'
+          }
+        };
+
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props['data-test'])
+          .toEqual(columns[columnIndex].attrs['data-test']);
+        expect(wrapper.find(Cell).get(columnIndex).props.title)
+          .toEqual(columns[columnIndex].attrs.title);
+        expect(wrapper.find(Cell).get(columnIndex).props.className)
+          .toEqual(columns[columnIndex].attrs.className);
+        expect(wrapper.find(Cell).get(columnIndex).props.style)
+          .toEqual(columns[columnIndex].attrs.style);
+      });
+
+      describe('when column.title prop is defined', () => {
+        it('attrs.title should be overwrited', () => {
+          columns[columnIndex].title = true;
+          columns[columnIndex].attrs = { title: 'title' };
+
+          wrapper = shallow(
+            <RowPureContent
+              keyField={ keyField }
+              rowIndex={ rowIndex }
+              columns={ columns }
+              row={ row }
+            />
+          );
+
+          expect(wrapper.find(Cell).get(columnIndex).props.title)
+            .toEqual(row[columns[columnIndex].dataField]);
+        });
+      });
+
+      describe('when column.classes prop is defined', () => {
+        it('attrs.className should be overwrited', () => {
+          columns[columnIndex].classes = 'td-test-class';
+          columns[columnIndex].attrs = { className: 'attrs-class' };
+
+          wrapper = shallow(
+            <RowPureContent
+              keyField={ keyField }
+              rowIndex={ rowIndex }
+              columns={ columns }
+              row={ row }
+            />
+          );
+
+          expect(wrapper.find(Cell).get(columnIndex).props.className)
+            .toEqual(columns[columnIndex].classes);
+        });
+      });
+
+      describe('when column.style prop is defined', () => {
+        it('attrs.style should be overwrited', () => {
+          columns[columnIndex].style = { backgroundColor: 'red' };
+          columns[columnIndex].attrs = { style: { backgroundColor: 'attrs-style-test' } };
+
+          wrapper = shallow(
+            <RowPureContent
+              keyField={ keyField }
+              rowIndex={ rowIndex }
+              columns={ columns }
+              row={ row }
+            />
+          );
+
+          expect(wrapper.find(Cell).get(columnIndex).props.style)
+            .toEqual(columns[columnIndex].style);
+        });
+      });
+
+      describe('when column.align prop is defined', () => {
+        it('attrs.style.textAlign should be overwrited', () => {
+          columns[columnIndex].align = 'center';
+          columns[columnIndex].attrs = { style: { textAlign: 'right' } };
+
+          wrapper = shallow(
+            <RowPureContent
+              keyField={ keyField }
+              rowIndex={ rowIndex }
+              columns={ columns }
+              row={ row }
+            />
+          );
+
+          expect(wrapper.find(Cell).get(columnIndex).props.style.textAlign)
+            .toEqual(columns[columnIndex].align);
+        });
+      });
+    });
+
+    describe('when attrs is custom function', () => {
+      let attrsCallBack;
+      const customAttrs = {
+        'data-test': 'test',
+        title: 'title'
+      };
+
+      beforeEach(() => {
+        attrsCallBack = jest.fn().mockReturnValue(customAttrs);
+        columns[columnIndex].attrs = attrsCallBack;
+        wrapper = shallow(
+          <RowPureContent
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ columns }
+            row={ row }
+          />
+        );
+      });
+
+      afterEach(() => { attrsCallBack.mockClear(); });
+
+      it('should render style.attrs correctly', () => {
+        expect(wrapper.length).toBe(defaultColumns.length);
+        expect(wrapper.find(Cell).get(columnIndex).props['data-test'])
+          .toEqual(customAttrs['data-test']);
+        expect(wrapper.find(Cell).get(columnIndex).props.title)
+          .toEqual(customAttrs.title);
+      });
+
+      it('should call custom attrs function correctly', () => {
+        expect(attrsCallBack).toHaveBeenCalledTimes(1);
+        expect(attrsCallBack).toHaveBeenCalledWith(
+          row[columns[columnIndex].dataField], row, rowIndex, columnIndex);
+      });
+    });
+  });
+});

packages/react-bootstrap-table2/test/row/row-section.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import RowSection from '../src/row-section';
+import RowSection from '../../src/row/row-section';
 
 describe('Row', () => {
   const colSpan = 3;

packages/react-bootstrap-table2/test/row/should-updater.test.js

@@ -0,0 +1,164 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import shouldUpdater from '../../src/row/should-updater';
+
+describe('Row shouldUpdater', () => {
+  let wrapper;
+  let props;
+  let nextProps;
+
+  class DummyComponent extends shouldUpdater(React.Component) {
+    render() { return null; }
+  }
+
+  describe('shouldUpdateByCellEditing', () => {
+    describe('when nextProps.clickToEdit and nexrProps.dbclickToEdit both are negative', () => {
+      beforeEach(() => {
+        props = {
+          editingRowIdx: null,
+          rowIndex: 0
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should always return false', () => {
+        nextProps = { ...props, editingRowIdx: 0 };
+        expect(wrapper.instance().shouldUpdateByCellEditing(nextProps)).toBeFalsy();
+      });
+    });
+    describe('when nextProps.editingRowIdx eq props.rowIndex and it\' not null', () => {
+      beforeEach(() => {
+        props = {
+          clickToEdit: true,
+          editingRowIdx: null,
+          rowIndex: 0
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, editingRowIdx: 0 };
+        expect(wrapper.instance().shouldUpdateByCellEditing(nextProps)).toBeTruthy();
+      });
+    });
+
+    describe('when props.editingRowIdx eq props.rowIndex but nextProps.editingRowIdx is null', () => {
+      beforeEach(() => {
+        props = {
+          clickToEdit: true,
+          editingRowIdx: 0,
+          rowIndex: 0
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, editingRowIdx: null };
+        expect(wrapper.instance().shouldUpdateByCellEditing(nextProps)).toBeTruthy();
+      });
+    });
+  });
+
+  describe('shouldUpdatedBySelfProps', () => {
+    describe('when nextProps.className is not eq props.className', () => {
+      beforeEach(() => {
+        props = {
+          className: ''
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, className: 'test' };
+        expect(wrapper.instance().shouldUpdatedBySelfProps(nextProps)).toBeTruthy();
+      });
+    });
+
+    describe('when nextProps.style is not eq props.style', () => {
+      beforeEach(() => {
+        props = {
+          style: null
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, style: { color: 'red' } };
+        expect(wrapper.instance().shouldUpdatedBySelfProps(nextProps)).toBeTruthy();
+      });
+    });
+
+    describe('when nextProps.attrs is not eq props.attrs', () => {
+      beforeEach(() => {
+        props = {
+          attrs: null
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, attrs: { onClick: jest.fn() } };
+        expect(wrapper.instance().shouldUpdatedBySelfProps(nextProps)).toBeTruthy();
+      });
+    });
+  });
+
+  describe('shouldUpdatedByNormalProps', () => {
+    describe('when nextProps.rowIndex is not eq props.rowIndex', () => {
+      beforeEach(() => {
+        props = {
+          rowIndex: 0
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, rowIndex: 1 };
+        expect(wrapper.instance().shouldUpdatedByNormalProps(nextProps)).toBeTruthy();
+      });
+    });
+
+    describe('when nextProps.editable is not eq props.editable', () => {
+      beforeEach(() => {
+        props = {
+          editable: false
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, editable: true };
+        expect(wrapper.instance().shouldUpdatedByNormalProps(nextProps)).toBeTruthy();
+      });
+    });
+
+    describe('when nextProps.columns.length is not eq props.columns.length', () => {
+      beforeEach(() => {
+        props = {
+          columns: [{ dataField: 'price', text: 'Price' }]
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, columns: [...props.columns, { dataField: 'name', text: 'Name' }] };
+        expect(wrapper.instance().shouldUpdatedByNormalProps(nextProps)).toBeTruthy();
+      });
+    });
+
+    describe('when nextProps.row is not eq props.row', () => {
+      beforeEach(() => {
+        props = {
+          row: { id: 1, name: 'test' }
+        };
+        wrapper = shallow(<DummyComponent { ...props } />);
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, row: { id: 1, name: 'test', price: 123 } };
+        expect(wrapper.instance().shouldUpdatedByNormalProps(nextProps)).toBeTruthy();
+      });
+    });
+  });
+});

packages/react-bootstrap-table2/test/row/simple-row.test.js

@@ -0,0 +1,216 @@
+import React from 'react';
+import sinon from 'sinon';
+import { shallow } from 'enzyme';
+
+import RowPureContent from '../../src/row/row-pure-content';
+import SimpleRow from '../../src/row/simple-row';
+
+let defaultColumns = [{
+  dataField: 'id',
+  text: 'ID'
+}, {
+  dataField: 'name',
+  text: 'Name'
+}, {
+  dataField: 'price',
+  text: 'Price'
+}];
+
+const keyField = 'id';
+const rowIndex = 1;
+
+describe('SimpleRow', () => {
+  let wrapper;
+
+  const row = {
+    id: 1,
+    name: 'A',
+    price: 1000
+  };
+
+  beforeEach(() => {
+    defaultColumns = [{
+      dataField: 'id',
+      text: 'ID'
+    }, {
+      dataField: 'name',
+      text: 'Name'
+    }, {
+      dataField: 'price',
+      text: 'Price'
+    }];
+  });
+
+  describe('simplest row', () => {
+    beforeEach(() => {
+      wrapper = shallow(
+        <SimpleRow
+          keyField={ keyField }
+          rowIndex={ rowIndex }
+          columns={ defaultColumns }
+          row={ row }
+        />
+      );
+    });
+
+    it('should render successfully', () => {
+      expect(wrapper.length).toBe(1);
+      expect(wrapper.find(RowPureContent)).toHaveLength(1);
+    });
+
+    describe('when tabIndexCell prop is enable', () => {
+      const visibleColumnSize = 3;
+      beforeEach(() => {
+        wrapper = shallow(
+          <SimpleRow
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ defaultColumns }
+            row={ row }
+            tabIndexCell
+            visibleColumnSize={ visibleColumnSize }
+          />
+        );
+      });
+
+      it('should render correct tabIndexStart', () => {
+        expect(wrapper.length).toBe(1);
+        expect(wrapper.find(RowPureContent)).toHaveLength(1);
+        expect(wrapper.find(RowPureContent).prop('tabIndexStart')).toBe((rowIndex * visibleColumnSize) + 1);
+      });
+    });
+
+    describe('when tabIndexCell prop is disable', () => {
+      const visibleColumnSize = 3;
+      beforeEach(() => {
+        wrapper = shallow(
+          <SimpleRow
+            keyField={ keyField }
+            rowIndex={ rowIndex }
+            columns={ defaultColumns }
+            row={ row }
+            visibleColumnSize={ visibleColumnSize }
+          />
+        );
+      });
+
+      it('should always render tabIndexStart as -1', () => {
+        expect(wrapper.length).toBe(1);
+        expect(wrapper.find(RowPureContent)).toHaveLength(1);
+        expect(wrapper.find(RowPureContent).prop('tabIndexStart')).toBe(-1);
+      });
+    });
+  });
+
+  describe('shouldComponentUpdate', () => {
+    let props;
+    let nextProps;
+    describe('if shouldUpdatedByNormalProps return true', () => {
+      beforeEach(() => {
+        props = {
+          keyField,
+          columns: defaultColumns,
+          rowIndex: 1,
+          row,
+          editable: true
+        };
+        wrapper = shallow(
+          <SimpleRow { ...props } />
+        );
+      });
+
+      it('should return true', () => {
+        nextProps = { ...props, rowIndex: 2 };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
+      });
+
+      it('should set this.shouldUpdateRowContent as true', () => {
+        nextProps = { ...props, rowIndex: 2 };
+        wrapper.instance().shouldComponentUpdate(nextProps);
+        expect(wrapper.instance().shouldUpdateRowContent).toBe(true);
+      });
+    });
+
+    describe('if shouldUpdatedByNormalProps return false', () => {
+      beforeEach(() => {
+        props = {
+          keyField,
+          columns: defaultColumns,
+          rowIndex: 1,
+          row,
+          editable: true
+        };
+        wrapper = shallow(
+          <SimpleRow { ...props } />
+        );
+      });
+
+      it('should return value which depends on the result of shouldUpdatedBySelfProps', () => {
+        nextProps = { ...props, className: 'test' };
+        expect(wrapper.instance().shouldComponentUpdate(nextProps)).toBe(true);
+      });
+
+      it('should always set this.shouldUpdateRowContent as false', () => {
+        nextProps = { ...props, className: 'test' };
+        wrapper.instance().shouldComponentUpdate(nextProps);
+        expect(wrapper.instance().shouldUpdateRowContent).toBe(false);
+      });
+    });
+  });
+
+  describe('when style prop is defined', () => {
+    const customStyle = { backgroundColor: 'red' };
+    beforeEach(() => {
+      wrapper = shallow(
+        <SimpleRow
+          rowIndex={ rowIndex }
+          columns={ defaultColumns }
+          row={ row }
+          style={ customStyle }
+        />);
+    });
+
+    it('should render component with style successfully', () => {
+      expect(wrapper.length).toBe(1);
+      expect(wrapper.prop('style')).toEqual(customStyle);
+    });
+  });
+
+  describe('when className prop is defined', () => {
+    const className = 'test-class';
+    beforeEach(() => {
+      wrapper = shallow(
+        <SimpleRow
+          rowIndex={ rowIndex }
+          columns={ defaultColumns }
+          row={ row }
+          className={ className }
+        />);
+    });
+
+    it('should render component with className successfully', () => {
+      expect(wrapper.length).toBe(1);
+      expect(wrapper.hasClass(className)).toBe(true);
+    });
+  });
+
+  describe('when attrs prop is defined', () => {
+    const customClickCallBack = sinon.stub();
+    const attrs = { 'data-index': 1, onClick: customClickCallBack };
+    beforeEach(() => {
+      wrapper = shallow(
+        <SimpleRow
+          rowIndex={ rowIndex }
+          columns={ defaultColumns }
+          row={ row }
+          attrs={ attrs }
+        />);
+    });
+
+    it('should render component with correct attributes', () => {
+      expect(wrapper.length).toBe(1);
+      expect(wrapper.prop('data-index')).toBe(attrs['data-index']);
+      expect(wrapper.prop('onClick')).toBeDefined();
+    });
+  });
+});

packages/react-bootstrap-table2/test/test-helpers/mock/body-resolved-props.js

@@ -1,16 +1,25 @@
 import Const from '../../../src/const';
 
-const { ROW_SELECT_DISABLED, UNABLE_TO_CELL_EDIT } = Const;
+const { ROW_SELECT_DISABLED } = Const;
 
 export const rowSelectionResolvedProps = {
-  mode: ROW_SELECT_DISABLED
+  mode: ROW_SELECT_DISABLED,
+  selected: [],
+  hideSelectColumn: true
+};
+
+export const expandRowResolvedProps = {
+  renderer: undefined,
+  expanded: []
 };
 
 export const cellEditResolvedProps = {
-  mode: UNABLE_TO_CELL_EDIT
+  mode: null,
+  nonEditableRows: []
 };
 
 export default {
   cellEdit: cellEditResolvedProps,
+  expandRow: expandRowResolvedProps,
   selectRow: rowSelectionResolvedProps
 };

packages/react-bootstrap-table2/test/test-helpers/mock/header-resolved-props.js

@@ -3,9 +3,17 @@ import Const from '../../../src/const';
 const { ROW_SELECT_DISABLED } = Const;
 
 export const rowSelectionResolvedProps = {
-  mode: ROW_SELECT_DISABLED
+  mode: ROW_SELECT_DISABLED,
+  selected: [],
+  hideSelectColumn: true
+};
+
+export const expandRowResolvedProps = {
+  renderer: undefined,
+  expanded: []
 };
 
 export default {
-  selectRow: rowSelectionResolvedProps
+  selectRow: rowSelectionResolvedProps,
+  expandRow: expandRowResolvedProps
 };

yarn.lock

@@ -332,6 +332,14 @@ array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
+array.prototype.flat@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.10.0"
+    function-bind "^1.1.1"
+
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -2692,24 +2700,26 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-enzyme-adapter-react-16@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
-  dependencies:
-    enzyme-adapter-utils "^1.3.0"
-    lodash "^4.17.4"
-    object.assign "^4.0.4"
-    object.values "^1.0.4"
-    prop-types "^15.6.0"
-    react-reconciler "^0.7.0"
-    react-test-renderer "^16.0.0-0"
-
-enzyme-adapter-utils@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.4.0.tgz#c403b81e8eb9953658569e539780964bdc98de62"
+enzyme-adapter-react-16.3@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16.3/-/enzyme-adapter-react-16.3-1.0.0.tgz#d3992301aba46c8cceab21c1d201e85f01c93bfc"
   dependencies:
+    enzyme-adapter-utils "^1.5.0"
+    function.prototype.name "^1.1.0"
     object.assign "^4.1.0"
-    prop-types "^15.6.0"
+    object.values "^1.0.4"
+    prop-types "^15.6.2"
+    react-is "^16.4.1"
+    react-reconciler "^0.7.0"
+    react-test-renderer "~16.3.0-0"
+
+enzyme-adapter-utils@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.5.0.tgz#a020ab3ae79bb1c85e1d51f48f35e995e0eed810"
+  dependencies:
+    function.prototype.name "^1.1.0"
+    object.assign "^4.1.0"
+    prop-types "^15.6.2"
 
 enzyme-to-json@3.3.4:
   version "3.3.4"
@@ -2717,20 +2727,21 @@ enzyme-to-json@3.3.4:
   dependencies:
     lodash "^4.17.4"
 
-enzyme@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.3.0.tgz#0971abd167f2d4bf3f5bd508229e1c4b6dc50479"
+enzyme@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.4.0.tgz#085c66fe647d8c9c4becd1fee3042c040cda88a6"
   dependencies:
+    array.prototype.flat "^1.2.1"
     cheerio "^1.0.0-rc.2"
-    function.prototype.name "^1.0.3"
-    has "^1.0.1"
+    function.prototype.name "^1.1.0"
+    has "^1.0.3"
     is-boolean-object "^1.0.0"
-    is-callable "^1.1.3"
+    is-callable "^1.1.4"
     is-number-object "^1.0.3"
     is-string "^1.0.4"
     is-subset "^0.1.1"
     lodash "^4.17.4"
-    object-inspect "^1.5.0"
+    object-inspect "^1.6.0"
     object-is "^1.0.1"
     object.assign "^4.1.0"
     object.entries "^1.0.4"
@@ -2750,6 +2761,16 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+es-abstract@^1.10.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.1"
+    has "^1.0.1"
+    is-callable "^1.1.3"
+    is-regex "^1.0.4"
+
 es-abstract@^1.6.1, es-abstract@^1.7.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
@@ -3499,7 +3520,7 @@ function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
-function.prototype.name@^1.0.3:
+function.prototype.name@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
   dependencies:
@@ -3973,6 +3994,12 @@ has@^1.0.1:
   dependencies:
     function-bind "^1.0.2"
 
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  dependencies:
+    function-bind "^1.1.1"
+
 hash-base@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
@@ -4323,6 +4350,10 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
 
+is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+
 is-ci@^1.0.10:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
@@ -6002,7 +6033,7 @@ object-hash@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.2.0.tgz#e96af0e96981996a1d47f88ead8f74f1ebc4422b"
 
-object-inspect@^1.5.0:
+object-inspect@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
 
@@ -6761,6 +6792,13 @@ prop-types@^15.6.0:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 proxy-addr@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
@@ -6920,15 +6958,19 @@ rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@16.3.2:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
+react-dom@16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.0.tgz#099f067dd5827ce36a29eaf9a6cdc7cbf6216b1e"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+react-is@^16.3.2, react-is@^16.4.1:
+  version "16.4.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.2.tgz#84891b56c2b6d9efdee577cc83501dfc5ecead88"
+
 react-reconciler@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
@@ -6945,17 +6987,18 @@ react-test-renderer@16.0.0:
     fbjs "^0.8.16"
     object-assign "^4.1.1"
 
-react-test-renderer@^16.0.0-0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
+react-test-renderer@~16.3.0-0:
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.3.2.tgz#3d1ed74fda8db42521fdf03328e933312214749a"
   dependencies:
     fbjs "^0.8.16"
     object-assign "^4.1.1"
     prop-types "^15.6.0"
+    react-is "^16.3.2"
 
-react@16.3.2:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
+react@16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"