@dimailn/vuetify 2.7.2-alpha34 → 2.7.2-alpha36

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

@@ -6,6 +6,7 @@ exports[`VTextarea.ts should calculate element height when using auto-grow prop
     <div class="v-input__slot">
       <div class="v-text-field__slot">
         <textarea id="input-1"
+                  rows="5"
                   value="this
 is
 a
@@ -34,3 +35,87 @@ maybe?"
   </div>
 </div>
 `;
+
+exports[`VTextarea.ts should render with custom rows attribute 1`] = `
+<div class="v-input v-textarea theme--light v-text-field">
+  <div class="v-input__control">
+    <div class="v-input__slot">
+      <div class="v-text-field__slot">
+        <textarea id="input-45"
+                  rows="3"
+        >
+        </textarea>
+      </div>
+    </div>
+    <div class="v-text-field__details">
+      <div class="v-messages theme--light">
+        <div class="v-messages__wrapper">
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`VTextarea.ts should render with default rows attribute 1`] = `
+<div class="v-input v-textarea theme--light v-text-field">
+  <div class="v-input__control">
+    <div class="v-input__slot">
+      <div class="v-text-field__slot">
+        <textarea id="input-41"
+                  rows="5"
+        >
+        </textarea>
+      </div>
+    </div>
+    <div class="v-text-field__details">
+      <div class="v-messages theme--light">
+        <div class="v-messages__wrapper">
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`VTextarea.ts should render with rows and autoGrow 1`] = `
+<div class="v-input v-textarea v-textarea--auto-grow v-textarea--no-resize theme--light v-text-field">
+  <div class="v-input__control">
+    <div class="v-input__slot">
+      <div class="v-text-field__slot">
+        <textarea id="input-53"
+                  rows="7"
+        >
+        </textarea>
+      </div>
+    </div>
+    <div class="v-text-field__details">
+      <div class="v-messages theme--light">
+        <div class="v-messages__wrapper">
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`VTextarea.ts should render with rows as string 1`] = `
+<div class="v-input v-textarea theme--light v-text-field">
+  <div class="v-input__control">
+    <div class="v-input__slot">
+      <div class="v-text-field__slot">
+        <textarea id="input-49"
+                  rows="10"
+        >
+        </textarea>
+      </div>
+    </div>
+    <div class="v-text-field__details">
+      <div class="v-messages theme--light">
+        <div class="v-messages__wrapper">
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;

package/src/components/VTreeview/__tests__/VTreeviewNode.spec.ts

