Skip to content

Commit

Permalink
fix(routable): support exactPath
Browse files Browse the repository at this point in the history
fixes #13132
  • Loading branch information
KaelWD committed Jun 19, 2021
1 parent a037500 commit 8f4773c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"vue-analytics": "^5.16.1",
"vue-loader": "^15.7.1",
"vue-meta": "^2.4.0",
"vue-router": "^3.0.1",
"vue-router": "^3.5.1",
"vue-template-compiler": "^2.6.11",
"vuex": "^3.0.1",
"webpack": "^4.39.1",
Expand Down
1 change: 1 addition & 0 deletions packages/api-generator/src/locale/en/routable.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"append": "Setting **append** prop always appends the relative path to the current path. You can find more information about the [**append** prop](https://router.vuejs.org/api/#append) on the vue-router documentation.",
"disabled": "Removes the ability to click or target the component.",
"exact": "Exactly match the link. Without this, '/' will match every route. You can find more information about the [**exact** prop](https://router.vuejs.org/api/#exact) on the vue-router documentation.",
"exactPath": "Exactly match the link, ignoring the `query` and the `hash` sections. You can find more information about the [**exact-path** prop](https://router.vuejs.org/api/#exact-path) on the vue-router documentation.",
"exactActiveClass": "Configure the active CSS class applied when the link is active with exact match. You can find more information about the [**exact-active-class** prop](https://router.vuejs.org/api/#exact-active-class) on the vue-router documentation.",
"href": "Designates the component as anchor and applies the **href** attribute.",
"link": "Designates that the component is a link. This is automatic when using the **href** or **to** prop.",
Expand Down
1 change: 0 additions & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"register-service-worker": "^1.7.1",
"vue-i18n": "^8.17.7",
"vue-instantsearch": "^3.4.3",
"vue-router": "^3.1.6",
"vuetify": "^2.5.4",
"vuex": "^3.4.0",
"webpack-node-externals": "^2.5.1"
Expand Down
1 change: 0 additions & 1 deletion packages/vuetify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
"ts-loader": "^8.0.6",
"url-loader": "^2.1.0",
"vue-meta": "^2.4.0",
"vue-router": "^3.0.7",
"vuetify-loader": "^1.3.0",
"webpack-dev-server": "^3.7.2"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/vuetify/src/mixins/routable/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default Vue.extend({
type: Boolean as PropType<boolean | undefined>,
default: undefined,
},
exactPath: Boolean,
exactActiveClass: String,
link: Boolean,
href: [String, Object],
Expand Down Expand Up @@ -120,6 +121,7 @@ export default Vue.extend({
Object.assign(data.props, {
to: this.to,
exact,
exactPath: this.exactPath,
activeClass,
exactActiveClass,
append: this.append,
Expand Down
13 changes: 4 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18670,15 +18670,10 @@ vue-prism-component@^1.2.0:
resolved "https://registry.yarnpkg.com/vue-prism-component/-/vue-prism-component-1.2.0.tgz#406252e16979def13b5d28827d95b2b6dc647825"
integrity sha512-0N9CNuQu+36CJpdsZHrhdq7d18oBvjVMjawyKdIr8xuzFWLfdxECZQYbFaYoopPBg3SvkEEMtkhYqdgTQl5Y+A==

vue-router@^3.0.1, vue-router@^3.1.6:
version "3.4.3"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa"
integrity sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A==

vue-router@^3.0.7:
version "3.0.7"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.7.tgz#b36ca107b4acb8ff5bc4ff824584059c23fcb87b"
integrity sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ==
vue-router@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9"
integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==

vue-server-renderer@^2.6.11:
version "2.6.11"
Expand Down

2 comments on commit 8f4773c

@AnthonyDreams
Copy link

@AnthonyDreams AnthonyDreams commented on 8f4773c Aug 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we please have this implemented? it is in the doc but not deployed yet. @KaelWD

@KaelWD
Copy link
Member Author

@KaelWD KaelWD commented on 8f4773c Aug 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.