Revert "fix#264: wrong col span when enable selection in a empty table (#265)"

This reverts commit 42dbd00fd9.

packages/react-bootstrap-table2-example/examples/row-selection/selection-no-data.js

@@ -1,62 +0,0 @@
-/* eslint no-unused-vars: 0 */
-import React from 'react';
-
-import BootstrapTable from 'react-bootstrap-table-next';
-import Code from 'components/common/code-block';
-
-const columns = [{
-  dataField: 'id',
-  text: 'Product ID'
-}, {
-  dataField: 'name',
-  text: 'Product Name'
-}, {
-  dataField: 'price',
-  text: 'Product Price'
-}];
-
-const selectRow1 = {
-  mode: 'checkbox',
-  clickToSelect: true
-};
-
-const sourceCode1 = `\
-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
-};
-
-<BootstrapTable
-  keyField='id'
-  data={ [] }
-  columns={ columns }
-  selectRow={ selectRow }
-  noDataIndication={ 'no results found' }
-/>
-`;
-
-export default () => (
-  <div>
-    <BootstrapTable
-      keyField="id"
-      data={ [] }
-      columns={ columns }
-      selectRow={ selectRow1 }
-      noDataIndication={ 'no results found' }
-    />
-    <Code>{ sourceCode1 }</Code>
-  </div>
-);

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

@@ -81,7 +81,6 @@ 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 ClickToSelectWithCellEditTable from 'examples/row-selection/click-to-select-with-cell-edit';
-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';
 import NonSelectableRowsTable from 'examples/row-selection/non-selectable-rows';
@@ -197,7 +196,6 @@ storiesOf('Row Selection', module)
   .add('Default Select', () => <DefaultSelectTable />)
   .add('Selection Management', () => <SelectionManagement />)
   .add('Click to Select and Edit Cell', () => <ClickToSelectWithCellEditTable />)
-  .add('Selection without Data', () => <SelectionNoDataTable />)
   .add('Selection Style', () => <SelectionStyleTable />)
   .add('Selection Class', () => <SelectionClassTable />)
   .add('Selection Background Color', () => <SelectionBgColorTable />)

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

@@ -1,11 +1,6 @@
 export default ExtendBase =>
   class ColumnResolver extends ExtendBase {
-    visibleColumnSize(includeSelectColumn = true) {
-      const columnLen = this.props.columns.filter(c => !c.hidden).length;
-      if (!includeSelectColumn) return columnLen;
-      if (this.props.selectRow && !this.props.selectRow.hideSelectColumn) {
-        return columnLen + 1;
-      }
-      return columnLen;
+    visibleColumnSize() {
+      return this.props.columns.filter(c => !c.hidden).length;
     }
   };

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

@@ -5,12 +5,12 @@ import _ from '../utils';
 export default ExtendBase =>
   class TableResolver extends ColumnResolver(ExtendBase) {
     validateProps() {
-      const { keyField } = this.props;
+      const { columns, keyField } = this.props;
       if (!keyField) {
         throw new Error('Please specify a field as key via keyField');
       }
-      if (this.visibleColumnSize(false) <= 0) {
-        throw new Error('No visible columns detected');
+      if (this.visibleColumnSize(columns) <= 0) {
+        throw new Error('No any visible columns detect');
       }
     }
 

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

@@ -56,7 +56,7 @@ describe('TableResolver', () => {
       });
     });
 
-    describe('if no columns are visible', () => {
+    describe('if columns is all unvisible', () => {
       beforeEach(() => {
         const mockElement = React.createElement(BootstrapTableMock, {
           data, keyField, columns: []
@@ -67,7 +67,7 @@ describe('TableResolver', () => {
       it('should throw error', () => {
         expect(() =>
           wrapper.instance().validateProps()
-        ).toThrow(new Error('No visible columns detected'));
+        ).toThrow(new Error('No any visible columns detect'));
       });
     });
   });