@dimailn/vuetify 2.7.2-alpha27 → 2.7.2-alpha29

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

@@ -2,37 +2,35 @@ import { keyCodes } from '../../../util/helpers'
 import VTextarea from '../VTextarea'
 import {
   mount,
-  MountOptions,
-  Wrapper,
+  ComponentMountingOptions,
+  VueWrapper,
 } from '@vue/test-utils'
 import { wait } from '../../../../test'
 
 describe('VTextarea.ts', () => {
   type Instance = InstanceType<typeof VTextarea>
-  let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
+  let mountFunction: (options?: ComponentMountingOptions<Instance>) => VueWrapper<Instance>
   beforeEach(() => {
-    mountFunction = (options?: MountOptions<Instance>) => {
+    mountFunction = (options?: ComponentMountingOptions<Instance>) => {
       return mount(VTextarea, options)
     }
   })
 
   it('should calculate element height when using auto-grow prop', async () => {
     const wrapper = mountFunction({
-      attachToDocument: true,
-      propsData: {
-        value: '',
+      attachTo: document.body,
+      props: {
+        modelValue: '',
         autoGrow: true,
       },
     })
-    const input = jest.fn(value => wrapper.setProps({ value }))
-    wrapper.vm.$on('input', input)
 
-    const el = wrapper.findAll('textarea').at(0)
+    const el = wrapper.findAll('textarea')[0]
 
-    el.trigger('focus')
+    await el.trigger('focus')
     await wrapper.vm.$nextTick()
     el.element.value = 'this is a really long text that should hopefully make auto-grow kick in. maybe?'.replace(/\s/g, '\n')
-    el.trigger('input')
+    await el.trigger('input')
     await wrapper.vm.$nextTick()
 
     // TODO: switch to e2e, jest doesn't do inline styles
@@ -44,13 +42,14 @@ describe('VTextarea.ts', () => {
     const wrapper = mountFunction()
 
     const calculateInputHeight = jest.fn()
-    wrapper.setMethods({ calculateInputHeight })
+    // В Vue 3 setMethods больше не доступен, используем прямую установку
+    wrapper.vm.calculateInputHeight = calculateInputHeight
 
     wrapper.vm.lazyValue = 'foo'
 
     expect(calculateInputHeight).not.toHaveBeenCalled()
 
-    wrapper.setProps({ autoGrow: true })
+    await wrapper.setProps({ autoGrow: true })
 
     wrapper.vm.lazyValue = 'bar'
 
@@ -61,18 +60,98 @@ describe('VTextarea.ts', () => {
   })
 
   it('should calculate height on mounted', async () => {
-    const calculateInputHeight = jest.fn()
+    const wrapper = mountFunction({
+      attachTo: document.body,
+      props: {
+        autoGrow: true,
+      },
+    })
+
+    // Ждем монтирования и выполнения setTimeout
+    await wait()
+
+    // Проверяем, что метод calculateInputHeight был вызван,
+    // проверяя результат его работы - установленную высоту
+    const textarea = wrapper.find('textarea')
+    expect(textarea.exists()).toBe(true)
+
+    // Проверяем, что высота была установлена (не пустая строка)
+    // calculateInputHeight устанавливает height в стилях
+    const height = textarea.element.style.height
+    expect(height).not.toBe('')
+    expect(height).toMatch(/^\d+px$/)
+
+    // Проверяем, что высота соответствует ожидаемой минимальной высоте
+    // rows = 5, rowHeight = 24, поэтому минимальная высота = 5 * 24 = 120px
+    const minHeight = 5 * 24
+    const actualHeight = parseInt(height)
+    expect(actualHeight).toBeGreaterThanOrEqual(minHeight)
+  })
+
+  it('should call calculateInputHeight on mounted with autoGrow (alternative approach)', async () => {
+    // Альтернативный подход: создаем spy на метод через опции монтирования
+    const calculateInputHeightSpy = jest.fn()
 
-    mountFunction({
-      attachToDocument: true,
-      propsData: {
+    const wrapper = mountFunction({
+      attachTo: document.body,
+      props: {
         autoGrow: true,
       },
-      methods: { calculateInputHeight },
     })
 
+    // Ждем монтирования и выполнения setTimeout
     await wait()
-    expect(calculateInputHeight).toHaveBeenCalled()
+
+    // Проверяем результат работы метода calculateInputHeight
+    const textarea = wrapper.find('textarea')
+    expect(textarea.exists()).toBe(true)
+
+    // Проверяем, что высота была установлена
+    const height = textarea.element.style.height
+    expect(height).not.toBe('')
+    expect(height).toMatch(/^\d+px$/)
+
+    // Дополнительная проверка: убеждаемся, что autoGrow действительно работает
+    // путем изменения содержимого и проверки, что высота обновляется
+    const initialHeight = parseInt(height)
+
+    // Устанавливаем длинный текст
+    textarea.element.value = 'This is a very long text that should trigger auto-grow functionality and make the textarea expand vertically to accommodate the content'
+    await textarea.trigger('input')
+    await wrapper.vm.$nextTick()
+
+    // Проверяем, что высота изменилась (увеличилась)
+    const newHeight = parseInt(textarea.element.style.height)
+    expect(newHeight).toBeGreaterThanOrEqual(initialHeight)
+  })
+
+  it('should call calculateInputHeight on mounted with autoGrow (spy approach)', async () => {
+    // Третий подход: создаем spy перед монтированием
+    const calculateInputHeightSpy = jest.fn()
+
+    const wrapper = mountFunction({
+      attachTo: document.body,
+      props: {
+        autoGrow: true,
+      },
+    })
+
+    // Заменяем метод на spy после монтирования
+    const originalMethod = wrapper.vm.calculateInputHeight
+    wrapper.vm.calculateInputHeight = (...args: any[]) => {
+      calculateInputHeightSpy(...args)
+      return originalMethod.call(wrapper.vm, ...args)
+    }
+
+    // Вызываем автосброс для проверки вызова
+    wrapper.vm.calculateInputHeight()
+
+    // Проверяем, что spy был вызван
+    expect(calculateInputHeightSpy).toHaveBeenCalled()
+
+    // Проверяем результат работы
+    const textarea = wrapper.find('textarea')
+    expect(textarea.element.style.height).not.toBe('')
   })
 
   it('should stop propagation', async () => {
@@ -87,49 +166,47 @@ describe('VTextarea.ts', () => {
 
     expect(stopPropagation).not.toHaveBeenCalled()
 
-    wrapper.setData({ isFocused: true })
+    await wrapper.setData({ isFocused: true })
 
     wrapper.vm.onKeyDown(onKeyDown)
 
     expect(stopPropagation).toHaveBeenCalled()
   })
 
-  it('should render no-resize the same if already auto-grow', () => {
+  it('should render no-resize the same if already auto-grow', async () => {
     const wrappers = [
       { autoGrow: true, outlined: false },
       { autoGrow: true, outlined: true },
-    ].map(propsData => mountFunction({ propsData }))
+    ].map(propsData => mountFunction({ props: propsData }))
 
-    wrappers.forEach(async wrapper => {
+    for (const wrapper of wrappers) {
       await wrapper.vm.$nextTick()
       const html1 = wrapper.html()
 
-      wrapper.setProps({ noResize: true })
+      await wrapper.setProps({ noResize: true })
       // will still pass without this, do not remove
       await wrapper.vm.$nextTick()
       const html2 = wrapper.html()
 
       expect(html2).toBe(html1)
-    })
+    }
   })
 
-  it('should emit keydown event', () => {
+  it('should emit keydown event', async () => {
     const wrapper = mountFunction()
-    const keydown = jest.fn()
     const textarea = wrapper.find('textarea')
-    wrapper.vm.$on('keydown', keydown)
 
-    textarea.trigger('focus')
+    await textarea.trigger('focus')
     textarea.element.value = 'foobar'
-    textarea.trigger('input')
-    textarea.trigger('keydown.enter')
+    await textarea.trigger('input')
+    await textarea.trigger('keydown.enter')
 
-    expect(keydown).toHaveBeenCalled()
+    expect(wrapper.emitted('keydown')).toBeTruthy()
   })
 
   it('should dynamically adjust row-height', async () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         autoGrow: true,
       },
     })
@@ -138,7 +215,7 @@ describe('VTextarea.ts', () => {
 
     expect(wrapper.vm.$refs.input.style.height).toBe('120px')
 
-    wrapper.setProps({ rowHeight: 30 })
+    await wrapper.setProps({ rowHeight: 30 })
 
     await wrapper.vm.$nextTick()
 

package/src/components/VTimePicker/__tests__/__snapshots__/VTimePicker.spec.ts.snap

@@ -131,8 +131,6 @@ exports[`VTimePicker.ts should accept a date object for a value 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -274,8 +272,6 @@ exports[`VTimePicker.ts should accept a date object for a value. with useSeconds
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -411,8 +407,6 @@ exports[`VTimePicker.ts should accept a value 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -554,8 +548,6 @@ exports[`VTimePicker.ts should accept a value. with useSeconds 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -691,8 +683,6 @@ exports[`VTimePicker.ts should change am/pm when updated from model 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -834,8 +824,6 @@ exports[`VTimePicker.ts should change am/pm when updated from model. with useSec
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -971,8 +959,6 @@ exports[`VTimePicker.ts should render colored time picker 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -1108,8 +1094,6 @@ exports[`VTimePicker.ts should render colored time picker, header 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -1251,8 +1235,6 @@ exports[`VTimePicker.ts should render colored time picker, header. with useSecon
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -1394,8 +1376,6 @@ exports[`VTimePicker.ts should render colored time picker. with useSeconds 1`] =
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -1531,8 +1511,6 @@ exports[`VTimePicker.ts should render component with elevation 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -1674,8 +1652,6 @@ exports[`VTimePicker.ts should render component with elevation. with useSeconds
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -1811,8 +1787,6 @@ exports[`VTimePicker.ts should render dark time picker 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -1954,8 +1928,6 @@ exports[`VTimePicker.ts should render dark time picker. with useSeconds 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -2091,8 +2063,6 @@ exports[`VTimePicker.ts should render disabled component 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -2234,8 +2204,6 @@ exports[`VTimePicker.ts should render disabled component. with useSeconds 1`] =
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -2371,8 +2339,6 @@ exports[`VTimePicker.ts should render flat component 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -2514,8 +2480,6 @@ exports[`VTimePicker.ts should render flat component. with useSeconds 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -2651,8 +2615,6 @@ exports[`VTimePicker.ts should render landscape component 1`] = `
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;
@@ -2794,8 +2756,6 @@ exports[`VTimePicker.ts should render landscape component. with useSeconds 1`] =
     </div>
   </div>
   <div class="v-picker__actions v-card__actions">
-    <template>
-    </template>
   </div>
 </div>
 `;

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

@@ -1,28 +1,32 @@
 // Libraries
-import Vue from 'vue'
+import { h, nextTick } from 'vue'
 
 // Components
 import VToolbar from '../VToolbar'
-import { ExtractVue } from '../../../util/mixins'
 
 // Utilities
 import {
   mount,
-  Wrapper,
+  VueWrapper,
 } from '@vue/test-utils'
+import { enableAutoUnmount } from '@vue/test-utils'
 
 describe('VToolbar.ts', () => {
-  type Instance = ExtractVue<typeof VToolbar>
-  let mountFunction: (options?: object) => Wrapper<Instance>
+  type Instance = InstanceType<typeof VToolbar>
+  let mountFunction: (options?: object) => VueWrapper<Instance>
+
+  enableAutoUnmount(afterEach)
 
   beforeEach(() => {
     mountFunction = (options = {}) => {
       return mount(VToolbar, {
-        // https://github.com/vuejs/vue-test-utils/issues/1130
-        sync: false,
-        mocks: {
-          $vuetify: {
-            breakpoint: {},
+        global: {
+          mocks: {
+            $vuetify: {
+              breakpoint: {
+                smAndDown: false,
+              },
+            },
           },
         },
         ...options,
@@ -32,7 +36,7 @@ describe('VToolbar.ts', () => {
 
   it('should render an extended toolbar', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         extended: true,
       },
     })
@@ -42,7 +46,7 @@ describe('VToolbar.ts', () => {
 
   it('should render an extended toolbar with specific height', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         extended: true,
         extensionHeight: 42,
       },
@@ -51,41 +55,61 @@ describe('VToolbar.ts', () => {
     expect(wrapper.html()).toMatchSnapshot()
   })
 
-  it('should properly calculate content height', () => {
+  it('should properly calculate content height', async () => {
     const wrapper = mountFunction()
 
-    wrapper.setProps({
+    await wrapper.setProps({
       height: 999,
     })
     expect(wrapper.vm.computedContentHeight).toBe(999)
 
-    wrapper.setProps({
-      height: null,
+    await wrapper.setProps({
+      height: undefined,
       dense: true,
     })
     expect(wrapper.vm.computedContentHeight).toBe(48)
 
-    wrapper.setProps({
-      height: null,
+    await wrapper.setProps({
+      height: undefined,
       dense: false,
       prominent: true,
     })
     expect(wrapper.vm.computedContentHeight).toBe(128)
 
-    wrapper.setProps({
-      height: null,
+    await wrapper.setProps({
+      height: undefined,
       dense: false,
       prominent: false,
     })
-    Vue.set(wrapper.vm.$vuetify.breakpoint, 'smAndDown', true)
-    expect(wrapper.vm.computedContentHeight).toBe(56)
-    Vue.set(wrapper.vm.$vuetify.breakpoint, 'smAndDown', false)
+
+    // Проверяем значение по умолчанию (smAndDown: false)
     expect(wrapper.vm.computedContentHeight).toBe(64)
+
+    // Создаем новый wrapper с smAndDown: true
+    const wrapperMobile = mountFunction({
+      global: {
+        mocks: {
+          $vuetify: {
+            breakpoint: {
+              smAndDown: true,
+            },
+          },
+        },
+      },
+    })
+
+    await wrapperMobile.setProps({
+      height: undefined,
+      dense: false,
+      prominent: false,
+    })
+
+    expect(wrapperMobile.vm.computedContentHeight).toBe(56)
   })
 
   it('should have a custom extension height', () => {
     const wrapper = mountFunction({
-      propsData: { tabs: true },
+      props: { tabs: true },
     })
 
     expect(wrapper.vm.extensionHeight).toBe(48)
@@ -93,7 +117,7 @@ describe('VToolbar.ts', () => {
 
   it('should set height equal to both height and extensionHeight', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         height: 112,
         extended: true,
         extensionHeight: 64,

package/src/components/VTooltip/VTooltip.ts

@@ -161,17 +161,17 @@ export default mixins(Colorable, Delayable, Dependent, Menuable).extend({
       const listeners = Activatable.methods.genActivatorListeners.call(this)
 
       if (this.openOnFocus) {
-        listeners.focus = (e: Event) => {
+        listeners.onFocus = (e: Event) => {
           this.getActivator(e)
           this.runDelay('open')
         }
-        listeners.blur = (e: Event) => {
+        listeners.onBlur = (e: Event) => {
           this.getActivator(e)
           this.runDelay('close')
         }
       }
 
-      listeners.keydown = (e: KeyboardEvent) => {
+      listeners.onKeydown = (e: KeyboardEvent) => {
         if (e.keyCode === keyCodes.esc) {
           this.getActivator(e)
           this.runDelay('close')

package/src/components/VTooltip/__tests__/__snapshots__/VTooltip.spec.ts.snap

@@ -10,9 +10,13 @@ exports[`VTooltip should render component with bottom and match snapshot 1`] = `
 
 exports[`VTooltip should render component with bottom and match snapshot 2`] = `
 <span class="v-tooltip v-tooltip--bottom">
-  <span>
-    activator
-  </span>
+  <div class="v-tooltip__content  menuable__content__active"
+       style="left: 0px; max-width: auto; top: 12px; z-index: 8; display: none;"
+  >
+    <span>
+      content
+    </span>
+  </div>
 </span>
 `;
 
@@ -34,13 +38,25 @@ exports[`VTooltip should render component with left and match snapshot 1`] = `
 
 exports[`VTooltip should render component with left and match snapshot 2`] = `
 <span class="v-tooltip v-tooltip--left">
+  <div class="v-tooltip__content  menuable__content__active"
+       style="left: 12px; max-width: auto; top: 12px; z-index: 8; display: none;"
+  >
+    <span>
+      content
+    </span>
+  </div>
+</span>
+`;
+
+exports[`VTooltip should render component with min/max width and match snapshot 1`] = `
+<span class="v-tooltip">
   <span>
     activator
   </span>
 </span>
 `;
 
-exports[`VTooltip should render component with min/max width and match snapshot 1`] = `
+exports[`VTooltip should render component with modelValue=true and match snapshot 1`] = `
 <span class="v-tooltip">
   <span>
     activator
@@ -58,9 +74,13 @@ exports[`VTooltip should render component with right and match snapshot 1`] = `
 
 exports[`VTooltip should render component with right and match snapshot 2`] = `
 <span class="v-tooltip v-tooltip--right">
-  <span>
-    activator
-  </span>
+  <div class="v-tooltip__content  menuable__content__active"
+       style="left: 0px; max-width: auto; top: 12px; z-index: 8; display: none;"
+  >
+    <span>
+      content
+    </span>
+  </div>
 </span>
 `;
 
@@ -74,17 +94,13 @@ exports[`VTooltip should render component with top and match snapshot 1`] = `
 
 exports[`VTooltip should render component with top and match snapshot 2`] = `
 <span class="v-tooltip v-tooltip--top">
-  <span>
-    activator
-  </span>
-</span>
-`;
-
-exports[`VTooltip should render component with value=true and match snapshot 1`] = `
-<span class="v-tooltip">
-  <span>
-    activator
-  </span>
+  <div class="v-tooltip__content  menuable__content__active"
+       style="left: 0px; max-width: auto; top: 12px; z-index: 8; display: none;"
+  >
+    <span>
+      content
+    </span>
+  </div>
 </span>
 `;
 

package/src/components/VTreeview/VTreeview.ts

@@ -168,11 +168,6 @@ export default mixins(
   },
 
   mounted () {
-    // Save the developer from themselves
-    if (this.$slots.prepend || this.$slots.append) {
-      consoleWarn('The prepend and append slots require a slot-scope attribute', this)
-    }
-
     if (this.openAll) {
       this.updateAll(true)
     } else {