Publish

- react-bootstrap-table2-editor@1.2.3 - react-bootstrap-table2-example@1.0.23 - react-bootstrap-table2-filter@1.1.8 - react-bootstrap-table-next@3.1.0
Merge pull request #886 from react-bootstrap-table/develop
2026-06-29 05:30:05 +00:00 · 2019-04-02 21:33:49 +08:00 · 2019-04-02 21:25:03 +08:00 · 2019-03-31 16:02:13 +08:00 · 2019-03-31 15:33:43 +08:00 · 2019-03-31 15:17:57 +08:00
17 changed files with 292 additions and 182 deletions
--- a/packages/react-bootstrap-table2-editor/README.md
+++ b/packages/react-bootstrap-table2-editor/README.md
@@ -132,7 +132,7 @@ const columns = [
    if (typeof cell !== 'object') {
      dateObj = new Date(cell);
    }
-    return `${('0' + dateObj.getDate()).slice(-2)}/${('0' + (dateObj.getMonth() + 1)).slice(-2)}/${dateObj.getFullYear()}`;
+    return `${('0' + dateObj.getUTCDate()).slice(-2)}/${('0' + (dateObj.getUTCMonth() + 1)).slice(-2)}/${dateObj.getUTCFullYear()}`;
  },
  editor: {
    type: Type.DATE
--- a/packages/react-bootstrap-table2-editor/package.json
+++ b/packages/react-bootstrap-table2-editor/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-bootstrap-table2-editor",
-  "version": "1.2.2",
+  "version": "1.2.3",
  "description": "it's the editor addon for react-bootstrap-table2",
  "main": "./lib/index.js",
  "scripts": {
--- a/packages/react-bootstrap-table2-example/examples/cell-edit/date-editor-table.js
+++ b/packages/react-bootstrap-table2-example/examples/cell-edit/date-editor-table.js
@@ -23,7 +23,7 @@ const columns = [{
    if (typeof cell !== 'object') {
      dateObj = new Date(cell);
    }
-    return `${('0' + dateObj.getDate()).slice(-2)}/${('0' + (dateObj.getMonth() + 1)).slice(-2)}/${dateObj.getFullYear()}`;
+    return `${('0' + dateObj.getUTCDate()).slice(-2)}/${('0' + (dateObj.getUTCMonth() + 1)).slice(-2)}/${dateObj.getUTCFullYear()}`;
  },
  editor: {
    type: Type.DATE
@@ -48,7 +48,7 @@ const columns = [{
    if (typeof cell !== 'object') {
      dateObj = new Date(cell);
    }
-    return \`$\{('0' + dateObj.getDate()).slice(-2)}/$\{('0' + (dateObj.getMonth() + 1)).slice(-2)}/$\{dateObj.getFullYear()}\`;
+    return \`$\{('0' + dateObj.getUTCDate()).slice(-2)}/$\{('0' + (dateObj.getUTCMonth() + 1)).slice(-2)}/$\{dateObj.getUTCFullYear()}\`;
  },
  editor: {
    type: Type.DATE
--- a/packages/react-bootstrap-table2-example/examples/columns/dummy-column-table.js
+++ b/packages/react-bootstrap-table2-example/examples/columns/dummy-column-table.js
@@ -11,141 +11,13 @@ const products = [
  { id: 14, name: 'Item 14', price: 14.5, inStock: true }
 ];

-const columns = [
-  {
-    dataField: 'id',
-    text: 'Product ID'
-  },
-  {
-    dataField: 'name',
-    text: 'Product Name'
-  },
-  {
-    dataField: 'price',
-    text: 'Product Price'
-  },
-  {
-    dataField: 'inStock',
-    text: 'In Stock',
-    formatter: (cellContent, row) => (
-      <div className="checkbox disabled">
-        <label>
-          <input type="checkbox" checked={ row.inStock } disabled />
-        </label>
-      </div>
-    )
-  },
-  {
-    dataField: 'df1',
-    isDummyField: true,
-    text: 'Action 1',
-    formatter: (cellContent, row) => {
-      if (row.inStock) {
-        return (
-          <h5>
-            <span className="label label-success"> Available</span>
-          </h5>
-        );
-      }
-      return (
-        <h5>
-          <span className="label label-danger"> Backordered</span>
-        </h5>
-      );
-    }
-  },
-  {
-    dataField: 'df2',
-    isDummyField: true,
-    text: 'Action 2',
-    formatter: (cellContent, row) => {
-      if (row.inStock) {
-        return (
-          <h5>
-            <span className="label label-success"> Available</span>
-          </h5>
-        );
-      }
-      return (
-        <h5>
-          <span className="label label-danger"> Backordered</span>
-        </h5>
-      );
-    }
-  }
-];
-
 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'
-  },
-  {
-    dataField: 'inStock',
-    text: 'In Stock',
-    formatter: (cellContent, row) => (
-      <div className="checkbox disabled">
-        <label>
-          <input type="checkbox" checked={ row.inStock } disabled />
-        </label>
-      </div>
-    )
-  },
-  {
-    dataField: 'df1',
-    isDummyField: true,
-    text: 'Action 1',
-    formatter: (cellContent, row) => {
-      if (row.inStock) {
-        return (
-          <h5>
-            <span className="label label-success"> Available</span>
-          </h5>
-        );
-      }
-      return (
-        <h5>
-          <span className="label label-danger"> Backordered</span>
-        </h5>
-      );
-    }
-  },
-  {
-    dataField: 'df2',
-    isDummyField: true,
-    text: 'Action 2',
-    formatter: (cellContent, row) => {
-      if (row.inStock) {
-        return (
-          <h5>
-            <span className="label label-success"> Available</span>
-          </h5>
-        );
-      }
-      return (
-        <h5>
-          <span className="label label-danger"> Backordered</span>
-        </h5>
-      );
-    }
-  }
-];
-
 class ProductList extends React.Component {
  constructor(props) {
    super(props);
-    this.state = { products };
+    this.state = { products, count: 0 };
  }

  toggleInStock = () => {
@@ -163,17 +35,96 @@ class ProductList extends React.Component {
  };

  render() {
+    const columns = [
+      {
+        dataField: 'id',
+        text: 'Product ID',
+        formatter: (cell, row, rowIndex, extraData) => (
+          <div>
+            <span>ID: {row.id}</span>
+            <br />
+            <span>state: {extraData}</span>
+          </div>
+        ),
+        formatExtraData: this.state.count
+      },
+      {
+        dataField: 'name',
+        text: 'Product Name'
+      },
+      {
+        dataField: 'price',
+        text: 'Product Price'
+      },
+      {
+        dataField: 'inStock',
+        text: 'In Stock',
+        formatter: (cellContent, row) => (
+          <div className="checkbox disabled">
+            <label>
+              <input type="checkbox" checked={ row.inStock } disabled />
+            </label>
+          </div>
+        )
+      },
+      {
+        dataField: 'df1',
+        isDummyField: true,
+        text: 'Action 1',
+        formatter: (cellContent, row) => {
+          if (row.inStock) {
+            return (
+              <h5>
+                <span className="label label-success"> Available</span>
+              </h5>
+            );
+          }
+          return (
+            <h5>
+              <span className="label label-danger"> Backordered</span>
+            </h5>
+          );
+        }
+      },
+      {
+        dataField: 'df2',
+        isDummyField: true,
+        text: 'Action 2',
+        formatter: (cellContent, row) => {
+          if (row.inStock) {
+            return (
+              <h5>
+                <span className="label label-success"> Available</span>
+              </h5>
+            );
+          }
+          return (
+            <h5>
+              <span className="label label-danger"> Backordered</span>
+            </h5>
+          );
+        }
+      }
+    ];
+
    return (
      <div>
-        <h1 className="h2">Products</h1>
+        <h3>Action 1 and Action 2 are dummy column</h3>
+        <button onClick={ this.toggleInStock } className="btn btn-primary">
+          Toggle item 13 stock status
+        </button>
+        <button
+          className="btn btn-success"
+          onClick={ () => this.setState(() => ({ count: this.state.count + 1 })) }
+        >
+          Click me to Increase counter
+        </button>
        <BootstrapTable
          keyField="id"
          data={ this.state.products }
          columns={ columns }
        />
-        <button onClick={ this.toggleInStock } className="btn btn-primary">
-          Toggle item 13 stock status
-        </button>
+        <Code>{ sourceCode }</Code>
      </div>
    );
  }
@@ -183,7 +134,7 @@ class ProductList extends React.Component {
 class ProductList extends React.Component {
  constructor(props) {
    super(props);
-    this.state = { products };
+    this.state = { products, count: 0 };
  }

  toggleInStock = () => {
@@ -200,13 +151,95 @@ class ProductList extends React.Component {
    this.setState(curr => ({ ...curr, products: newProducts }));
  };

+  counter = () => {
+    this.setState(curr => ({ ...curr, count: this.state.count + 1 }));
+  }
+
  render() {
+    const columns = [
+      {
+        dataField: 'id',
+        text: 'Product ID',
+        formatter: (cell, row, rowIndex, extraData) => (
+          <div>
+            <span>ID: {row.id}</span>
+            <br />
+            <span>Counter: {extraData}</span>
+          </div>
+        ),
+        formatExtraData: this.state.count
+      },
+      {
+        dataField: 'name',
+        text: 'Product Name'
+      },
+      {
+        dataField: 'price',
+        text: 'Product Price'
+      },
+      {
+        dataField: 'inStock',
+        text: 'In Stock',
+        formatter: (cellContent, row) => (
+          <div className="checkbox disabled">
+            <label>
+              <input type="checkbox" checked={ row.inStock } disabled />
+            </label>
+          </div>
+        )
+      },
+      {
+        dataField: 'df1',
+        isDummyField: true,
+        text: 'Action 1',
+        formatter: (cellContent, row) => {
+          if (row.inStock) {
+            return (
+              <h5>
+                <span className="label label-success"> Available</span>
+              </h5>
+            );
+          }
+          return (
+            <h5>
+              <span className="label label-danger"> Backordered</span>
+            </h5>
+          );
+        }
+      },
+      {
+        dataField: 'df2',
+        isDummyField: true,
+        text: 'Action 2',
+        formatter: (cellContent, row) => {
+          if (row.inStock) {
+            return (
+              <h5>
+                <span className="label label-success"> Available</span>
+              </h5>
+            );
+          }
+          return (
+            <h5>
+              <span className="label label-danger"> Backordered</span>
+            </h5>
+          );
+        }
+      }
+    ];
+
    return (
      <div>
        <h3>Action 1 and Action 2 are dummy column</h3>
        <button onClick={ this.toggleInStock } className="btn btn-primary">
          Toggle item 13 stock status
        </button>
+        <button
+          className="btn btn-success"
+          onClick={ this.counter }
+        >
+          Click me to Increase counter
+        </button>
        <BootstrapTable
          keyField="id"
          data={ this.state.products }
--- a/packages/react-bootstrap-table2-example/package.json
+++ b/packages/react-bootstrap-table2-example/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-bootstrap-table2-example",
-  "version": "1.0.21",
+  "version": "1.0.23",
  "description": "",
  "main": "index.js",
  "private": true,
--- a/packages/react-bootstrap-table2-filter/package.json
+++ b/packages/react-bootstrap-table2-filter/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-bootstrap-table2-filter",
-  "version": "1.1.7",
+  "version": "1.1.8",
  "description": "it's a column filter addon for react-bootstrap-table2",
  "main": "./lib/index.js",
  "repository": {
--- a/packages/react-bootstrap-table2-filter/src/components/date.js
+++ b/packages/react-bootstrap-table2-filter/src/components/date.js
@@ -18,7 +18,7 @@ const legalComparators = [
 ];

 function dateParser(d) {
-  return `${d.getFullYear()}-${('0' + (d.getMonth() + 1)).slice(-2)}-${('0' + d.getDate()).slice(-2)}`;
+  return `${d.getUTCFullYear()}-${('0' + (d.getUTCMonth() + 1)).slice(-2)}-${('0' + d.getUTCDate()).slice(-2)}`;
 }

 class DateFilter extends Component {
--- a/packages/react-bootstrap-table2-filter/src/filter.js
+++ b/packages/react-bootstrap-table2-filter/src/filter.js
@@ -98,9 +98,9 @@ export const filterByDate = _ => (
  customFilterValue
 ) => {
  if (!date || !comparator) return data;
-  const filterDate = date.getDate();
-  const filterMonth = date.getMonth();
-  const filterYear = date.getFullYear();
+  const filterDate = date.getUTCDate();
+  const filterMonth = date.getUTCMonth();
+  const filterYear = date.getUTCFullYear();

  return data.filter((row) => {
    let valid = true;
@@ -114,9 +114,9 @@ export const filterByDate = _ => (
      cell = new Date(cell);
    }

-    const targetDate = cell.getDate();
-    const targetMonth = cell.getMonth();
-    const targetYear = cell.getFullYear();
+    const targetDate = cell.getUTCDate();
+    const targetMonth = cell.getUTCMonth();
+    const targetYear = cell.getUTCFullYear();


    switch (comparator) {
--- a/packages/react-bootstrap-table2-paginator/package.json
+++ b/packages/react-bootstrap-table2-paginator/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-bootstrap-table2-paginator",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "description": "it's the pagination addon for react-bootstrap-table2",
  "main": "./lib/index.js",
  "repository": {
--- a/packages/react-bootstrap-table2-paginator/src/page-resolver.js
+++ b/packages/react-bootstrap-table2-paginator/src/page-resolver.js
@@ -56,7 +56,7 @@ export default ExtendBase =>
        alwaysShowAllBtns
      } = this.props;

-      let pages;
+      let pages = [];
      let endPage = totalPages;
      if (endPage <= 0) return [];

@@ -68,24 +68,42 @@ export default ExtendBase =>
        startPage = endPage - paginationSize + 1;
      }

-      if (startPage !== pageStartIndex && totalPages > paginationSize && withFirstAndLast) {
+      if (alwaysShowAllBtns) {
+        if (withFirstAndLast) {
          pages = [firstPageText, prePageText];
-      } else if (totalPages > 1 || alwaysShowAllBtns) {
-        pages = [prePageText];
        } else {
-        pages = [];
+          pages = [prePageText];
+        }
+      }
+
+      if (startPage !== pageStartIndex &&
+        totalPages > paginationSize &&
+        withFirstAndLast &&
+        pages.length === 0
+      ) {
+        pages = [firstPageText, prePageText];
+      } else if (totalPages > 1 && pages.length === 0) {
+        pages = [prePageText];
      }

      for (let i = startPage; i <= endPage; i += 1) {
        if (i >= pageStartIndex) pages.push(i);
      }

-      if (endPage <= lastPage && pages.length > 1) {
+      if (alwaysShowAllBtns || (endPage <= lastPage && pages.length > 1)) {
        pages.push(nextPageText);
      }
-      if (endPage !== lastPage && withFirstAndLast) {
+      if ((endPage !== lastPage && withFirstAndLast) || (withFirstAndLast && alwaysShowAllBtns)) {
        pages.push(lastPageText);
      }
+
+      // if ((endPage <= lastPage && pages.length > 1) || alwaysShowAllBtns) {
+      //   pages.push(nextPageText);
+      // }
+      // if (endPage !== lastPage && withFirstAndLast) {
+      //   pages.push(lastPageText);
+      // }
+
      return pages;
    }

--- a/packages/react-bootstrap-table2/package.json
+++ b/packages/react-bootstrap-table2/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-bootstrap-table-next",
-  "version": "3.0.2",
+  "version": "3.1.0",
  "description": "Next generation of react-bootstrap-table",
  "main": "./lib/index.js",
  "repository": {
@@ -37,6 +37,7 @@
  ],
  "dependencies": {
    "classnames": "2.2.5",
+    "react-transition-group": "2.5.3",
    "underscore": "1.9.1"
  },
  "peerDependencies": {
--- a/packages/react-bootstrap-table2/src/cell.js
+++ b/packages/react-bootstrap-table2/src/cell.js
@@ -26,7 +26,7 @@ class Cell extends eventDelegater(Component) {
    // if (nextProps.formatter)

    shouldUpdate =
-      nextProps.column.formatter ? !_.isEqual(this.props.row, nextProps.row) : false ||
+      (nextProps.column.formatter ? !_.isEqual(this.props.row, nextProps.row) : false) ||
      this.props.column.hidden !== nextProps.column.hidden ||
      this.props.rowIndex !== nextProps.rowIndex ||
      this.props.columnIndex !== nextProps.columnIndex ||
--- a/packages/react-bootstrap-table2/src/contexts/row-expand-context.js
+++ b/packages/react-bootstrap-table2/src/contexts/row-expand-context.js
@@ -10,18 +10,31 @@ class RowExpandProvider extends React.Component {
    children: PropTypes.node.isRequired,
    data: PropTypes.array.isRequired,
    keyField: PropTypes.string.isRequired
-  }
+  };

-  state = { expanded: this.props.expandRow.expanded || [] };
+  state = { expanded: this.props.expandRow.expanded || [],
+    isClosing: this.props.expandRow.isClosing || [] };

  componentWillReceiveProps(nextProps) {
    if (nextProps.expandRow) {
+      const isClosing = this.state.expanded.reduce((acc, cur) => {
+        if (!nextProps.expandRow.expanded.includes(cur)) {
+          acc.push(cur);
+        }
+        return acc;
+      }, []);
+      this.setState(() => ({ expanded: nextProps.expandRow.expanded, isClosing }));
+    } else {
      this.setState(() => ({
-        expanded: nextProps.expandRow.expanded || this.state.expanded
+        expanded: this.state.expanded
      }));
    }
  }

+  onClosed = (closedRow) => {
+    this.setState({ isClosing: this.state.isClosing.filter(value => value !== closedRow) });
+  };
+
  handleRowExpand = (rowKey, expanded, rowIndex, e) => {
    const { data, keyField, expandRow: { onExpand, onlyOneExpanding, nonExpandable } } = this.props;
    if (nonExpandable && nonExpandable.includes(rowKey)) {
@@ -29,11 +42,15 @@ class RowExpandProvider extends React.Component {
    }

    let currExpanded = [...this.state.expanded];
+    let isClosing = [...this.state.isClosing];

    if (expanded) {
-      if (onlyOneExpanding) currExpanded = [rowKey];
-      else currExpanded.push(rowKey);
+      if (onlyOneExpanding) {
+        isClosing = isClosing.concat(currExpanded);
+        currExpanded = [rowKey];
+      } else currExpanded.push(rowKey);
    } else {
+      isClosing.push(rowKey);
      currExpanded = currExpanded.filter(value => value !== rowKey);
    }

@@ -41,8 +58,8 @@ class RowExpandProvider extends React.Component {
      const row = dataOperator.getRowByRowId(data, keyField, rowKey);
      onExpand(row, expanded, rowIndex, e);
    }
-    this.setState(() => ({ expanded: currExpanded }));
-  }
+    this.setState(() => ({ expanded: currExpanded, isClosing }));
+  };

  handleAllRowExpand = (e, expandAll) => {
    const {
@@ -68,7 +85,7 @@ class RowExpandProvider extends React.Component {
    }

    this.setState(() => ({ expanded: currExpanded }));
-  }
+  };

  render() {
    const { data, keyField } = this.props;
@@ -78,6 +95,8 @@ class RowExpandProvider extends React.Component {
          ...this.props.expandRow,
          nonExpandable: this.props.expandRow.nonExpandable,
          expanded: this.state.expanded,
+          isClosing: this.state.isClosing,
+          onClosed: this.onClosed,
          isAnyExpands: dataOperator.isAnyExpands(data, keyField, this.state.expanded),
          onRowExpand: this.handleRowExpand,
          onAllRowExpand: this.handleAllRowExpand
--- a/packages/react-bootstrap-table2/src/row-expand/expand-row.js
+++ b/packages/react-bootstrap-table2/src/row-expand/expand-row.js
@@ -1,18 +1,37 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { CSSTransition } from 'react-transition-group';

-const ExpandRow = ({ children, ...rest }) => (
-  <tr className="expanding-row">
-    <td { ...rest }>{ children }</td>
+const ExpandRow = ({ children, expanded, onClosed, ...rest }) => (
+  <tr>
+    <td className="reset-expansion-style" { ...rest }>
+      <CSSTransition
+        appear
+        in={ expanded }
+        timeout={ 400 }
+        classNames="row-expand-slide"
+        onExited={ onClosed }
+      >
+        <div>
+          <div className="row-expansion-style">
+            { children }
+          </div>
+        </div>
+      </CSSTransition>
+    </td>
  </tr>
 );

 ExpandRow.propTypes = {
-  children: PropTypes.node
+  children: PropTypes.node,
+  expanded: PropTypes.bool,
+  onClosed: PropTypes.func
 };

 ExpandRow.defaultProps = {
-  children: null
+  children: null,
+  expanded: false,
+  onClosed: null
 };

 export default ExpandRow;
--- a/packages/react-bootstrap-table2/src/row-expand/row-consumer.js
+++ b/packages/react-bootstrap-table2/src/row-expand/row-consumer.js
@@ -8,8 +8,8 @@ export default (Component) => {
    const key = props.value;

    const expanded = expandRow.expanded.includes(key);
+    const isClosing = expandRow.isClosing.includes(key);
    const expandable = !expandRow.nonExpandable || !expandRow.nonExpandable.includes(key);
-
    return [
      <Component
        { ...props }
@@ -18,9 +18,11 @@ export default (Component) => {
        expandable={ expandable }
        expandRow={ { ...expandRow } }
      />,
-      expanded ? <ExpandRow
+      expanded || isClosing ? <ExpandRow
        key={ `${key}-expanding` }
        colSpan={ props.visibleColumnSize }
+        expanded={ expanded }
+        onClosed={ () => expandRow.onClosed(key) }
      >
        { expandRow.renderer(props.row) }
      </ExpandRow> : null
--- a/packages/react-bootstrap-table2/src/row/should-updater.js
+++ b/packages/react-bootstrap-table2/src/row/should-updater.js
@@ -27,7 +27,7 @@ export default ExtendBase =>
        return true;
      }
      for (let i = 0; i < this.props.columns.length; i += 1) {
-        if (this.props.columns[i].hidden !== nextProps.columns[i].hidden) {
+        if (!_.isEqual(this.props.columns[i], nextProps.columns[i])) {
          return true;
        }
      }
--- a/packages/react-bootstrap-table2/style/react-bootstrap-table2.scss
+++ b/packages/react-bootstrap-table2/style/react-bootstrap-table2.scss
@@ -68,10 +68,6 @@
    text-align: center;
  }

-  tr.expanding-row {
-    padding: 5px;
-  }
-
  td.react-bootstrap-table-editing-cell {
    .animated {
      animation-fill-mode: both;
@@ -161,4 +157,26 @@
      animation-name: bounceOut;
    }
  }
+  .reset-expansion-style{
+    padding: 0;
+  }
+  .row-expansion-style{
+    padding: 8px;
+  }
+  .row-expand-slide-appear{
+    max-height: 0;
+    overflow: hidden;
+  }
+  .row-expand-slide-appear-active{
+    max-height: 1000px;
+    transition: max-height 3s linear;
+  }
+  .row-expand-slide-exit{
+    max-height: 1000px;
+  }
+  .row-expand-slide-exit-active{
+    max-height: 0;
+    overflow: hidden;
+    transition: max-height 400ms cubic-bezier(0, 0.95, 0, 0.95)
+  }
 }
Author	SHA1	Message	Date
AllenFang	497bf44192	Publish - react-bootstrap-table2-editor@1.2.3 - react-bootstrap-table2-example@1.0.23 - react-bootstrap-table2-filter@1.1.8 - react-bootstrap-table-next@3.1.0	2019-04-02 21:33:49 +08:00
Allen	fcefcf8c84	Merge pull request #886 from react-bootstrap-table/develop 20190331 release	2019-04-02 21:25:03 +08:00
Allen	04e3af0bbb	Merge pull request #861 from react-bootstrap-table/feature/row-expand-animate Feature/row expand animate	2019-03-31 16:02:13 +08:00
AllenFang	9f47fa009c	lock version	2019-03-31 15:33:43 +08:00
Alek Lefebvre	0edf9c8891	fix #808 (#874 )	2019-03-31 15:17:57 +08:00
AllenFang	df5024892c	Publish - react-bootstrap-table2-example@1.0.22 - react-bootstrap-table2-paginator@2.0.5 - react-bootstrap-table-next@3.0.3	2019-03-26 20:41:04 +08:00
Allen	4448c3f28c	Merge pull request #875 from react-bootstrap-table/develop 20190326 release	2019-03-26 20:39:13 +08:00
AllenFang	196ae33295	fix #859	2019-03-25 23:07:22 +08:00
AllenFang	7f1b7a6c97	fix #838	2019-03-24 20:52:26 +08:00
AllenFang	a6ccafcc75	fix #866	2019-03-24 16:55:56 +08:00
AllenFang	dba3da28c1	Merge branch 'YassienW-animate-row-expansion' into feature/row-expand-animate	2019-03-17 15:24:07 +08:00
AllenFang	a0e09cd804	fix conflicts	2019-03-17 15:20:16 +08:00
Yassien	8f304a849f	Animation now works with custom expand management	2019-03-16 19:03:22 +02:00
Yassien	33c026c7e2	Added original padding without breaking the animation	2019-02-25 13:01:42 +02:00
Yassien	d84fd5c801	CSS Animation for row expansion	2019-02-23 22:40:05 +02:00