From b2e6bf93fb53c738ed2d90172b153a26fe9edc22 Mon Sep 17 00:00:00 2001 From: AllenFang Date: Sat, 20 Jan 2018 17:43:05 +0800 Subject: [PATCH] tweak pagination factory name --- package.json | 5 ---- .../package.json | 21 ++++++++++------ .../loading-overlay/empty-table-overlay.js | 8 +++--- .../examples/loading-overlay/table-overlay.js | 8 +++--- .../examples/pagination/custom-pagination.js | 8 +++--- .../examples/pagination/index.js | 8 +++--- .../examples/pagination/pagination-hooks.js | 8 +++--- .../examples/remote/remote-all.js | 8 +++--- .../examples/remote/remote-pagination.js | 8 +++--- .../package.json | 2 +- .../package.json | 21 ++++++++++------ .../package.json | 21 ++++++++++------ .../README.md | 4 +-- .../package.json | 21 ++++++++++------ packages/react-bootstrap-table2/package.json | 25 +++++++++++++------ 15 files changed, 105 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index c26123c..104659b 100644 --- a/package.json +++ b/package.json @@ -75,11 +75,6 @@ "react": "16.0.0", "react-dom": "16.0.0" }, - "peerDependencies": { - "prop-types": "^15.0.0", - "react": "^16.0.0", - "react-dom": "^16.0.0" - }, "jest": { "collectCoverageFrom": [ "packages/**/*.js" diff --git a/packages/react-bootstrap-table2-editor/package.json b/packages/react-bootstrap-table2-editor/package.json index 444c412..e7c1ead 100644 --- a/packages/react-bootstrap-table2-editor/package.json +++ b/packages/react-bootstrap-table2-editor/package.json @@ -1,11 +1,12 @@ { "name": "react-bootstrap-table2-editor", - "version": "0.0.1", + "version": "0.0.1-beta.3", "description": "it's the editor addon for react-bootstrap-table2", "main": "./lib/index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, + "license": "MIT", "repository": { "type": "git", "url": "git+https://github.com/react-bootstrap-table/react-bootstrap-table2.git" @@ -26,10 +27,16 @@ "react" ], "author": "AllenFang", - "contributors": [{ - "name": "Chun-MingChen", - "email": "nick830314@gmail.com", - "url": "https://github.com/Chun-MingChen" - }], - "license": "MIT" + "contributors": [ + { + "name": "Chun-MingChen", + "email": "nick830314@gmail.com", + "url": "https://github.com/Chun-MingChen" + } + ], + "peerDependencies": { + "prop-types": "^15.0.0", + "react": "^16.0.0", + "react-dom": "^16.0.0" + } } diff --git a/packages/react-bootstrap-table2-example/examples/loading-overlay/empty-table-overlay.js b/packages/react-bootstrap-table2-example/examples/loading-overlay/empty-table-overlay.js index 63fc28f..faa0261 100644 --- a/packages/react-bootstrap-table2-example/examples/loading-overlay/empty-table-overlay.js +++ b/packages/react-bootstrap-table2-example/examples/loading-overlay/empty-table-overlay.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import Code from 'components/common/code-block'; import { productsGenerator } from 'utils/common'; @@ -21,7 +21,7 @@ const columns = [{ const sourceCode = `\ import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; // ... const RemotePagination = ({ data, page, sizePerPage, onTableChange, totalSize }) => (
@@ -30,7 +30,7 @@ const RemotePagination = ({ data, page, sizePerPage, onTableChange, totalSize }) keyField="id" data={ data } columns={ columns } - pagination={ paginator({ page, sizePerPage, totalSize }) } + pagination={ paginationFactory({ page, sizePerPage, totalSize }) } onTableChange={ onTableChange } /> { sourceCode } @@ -90,7 +90,7 @@ const Table = ({ data, page, sizePerPage, onTableChange, totalSize }) => ( keyField="id" data={ data } columns={ columns } - pagination={ paginator({ page, sizePerPage, totalSize }) } + pagination={ paginationFactory({ page, sizePerPage, totalSize }) } onTableChange={ onTableChange } noDataIndication={ () => } /> diff --git a/packages/react-bootstrap-table2-example/examples/loading-overlay/table-overlay.js b/packages/react-bootstrap-table2-example/examples/loading-overlay/table-overlay.js index 3af5a73..efd296c 100644 --- a/packages/react-bootstrap-table2-example/examples/loading-overlay/table-overlay.js +++ b/packages/react-bootstrap-table2-example/examples/loading-overlay/table-overlay.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import overlayFactory from 'react-bootstrap-table2-overlay'; import Code from 'components/common/code-block'; import { productsGenerator } from 'utils/common'; @@ -22,7 +22,7 @@ const columns = [{ const sourceCode = `\ import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import overlayFactory from 'react-bootstrap-table2-overlay'; // ... @@ -34,7 +34,7 @@ const RemotePagination = ({ loading, data, page, sizePerPage, onTableChange, tot keyField="id" data={ data } columns={ columns } - pagination={ paginator({ page, sizePerPage, totalSize }) } + pagination={ paginationFactory({ page, sizePerPage, totalSize }) } onTableChange={ onTableChange } overlay={ overlayFactory({ spinner: true, background: 'rgba(192,192,192,0.3)' }) } /> @@ -99,7 +99,7 @@ const RemotePagination = ({ loading, data, page, sizePerPage, onTableChange, tot keyField="id" data={ data } columns={ columns } - pagination={ paginator({ page, sizePerPage, totalSize }) } + pagination={ paginationFactory({ page, sizePerPage, totalSize }) } onTableChange={ onTableChange } overlay={ overlayFactory({ spinner: true, background: 'rgba(192,192,192,0.3)' }) } /> diff --git a/packages/react-bootstrap-table2-example/examples/pagination/custom-pagination.js b/packages/react-bootstrap-table2-example/examples/pagination/custom-pagination.js index 9913782..63197a3 100644 --- a/packages/react-bootstrap-table2-example/examples/pagination/custom-pagination.js +++ b/packages/react-bootstrap-table2-example/examples/pagination/custom-pagination.js @@ -2,7 +2,7 @@ import React from 'react'; import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import Code from 'components/common/code-block'; import { productsGenerator } from 'utils/common'; @@ -21,7 +21,7 @@ const columns = [{ const sourceCode = `\ import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; // ... const options = { @@ -48,7 +48,7 @@ const options = { }] // A numeric array is also available. the purpose of above example is custom the text }; - + `; const options = { paginationSize: 4, @@ -76,7 +76,7 @@ const options = { export default () => (
- + { sourceCode }
); diff --git a/packages/react-bootstrap-table2-example/examples/pagination/index.js b/packages/react-bootstrap-table2-example/examples/pagination/index.js index 1c72668..1822a75 100644 --- a/packages/react-bootstrap-table2-example/examples/pagination/index.js +++ b/packages/react-bootstrap-table2-example/examples/pagination/index.js @@ -2,7 +2,7 @@ import React from 'react'; import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import Code from 'components/common/code-block'; import { productsGenerator } from 'utils/common'; @@ -21,7 +21,7 @@ const columns = [{ const sourceCode = `\ import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; // ... const columns = [{ dataField: 'id', @@ -34,12 +34,12 @@ const columns = [{ text: 'Product Price' }]; - + `; export default () => (
- + { sourceCode }
); diff --git a/packages/react-bootstrap-table2-example/examples/pagination/pagination-hooks.js b/packages/react-bootstrap-table2-example/examples/pagination/pagination-hooks.js index 47a0047..397ced2 100644 --- a/packages/react-bootstrap-table2-example/examples/pagination/pagination-hooks.js +++ b/packages/react-bootstrap-table2-example/examples/pagination/pagination-hooks.js @@ -3,7 +3,7 @@ import React from 'react'; import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import Code from 'components/common/code-block'; import { productsGenerator } from 'utils/common'; @@ -22,7 +22,7 @@ const columns = [{ const sourceCode = `\ import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; // ... const columns = [{ dataField: 'id', @@ -52,7 +52,7 @@ const options = { keyField="id" data={ products } columns={ columns } - pagination={ paginator(options) } + pagination={ paginationFactory(options) } /> `; @@ -75,7 +75,7 @@ export default () => ( keyField="id" data={ products } columns={ columns } - pagination={ paginator(options) } + pagination={ paginationFactory(options) } /> { sourceCode }
diff --git a/packages/react-bootstrap-table2-example/examples/remote/remote-all.js b/packages/react-bootstrap-table2-example/examples/remote/remote-all.js index 033c837..2720584 100644 --- a/packages/react-bootstrap-table2-example/examples/remote/remote-all.js +++ b/packages/react-bootstrap-table2-example/examples/remote/remote-all.js @@ -3,7 +3,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import filterFactory, { textFilter, Comparator } from 'react-bootstrap-table2-filter'; import Code from 'components/common/code-block'; import { productsGenerator } from 'utils/common'; @@ -25,7 +25,7 @@ const columns = [{ const sourceCode = `\ import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import filterFactory, { textFilter, Comparator } from 'react-bootstrap-table2-filter'; // ... @@ -50,7 +50,7 @@ const RemoteAll = ({ data, page, sizePerPage, onTableChange, totalSize }) => ( data={ data } columns={ columns } filter={ filterFactory() } - pagination={ paginator({ page, sizePerPage, totalSize }) } + pagination={ paginationFactory({ page, sizePerPage, totalSize }) } onTableChange={ onTableChange } /> { sourceCode } @@ -130,7 +130,7 @@ const RemoteAll = ({ data, page, sizePerPage, onTableChange, totalSize }) => ( data={ data } columns={ columns } filter={ filterFactory() } - pagination={ paginator({ page, sizePerPage, totalSize }) } + pagination={ paginationFactory({ page, sizePerPage, totalSize }) } onTableChange={ onTableChange } /> { sourceCode } diff --git a/packages/react-bootstrap-table2-example/examples/remote/remote-pagination.js b/packages/react-bootstrap-table2-example/examples/remote/remote-pagination.js index 9408839..a971a4b 100644 --- a/packages/react-bootstrap-table2-example/examples/remote/remote-pagination.js +++ b/packages/react-bootstrap-table2-example/examples/remote/remote-pagination.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; import Code from 'components/common/code-block'; import { productsGenerator } from 'utils/common'; @@ -21,7 +21,7 @@ const columns = [{ const sourceCode = `\ import BootstrapTable from 'react-bootstrap-table-next'; -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; // ... const RemotePagination = ({ data, page, sizePerPage, onTableChange, totalSize }) => (
@@ -30,7 +30,7 @@ const RemotePagination = ({ data, page, sizePerPage, onTableChange, totalSize }) keyField="id" data={ data } columns={ columns } - pagination={ paginator({ page, sizePerPage, totalSize }) } + pagination={ paginationFactory({ page, sizePerPage, totalSize }) } onTableChange={ onTableChange } /> { sourceCode } @@ -80,7 +80,7 @@ const RemotePagination = ({ data, page, sizePerPage, onTableChange, totalSize }) keyField="id" data={ data } columns={ columns } - pagination={ paginator({ page, sizePerPage, totalSize }) } + pagination={ paginationFactory({ page, sizePerPage, totalSize }) } onTableChange={ onTableChange } /> { sourceCode } diff --git a/packages/react-bootstrap-table2-example/package.json b/packages/react-bootstrap-table2-example/package.json index baf4e6f..dfcfc07 100644 --- 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": "0.0.1-beta.1", + "version": "0.0.1-beta.3", "description": "", "main": "index.js", "private": true, diff --git a/packages/react-bootstrap-table2-filter/package.json b/packages/react-bootstrap-table2-filter/package.json index 89a1e07..d147f1b 100644 --- a/packages/react-bootstrap-table2-filter/package.json +++ b/packages/react-bootstrap-table2-filter/package.json @@ -1,12 +1,13 @@ { "name": "react-bootstrap-table2-filter", - "version": "0.0.1", + "version": "0.0.1-beta.3", "description": "it's a column filter addon for react-bootstrap-table2", "main": "./lib/index.js", "repository": { "type": "git", "url": "git+https://github.com/react-bootstrap-table/react-bootstrap-table2.git" }, + "license": "MIT", "keywords": [ "react", "bootstrap", @@ -23,10 +24,16 @@ "react" ], "author": "AllenFang", - "contributors": [{ - "name": "Chun-MingChen", - "email": "nick830314@gmail.com", - "url": "https://github.com/Chun-MingChen" - }], - "license": "MIT" + "contributors": [ + { + "name": "Chun-MingChen", + "email": "nick830314@gmail.com", + "url": "https://github.com/Chun-MingChen" + } + ], + "peerDependencies": { + "prop-types": "^15.0.0", + "react": "^16.0.0", + "react-dom": "^16.0.0" + } } diff --git a/packages/react-bootstrap-table2-overlay/package.json b/packages/react-bootstrap-table2-overlay/package.json index 76198bc..535e7b8 100644 --- a/packages/react-bootstrap-table2-overlay/package.json +++ b/packages/react-bootstrap-table2-overlay/package.json @@ -1,12 +1,13 @@ { "name": "react-bootstrap-table2-overlay", - "version": "0.0.1", + "version": "0.0.1-beta.3", "description": "it's a loading overlay addons for react-bootstrap-table2", "main": "./lib/index.js", "repository": { "type": "git", "url": "git+https://github.com/react-bootstrap-table/react-bootstrap-table2.git" }, + "license": "MIT", "keywords": [ "react", "bootstrap", @@ -23,13 +24,19 @@ "react" ], "author": "AllenFang", - "contributors": [{ - "name": "Chun-MingChen", - "email": "nick830314@gmail.com", - "url": "https://github.com/Chun-MingChen" - }], - "license": "MIT", + "contributors": [ + { + "name": "Chun-MingChen", + "email": "nick830314@gmail.com", + "url": "https://github.com/Chun-MingChen" + } + ], "dependencies": { "react-loading-overlay": "0.2.8" + }, + "peerDependencies": { + "prop-types": "^15.0.0", + "react": "^16.0.0", + "react-dom": "^16.0.0" } } diff --git a/packages/react-bootstrap-table2-paginator/README.md b/packages/react-bootstrap-table2-paginator/README.md index b6c4a11..dd8da93 100644 --- a/packages/react-bootstrap-table2-paginator/README.md +++ b/packages/react-bootstrap-table2-paginator/README.md @@ -27,10 +27,10 @@ import 'react-bootstrap-table2-paginator/dist/react-bootstrap-table2-paginator.m Let's enable a pagination on your table: ```js -import paginator from 'react-bootstrap-table2-paginator'; +import paginationFactory from 'react-bootstrap-table2-paginator'; // omit... - + ``` ## Customization diff --git a/packages/react-bootstrap-table2-paginator/package.json b/packages/react-bootstrap-table2-paginator/package.json index d75efe9..0a02744 100644 --- a/packages/react-bootstrap-table2-paginator/package.json +++ b/packages/react-bootstrap-table2-paginator/package.json @@ -1,12 +1,13 @@ { "name": "react-bootstrap-table2-paginator", - "version": "0.0.1", + "version": "0.0.1-beta.3", "description": "it's the pagination addon for react-bootstrap-table2", "main": "./lib/index.js", "repository": { "type": "git", "url": "git+https://github.com/react-bootstrap-table/react-bootstrap-table2.git" }, + "license": "MIT", "keywords": [ "react", "bootstrap", @@ -23,10 +24,16 @@ "react" ], "author": "AllenFang", - "contributors": [{ - "name": "Chun-MingChen", - "email": "nick830314@gmail.com", - "url": "https://github.com/Chun-MingChen" - }], - "license": "MIT" + "contributors": [ + { + "name": "Chun-MingChen", + "email": "nick830314@gmail.com", + "url": "https://github.com/Chun-MingChen" + } + ], + "peerDependencies": { + "prop-types": "^15.0.0", + "react": "^16.0.0", + "react-dom": "^16.0.0" + } } diff --git a/packages/react-bootstrap-table2/package.json b/packages/react-bootstrap-table2/package.json index e640b77..99fc64d 100644 --- a/packages/react-bootstrap-table2/package.json +++ b/packages/react-bootstrap-table2/package.json @@ -1,12 +1,13 @@ { "name": "react-bootstrap-table-next", - "version": "0.0.1", + "version": "0.0.1-beta.3", "description": "Next generation of react-bootstrap-table", "main": "./lib/index.js", "repository": { "type": "git", "url": "git+https://github.com/react-bootstrap-table/react-bootstrap-table2.git" }, + "license": "MIT", "keywords": [ "react", "bootstrap", @@ -22,10 +23,20 @@ "react" ], "author": "AllenFang", - "contributors": [{ - "name": "Chun-MingChen", - "email": "nick830314@gmail.com", - "url": "https://github.com/Chun-MingChen" - }], - "license": "MIT" + "contributors": [ + { + "name": "Chun-MingChen", + "email": "nick830314@gmail.com", + "url": "https://github.com/Chun-MingChen" + } + ], + "dependencies": { + "classnames": "2.2.5" + }, + "peerDependencies": { + "classnames": "^2.2.5", + "prop-types": "^15.0.0", + "react": "^16.0.0", + "react-dom": "^16.0.0" + } }