@dimailn/vuetify 2.7.2-alpha52 → 2.7.2-alpha53
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/vuetify.js +6 -4
- package/dist/vuetify.js.map +1 -1
- package/dist/vuetify.min.css +1 -1
- package/dist/vuetify.min.js +2 -2
- package/es5/framework.js +1 -1
- package/es5/mixins/routable/index.js +5 -3
- package/es5/mixins/routable/index.js.map +1 -1
- package/lib/framework.js +1 -1
- package/lib/mixins/routable/index.js +5 -3
- package/lib/mixins/routable/index.js.map +1 -1
- package/package.json +1 -1
- package/src/components/VList/__tests__/VListItem.spec.ts +119 -0
- package/src/mixins/routable/__tests__/routable.spec.ts +78 -1
- package/src/mixins/routable/index.ts +4 -3
package/es5/framework.js
CHANGED
|
@@ -79,7 +79,7 @@ var Vuetify = /*#__PURE__*/function () {
|
|
|
79
79
|
exports.default = Vuetify;
|
|
80
80
|
Vuetify.install = _install.install;
|
|
81
81
|
Vuetify.installed = false;
|
|
82
|
-
Vuetify.version = "2.7.2-
|
|
82
|
+
Vuetify.version = "2.7.2-alpha53";
|
|
83
83
|
Vuetify.config = {
|
|
84
84
|
silent: false
|
|
85
85
|
};
|
|
@@ -115,8 +115,8 @@ var _default = (0, _vue.defineComponent)({
|
|
|
115
115
|
var exactActiveClass = this.exactActiveClass || activeClass;
|
|
116
116
|
|
|
117
117
|
if (this.proxyClass) {
|
|
118
|
-
activeClass =
|
|
119
|
-
exactActiveClass =
|
|
118
|
+
activeClass = [activeClass, this.proxyClass].filter(Boolean).join(' ');
|
|
119
|
+
exactActiveClass = [exactActiveClass, this.proxyClass].filter(Boolean).join(' ');
|
|
120
120
|
}
|
|
121
121
|
|
|
122
122
|
tag = (0, _vue.resolveComponent)(this.nuxt ? 'nuxt-link' : 'router-link');
|
|
@@ -150,7 +150,9 @@ var _default = (0, _vue.defineComponent)({
|
|
|
150
150
|
var path = '_vnode.data.class.' + (this.exact ? exactActiveClass : activeClass);
|
|
151
151
|
this.$nextTick(function () {
|
|
152
152
|
/* istanbul ignore else */
|
|
153
|
-
|
|
153
|
+
var isLinkActive = Boolean((0, _helpers.getObjectValueByPath)(_this.$refs.link, path));
|
|
154
|
+
|
|
155
|
+
if (isLinkActive !== _this.isActive) {
|
|
154
156
|
_this.toggle();
|
|
155
157
|
}
|
|
156
158
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/mixins/routable/index.ts"],"names":[],"mappings":";;;;;;;AAEA;;AAGA;;AAGA;;;;;;;;;;eAEe,0BAAgB;AAC7B,EAAA,IAAI,EAAE,UADuB;AAG7B,EAAA,UAAU,EAAE;AACV,IAAA,MAAM,EAAN;AADU,GAHiB;AAO7B,EAAA,KAAK,EAAE;AACL,IAAA,WAAW,EAAE,MADR;AAEL,IAAA,MAAM,EAAE,OAFH;AAGL,IAAA,QAAQ,EAAE,OAHL;AAIL,IAAA,KAAK,EAAE;AACL,MAAA,IAAI,EAAE,OADD;AAEL,MAAA,OAAO,EAAE;AAFJ,KAJF;AAQL,IAAA,SAAS,EAAE,OARN;AASL,IAAA,gBAAgB,EAAE,MATb;AAUL,IAAA,IAAI,EAAE,OAVD;AAWL,IAAA,IAAI,EAAE,CAAC,MAAD,EAAS,MAAT,CAXD;AAYL,IAAA,EAAE,EAAE,CAAC,MAAD,EAAS,MAAT,CAZC;AAaL,IAAA,IAAI,EAAE,OAbD;AAcL,IAAA,OAAO,EAAE,OAdJ;AAeL,IAAA,MAAM,EAAE;AACN,MAAA,IAAI,EAAE,CAAC,OAAD,EAAU,MAAV,CADA;AAEN,MAAA,OAAO,EAAE;AAFH,KAfH;AAmBL,IAAA,GAAG,EAAE,MAnBA;AAoBL,IAAA,MAAM,EAAE,MApBH;AAqBL,IAAA,QAAQ,EAAE;AArBL,GAPsB;AA+B7B,EAAA,IAAI,EAAE;AAAA,WAAO;AACX,MAAA,QAAQ,EAAE,KADC;AAEX,MAAA,UAAU,EAAE;AAFD,KAAP;AAAA,GA/BuB;AAoC7B,EAAA,QAAQ,EAAE;AACR,IAAA,OADQ,qBACD;AACL,UAAM,OAAO,GAA4B,EAAzC;AAEA,UAAI,KAAK,EAAT,EAAa,OAAO,OAAP;AAEb,UAAM,WAAW,GAAG,KAAK,WAAL,KAAqB,kBAAkB,IAAlB,GAAyB,KAAK,YAA9B,GAA6C,SAAlE,CAApB,CALK,CAML;;AAEA,UAAI,WAAJ,EAAiB,OAAO,CAAC,WAAD,CAAP,GAAuB,KAAK,QAA5B;AACjB,UAAI,KAAK,UAAT,EAAqB,OAAO,CAAC,KAAK,UAAN,CAAP,GAA2B,KAAK,QAAhC;AAErB,aAAO,OAAP;AACD,KAbO;AAcR,IAAA,cAdQ,4BAcM;;;AACZ,aAAO,CAAA,EAAA,GAAA,KAAK,MAAL,MAAW,IAAX,IAAW,EAAA,KAAA,KAAA,CAAX,GAAW,EAAX,GAAgB,CAAC,KAAK,QAAN,IAAkB,KAAK,WAA9C;AACD,KAhBO;AAiBR,IAAA,WAjBQ,yBAiBG;;;AACT,UAAI,KAAK,QAAT,EAAmB,OAAO,KAAP;AAEnB,UAAI,KAAK,QAAT,EAAmB,OAAO,KAAP;AAEnB,aAAO,OAAO,CACZ,KAAK,MAAL,IACA,KAAK,MAAL,CAAY,OADZ,IAEA,KAAK,MAAL,CAAY,UAAZ,CAFA,IAGA,KAAK,MAAL,CAAY,QAHZ,KAIA,CAAA,EAAA,GAAA,KAAK,MAAL,MAAW,IAAX,IAAW,EAAA,KAAA,KAAA,CAAX,GAAW,KAAA,CAAX,GAAW,EAAA,CAAE,OAJb,CADY,CAAd;AAOD,KA7BO;AA8BR,IAAA,MA9BQ,oBA8BF;AACJ,aAAO,KAAK,EAAL,IAAW,KAAK,IAAhB,IAAwB,KAAK,IAApC;AACD,KAhCO;AAiCR,IAAA,MAAM,EAAE;AAAA,aAAO,EAAP;AAAA;AAjCA,GApCmB;AAwE7B,EAAA,KAAK,EAAE;AACL,IAAA,MAAM,EAAE;AADH,GAxEsB;AA4E7B,EAAA,OA5E6B,qBA4EtB;AACL,SAAK,aAAL;AACD,GA9E4B;AAgF7B,EAAA,OAAO,EAAE;AACP,IAAA,iBADO,+BACU;AACf,UAAI,KAAK,GAAG,KAAK,KAAjB;AACA,UAAI,GAAJ;AAEA,UAAM,UAAU,GAAG,CAAC,CAClB,eADkB,EAElB,KAAK,cAFa,CAAD,CAAnB;;AAKA,UAAM,IAAI;AACR,QAAA,QAAQ,EAAE,cAAc,KAAK,MAAnB,GAA4B,KAAK,MAAL,CAAY,QAAxC,GAAmD,SADrD;AAER,QAAA,KAAK,EAAE,KAAK,OAFJ;AAGR,QAAA,KAAK,EAAE,KAAK;AAHJ,SAIL,KAAK,UAJA,GAKJ,WAAW,IAAX,GAAkB;AAAE,QAAA,OAAO,EAAG,KAAa;AAAzB,OAAlB,GAAqD,SALjD;AAMR,QAAA,GAAG,EAAE;AANG,QAAV;;AASA,UAAI,OAAO,KAAK,KAAZ,KAAsB,WAA1B,EAAuC;AACrC,QAAA,KAAK,GAAG,KAAK,EAAL,KAAY,GAAZ,IACL,KAAK,EAAL,KAAY,MAAM,CAAC,KAAK,EAAN,CAAlB,IAA+B,KAAK,EAAL,CAAQ,IAAR,KAAiB,GADnD;AAED;;AAED,UAAI,KAAK,EAAT,EAAa;AACX;AACA;AACA,YAAI,WAAW,GAAG,KAAK,WAAvB;AACA,YAAI,gBAAgB,GAAG,KAAK,gBAAL,IAAyB,WAAhD;;AAEA,YAAI,KAAK,UAAT,EAAqB;AACnB,UAAA,WAAW,GAAG,
|
|
1
|
+
{"version":3,"sources":["../../../src/mixins/routable/index.ts"],"names":[],"mappings":"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","sourcesContent":["import type { VNodeData } from '../../types/vue-internal'\nimport type { PropType } from 'vue'\nimport { defineComponent, resolveComponent } from 'vue'\n\n// Directives\nimport Ripple, { RippleOptions } from '../../directives/ripple'\n\n// Utilities\nimport { getObjectValueByPath } from '../../util/helpers'\n\nexport default defineComponent({\n name: 'routable',\n\n directives: {\n Ripple\n },\n\n props: {\n activeClass: String,\n append: Boolean,\n disabled: Boolean,\n exact: {\n type: Boolean as PropType<boolean | undefined>,\n default: undefined\n },\n exactPath: Boolean,\n exactActiveClass: String,\n link: Boolean,\n href: [String, Object],\n to: [String, Object],\n nuxt: Boolean,\n replace: Boolean,\n ripple: {\n type: [Boolean, Object],\n default: null\n },\n tag: String,\n target: String,\n notALink: Boolean\n },\n\n data: () => ({\n isActive: false,\n proxyClass: ''\n }),\n\n computed: {\n classes (): object {\n const classes: Record<string, boolean> = {}\n\n if (this.to) return classes\n\n const activeClass = this.activeClass || ('$activeClass' in this ? this.$activeClass : undefined)\n // const activeClass = this.activeClass || this.$activeClass\n\n if (activeClass) classes[activeClass] = this.isActive\n if (this.proxyClass) classes[this.proxyClass] = this.isActive\n\n return classes\n },\n computedRipple (): RippleOptions | boolean {\n return this.ripple ?? (!this.disabled && this.isClickable)\n },\n isClickable (): boolean {\n if (this.notALink) return false\n\n if (this.disabled) return false\n\n return Boolean(\n this.isLink ||\n this.$attrs.onClick ||\n this.$attrs['on!click'] ||\n this.$attrs.tabindex ||\n this.$props?.onClick\n )\n },\n isLink (): boolean {\n return this.to || this.href || this.link\n },\n styles: () => ({})\n },\n\n watch: {\n $route: 'onRouteChange'\n },\n\n mounted () {\n this.onRouteChange()\n },\n\n methods: {\n generateRouteLink () {\n let exact = this.exact\n let tag\n\n const directives = [[\n Ripple,\n this.computedRipple\n ]]\n\n const data: VNodeData = {\n tabindex: 'tabindex' in this.$attrs ? this.$attrs.tabindex : undefined,\n class: this.classes,\n style: this.styles,\n ...this.$listeners,\n ...('click' in this ? { onClick: (this as any).click } : undefined), // #14447\n ref: 'link'\n }\n\n if (typeof this.exact === 'undefined') {\n exact = this.to === '/' ||\n (this.to === Object(this.to) && this.to.path === '/')\n }\n\n if (this.to) {\n // Add a special activeClass hook\n // for component level styles\n let activeClass = this.activeClass\n let exactActiveClass = this.exactActiveClass || activeClass\n\n if (this.proxyClass) {\n activeClass = [activeClass, this.proxyClass].filter(Boolean).join(' ')\n exactActiveClass = [exactActiveClass, this.proxyClass].filter(Boolean).join(' ')\n }\n\n tag = resolveComponent(this.nuxt ? 'nuxt-link' : 'router-link')\n Object.assign(data, {\n to: this.to,\n exact,\n exactPath: this.exactPath,\n activeClass,\n exactActiveClass,\n append: this.append,\n replace: this.replace\n })\n } else {\n tag = (this.href && 'a') || this.tag || 'div'\n\n if (tag === 'a' && this.href) data.href = this.href\n }\n\n if (this.target) data.target = this.target\n\n return { tag, data, directives }\n },\n onRouteChange () {\n if (!this.to || !this.$refs.link || !this.$route) return\n const activeClass = `${this.activeClass || ''} ${this.proxyClass || ''}`.trim()\n const exactActiveClass = `${this.exactActiveClass || ''} ${this.proxyClass || ''}`.trim() || activeClass\n\n const path = '_vnode.data.class.' + (this.exact ? exactActiveClass : activeClass)\n\n this.$nextTick(() => {\n /* istanbul ignore else */\n const isLinkActive = Boolean(getObjectValueByPath(this.$refs.link, path))\n if (isLinkActive !== this.isActive) {\n this.toggle()\n }\n })\n },\n toggle () {\n this.isActive = !this.isActive\n }\n }\n})\n"],"sourceRoot":"","file":"index.js"}
|
package/lib/framework.js
CHANGED
|
@@ -101,8 +101,8 @@ export default defineComponent({
|
|
|
101
101
|
let exactActiveClass = this.exactActiveClass || activeClass;
|
|
102
102
|
|
|
103
103
|
if (this.proxyClass) {
|
|
104
|
-
activeClass =
|
|
105
|
-
exactActiveClass =
|
|
104
|
+
activeClass = [activeClass, this.proxyClass].filter(Boolean).join(' ');
|
|
105
|
+
exactActiveClass = [exactActiveClass, this.proxyClass].filter(Boolean).join(' ');
|
|
106
106
|
}
|
|
107
107
|
|
|
108
108
|
tag = resolveComponent(this.nuxt ? 'nuxt-link' : 'router-link');
|
|
@@ -135,7 +135,9 @@ export default defineComponent({
|
|
|
135
135
|
const path = '_vnode.data.class.' + (this.exact ? exactActiveClass : activeClass);
|
|
136
136
|
this.$nextTick(() => {
|
|
137
137
|
/* istanbul ignore else */
|
|
138
|
-
|
|
138
|
+
const isLinkActive = Boolean(getObjectValueByPath(this.$refs.link, path));
|
|
139
|
+
|
|
140
|
+
if (isLinkActive !== this.isActive) {
|
|
139
141
|
this.toggle();
|
|
140
142
|
}
|
|
141
143
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/mixins/routable/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../../src/mixins/routable/index.ts"],"names":[],"mappings":"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","sourcesContent":["import type { VNodeData } from '../../types/vue-internal'\nimport type { PropType } from 'vue'\nimport { defineComponent, resolveComponent } from 'vue'\n\n// Directives\nimport Ripple, { RippleOptions } from '../../directives/ripple'\n\n// Utilities\nimport { getObjectValueByPath } from '../../util/helpers'\n\nexport default defineComponent({\n name: 'routable',\n\n directives: {\n Ripple\n },\n\n props: {\n activeClass: String,\n append: Boolean,\n disabled: Boolean,\n exact: {\n type: Boolean as PropType<boolean | undefined>,\n default: undefined\n },\n exactPath: Boolean,\n exactActiveClass: String,\n link: Boolean,\n href: [String, Object],\n to: [String, Object],\n nuxt: Boolean,\n replace: Boolean,\n ripple: {\n type: [Boolean, Object],\n default: null\n },\n tag: String,\n target: String,\n notALink: Boolean\n },\n\n data: () => ({\n isActive: false,\n proxyClass: ''\n }),\n\n computed: {\n classes (): object {\n const classes: Record<string, boolean> = {}\n\n if (this.to) return classes\n\n const activeClass = this.activeClass || ('$activeClass' in this ? this.$activeClass : undefined)\n // const activeClass = this.activeClass || this.$activeClass\n\n if (activeClass) classes[activeClass] = this.isActive\n if (this.proxyClass) classes[this.proxyClass] = this.isActive\n\n return classes\n },\n computedRipple (): RippleOptions | boolean {\n return this.ripple ?? (!this.disabled && this.isClickable)\n },\n isClickable (): boolean {\n if (this.notALink) return false\n\n if (this.disabled) return false\n\n return Boolean(\n this.isLink ||\n this.$attrs.onClick ||\n this.$attrs['on!click'] ||\n this.$attrs.tabindex ||\n this.$props?.onClick\n )\n },\n isLink (): boolean {\n return this.to || this.href || this.link\n },\n styles: () => ({})\n },\n\n watch: {\n $route: 'onRouteChange'\n },\n\n mounted () {\n this.onRouteChange()\n },\n\n methods: {\n generateRouteLink () {\n let exact = this.exact\n let tag\n\n const directives = [[\n Ripple,\n this.computedRipple\n ]]\n\n const data: VNodeData = {\n tabindex: 'tabindex' in this.$attrs ? this.$attrs.tabindex : undefined,\n class: this.classes,\n style: this.styles,\n ...this.$listeners,\n ...('click' in this ? { onClick: (this as any).click } : undefined), // #14447\n ref: 'link'\n }\n\n if (typeof this.exact === 'undefined') {\n exact = this.to === '/' ||\n (this.to === Object(this.to) && this.to.path === '/')\n }\n\n if (this.to) {\n // Add a special activeClass hook\n // for component level styles\n let activeClass = this.activeClass\n let exactActiveClass = this.exactActiveClass || activeClass\n\n if (this.proxyClass) {\n activeClass = [activeClass, this.proxyClass].filter(Boolean).join(' ')\n exactActiveClass = [exactActiveClass, this.proxyClass].filter(Boolean).join(' ')\n }\n\n tag = resolveComponent(this.nuxt ? 'nuxt-link' : 'router-link')\n Object.assign(data, {\n to: this.to,\n exact,\n exactPath: this.exactPath,\n activeClass,\n exactActiveClass,\n append: this.append,\n replace: this.replace\n })\n } else {\n tag = (this.href && 'a') || this.tag || 'div'\n\n if (tag === 'a' && this.href) data.href = this.href\n }\n\n if (this.target) data.target = this.target\n\n return { tag, data, directives }\n },\n onRouteChange () {\n if (!this.to || !this.$refs.link || !this.$route) return\n const activeClass = `${this.activeClass || ''} ${this.proxyClass || ''}`.trim()\n const exactActiveClass = `${this.exactActiveClass || ''} ${this.proxyClass || ''}`.trim() || activeClass\n\n const path = '_vnode.data.class.' + (this.exact ? exactActiveClass : activeClass)\n\n this.$nextTick(() => {\n /* istanbul ignore else */\n const isLinkActive = Boolean(getObjectValueByPath(this.$refs.link, path))\n if (isLinkActive !== this.isActive) {\n this.toggle()\n }\n })\n },\n toggle () {\n this.isActive = !this.isActive\n }\n }\n})\n"],"sourceRoot":"","file":"index.js"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
// Components
|
|
2
2
|
import VListItem from '../VListItem'
|
|
3
3
|
|
|
4
|
+
// Libraries
|
|
5
|
+
import { defineComponent, h, nextTick } from 'vue'
|
|
6
|
+
|
|
4
7
|
// Utilities
|
|
5
8
|
import {
|
|
6
9
|
mount,
|
|
7
10
|
VueWrapper,
|
|
8
11
|
enableAutoUnmount
|
|
9
12
|
} from '@vue/test-utils'
|
|
13
|
+
import { createRouter, createWebHistory } from 'vue-router'
|
|
10
14
|
import { Vue3RouterLinkStub } from '../../../../test/util/stubs'
|
|
11
15
|
|
|
12
16
|
describe('VListItem.ts', () => {
|
|
@@ -325,4 +329,119 @@ describe('VListItem.ts', () => {
|
|
|
325
329
|
|
|
326
330
|
expect(wrapper.vm.isClickable).toBe(true)
|
|
327
331
|
})
|
|
332
|
+
|
|
333
|
+
it('passes active and toggle in default slot scope', async () => {
|
|
334
|
+
const wrapper = mountFunction({
|
|
335
|
+
props: { modelValue: true },
|
|
336
|
+
slots: {
|
|
337
|
+
default: ({ active, toggle }: { active: boolean, toggle: Function }) => h('div', [
|
|
338
|
+
h('span', { class: { 'link--text': active } }, String(active)),
|
|
339
|
+
h('button', { onClick: toggle }, 'toggle')
|
|
340
|
+
])
|
|
341
|
+
}
|
|
342
|
+
})
|
|
343
|
+
|
|
344
|
+
expect(wrapper.find('.link--text').exists()).toBe(true)
|
|
345
|
+
expect(wrapper.find('span').text()).toBe('true')
|
|
346
|
+
})
|
|
347
|
+
|
|
348
|
+
it('does not pass undefined to activeClass when to is used without activeClass', () => {
|
|
349
|
+
const RouterLinkCapture = defineComponent({
|
|
350
|
+
name: 'RouterLinkCapture',
|
|
351
|
+
props: {
|
|
352
|
+
to: { type: [String, Object], required: true },
|
|
353
|
+
activeClass: String,
|
|
354
|
+
exactActiveClass: String
|
|
355
|
+
},
|
|
356
|
+
setup (props, { slots }) {
|
|
357
|
+
return () => h('a', { class: props.activeClass }, slots.default?.())
|
|
358
|
+
}
|
|
359
|
+
})
|
|
360
|
+
|
|
361
|
+
const wrapper = mountFunction({
|
|
362
|
+
props: { to: '/foo' },
|
|
363
|
+
global: {
|
|
364
|
+
stubs: {
|
|
365
|
+
'router-link': RouterLinkCapture
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
})
|
|
369
|
+
|
|
370
|
+
const routerLink = wrapper.findComponent({ name: 'RouterLinkCapture' })
|
|
371
|
+
|
|
372
|
+
expect(routerLink.props('activeClass')).toBe('v-list-item--active')
|
|
373
|
+
expect(routerLink.props('activeClass')).not.toContain('undefined')
|
|
374
|
+
})
|
|
375
|
+
|
|
376
|
+
it('syncs slot active with router-link when route matches', async () => {
|
|
377
|
+
const router = createRouter({
|
|
378
|
+
history: createWebHistory(),
|
|
379
|
+
routes: [
|
|
380
|
+
{ path: '/products/:id', component: { template: '<div />' } }
|
|
381
|
+
]
|
|
382
|
+
})
|
|
383
|
+
|
|
384
|
+
await router.push('/products/131830946')
|
|
385
|
+
await router.isReady()
|
|
386
|
+
|
|
387
|
+
const Host = defineComponent({
|
|
388
|
+
components: { VListItem },
|
|
389
|
+
props: { to: String },
|
|
390
|
+
template: `
|
|
391
|
+
<v-list-item :to="to">
|
|
392
|
+
<template #default="{ active }">
|
|
393
|
+
<span :class="{ 'link--text': active }">{{ active }}</span>
|
|
394
|
+
</template>
|
|
395
|
+
</v-list-item>
|
|
396
|
+
`
|
|
397
|
+
})
|
|
398
|
+
|
|
399
|
+
const wrapper = mount(Host, {
|
|
400
|
+
props: { to: '/products/131830946' },
|
|
401
|
+
global: {
|
|
402
|
+
plugins: [router],
|
|
403
|
+
provide: { isInGroup: true },
|
|
404
|
+
stubs: {
|
|
405
|
+
'router-link': Vue3RouterLinkStub
|
|
406
|
+
}
|
|
407
|
+
}
|
|
408
|
+
})
|
|
409
|
+
|
|
410
|
+
const listItem = wrapper.findComponent(VListItem)
|
|
411
|
+
|
|
412
|
+
;(listItem.vm.$refs.link as any)._vnode = {
|
|
413
|
+
data: {
|
|
414
|
+
class: { 'v-list-item--active': true }
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
listItem.vm.onRouteChange()
|
|
419
|
+
await nextTick()
|
|
420
|
+
await nextTick()
|
|
421
|
+
|
|
422
|
+
expect(listItem.vm.isActive).toBe(true)
|
|
423
|
+
expect(wrapper.find('.link--text').exists()).toBe(true)
|
|
424
|
+
expect(listItem.element.getAttribute('aria-selected')).toBe('true')
|
|
425
|
+
})
|
|
426
|
+
|
|
427
|
+
it('syncs aria-selected with isActive in list item group', async () => {
|
|
428
|
+
const wrapper = mountFunction({
|
|
429
|
+
props: { modelValue: 'item-1' },
|
|
430
|
+
global: {
|
|
431
|
+
provide: {
|
|
432
|
+
isInGroup: true,
|
|
433
|
+
listItemGroup: {
|
|
434
|
+
activeClass: 'v-item--active',
|
|
435
|
+
register: () => {},
|
|
436
|
+
unregister: () => {}
|
|
437
|
+
}
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
})
|
|
441
|
+
|
|
442
|
+
wrapper.vm.isActive = true
|
|
443
|
+
await wrapper.vm.$nextTick()
|
|
444
|
+
|
|
445
|
+
expect(wrapper.element.getAttribute('aria-selected')).toBe('true')
|
|
446
|
+
})
|
|
328
447
|
})
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Routable from '../'
|
|
2
2
|
import { mount, Wrapper } from '@vue/test-utils'
|
|
3
3
|
import { createRouter, createWebHistory } from 'vue-router'
|
|
4
|
-
import { nextTick } from 'vue'
|
|
4
|
+
import { defineComponent, h, nextTick } from 'vue'
|
|
5
5
|
|
|
6
6
|
describe('routable.ts', () => {
|
|
7
7
|
let mountFunction: (options?: object) => Wrapper<any>
|
|
@@ -102,4 +102,81 @@ describe('routable.ts', () => {
|
|
|
102
102
|
expect(wrapper.vm.isLink).toBe(true)
|
|
103
103
|
expect(wrapper.vm.isClickable).toBe(true)
|
|
104
104
|
})
|
|
105
|
+
|
|
106
|
+
it('should not include undefined in activeClass passed to router-link', async () => {
|
|
107
|
+
const RouterLinkCapture = defineComponent({
|
|
108
|
+
name: 'RouterLinkCapture',
|
|
109
|
+
props: {
|
|
110
|
+
to: { type: [String, Object], required: true },
|
|
111
|
+
activeClass: String,
|
|
112
|
+
exactActiveClass: String
|
|
113
|
+
},
|
|
114
|
+
template: '<a><slot /></a>'
|
|
115
|
+
})
|
|
116
|
+
|
|
117
|
+
const wrapper = mount({
|
|
118
|
+
mixins: [Routable],
|
|
119
|
+
data: () => ({
|
|
120
|
+
proxyClass: 'v-list-item--active'
|
|
121
|
+
}),
|
|
122
|
+
render () {
|
|
123
|
+
const { tag, data } = this.generateRouteLink()
|
|
124
|
+
return h(tag, data, { default: () => 'link' })
|
|
125
|
+
}
|
|
126
|
+
}, {
|
|
127
|
+
global: {
|
|
128
|
+
plugins: [router],
|
|
129
|
+
stubs: {
|
|
130
|
+
'router-link': RouterLinkCapture
|
|
131
|
+
}
|
|
132
|
+
},
|
|
133
|
+
props: {
|
|
134
|
+
to: '/'
|
|
135
|
+
}
|
|
136
|
+
})
|
|
137
|
+
|
|
138
|
+
const routerLink = wrapper.findComponent({ name: 'RouterLinkCapture' })
|
|
139
|
+
|
|
140
|
+
expect(routerLink.props('activeClass')).toBe('v-list-item--active')
|
|
141
|
+
expect(routerLink.props('activeClass')).not.toContain('undefined')
|
|
142
|
+
expect(routerLink.props('exactActiveClass')).toBe('v-list-item--active')
|
|
143
|
+
})
|
|
144
|
+
|
|
145
|
+
it('should sync isActive with router-link on route change', async () => {
|
|
146
|
+
const toggle = jest.fn()
|
|
147
|
+
const wrapper = mount({
|
|
148
|
+
mixins: [Routable],
|
|
149
|
+
data: () => ({
|
|
150
|
+
proxyClass: 'v-tab--active'
|
|
151
|
+
}),
|
|
152
|
+
methods: {
|
|
153
|
+
toggle
|
|
154
|
+
},
|
|
155
|
+
template: '<div ref="link" />'
|
|
156
|
+
}, {
|
|
157
|
+
global: {
|
|
158
|
+
plugins: [router]
|
|
159
|
+
},
|
|
160
|
+
props: {
|
|
161
|
+
to: '/foo',
|
|
162
|
+
activeClass: 'bar'
|
|
163
|
+
}
|
|
164
|
+
})
|
|
165
|
+
|
|
166
|
+
wrapper.vm.onRouteChange()
|
|
167
|
+
await nextTick()
|
|
168
|
+
|
|
169
|
+
expect(toggle).not.toHaveBeenCalled()
|
|
170
|
+
|
|
171
|
+
;(wrapper.vm.$refs.link as any)._vnode = {
|
|
172
|
+
data: {
|
|
173
|
+
class: { 'bar v-tab--active': true }
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
wrapper.vm.onRouteChange()
|
|
178
|
+
await nextTick()
|
|
179
|
+
|
|
180
|
+
expect(toggle).toHaveBeenCalledTimes(1)
|
|
181
|
+
})
|
|
105
182
|
})
|
|
@@ -119,8 +119,8 @@ export default defineComponent({
|
|
|
119
119
|
let exactActiveClass = this.exactActiveClass || activeClass
|
|
120
120
|
|
|
121
121
|
if (this.proxyClass) {
|
|
122
|
-
activeClass =
|
|
123
|
-
exactActiveClass =
|
|
122
|
+
activeClass = [activeClass, this.proxyClass].filter(Boolean).join(' ')
|
|
123
|
+
exactActiveClass = [exactActiveClass, this.proxyClass].filter(Boolean).join(' ')
|
|
124
124
|
}
|
|
125
125
|
|
|
126
126
|
tag = resolveComponent(this.nuxt ? 'nuxt-link' : 'router-link')
|
|
@@ -152,7 +152,8 @@ export default defineComponent({
|
|
|
152
152
|
|
|
153
153
|
this.$nextTick(() => {
|
|
154
154
|
/* istanbul ignore else */
|
|
155
|
-
|
|
155
|
+
const isLinkActive = Boolean(getObjectValueByPath(this.$refs.link, path))
|
|
156
|
+
if (isLinkActive !== this.isActive) {
|
|
156
157
|
this.toggle()
|
|
157
158
|
}
|
|
158
159
|
})
|