Skip to content

fix(b-link): remove default values from vue-router pass-down props (closes #6373) #6374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 28, 2021
Merged

fix(b-link): remove default values from vue-router pass-down props (closes #6373) #6374

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88f1de0
fix(b-link): remove default values from `vue-router` passdown props
jacobmllr95 Jan 28, 2021
0788368
Update link.js
jacobmllr95 Jan 28, 2021
2e758af
Update link.js
jacobmllr95 Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/components/link/link.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { concat } from '../../utils/array'
import { attemptBlur, attemptFocus, isTag } from '../../utils/dom'
import { getRootEventName, stopEvent } from '../../utils/events'
import { isBoolean, isEvent, isFunction, isUndefined } from '../../utils/inspect'
import { sortKeys } from '../../utils/object'
import { omit, sortKeys } from '../../utils/object'
import { makeProp, makePropsConfigurable, pluckProps } from '../../utils/props'
import { computeHref, computeRel, computeTag, isRouterLink } from '../../utils/router'
import { attrsMixin } from '../../mixins/attrs'
Expand All @@ -29,11 +29,11 @@ const ROOT_EVENT_NAME_CLICKED = getRootEventName(NAME_LINK, 'clicked')
export const routerLinkProps = {
activeClass: makeProp(PROP_TYPE_STRING),
append: makeProp(PROP_TYPE_BOOLEAN, false),
event: makeProp(PROP_TYPE_ARRAY_STRING, EVENT_NAME_CLICK),
event: makeProp(PROP_TYPE_ARRAY_STRING),
exact: makeProp(PROP_TYPE_BOOLEAN, false),
exactActiveClass: makeProp(PROP_TYPE_STRING),
replace: makeProp(PROP_TYPE_BOOLEAN, false),
routerTag: makeProp(PROP_TYPE_STRING, 'a'),
routerTag: makeProp(PROP_TYPE_STRING),
to: makeProp(PROP_TYPE_OBJECT_STRING)
}

Expand Down Expand Up @@ -98,14 +98,18 @@ export const BLink = /*#__PURE__*/ Vue.extend({
return computeHref({ to, href }, this.computedTag)
},
computedProps() {
const { prefetch } = this
const { event, prefetch, routerTag } = this
return this.isRouterLink
? {
...pluckProps({ ...routerLinkProps, ...nuxtLinkProps }, this),
// Coerce `prefetch` value `null` to be `undefined`
prefetch: isBoolean(prefetch) ? prefetch : undefined,
...pluckProps(
omit({ ...routerLinkProps, ...nuxtLinkProps }, ['event', 'prefetch', 'routerTag']),
this
),
// Only add these props, when actually defined
...(event ? { event } : {}),
...(isBoolean(prefetch) ? { prefetch } : {}),
// Pass `router-tag` as `tag` prop
tag: this.routerTag
...(routerTag ? { tag: routerTag } : {})
}
: {}
},
Expand All @@ -127,7 +131,7 @@ export const BLink = /*#__PURE__*/ Vue.extend({
// (i.e. if `computedHref` is truthy)
...(href ? { href } : {}),
// We don't render `rel` or `target` on non link tags when using `vue-router`
...(isRouterLink && !isTag(routerTag, 'a') ? {} : { rel, target }),
...(isRouterLink && routerTag && !isTag(routerTag, 'a') ? {} : { rel, target }),
tabindex: disabled ? '-1' : isUndefined(bvAttrs.tabindex) ? null : bvAttrs.tabindex,
'aria-disabled': disabled ? 'true' : null
}
Expand All @@ -153,10 +157,10 @@ export const BLink = /*#__PURE__*/ Vue.extend({
// Needed to prevent `vue-router` for doing its thing
stopEvent(event, { immediatePropagation: true })
} else {
// Router links do not emit instance `click` events, so we
// add in an `$emit('click', event)` on its Vue instance
/* istanbul ignore next: difficult to test, but we know it works */
if (isRouterLink && event.currentTarget.__vue__) {
// Router links do not emit instance `click` events, so we
// add in an `$emit('click', event)` on its Vue instance
event.currentTarget.__vue__.$emit(EVENT_NAME_CLICK, event)
}
// Call the suppliedHandler(s), if any provided
Expand Down