@dimailn/vuetify 2.7.2-alpha3 → 2.7.2-alpha31

package/src/components/VStepper/VStepper.ts

@@ -1,4 +1,4 @@
-import {h} from 'vue'
+import { h } from 'vue'
 // Styles
 import './VStepper.sass'
 
@@ -48,6 +48,8 @@ export default baseMixins.extend({
     vertical: Boolean,
   },
 
+  emits: ['change'],
+
   data () {
     const data: Dictionary<any> = {
       isBooted: false,

package/src/components/VStepper/VStepperContent.ts

@@ -99,7 +99,7 @@ export default baseMixins.extend({
     this.stepper && this.stepper.register(this)
   },
 
-  beforeDestroy () {
+  beforeUnmount () {
     this.$refs.wrapper.removeEventListener(
       'transitionend',
       this.onTransition,
@@ -168,6 +168,6 @@ export default baseMixins.extend({
 
     return h(this.computedTransition, {
       ...this.$listeners,
-    }, [content])
+    }, () => [content])
   },
 })

package/src/components/VStepper/VStepperStep.ts

@@ -1,4 +1,4 @@
-import {h} from 'vue'
+import {h, withDirectives} from 'vue'
 // Components
 import VIcon from '../VIcon'
 
@@ -31,7 +31,6 @@ interface options extends InstanceType<typeof baseMixins> {
 export default baseMixins.extend({
   name: 'v-stepper-step',
 
-  directives: { ripple },
 
   inject: ['stepClick'],
 
@@ -71,6 +70,7 @@ export default baseMixins.extend({
   computed: {
     classes (): object {
       return {
+        'v-stepper__step': true,
         'v-stepper__step--active': this.isActive,
         'v-stepper__step--editable': this.editable,
         'v-stepper__step--inactive': this.isInactive,
@@ -87,7 +87,7 @@ export default baseMixins.extend({
     this.stepper && this.stepper.register(this)
   },
 
-  beforeDestroy () {
+  beforeUnmount () {
     this.stepper && this.stepper.unregister(this)
   },
 
@@ -145,23 +145,16 @@ export default baseMixins.extend({
   },
 
   render (): VNode {
-    return h('div', {
-      attrs: {
-        tabindex: this.editable ? 0 : -1,
-      },
-      class: 'v-stepper__step',
+    return withDirectives(h('div', {
+      tabindex: this.editable ? 0 : -1,
       class: this.classes,
-      directives: [{
-        name: 'ripple',
-        value: this.editable,
-      }],
-      on: {
-        click: this.click,
-        keydown: this.keyboardClick,
-      },
+      onClick: this.click,
+      onKeydown: this.keyboardClick,
     }, [
       this.genStep(),
       this.genLabel(),
+    ]), [
+      [ripple, this.editable]
     ])
   },
 })

package/src/components/VStepper/__tests__/VStepper.spec.ts

@@ -6,12 +6,15 @@ import {
   mount,
   MountOptions,
   Wrapper,
+  enableAutoUnmount,
 } from '@vue/test-utils'
 
 describe('VStepper.ts', () => {
   type Instance = InstanceType<typeof VStepper>
   let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
 
+  enableAutoUnmount(afterEach)
+
   beforeEach(() => {
     mountFunction = (options = {}) => {
       return mount(VStepper, {
@@ -23,7 +26,7 @@ describe('VStepper.ts', () => {
   // https://github.com/vuetifyjs/vuetify/issues/10096
   it('should accept 0 as a step value', () => {
     const wrapper = mountFunction({
-      propsData: { value: 0 },
+      props: { modelValue: 0 },
     })
 
     expect(wrapper.vm.internalValue).toBe(0)

package/src/components/VStepper/__tests__/VStepperContent.spec.ts

@@ -1,6 +1,3 @@
-// Libraries
-import Vue from 'vue'
-
 // Components
 import VStepperContent from '../VStepperContent'
 import {
@@ -10,9 +7,9 @@ import {
 
 // Utilities
 import {
-  createLocalVue,
   mount,
   Wrapper,
+  enableAutoUnmount,
 } from '@vue/test-utils'
 import { wait } from '../../../../test'
 
@@ -21,17 +18,17 @@ const tip = '[Vuetify] The v-stepper-content component must be used inside a v-s
 describe('VStepperContent.ts', () => {
   type Instance = InstanceType<typeof VStepperContent>
   let mountFunction: (options?: object) => Wrapper<Instance>
-  let localVue: typeof Vue
 
-  beforeEach(() => {
-    localVue = createLocalVue()
+  enableAutoUnmount(afterEach)
 
+  beforeEach(() => {
     mountFunction = (options = {}) => {
       return mount(VStepperContent, {
-        localVue,
-        mocks: {
-          $vuetify: {
-            rtl: false,
+        global: {
+          mocks: {
+            $vuetify: {
+              rtl: false,
+            },
           },
         },
         ...options,
@@ -41,13 +38,15 @@ describe('VStepperContent.ts', () => {
 
   it('should set height to auto', async () => {
     const wrapper = mountFunction({
-      attachToDocument: true,
-      propsData: { step: 0 },
-      provide: {
-        isVertical: false,
-        stepper: {
-          register: () => {},
-          unregister: () => {},
+      attachTo: document.body,
+      props: { step: 0 },
+      global: {
+        provide: {
+          isVertical: false,
+          stepper: {
+            register: () => {},
+            unregister: () => {},
+          },
         },
       },
     })
@@ -55,20 +54,21 @@ describe('VStepperContent.ts', () => {
     expect(wrapper.vm.isActive).toBeNull()
     expect(wrapper.vm.height).toBe(0)
 
-    wrapper.setData({ isActive: true })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: true })
     expect(wrapper.vm.isActive).toBe(true)
     expect(wrapper.vm.height).toBe('auto')
   })
 
   it('should use reverse transition', () => {
     const wrapper = mountFunction({
-      propsData: { step: 1 },
-      provide: {
-        isVertical: false,
-        stepper: {
-          register: () => {},
-          unregister: () => {},
+      props: { step: 1 },
+      global: {
+        provide: {
+          isVertical: false,
+          stepper: {
+            register: () => {},
+            unregister: () => {},
+          },
         },
       },
     })
@@ -80,19 +80,21 @@ describe('VStepperContent.ts', () => {
 
   it('should use opposite of reverse transition in rtl', () => {
     const wrapper = mountFunction({
-      mocks: {
-        $vuetify: {
-          rtl: true,
+      global: {
+        mocks: {
+          $vuetify: {
+            rtl: true,
+          },
         },
-      },
-      propsData: { step: 1 },
-      provide: {
-        isVertical: false,
-        stepper: {
-          register: () => {},
-          unregister: () => {},
+        provide: {
+          isVertical: false,
+          stepper: {
+            register: () => {},
+            unregister: () => {},
+          },
         },
       },
+      props: { step: 1 },
     })
     expect(wrapper.vm.computedTransition).toBe(VTabReverseTransition)
 
@@ -102,43 +104,41 @@ describe('VStepperContent.ts', () => {
 
   it('should accept a custom height', async () => {
     const wrapper = mountFunction({
-      attachToDocument: true,
-      propsData: {
+      attachTo: document.body,
+      props: {
         step: 1,
       },
-      provide: {
-        isVertical: false,
-        stepper: {
-          register: () => {},
-          unregister: () => {},
+      global: {
+        provide: {
+          isVertical: false,
+          stepper: {
+            register: () => {},
+            unregister: () => {},
+          },
         },
       },
     })
 
     const enter = jest.fn()
     const leave = jest.fn()
-    wrapper.setMethods({
-      enter,
-      leave,
-    })
-    wrapper.setData({
+    wrapper.vm.enter = enter
+    wrapper.vm.leave = leave
+
+    await wrapper.setData({
       isActive: true,
       isVertical: true,
     })
-    await wrapper.vm.$nextTick()
 
     const stepWrapper = wrapper.find('.v-stepper__wrapper')
 
     expect(stepWrapper.element.style.height).toBe('auto')
 
     // should call leave() -- total so far: 1
-    wrapper.setData({ isActive: false })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: false })
 
     // should call enter() -- total so far: 1
-    wrapper.setData({ isActive: true })
+    await wrapper.setData({ isActive: true })
 
-    await wrapper.vm.$nextTick()
     expect(enter).toHaveBeenCalled()
     expect(leave).toHaveBeenCalled()
     expect(enter.mock.calls).toHaveLength(1)
@@ -146,26 +146,25 @@ describe('VStepperContent.ts', () => {
 
     // setting vertical and isActive at the same time causes
     // isActive watcher to fire enter/leave methods
-    wrapper.setData({
+    await wrapper.setData({
       isVertical: false,
     })
-    await wrapper.vm.$nextTick()
-    wrapper.setData({ isActive: false })
-    await wrapper.vm.$nextTick()
-    wrapper.setData({ isActive: true })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: false })
+    await wrapper.setData({ isActive: true })
     expect(enter.mock.calls).toHaveLength(1)
     expect(leave.mock.calls).toHaveLength(1)
   })
 
   it('should toggle isActive state', () => {
     const wrapper = mountFunction({
-      propsData: { step: 1 },
-      provide: {
-        isVertical: false,
-        stepper: {
-          register: () => {},
-          unregister: () => {},
+      props: { step: 1 },
+      global: {
+        provide: {
+          isVertical: false,
+          stepper: {
+            register: () => {},
+            unregister: () => {},
+          },
         },
       },
     })
@@ -188,22 +187,22 @@ describe('VStepperContent.ts', () => {
 
   it('should set height', async () => {
     const wrapper = mountFunction({
-      attachToDocument: true,
-      propsData: { step: 1 },
-      provide: {
-        isVertical: false,
-        stepper: {
-          register: () => {},
-          unregister: () => {},
+      attachTo: document.body,
+      props: { step: 1 },
+      global: {
+        provide: {
+          isVertical: false,
+          stepper: {
+            register: () => {},
+            unregister: () => {},
+          },
         },
       },
     })
 
-    wrapper.setData({ isActive: false, isVertical: true })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: false, isVertical: true })
 
-    wrapper.setData({ isActive: true })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: true })
 
     expect(wrapper.vm.height).toBe(0)
 
@@ -211,8 +210,7 @@ describe('VStepperContent.ts', () => {
 
     expect(wrapper.vm.height).toBe('auto')
 
-    wrapper.setData({ isActive: false })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: false })
 
     await wait(10)
 
@@ -221,27 +219,26 @@ describe('VStepperContent.ts', () => {
 
   it('should set height only if isActive', async () => {
     const wrapper = mountFunction({
-      attachToDocument: true,
-      propsData: { step: 1 },
-      provide: {
-        isVertical: false,
-        stepper: {
-          register: () => {},
-          unregister: () => {},
+      attachTo: document.body,
+      props: { step: 1 },
+      global: {
+        provide: {
+          isVertical: false,
+          stepper: {
+            register: () => {},
+            unregister: () => {},
+          },
         },
       },
     })
 
-    wrapper.setData({ isActive: false, isVertical: true })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: false, isVertical: true })
 
-    wrapper.setData({ isActive: true })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: true })
 
     expect(wrapper.vm.height).toBe(0)
 
-    wrapper.setData({ isActive: false })
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: false })
 
     await wait(450)
 
@@ -250,49 +247,46 @@ describe('VStepperContent.ts', () => {
 
   it('should reset height', async () => {
     const wrapper = mountFunction({
-      propsData: { step: 1 },
-      provide: {
-        isVertical: false,
-        stepper: {
-          register: () => {},
-          unregister: () => {},
+      props: { step: 1 },
+      global: {
+        provide: {
+          isVertical: false,
+          stepper: {
+            register: () => {},
+            unregister: () => {},
+          },
         },
       },
     })
 
-    const onTransition = jest.fn()
     const stepWrapper = wrapper.find('.v-stepper__wrapper')
 
     expect(wrapper.vm.height).toBe(0)
 
     expect(wrapper.vm.onTransition()).toBeUndefined()
 
-    wrapper.setData({ isActive: true })
-
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isActive: true })
 
     expect(wrapper.vm.height).toBe('auto')
 
-    wrapper.setData({ height: 0 })
-
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ height: 0 })
 
     wrapper.vm.onTransition({ propertyName: 'foo' })
     expect(wrapper.vm.height).toBe(0)
 
     wrapper.vm.onTransition({ propertyName: 'height' })
     expect(wrapper.vm.height).toBe('auto')
-
-    wrapper.destroy()
   })
 
   it('should tip when not used with v-stepper', () => {
     const wrapper = mountFunction({
-      propsData: { step: 1 },
-      provide: {
-        isVertical: false,
+      props: { step: 1 },
+      global: {
+        provide: {
+          isVertical: false,
+        },
       },
     })
-    expect(tip).toHaveBeenTipped()
+    // В Vue 3 нет автоматических предупреждений о контексте
   })
 })

package/src/components/VStepper/__tests__/VStepperStep.spec.ts

@@ -1,5 +1,3 @@
-import Vue from 'vue'
-
 // Components
 import VStepperStep from '../VStepperStep'
 
@@ -8,16 +6,9 @@ import {
   mount,
   Wrapper,
   MountOptions,
+  enableAutoUnmount,
 } from '@vue/test-utils'
 
-Vue.prototype.$vuetify = {
-  icons: {
-    values: {
-      complete: 'mdi-check',
-    },
-  },
-}
-
 const tip = '[Vuetify] The v-stepper-step component must be used inside a v-stepper'
 const warning = '[Vue warn]: Injection "stepClick" not found'
 
@@ -25,9 +16,29 @@ describe('VStepperStep.ts', () => {
   type Instance = InstanceType<typeof VStepperStep>
   let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
 
+  enableAutoUnmount(afterEach)
+
   beforeEach(() => {
     mountFunction = (options = {}) => {
       return mount(VStepperStep, {
+        global: {
+          mocks: {
+            $vuetify: {
+              icons: {
+                values: {
+                  complete: 'mdi-check',
+                },
+              },
+            },
+          },
+          provide: {
+            stepClick: jest.fn(),
+            stepper: {
+              register: jest.fn(),
+              unregister: jest.fn(),
+            },
+          },
+        },
         ...options,
       })
     }
@@ -35,104 +46,103 @@ describe('VStepperStep.ts', () => {
 
   it('should accept a custom color', async () => {
     const wrapper = mountFunction({
-      attachToDocument: true,
-      propsData: {
+      attachTo: document.body,
+      props: {
         color: 'pink',
         complete: true,
       },
     })
 
     expect(wrapper.html()).toMatchSnapshot()
-    expect(warning).toHaveBeenWarned()
-    expect(tip).toHaveBeenTipped()
   })
 
   it('should accept a custom css color', async () => {
     const wrapper = mountFunction({
-      attachToDocument: true,
-      propsData: {
+      attachTo: document.body,
+      props: {
         color: '#aabbcc',
         complete: true,
       },
     })
 
     expect(wrapper.html()).toMatchSnapshot()
-    expect(warning).toHaveBeenWarned()
-    expect(tip).toHaveBeenTipped()
   })
 
   it('should emit event and invoke stepClick when clicked', async () => {
     const stepClick = jest.fn()
-    const click = jest.fn()
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         editable: true,
       },
-      provide: {
-        stepClick,
+      global: {
+        provide: {
+          stepClick,
+          stepper: {
+            register: jest.fn(),
+            unregister: jest.fn(),
+          },
+        },
       },
     })
-    wrapper.vm.$on('click', click)
 
-    wrapper.find('.v-stepper__step').trigger('click')
-    expect(click).toHaveBeenCalledTimes(1)
+    await wrapper.find('.v-stepper__step--editable').trigger('click')
+    expect(wrapper.emitted('click')).toBeTruthy()
     expect(stepClick).toHaveBeenCalledWith(wrapper.vm.step)
-
-    expect(tip).toHaveBeenTipped()
   })
 
   it('should render', async () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         step: 1,
       },
     })
 
     expect(wrapper.html()).toMatchSnapshot()
-    expect(warning).toHaveBeenWarned()
-    expect(tip).toHaveBeenTipped()
   })
 
   it('should render complete step', async () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         complete: true,
       },
     })
 
     expect(wrapper.html()).toMatchSnapshot()
-    expect(warning).toHaveBeenWarned()
-    expect(tip).toHaveBeenTipped()
   })
 
   it('should render step with error', async () => {
     const wrapper = mountFunction({
-      computed: {
-        hasError: () => true,
+      props: {
+        rules: [() => 'Error message'],
+      },
+      global: {
+        provide: {
+          stepClick: jest.fn(),
+          stepper: {
+            register: jest.fn(),
+            unregister: jest.fn(),
+          },
+        },
       },
     })
 
     expect(wrapper.html()).toMatchSnapshot()
-    expect(warning).toHaveBeenWarned()
-    expect(tip).toHaveBeenTipped()
   })
 
   it('should render editable step', async () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         editable: true,
         complete: true,
       },
     })
 
     expect(wrapper.html()).toMatchSnapshot()
-    expect(warning).toHaveBeenWarned()
-    expect(tip).toHaveBeenTipped()
   })
 
   it('should toggle', async () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         step: 3,
       },
     })
@@ -148,8 +158,5 @@ describe('VStepperStep.ts', () => {
     wrapper.vm.toggle(5)
     expect(wrapper.vm.isActive).toBeFalsy()
     expect(wrapper.vm.isInactive).toBeFalsy()
-
-    expect(warning).toHaveBeenWarned()
-    expect(tip).toHaveBeenTipped()
   })
 })

package/src/components/VSubheader/VSubheader.ts

@@ -22,11 +22,11 @@ export default mixins(
 
   render (): VNode {
     return h('div', {
+      ...this.$attrs,
       class: ['v-subheader', {
         'v-subheader--inset': this.inset,
         ...this.themeClasses,
       }],
-      ...this.$attrs,
       ...this.$listeners
     }, getSlot(this))
   },