Merge branch 'master' into speedup-splitNested

Author: Avasam

enzyme-setup.js

@@ -1,8 +1,8 @@
-import Adapter from 'enzyme-adapter-react-16.3';
-import { configure } from 'enzyme';
+import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
+import { configure } from "enzyme";
 
 const configureEnzyme = () => {
- configure({ adapter: new Adapter() });
+  configure({ adapter: new Adapter() });
 };
 
 configureEnzyme();

package.json

@@ -1,8 +1,8 @@
 {
- "name": "react-bootstrap-table2",
- "version": "0.0.1",
+ "name": "@musicstory/react-bootstrap-table2",
+ "version": "1.0.0",
  "private": true,
- "description": "Rebuilt for react-bootstrap-table",
+ "description": "Rebuilt for react-bootstrap-table by musicstory",
  "main": "index.js",
  "scripts": {
  "postinstall": "lerna bootstrap",
@@ -51,7 +51,7 @@
  "babel-register": "6.24.1",
  "css-loader": "0.28.1",
  "enzyme": "3.4.0",
- "enzyme-adapter-react-16.3": "1.0.0",
+ "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
  "enzyme-to-json": "3.3.4",
  "eslint": "4.5.0",
  "eslint-config-airbnb": "15.1.0",
@@ -82,8 +82,8 @@
  "dependencies": {
  "classnames": "^2.2.5",
  "prop-types": "15.5.10",
- "react": "16.4.0",
- "react-dom": "16.4.0",
+ "react": "17.0.2",
+ "react-dom": "17.0.2",
  "underscore": "1.9.1"
  },
  "jest": {

packages/react-bootstrap-table2-editor/package.json

@@ -1,7 +1,7 @@
 {
- "name": "react-bootstrap-table2-editor",
- "version": "1.4.0",
- "description": "it's the editor addon for react-bootstrap-table2",
+ "name": "@musicstory/react-bootstrap-table2-editor",
+ "version": "1.0.1",
+ "description": "it's the editor addon for react-bootstrap-table2 by musicstory",
  "main": "./lib/index.js",
  "scripts": {
  "test": "echo \"Error: no test specified\" && exit 1"
@@ -41,7 +41,7 @@
  ],
  "peerDependencies": {
  "prop-types": "^15.0.0",
- "react": "^16.3.0",
- "react-dom": "^16.3.0"
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
  }
 }

packages/react-bootstrap-table2-example/package.json

@@ -1,6 +1,6 @@
 {
- "name": "react-bootstrap-table2-example",
- "version": "1.0.41",
+ "name": "@musicstory/react-bootstrap-table2-example",
+ "version": "1.0.0",
  "description": "",
  "main": "index.js",
  "private": true,
@@ -14,8 +14,8 @@
  "license": "ISC",
  "peerDependencies": {
  "prop-types": "^15.0.0",
- "react": "^16.3.0",
- "react-dom": "^16.3.0"
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
  },
  "devDependencies": {
  "@storybook/addon-console": "^1.0.0",

packages/react-bootstrap-table2-filter/package.json

@@ -1,7 +1,7 @@
 {
- "name": "react-bootstrap-table2-filter",
- "version": "1.3.3",
- "description": "it's a column filter addon for react-bootstrap-table2",
+ "name": "@musicstory/react-bootstrap-table2-filter",
+ "version": "1.0.1",
+ "description": "it's a column filter addon for react-bootstrap-table2 by musicstory",
  "main": "./lib/index.js",
  "repository": {
  "type": "git",
@@ -38,7 +38,7 @@
  ],
  "peerDependencies": {
  "prop-types": "^15.0.0",
- "react": "^16.3.0",
- "react-dom": "^16.3.0"
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
  }
 }

packages/react-bootstrap-table2-overlay/package.json

@@ -1,7 +1,7 @@
 {
- "name": "react-bootstrap-table2-overlay",
- "version": "2.0.0",
- "description": "it's a loading overlay addons for react-bootstrap-table2",
+ "name": "@musicstory/react-bootstrap-table2-overlay",
+ "version": "1.0.1",
+ "description": "it's a loading overlay addons for react-bootstrap-table2 by musicstory",
  "main": "./lib/index.js",
  "repository": {
  "type": "git",
@@ -41,7 +41,7 @@
  },
  "peerDependencies": {
  "prop-types": "^15.0.0",
- "react": "^16.3.0",
- "react-dom": "^16.3.0"
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
  }
 }

packages/react-bootstrap-table2-paginator/package.json

@@ -1,7 +1,7 @@
 {
- "name": "react-bootstrap-table2-paginator",
- "version": "2.1.2",
- "description": "it's the pagination addon for react-bootstrap-table2",
+ "name": "@musicstory/react-bootstrap-table2-paginator",
+ "version": "1.0.1",
+ "description": "it's the pagination addon for react-bootstrap-table2 by musicstory",
  "main": "./lib/index.js",
  "repository": {
  "type": "git",
@@ -38,7 +38,7 @@
  ],
  "peerDependencies": {
  "prop-types": "^15.0.0",
- "react": "^16.3.0",
- "react-dom": "^16.3.0"
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
  }
 }

packages/react-bootstrap-table2-toolkit/package.json

@@ -1,7 +1,7 @@
 {
- "name": "react-bootstrap-table2-toolkit",
- "version": "2.1.3",
- "description": "The toolkit for react-bootstrap-table2",
+ "name": "@musicstory/react-bootstrap-table2-toolkit",
+ "version": "1.0.2",
+ "description": "The toolkit for react-bootstrap-table2 by musicstory",
  "main": "./lib/index.js",
  "repository": {
  "type": "git",
@@ -41,8 +41,8 @@
  ],
  "peerDependencies": {
  "prop-types": "^15.0.0",
- "react": "^16.3.0",
- "react-dom": "^16.3.0"
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
  },
  "dependencies": {
  "file-saver": "2.0.2"

packages/react-bootstrap-table2-toolkit/src/search/SearchBar.js

@@ -6,12 +6,12 @@ import PropTypes from 'prop-types';
 const handleDebounce = (func, wait, immediate) => {
  let timeout;
 
- return () => {
+ return (...args) => {
  const later = () => {
  timeout = null;
 
  if (!immediate) {
- func.apply(this, arguments);
+ func.apply(this, args);
  }
  };
 
@@ -22,7 +22,7 @@ const handleDebounce = (func, wait, immediate) => {
  timeout = setTimeout(later, wait || 0);
 
  if (callNow) {
- func.appy(this, arguments);
+ func.apply(this, args);
  }
  };
 };

packages/react-bootstrap-table2/package.json

@@ -1,7 +1,7 @@
 {
- "name": "react-bootstrap-table-next",
- "version": "4.0.3",
- "description": "Next generation of react-bootstrap-table",
+ "name": "@musicstory/react-bootstrap-table-next",
+ "version": "1.0.5",
+ "description": "Next generation of react-bootstrap-table by musicstory",
  "main": "./lib/index.js",
  "repository": {
  "type": "git",
@@ -43,7 +43,7 @@
  "peerDependencies": {
  "classnames": "^2.2.5",
  "prop-types": "^15.0.0",
- "react": "^16.3.0",
- "react-dom": "^16.3.0"
+ "react": "^17.0.2",
+ "react-dom": "^17.0.2"
  }
 }