Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace PropTypes with prop-types library to remove warnings #1331

Merged
merged 2 commits into from
May 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions examples/js/column-filter/custom-filter.js
Original file line number Diff line number Diff line change
@@ -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 = [];
Expand Down Expand Up @@ -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 = {
Expand Down
3 changes: 2 additions & 1 deletion examples/js/components/App.js
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -12,7 +13,7 @@ import {
class App extends React.Component {

static propTypes = {
children: React.PropTypes.node
children: PropTypes.node
};

static defaultProps = {};
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
15 changes: 8 additions & 7 deletions src/BootstrapTable.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -1411,13 +1412,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,
Expand Down
3 changes: 2 additions & 1 deletion src/SelectRowHeaderColumn.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';

class SelectRowHeaderColumn extends Component {

Expand Down
3 changes: 2 additions & 1 deletion src/TableBody.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/TableColumn.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion src/TableEditColumn.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/TableFilter.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion src/TableHeader.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/TableHeaderColumn.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/TableRow.js
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
3 changes: 2 additions & 1 deletion src/filters/Date.js
Original file line number Diff line number Diff line change
@@ -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 = [ '=', '>', '>=', '<', '<=', '!=' ];
Expand Down
3 changes: 2 additions & 1 deletion src/filters/Number.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion src/filters/Regex.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/filters/Select.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion src/filters/Text.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/pagination/PageButton.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/pagination/PaginationList.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/pagination/SizePerPageDropDown.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/ButtonGroup.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/ClearSearchButton.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/DeleteButton.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/ExportCSVButton.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/InsertButton.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/InsertModal.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/InsertModalBody.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/InsertModalFooter.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/InsertModalHeader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';

class InsertModalHeader extends Component {

Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/SearchField.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/ShowSelectedOnlyButton.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/toolbar/ToolBar.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Loading