Merge branch 'SidKwok-v4.0.0-dev' into v4.0.0-dev

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';

src/TableHeaderColumn.js

@@ -1,6 +1,7 @@
 /* eslint default-case: 0 */
 /* eslint guard-for-in: 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 Util from './util';

src/TableRow.js

@@ -1,6 +1,7 @@
 /* eslint no-nested-ternary: 0 */
 import classSet from 'classnames';
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 class TableRow extends Component {
 

src/filters/Date.js

@@ -1,6 +1,7 @@
 /* eslint quotes: 0 */
 /* eslint max-len: 0 */
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import Const from '../Const';
 
 const legalComparators = [ '=', '>', '>=', '<', '<=', '!=' ];

src/filters/Number.js

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

src/filters/Regex.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';
 
 class RegexFilter extends Component {

src/filters/Select.js

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

src/filters/Text.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';
 
 class TextFilter extends Component {

src/pagination/PageButton.js

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

src/pagination/PaginationList.js

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

src/pagination/SizePerPageDropDown.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 const sizePerPageDefaultClass = 'react-bs-table-sizePerPage-dropdown';
 

src/toolbar/ButtonGroup.js

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

src/toolbar/ClearSearchButton.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 const clearBtnDefaultClass = 'react-bs-table-search-clear-btn';
 

src/toolbar/DeleteButton.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';
 
 const deleteBtnDefaultClass = 'react-bs-table-del-btn';

src/toolbar/ExportCSVButton.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';
 
 const exportCsvBtnDefaultClass = 'react-bs-table-csv-btn';

src/toolbar/InsertButton.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';
 
 const insertBtnDefaultClass = 'react-bs-table-add-btn';

src/toolbar/InsertModal.js

@@ -1,6 +1,7 @@
 /* eslint no-console: 0 */
 
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import InsertModalHeader from './InsertModalHeader';
 import InsertModalFooter from './InsertModalFooter';

src/toolbar/InsertModalBody.js

@@ -1,5 +1,6 @@
 /* eslint react/display-name: 0 */
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 import editor from '../Editor';
 

src/toolbar/InsertModalFooter.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';
 
 class InsertModalFooter extends Component {

src/toolbar/InsertModalHeader.js

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

src/toolbar/SearchField.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';
 
 class SearchField extends Component {

src/toolbar/ShowSelectedOnlyButton.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';
 
 const showSelectedOnlyBtnDefaultClass = 'react-bs-table-show-sel-only-btn';

src/toolbar/ToolBar.js

@@ -1,6 +1,7 @@
 /* eslint no-console: 0 */
 
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import Modal from 'react-modal';
 // import classSet from 'classnames';
 import Const from '../Const';