@@ -17,27 +17,9 @@ const defaultSlot = () => h('div', 'foobar')
 const Mock = defineComponent({
   name: 'test',
 
-  render() {
+  render () {
     return h(VTreeviewNode, {
-      slots: {
-        prepend: defaultSlot,
-        append: defaultSlot,
-      },
-    })
-  },
-})
-
-const MockScopedLabel = defineComponent({
-  name: 'test',
-
-  render() {
-    return h(VTreeviewNode, {
-      props: {
-        item: singleRootTwoChildren,
-      },
-      slots: {
-        label: (props: any) => h('div', [props.item.name.toUpperCase()]),
-      },
+      item: singleRootTwoChildren,
     })
   },
 })
@@ -85,14 +67,20 @@ describe('VTreeViewNode.ts', () => {
     expect(wrapper.vm.computedIcon).toBe('$checkboxOff')
 
     // В Vue 3 нужно использовать другой подход для изменения внутренних данных
-    wrapper.vm.isIndeterminate = true
-    await wrapper.vm.$nextTick()
+    await wrapper.setData({ isIndeterminate: true })
 
     expect(wrapper.vm.computedIcon).toBe('$checkboxIndeterminate')
   })
 
   it('should use scoped slots', () => {
-    const wrapper = mount(Mock, {
+    const wrapper = mount(VTreeviewNode, {
+      props: {
+        item: singleRootTwoChildren,
+      },
+      slots: {
+        prepend: defaultSlot,
+        append: defaultSlot,
+      },
       global: {
         provide: { treeview },
       },
@@ -110,7 +98,13 @@ describe('VTreeViewNode.ts', () => {
   })
 
   it('should use label slot', () => {
-    const wrapper = mount(MockScopedLabel, {
+    const wrapper = mount(VTreeviewNode, {
+      props: {
+        item: singleRootTwoChildren,
+      },
+      slots: {
+        label: (props: any) => h('div', [props.item.name.toUpperCase()]),
+      },
       global: {
         provide: { treeview },
       },
@@ -120,23 +114,14 @@ describe('VTreeViewNode.ts', () => {
   })
 
   it('should render disabled item', () => {
-    const TestComponent = defineComponent({
-      name: 'test',
-
-      render() {
-        return h(VTreeviewNode, {
-          slots: {
-            prepend: defaultSlot,
-            append: defaultSlot,
-          },
-          props: {
-            item: { ...singleRootTwoChildren, disabled: true },
-          },
-        })
+    const wrapper = mount(VTreeviewNode, {
+      props: {
+        item: { ...singleRootTwoChildren, disabled: true },
+      },
+      slots: {
+        prepend: defaultSlot,
+        append: defaultSlot,
       },
-    })
-
-    const wrapper = mount(TestComponent, {
       global: {
         provide: { treeview },
       },
@@ -146,7 +131,7 @@ describe('VTreeViewNode.ts', () => {
   })
 
   const singleRootWithEmptyChildrens = { id: 1, name: 'Child', children: [] }
-  it('should be able to have active children with empty array', () => {
+  it('should be able to have active children with empty array', async () => {
     const wrapper = mountFunction({
       props: {
         item: singleRootWithEmptyChildrens,
@@ -157,13 +142,13 @@ describe('VTreeViewNode.ts', () => {
 
     expect(wrapper.vm.isActive).toBe(false)
     const selectedLeaf = wrapper.find('.v-treeview-node__root')
-    selectedLeaf.trigger('click')
+    await selectedLeaf.trigger('click')
     expect(wrapper.vm.isActive).toBe(true)
 
     expect(wrapper.html()).toMatchSnapshot()
   })
 
-  it('should not be able to have active children with empty array when loadChildren is specified', () => {
+  it('should not be able to have active children with empty array when loadChildren is specified', async () => {
     const wrapper = mountFunction({
       props: {
         item: singleRootWithEmptyChildrens,
@@ -175,13 +160,13 @@ describe('VTreeViewNode.ts', () => {
 
     expect(wrapper.vm.isActive).toBe(false)
     const selectedLeaf = wrapper.find('.v-treeview-node__root')
-    selectedLeaf.trigger('click')
+    await selectedLeaf.trigger('click')
     expect(wrapper.vm.isActive).toBe(false)
 
     expect(wrapper.html()).toMatchSnapshot()
   })
 
-  it('should not be able to have active children with empty array when disabled', () => {
+  it('should not be able to have active children with empty array when disabled', async () => {
     const wrapper = mountFunction({
       props: {
         item: { ...singleRootWithEmptyChildrens, disabled: true },
@@ -192,7 +177,7 @@ describe('VTreeViewNode.ts', () => {
 
     expect(wrapper.vm.isActive).toBe(false)
     const selectedLeaf = wrapper.find('.v-treeview-node__root')
-    selectedLeaf.trigger('click')
+    await selectedLeaf.trigger('click')
     expect(wrapper.vm.isActive).toBe(false)
 
     expect(wrapper.html()).toMatchSnapshot()

package/src/components/VTreeview/__tests__/__snapshots__/VTreeviewNode.spec.ts.snap

@@ -4,7 +4,7 @@ exports[`VTreeViewNode.ts should be able to have active children with empty arra
 <div class="v-treeview-node v-treeview-node--leaf v-treeview-node--click"
      aria-expanded="false"
 >
-  <div class="v-treeview-node__root">
+  <div class="v-treeview-node__root v-treeview-node--active primary--text">
     <div class="v-treeview-node__level">
     </div>
     <div class="v-treeview-node__content">
@@ -49,10 +49,10 @@ exports[`VTreeViewNode.ts should not be able to have active children with empty
 
 exports[`VTreeViewNode.ts should not be able to have active children with empty array when loadChildren is specified 1`] = `
 <div class="v-treeview-node v-treeview-node--click"
-     aria-expanded="false"
+     aria-expanded="true"
 >
   <div class="v-treeview-node__root">
-    <button class="v-icon--link v-icon notranslate theme--light material-icons v-treeview-node__toggle"
+    <button class="v-icon--link v-icon notranslate theme--light material-icons v-treeview-node__toggle v-treeview-node__toggle--open"
             aria-hidden="false"
             type="button"
     >
@@ -63,20 +63,34 @@ exports[`VTreeViewNode.ts should not be able to have active children with empty
       </div>
     </div>
   </div>
+  <div class="v-treeview-node__children">
+  </div>
 </div>
 `;
 
 exports[`VTreeViewNode.ts should render disabled item 1`] = `
-<div class="v-treeview-node v-treeview-node--leaf"
+<div class="v-treeview-node v-treeview-node--disabled"
      aria-expanded="false"
-     slots="[object Object]"
-     props="[object Object]"
 >
   <div class="v-treeview-node__root">
-    <div class="v-treeview-node__level">
-    </div>
+    <button class="v-icon--link v-icon notranslate theme--light mdi mdi-menu-down v-treeview-node__toggle"
+            aria-hidden="false"
+            type="button"
+    >
+    </button>
     <div class="v-treeview-node__content">
+      <div class="v-treeview-node__prepend">
+        <div>
+          foobar
+        </div>
+      </div>
       <div class="v-treeview-node__label">
+        Root
+      </div>
+      <div class="v-treeview-node__append">
+        <div>
+          foobar
+        </div>
       </div>
     </div>
   </div>
@@ -84,16 +98,20 @@ exports[`VTreeViewNode.ts should render disabled item 1`] = `
 `;
 
 exports[`VTreeViewNode.ts should use label slot 1`] = `
-<div class="v-treeview-node v-treeview-node--leaf"
+<div class="v-treeview-node"
      aria-expanded="false"
-     props="[object Object]"
-     slots="[object Object]"
 >
   <div class="v-treeview-node__root">
-    <div class="v-treeview-node__level">
-    </div>
+    <button class="v-icon--link v-icon notranslate theme--light mdi mdi-menu-down v-treeview-node__toggle"
+            aria-hidden="false"
+            type="button"
+    >
+    </button>
     <div class="v-treeview-node__content">
       <div class="v-treeview-node__label">
+        <div>
+          ROOT
+        </div>
       </div>
     </div>
   </div>
@@ -101,15 +119,28 @@ exports[`VTreeViewNode.ts should use label slot 1`] = `
 `;
 
 exports[`VTreeViewNode.ts should use scoped slots 1`] = `
-<div class="v-treeview-node v-treeview-node--leaf"
+<div class="v-treeview-node"
      aria-expanded="false"
-     slots="[object Object]"
 >
   <div class="v-treeview-node__root">
-    <div class="v-treeview-node__level">
-    </div>
+    <button class="v-icon--link v-icon notranslate theme--light mdi mdi-menu-down v-treeview-node__toggle"
+            aria-hidden="false"
+            type="button"
+    >
+    </button>
     <div class="v-treeview-node__content">
+      <div class="v-treeview-node__prepend">
+        <div>
+          foobar
+        </div>
+      </div>
       <div class="v-treeview-node__label">
+        Root
+      </div>
+      <div class="v-treeview-node__append">
+        <div>
+          foobar
+        </div>
       </div>
     </div>
   </div>

package/src/mixins/proxyable/index.ts

@@ -35,7 +35,10 @@ export function factory (
 
           this.internalLazyValue = val
 
-          this.$emit(event, val)
+          // Don't emit events if component is being destroyed
+          if (!(this as any)._isDestroyed) {
+            this.$emit(event, val)
+          }
         },
       },
     },