@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

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

@@ -8,7 +8,7 @@ import VIcon from '../VIcon'
 import {
   mount,
   VueWrapper,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 
 // Импортируем внутренний компонент для прямого тестирования
@@ -29,13 +29,13 @@ describe('VIcon', () => {
     mountFunction = (ctx: MountContext = {}, name = 'add') => {
       return mount(VIcon, {
         props: {
-          ...ctx.props,
+          ...ctx.props
         },
         attrs: {
-          ...ctx.attrs,
+          ...ctx.attrs
         },
         slots: {
-          default: () => name,
+          default: () => name
         }
       })
     }
@@ -76,7 +76,7 @@ describe('VIcon', () => {
       xSmall: '12px',
       small: '16px',
       large: '36px',
-      xLarge: '40px',
+      xLarge: '40px'
     }
 
     Object.keys(SIZE_MAP).forEach(size => {
@@ -134,7 +134,7 @@ describe('VIcon', () => {
 
   it('should allow the use of v-text', () => {
     const wrapper = mountFunction({
-      attrs: { textContent: 'fa-home' },
+      attrs: { textContent: 'fa-home' }
     })
 
     expect(wrapper.find('.v-icon').exists()).toBe(true)
@@ -144,7 +144,7 @@ describe('VIcon', () => {
 
   it('should allow the use of v-html', () => {
     const wrapper = mountFunction({
-      attrs: { innerHTML: 'fa-home' },
+      attrs: { innerHTML: 'fa-home' }
     })
 
     expect(wrapper.find('.v-icon').exists()).toBe(true)
@@ -154,7 +154,7 @@ describe('VIcon', () => {
 
   it('set font size from helper prop', async () => {
     const iconFactory = size => mountFunction({
-      props: { [size]: true },
+      props: { [size]: true }
     })
 
     const small = iconFactory('small')
@@ -173,11 +173,11 @@ describe('VIcon', () => {
   it('should have proper classname', () => {
     const wrapper = mountFunction({
       props: {
-        color: 'primary',
+        color: 'primary'
       },
       attrs: {
-        innerHTML: 'fa-lock',
-      },
+        innerHTML: 'fa-lock'
+      }
     })
 
     expect(wrapper.element.classList).toContain('primary--text')
@@ -220,22 +220,22 @@ describe('VIcon', () => {
       props: ['name'],
       render () {
         return h('div', {
-          class: 'test-component',
+          class: 'test-component'
         }, this.name)
-      },
+      }
     })
 
     it('should render component', () => {
       const wrapper = mount(VIcon, {
         slots: {
-          default: () => '$testIcon',
+          default: () => '$testIcon'
         },
         global: {
           mocks: {
             $vuetify: {
               theme: {
                 current: 'light',
-                dark: false,
+                dark: false
               },
               icons: {
                 component: null,
@@ -243,13 +243,13 @@ describe('VIcon', () => {
                   testIcon: {
                     component: getTestComponent(),
                     props: {
-                      name: 'test icon',
-                    },
-                  },
-                },
-              },
-            },
-          },
+                      name: 'test icon'
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       })
 
@@ -265,11 +265,11 @@ describe('VIcon', () => {
 
     it('should render an svg icon', async () => {
       const svgPath = 'M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z'
-      
+
       // Тестируем напрямую внутренний компонент VIconInternal
       const directWrapper = mount(VIconInternal, {
         slots: {
-          default: () => svgPath,
+          default: () => svgPath
         },
         global: {
           mocks: {
@@ -279,34 +279,34 @@ describe('VIcon', () => {
                 dark: false,
                 themes: {
                   light: {},
-                  dark: {},
-                },
+                  dark: {}
+                }
               },
               rtl: false,
               icons: {
                 component: null,
-                values: {},
-              },
-            },
-          },
+                values: {}
+              }
+            }
+          }
         }
       })
-      
+
       expect(directWrapper.html()).toMatchSnapshot()
 
       await directWrapper.setProps({ large: true })
-      
+
       expect(directWrapper.html()).toMatchSnapshot()
     })
 
     it('should detect svg path correctly', () => {
       const svgPath = 'M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z'
-      
+
       // Проверяем функцию определения SVG пути
       const isSvgPath = (icon: string): boolean => {
         return (/^[mzlhvcsqta]\s*[-+.0-9][^mlhvzcsqta]+/i.test(icon) && /[\dz]$/i.test(icon) && icon.length > 4)
       }
-      
+
       expect(isSvgPath(svgPath)).toBe(true)
       expect(isSvgPath('mdi-home')).toBe(false)
       expect(isSvgPath('material-icons')).toBe(false)

package/src/components/VImg/VImg.ts

@@ -1,4 +1,4 @@
-import {h, Transition, withDirectives, mergeProps} from 'vue'
+import { h, Transition, withDirectives, mergeProps, PropType } from 'vue'
 // Styles
 import './VImg.sass'
 
@@ -7,7 +7,6 @@ import intersect from '../../directives/intersect'
 
 // Types
 import { VNode } from 'vue'
-import { PropValidator } from 'vue/types/options'
 
 // Components
 import VResponsive from '../VResponsive'
@@ -35,11 +34,10 @@ const hasIntersect = typeof window !== 'undefined' && 'IntersectionObserver' in
 /* @vue/component */
 export default mixins(
   VResponsive,
-  Themeable,
+  Themeable
 ).extend({
   name: 'v-img',
 
-
   props: {
     alt: String,
     contain: Boolean,
@@ -53,23 +51,23 @@ export default mixins(
       default: () => ({
         root: undefined,
         rootMargin: undefined,
-        threshold: undefined,
-      }),
-    } as PropValidator<IntersectionObserverInit>,
+        threshold: undefined
+      })
+    } as unknown as PropType<IntersectionObserverInit>,
     position: {
       type: String,
-      default: 'center center',
+      default: 'center center'
     },
     sizes: String,
     src: {
       type: [String, Object],
-      default: '',
-    } as PropValidator<string | srcObject>,
+      default: ''
+    } as unknown as PropType<string | srcObject>,
     srcset: String,
     transition: {
       type: [Boolean, String],
-      default: 'fade-transition',
-    },
+      default: 'fade-transition'
+    }
   },
 
   emits: ['load', 'error', 'loadstart'],
@@ -81,7 +79,7 @@ export default mixins(
       isLoading: true,
       calculatedAspectRatio: undefined as number | undefined,
       naturalWidth: undefined as number | undefined,
-      hasError: false,
+      hasError: false
     }
   },
 
@@ -92,16 +90,17 @@ export default mixins(
     normalisedSrc (): srcObject {
       return this.src && typeof this.src === 'object'
         ? {
-          src: this.src.src,
-          srcset: this.srcset || this.src.srcset,
-          lazySrc: this.lazySrc || this.src.lazySrc,
-          aspect: Number(this.aspectRatio || this.src.aspect),
-        } : {
-          src: this.src,
-          srcset: this.srcset,
-          lazySrc: this.lazySrc,
-          aspect: Number(this.aspectRatio || 0),
-        }
+            src: this.src.src,
+            srcset: this.srcset || this.src.srcset,
+            lazySrc: this.lazySrc || this.src.lazySrc,
+            aspect: Number(this.aspectRatio || this.src.aspect)
+          }
+        : {
+            src: this.src,
+            srcset: this.srcset,
+            lazySrc: this.lazySrc,
+            aspect: Number(this.aspectRatio || 0)
+          }
     },
     __cachedImage (): VNode | [] {
       if (!(this.normalisedSrc.src || this.normalisedSrc.lazySrc || this.gradient)) return []
@@ -121,9 +120,9 @@ export default mixins(
         },
         style: {
           backgroundImage: backgroundImage.join(', '),
-          backgroundPosition: this.position,
+          backgroundPosition: this.position
         },
-        key: +this.isLoading,
+        key: +this.isLoading
       })
 
       /* istanbul ignore if */
@@ -131,9 +130,9 @@ export default mixins(
 
       return h(Transition, {
         name: this.transition,
-        mode: 'in-out',
+        mode: 'in-out'
       }, () => [image])
-    },
+    }
   },
 
   watch: {
@@ -142,7 +141,7 @@ export default mixins(
       if (!this.isLoading) this.init(undefined, undefined, true)
       else this.loadImage()
     },
-    '$vuetify.breakpoint.width': 'getSrc',
+    '$vuetify.breakpoint.width': 'getSrc'
   },
 
   mounted () {
@@ -245,9 +244,9 @@ export default mixins(
       let content: VNode = VResponsive.methods.genContent.call(this)
 
       if (this.naturalWidth) {
-        content = h(content.type, mergeProps(content.props, {
-          style: { width: `${this.naturalWidth}px` },
-        }), content.children)
+        content = h(content.type as any, mergeProps(content.props ?? {}, {
+          style: { width: `${this.naturalWidth}px` }
+        }), content.children ?? [])
       }
 
       return content
@@ -257,18 +256,18 @@ export default mixins(
       if (slot) {
         const placeholder = this.isLoading
           ? [h('div', {
-            class: 'v-image__placeholder',
-          }, slot)]
+              class: 'v-image__placeholder'
+            }, slot)]
           : []
 
         if (!this.transition) return placeholder[0]
 
         return h(Transition, {
           appear: true,
-          name: this.transition,
+          name: this.transition
         }, () => placeholder)
       }
-    },
+    }
   },
 
   render (): VNode {
@@ -277,7 +276,7 @@ export default mixins(
     const data = mergeData(node.props, {
       'aria-label': this.alt,
       role: this.alt ? 'img' : undefined,
-      class:  {
+      class: {
         ...this.themeClasses,
         'v-image': true
       }
@@ -287,26 +286,26 @@ export default mixins(
       this.__cachedSizer,
       this.__cachedImage,
       this.__genPlaceholder(),
-      this.genContent(),
+      this.genContent()
     ] as VNode[]
 
     node = h(node.type, data, node.children)
 
     return withDirectives(node, hasIntersect
       ? [
-        [
-          Intersect,
-          {
-            handler: this.init,
-            options: this.options,
-          },
-          '',
-          {
-            once: true
-          }
+          [
+            Intersect,
+            {
+              handler: this.init,
+              options: this.options
+            },
+            '',
+            {
+              once: true
+            }
+          ]
         ]
-      ]
 
       : [])
-  },
+  }
 })

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

@@ -5,7 +5,7 @@ import VImg from '../VImg'
 import {
   mount,
   VueWrapper,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { h } from 'vue'
 
@@ -21,8 +21,8 @@ describe('VImg.ts', () => {
         ...options,
         props: {
           eager: true,
-          ...options.props,
-        },
+          ...options.props
+        }
       })
     }
   })
@@ -45,18 +45,18 @@ describe('VImg.ts', () => {
             this.onload && this.onload()
           })
         }
-      },
+      }
     })
     Object.defineProperty((global as any).Image.prototype, 'currentSrc', {
       get () {
         return this._currentSrc
-      },
+      }
     })
     Object.defineProperty((global as any).Image.prototype, 'naturalWidth', {
-      get () { return this._naturalWidth },
+      get () { return this._naturalWidth }
     })
     Object.defineProperty((global as any).Image.prototype, 'naturalHeight', {
-      get () { return this._naturalHeight },
+      get () { return this._naturalHeight }
     })
   })
 
@@ -66,7 +66,7 @@ describe('VImg.ts', () => {
 
   it('should load', async () => {
     const wrapper = mountFunction({
-      props: { src: LOAD_SUCCESS_SRC },
+      props: { src: LOAD_SUCCESS_SRC }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -81,11 +81,11 @@ describe('VImg.ts', () => {
     const wrapper = mountFunction({
       props: {
         src: 'full_src',
-        lazySrc: 'lazy_src',
+        lazySrc: 'lazy_src'
       },
       slots: {
-        placeholder: () => h('div', ['loading...']),
-      },
+        placeholder: () => h('div', ['loading...'])
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -99,8 +99,8 @@ describe('VImg.ts', () => {
   it('should emit errors', () => {
     const wrapper = mountFunction({
       props: {
-        src: LOAD_FAILURE_SRC,
-      },
+        src: LOAD_FAILURE_SRC
+      }
     })
 
     jest.runOnlyPendingTimers()
@@ -113,8 +113,8 @@ describe('VImg.ts', () => {
     const wrapper = mountFunction({
       props: {
         src: LOAD_SUCCESS_SRC,
-        alt: 'this is not a decorative image',
-      },
+        alt: 'this is not a decorative image'
+      }
     })
 
     jest.runOnlyPendingTimers()
@@ -129,9 +129,9 @@ describe('VImg.ts', () => {
         src: {
           src: LOAD_SUCCESS_SRC,
           lazySrc: 'lazySrc_auto',
-          aspect: 1,
-        },
-      },
+          aspect: 1
+        }
+      }
     })
 
     jest.runOnlyPendingTimers()
@@ -145,11 +145,11 @@ describe('VImg.ts', () => {
         src: {
           src: LOAD_SUCCESS_SRC,
           lazySrc: 'lazySrc_auto',
-          aspect: 1,
+          aspect: 1
         },
         lazySrc: 'lazySrc_manual',
-        aspectRatio: 2,
-      },
+        aspectRatio: 2
+      }
     })
 
     jest.runOnlyPendingTimers()
@@ -160,8 +160,8 @@ describe('VImg.ts', () => {
   it('should update src', async () => {
     const wrapper = mountFunction({
       props: {
-        src: LOAD_SUCCESS_SRC,
-      },
+        src: LOAD_SUCCESS_SRC
+      }
     })
 
     jest.runOnlyPendingTimers()
@@ -180,8 +180,8 @@ describe('VImg.ts', () => {
   it('should update src while still loading', async () => {
     const wrapper = mountFunction({
       props: {
-        src: LOAD_SUCCESS_SRC,
-      },
+        src: LOAD_SUCCESS_SRC
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()