From 099f9599e6f60bc8bdcc45dc53c6fde1245f53a3 Mon Sep 17 00:00:00 2001 From: xidedix Date: Wed, 18 Jul 2018 17:24:29 +0200 Subject: [PATCH 1/3] feat: hide on click outside mobile sidebar --- package.json | 1 + src/components/Sidebar/Sidebar.vue | 6 +++++- src/components/Sidebar/SidebarNavItem.vue | 12 ++++-------- src/components/Sidebar/SidebarToggler.vue | 1 + src/mixins/hideMobile.js | 11 +++++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 src/mixins/hideMobile.js diff --git a/package.json b/package.json index c46269ea..8294a627 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "lint:fix": "eslint --ext .js,.vue . --fix" }, "dependencies": { + "vue-clickaway": "^2.2.2", "vue-perfect-scrollbar": "^0.1.0" }, "devDependencies": { diff --git a/src/components/Sidebar/Sidebar.vue b/src/components/Sidebar/Sidebar.vue index 4b3689d3..3e2592e0 100644 --- a/src/components/Sidebar/Sidebar.vue +++ b/src/components/Sidebar/Sidebar.vue @@ -1,11 +1,15 @@ diff --git a/src/components/Sidebar/SidebarToggler.vue b/src/components/Sidebar/SidebarToggler.vue index ba9f37f2..a32e9930 100644 --- a/src/components/Sidebar/SidebarToggler.vue +++ b/src/components/Sidebar/SidebarToggler.vue @@ -50,6 +50,7 @@ export default { }, sidebarToggle (e) { e.preventDefault() + e.stopPropagation() this.toggle() } } diff --git a/src/mixins/hideMobile.js b/src/mixins/hideMobile.js new file mode 100644 index 00000000..0d3fb183 --- /dev/null +++ b/src/mixins/hideMobile.js @@ -0,0 +1,11 @@ +const hideMobile = { + methods: { + hideMobile() { + if (document.body.classList.contains('sidebar-show')) { + document.body.classList.toggle('sidebar-show') + } + } + } +} + +export { hideMobile } From 56c7e0d2b96472d0041c98b3d0134ad30783f453 Mon Sep 17 00:00:00 2001 From: xidedix Date: Wed, 18 Jul 2018 17:25:15 +0200 Subject: [PATCH 2/3] chore: dependencies update --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8294a627..1ae99453 100644 --- a/package.json +++ b/package.json @@ -74,9 +74,9 @@ "eslint-import-resolver-babel-module": "^4.0.0", "eslint-plugin-html": "^4.0.3", "eslint-plugin-import": "^2.12.0", - "eslint-plugin-jest": "^21.17.0", + "eslint-plugin-jest": "^21.18.0", "eslint-plugin-prettier": "^2.6.2", - "eslint-plugin-vue": "^4.5.0", + "eslint-plugin-vue": "^4.7.0", "husky": "^0.14.3", "jest": "^22.4.4", "jest-serializer-html": "^5.0.0", @@ -85,7 +85,7 @@ "lint-staged": "^7.1.3", "lodash": "^4.17.10", "node-sass": "^4.9.2", - "prettier": "^1.13.4", + "prettier": "^1.13.7", "rollup": "^0.59.4", "rollup-plugin-babel": "^3.0.7", "rollup-plugin-commonjs": "^9.1.3", @@ -100,7 +100,7 @@ "uglify-es": "^3.3.9", "vue": "^2.5.16", "vue-jest": "^2.6.0", - "vue-loader": "^14.2.2", + "vue-loader": "^15.2.6", "vue-server-renderer": "^2.5.16", "vue-template-compiler": "^2.5.16", "vue-test-utils": "^1.0.0-beta.11" From 9efda759e8a2043b2a7f5763a25792e980accbdb Mon Sep 17 00:00:00 2001 From: xidedix Date: Wed, 18 Jul 2018 17:25:58 +0200 Subject: [PATCH 3/3] chore(ship): v2.0.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ae99453..ab6c7a60 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@coreui/vue", "description": "CoreUI Vue Bootstrap 4 layout components", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "license": "MIT", "main": "dist/coreui-vue.common.js", "module": "dist/coreui-vue.esm.js",