Merge pull request #180 from coreui/dev-vnext

v2.1.7
This commit is contained in:
xidedix 2019-05-14 19:22:13 +02:00 committed by GitHub
commit 5fcef7ed9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17490 additions and 15 deletions

1
.gitignore vendored
View File

@ -2,7 +2,6 @@
# dependencies # dependencies
/node_modules /node_modules
package-lock.json
# testing # testing
/coverage /coverage

View File

@ -1,5 +1,25 @@
## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog ## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog
##### `v2.1.7`
- maintenance release for use with:
- react-router `v4.3.x`
- reactstrap `v7.x`
- @coreui/react `~2.1.7`
- chore: add `package-lock.json` with updated `tar` dependency
- chore: fix `test:cov` script
- fix(Popovers): add `trigger="legacy" delay={0}` (breaking change in reactstrap)
###### dependencies update
- update: `@coreui/react` to `~2.1.7`
- update: `@coreui/coreui-plugin-chartjs-custom-tooltips` to `^1.3.0`
- update: `enzyme-adapter-react-16` to `^1.13.0`
- update: `node-sass` to `^4.12.0`
- update: `react` to `^16.8.6`
- update: `react-app-polyfill` to `^1.0.1`
- update: `react-chartjs-2` to `^2.7.6`
- update: `react-dom` to `^16.8.6`
- update: `react-test-renderer` to `^16.8.6`
- update: `react-scripts` to `^3.0.1`
##### `v2.1.6` ##### `v2.1.6`
- fix(App): remove redundant react-loadable - thanks @sergeyt - fix(App): remove redundant react-loadable - thanks @sergeyt
- fix(routes) remove circular dependency - thanks @sergeyt - fix(routes) remove circular dependency - thanks @sergeyt

17456
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@coreui/coreui-free-react-admin-template", "name": "@coreui/coreui-free-react-admin-template",
"version": "2.1.6", "version": "2.1.7",
"description": "CoreUI React Open Source Bootstrap 4 Admin Template", "description": "CoreUI React Open Source Bootstrap 4 Admin Template",
"author": "Łukasz Holeczek", "author": "Łukasz Holeczek",
"homepage": "https://coreui.io", "homepage": "https://coreui.io",
@ -13,37 +13,37 @@
}, },
"dependencies": { "dependencies": {
"@coreui/coreui": "^2.1.9", "@coreui/coreui": "^2.1.9",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.0",
"@coreui/icons": "0.3.0", "@coreui/icons": "0.3.0",
"@coreui/react": "~2.1.5", "@coreui/react": "~2.1.7",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"chart.js": "^2.8.0", "chart.js": "^2.8.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"core-js": "^2.6.5", "core-js": "^2.6.5",
"enzyme": "^3.9.0", "enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.11.2", "enzyme-adapter-react-16": "^1.13.0",
"flag-icon-css": "^3.3.0", "flag-icon-css": "^3.3.0",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"node-sass": "^4.11.0", "node-sass": "^4.12.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^16.8.5", "react": "^16.8.6",
"react-app-polyfill": "^0.2.2", "react-app-polyfill": "^1.0.1",
"react-chartjs-2": "^2.7.4", "react-chartjs-2": "^2.7.6",
"react-dom": "^16.8.5", "react-dom": "^16.8.6",
"react-router-config": "^4.4.0-beta.8", "react-router-config": "^4.4.0-beta.8",
"react-router-dom": "~4.3.1", "react-router-dom": "~4.3.1",
"react-test-renderer": "^16.8.5", "react-test-renderer": "^16.8.6",
"reactstrap": "^7.1.0", "reactstrap": "^7.1.0",
"simple-line-icons": "^2.4.1" "simple-line-icons": "^2.4.1"
}, },
"devDependencies": { "devDependencies": {
"react-scripts": "^2.1.8" "react-scripts": "^3.0.1"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"test": "react-scripts test", "test": "react-scripts test",
"test:cov": "react-scripts test --coverage", "test:cov": "npm test -- --coverage --watchAll=false",
"test:debug": "react-scripts --inspect-brk test --runInBand", "test:debug": "react-scripts --inspect-brk test --runInBand",
"eject": "react-scripts eject" "eject": "react-scripts eject"
}, },

View File

@ -23,7 +23,7 @@ class PopoverItem extends Component {
<Button className="mr-1" color="secondary" id={'Popover-' + this.props.id} onClick={this.toggle}> <Button className="mr-1" color="secondary" id={'Popover-' + this.props.id} onClick={this.toggle}>
{this.props.item.text} {this.props.item.text}
</Button> </Button>
<Popover placement={this.props.item.placement} isOpen={this.state.popoverOpen} target={'Popover-' + this.props.id} toggle={this.toggle}> <Popover placement={this.props.item.placement} isOpen={this.state.popoverOpen} target={'Popover-' + this.props.id} toggle={this.toggle} trigger="legacy" delay={0}>
<PopoverHeader>Popover Title</PopoverHeader> <PopoverHeader>Popover Title</PopoverHeader>
<PopoverBody>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverBody> <PopoverBody>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</PopoverBody>
</Popover> </Popover>