Merge branch 'v4.0.0-dev' of https://github.com/SidKwok/react-bootstrap-table into SidKwok-v4.0.0-dev

Author: AllenFang

examples/js/column-filter/custom-filter.js

@@ -1,6 +1,7 @@
 /* eslint max-len: 0 */
 /* eslint no-unused-vars: 0 */
 import React from 'react';
+import PropTypes from 'prop-types';
 import { BootstrapTable, TableHeaderColumn } from 'react-bootstrap-table';
 
 const products = [];
@@ -60,9 +61,9 @@ class CheckboxFilter extends React.Component {
 }
 
 CheckboxFilter.propTypes = {
-  filterHandler: React.PropTypes.func.isRequired,
-  textOK: React.PropTypes.string,
-  textNOK: React.PropTypes.string
+  filterHandler: PropTypes.func.isRequired,
+  textOK: PropTypes.string,
+  textNOK: PropTypes.string
 };
 
 CheckboxFilter.defaultProps = {

examples/js/components/App.js

@@ -1,5 +1,6 @@
 /* eslint max-len: 0 */
 import React from 'react';
+import PropTypes from 'prop-types';
 import 'react-s-alert/dist/s-alert-default.css';
 import 'react-s-alert/dist/s-alert-css-effects/scale.css';
 import '../../../css/react-bootstrap-table.css';
@@ -12,7 +13,7 @@ import {
 class App extends React.Component {
 
   static propTypes = {
-    children: React.PropTypes.node
+    children: PropTypes.node
   };
 
   static defaultProps = {};

package.json

@@ -69,6 +69,7 @@
   },
   "dependencies": {
     "classnames": "^2.1.2",
+    "prop-types": "^15.5.10",
     "react-modal": "^1.4.0",
     "react-s-alert": "^1.3.0"
   },

src/BootstrapTable.js

@@ -1,6 +1,7 @@
 /* eslint no-alert: 0 */
 /* eslint max-len: 0 */
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classSet from 'classnames';
 import Const from './Const';
 import TableHeader from './TableHeader';
@@ -1432,13 +1433,13 @@ BootstrapTable.propTypes = {
     onSortChange: PropTypes.func,
     onPageChange: PropTypes.func,
     onSizePerPageList: PropTypes.func,
-    onFilterChange: React.PropTypes.func,
-    onSearchChange: React.PropTypes.func,
-    onAddRow: React.PropTypes.func,
-    onExportToCSV: React.PropTypes.func,
-    onCellEdit: React.PropTypes.func,
+    onFilterChange: PropTypes.func,
+    onSearchChange: PropTypes.func,
+    onAddRow: PropTypes.func,
+    onExportToCSV: PropTypes.func,
+    onCellEdit: PropTypes.func,
     noDataText: PropTypes.oneOfType([ PropTypes.string, PropTypes.object ]),
-    withoutNoDataText: React.PropTypes.bool,
+    withoutNoDataText: PropTypes.bool,
     handleConfirmDeleteRow: PropTypes.func,
     prePage: PropTypes.string,
     nextPage: PropTypes.string,

src/SelectRowHeaderColumn.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 class SelectRowHeaderColumn extends Component {
 

src/TableBody.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import Utils from './util';
 import Const from './Const';
 import TableRow from './TableRow';

src/TableColumn.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import Const from './Const';
 

src/TableEditColumn.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import editor from './Editor';
 import { notice } from './Notification.js';

src/TableFilter.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import Const from './Const';
 import classSet from 'classnames';
 

src/TableHeader.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import Const from './Const';
 import classSet from 'classnames';