Merge pull request #144 from coreui/dev-vnext

v2.1.3

CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog
 
+##### `v2.1.3`
+- fix(Collapse): add `mb-0` to accordion cards
+- fix(ButtonGroups): misplaced dropdownOpen
+- chore: update `@coreui/coreui` to `^2.1.5`
+- chore: update `@coreui/react` to `^2.1.3`
+- chore: update `bootstrap` to `^4.2.1`
+- chore: update `core-js` to `^2.6.1`
+- chore: update `enzyme` to `^3.8.0`
+- chore: update `enzyme-adapter-react-16` to `^1.7.1`
+- chore: update `node-sass` to `^4.11.0`
+- chore: update `react` to `^16.7.0`
+- chore: update `react-app-polyfill` to `^0.2.0`
+- chore: update `react-chartjs-2` to `^2.7.4`
+- chore: update `react-dom` to `^16.7.0`
+- chore: update `react-test-renderer` to `^16.7.0`
+- chore: update `reactstrap` to `^7.0.2`
+- chore: update `react-scripts` to `2.1.3`
+
 ##### `v2.1.2`
 - fix(scss): floating footer ie11 issue
 - chore: update `@coreui/react` to `^2.1.1`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coreui/coreui-free-react-admin-template",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "CoreUI React Open Source Bootstrap 4 Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "https://coreui.io",
@@ -12,33 +12,33 @@
     "url": "git@github.com:coreui/coreui-free-react-admin-template.git"
   },
   "dependencies": {
-    "@coreui/coreui": "^2.1.1",
+    "@coreui/coreui": "^2.1.5",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
     "@coreui/icons": "0.3.0",
-    "@coreui/react": "^2.1.1",
-    "bootstrap": "^4.1.3",
+    "@coreui/react": "^2.1.3",
+    "bootstrap": "^4.2.1",
     "chart.js": "^2.7.3",
     "classnames": "^2.2.6",
-    "core-js": "^2.5.7",
-    "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0",
+    "core-js": "^2.6.1",
+    "enzyme": "^3.8.0",
+    "enzyme-adapter-react-16": "^1.7.1",
     "flag-icon-css": "^3.2.1",
     "font-awesome": "^4.7.0",
-    "node-sass": "^4.10.0",
+    "node-sass": "^4.11.0",
     "prop-types": "^15.6.2",
-    "react": "^16.6.3",
-    "react-app-polyfill": "^0.1.3",
-    "react-chartjs-2": "^2.7.2",
-    "react-dom": "^16.6.3",
+    "react": "^16.7.0",
+    "react-app-polyfill": "^0.2.0",
+    "react-chartjs-2": "^2.7.4",
+    "react-dom": "^16.7.0",
     "react-loadable": "^5.5.0",
     "react-router-config": "^4.4.0-beta.6",
     "react-router-dom": "^4.3.1",
-    "react-test-renderer": "^16.6.3",
-    "reactstrap": "^6.5.0",
+    "react-test-renderer": "^16.7.0",
+    "reactstrap": "^7.0.2",
     "simple-line-icons": "^2.4.1"
   },
   "devDependencies": {
-    "react-scripts": "^2.1.1"
+    "react-scripts": "2.1.3"
   },
   "scripts": {
     "start": "react-scripts start",

src/views/Base/Collapses/Collapses.js

@@ -137,7 +137,7 @@ class Collapses extends Component {
               </CardHeader>
               <CardBody>
                 <div id="accordion">
-                  <Card>
+                  <Card className="mb-0">
                     <CardHeader id="headingOne">
                       <Button block color="link" className="text-left m-0 p-0" onClick={() => this.toggleAccordion(0)} aria-expanded={this.state.accordion[0]} aria-controls="collapseOne">
                         <h5 className="m-0 p-0">Collapsible Group Item #1</h5>
@@ -153,7 +153,7 @@ class Collapses extends Component {
                       </CardBody>
                     </Collapse>
                   </Card>
-                  <Card>
+                  <Card className="mb-0">
                     <CardHeader id="headingTwo">
                       <Button block color="link" className="text-left m-0 p-0" onClick={() => this.toggleAccordion(1)} aria-expanded={this.state.accordion[1]} aria-controls="collapseTwo">
                         <h5 className="m-0 p-0">Collapsible Group Item #2</h5>
@@ -169,7 +169,7 @@ class Collapses extends Component {
                       </CardBody>
                     </Collapse>
                   </Card>
-                  <Card>
+                  <Card className="mb-0">
                     <CardHeader id="headingThree">
                       <Button block color="link" className="text-left m-0 p-0" onClick={() => this.toggleAccordion(2)} aria-expanded={this.state.accordion[2]} aria-controls="collapseThree">
                         <h5 className="m-0 p-0">Collapsible Group Item #3</h5>

src/views/Buttons/ButtonGroups/ButtonGroups.js

@@ -66,7 +66,7 @@ class ButtonGroups extends Component {
                 <ButtonGroup vertical>
                   <Button>1</Button>
                   <Button>2</Button>
-                  <ButtonDropdown isOpen={this.state.dropdownOpen[1]} toggle={() => { this.toggle(0); }}>
+                  <ButtonDropdown isOpen={this.state.dropdownOpen[0]} toggle={() => { this.toggle(0); }}>
                     <DropdownToggle caret>
                       Dropdown
                     </DropdownToggle>
@@ -135,7 +135,7 @@ class ButtonGroups extends Component {
                 <ButtonGroup>
                   <Button>1</Button>
                   <Button>2</Button>
-                  <ButtonDropdown isOpen={this.state.dropdownOpen[0]} toggle={() => { this.toggle(1); }}>
+                  <ButtonDropdown isOpen={this.state.dropdownOpen[1]} toggle={() => { this.toggle(1); }}>
                     <DropdownToggle caret>
                       Dropdown
                     </DropdownToggle>