@dimailn/vuetify 2.7.2-alpha36 → 2.7.2-alpha37

package/lib/mixins/proxyable/index.js

@@ -22,9 +22,10 @@ export function factory(prop = 'modelValue', event = 'update:modelValue') {
 
         set(val) {
           if (val === this.internalLazyValue) return;
-          this.internalLazyValue = val; // Don't emit events if component is being destroyed
+          this.internalLazyValue = val;
+          console.log(this, !this.$.isUnmounted); // Don't emit events if component is being destroyed
 
-          if (!this._isDestroyed) {
+          if (!this.$.isUnmounted) {
             this.$emit(event, val);
           }
         }

package/lib/mixins/proxyable/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mixins/proxyable/index.ts"],"names":[],"mappings":"AAAA,SAAS,eAAT,QAAgD,KAAhD;AAQA,OAAM,SAAU,OAAV,CACJ,IAAI,GAAG,YADH,EAEJ,KAAK,GAAG,mBAFJ,EAEuB;AAE3B,SAAO,eAAe,CAAC;AACrB,IAAA,IAAI,EAAE,WADe;AAGrB,IAAA,KAAK,EAAE;AACL,OAAC,IAAD,GAAQ;AACN,QAAA,QAAQ,EAAE;AADJ;AADH,KAHc;;AASrB,IAAA,IAAI,GAAA;AACF,aAAO;AACL,QAAA,iBAAiB,EAAE,KAAK,IAAL;AADd,OAAP;AAGD,KAboB;;AAerB,IAAA,QAAQ,EAAE;AACR,MAAA,aAAa,EAAE;AACb,QAAA,GAAG,GAAA;AACD,iBAAO,KAAK,iBAAZ;AACD,SAHY;;AAIb,QAAA,GAAG,CAAE,GAAF,EAAU;AACX,cAAI,GAAG,KAAK,KAAK,iBAAjB,EAAoC;AAEpC,eAAK,iBAAL,GAAyB,GAAzB,CAHW,CAKX;;AACA,cAAI,CAAE,KAAa,YAAnB,EAAiC;AAC/B,iBAAK,KAAL,CAAW,KAAX,EAAkB,GAAlB;AACD;AACF;;AAbY;AADP,KAfW;AAiCrB,IAAA,KAAK,EAAE;AACL,OAAC,IAAD,EAAQ,GAAR,EAAW;AACT,aAAK,iBAAL,GAAyB,GAAzB;AACD;;AAHI;AAjCc,GAAD,CAAtB;AAuCD;AAED;;AACA,MAAM,SAAS,GAAG,OAAO,EAAzB;AAEA,eAAe,SAAf","sourcesContent":["import { defineComponent, Component, App } from 'vue'\n\nexport type Proxyable<T extends string = 'value'> = Component<App & {\n  internalLazyValue: unknown\n  internalValue: unknown\n} & Record<T, any>>\n\nexport function factory<T extends string = 'value'> (prop?: T, event?: string): Proxyable<T>\nexport function factory (\n  prop = 'modelValue',\n  event = 'update:modelValue'\n) {\n  return defineComponent({\n    name: 'proxyable',\n\n    props: {\n      [prop]: {\n        required: false,\n      },\n    },\n\n    data () {\n      return {\n        internalLazyValue: this[prop] as unknown,\n      }\n    },\n\n    computed: {\n      internalValue: {\n        get (): unknown {\n          return this.internalLazyValue\n        },\n        set (val: any) {\n          if (val === this.internalLazyValue) return\n\n          this.internalLazyValue = val\n\n          // Don't emit events if component is being destroyed\n          if (!(this as any)._isDestroyed) {\n            this.$emit(event, val)\n          }\n        },\n      },\n    },\n\n    watch: {\n      [prop] (val) {\n        this.internalLazyValue = val\n      },\n    },\n  })\n}\n\n/* eslint-disable-next-line @typescript-eslint/no-redeclare */\nconst Proxyable = factory()\n\nexport default Proxyable\n"],"sourceRoot":"","file":"index.js"}
+{"version":3,"sources":["../../../src/mixins/proxyable/index.ts"],"names":[],"mappings":"AAAA,SAAS,eAAT,QAAgD,KAAhD;AAQA,OAAM,SAAU,OAAV,CACJ,IAAI,GAAG,YADH,EAEJ,KAAK,GAAG,mBAFJ,EAEuB;AAE3B,SAAO,eAAe,CAAC;AACrB,IAAA,IAAI,EAAE,WADe;AAGrB,IAAA,KAAK,EAAE;AACL,OAAC,IAAD,GAAQ;AACN,QAAA,QAAQ,EAAE;AADJ;AADH,KAHc;;AASrB,IAAA,IAAI,GAAA;AACF,aAAO;AACL,QAAA,iBAAiB,EAAE,KAAK,IAAL;AADd,OAAP;AAGD,KAboB;;AAerB,IAAA,QAAQ,EAAE;AACR,MAAA,aAAa,EAAE;AACb,QAAA,GAAG,GAAA;AACD,iBAAO,KAAK,iBAAZ;AACD,SAHY;;AAIb,QAAA,GAAG,CAAE,GAAF,EAAU;AACX,cAAI,GAAG,KAAK,KAAK,iBAAjB,EAAoC;AAEpC,eAAK,iBAAL,GAAyB,GAAzB;AACA,UAAA,OAAO,CAAC,GAAR,CAAY,IAAZ,EAAkB,CAAC,KAAK,CAAL,CAAO,WAA1B,EAJW,CAMX;;AACA,cAAI,CAAC,KAAK,CAAL,CAAO,WAAZ,EAAyB;AACvB,iBAAK,KAAL,CAAW,KAAX,EAAkB,GAAlB;AACD;AACF;;AAdY;AADP,KAfW;AAkCrB,IAAA,KAAK,EAAE;AACL,OAAC,IAAD,EAAQ,GAAR,EAAW;AACT,aAAK,iBAAL,GAAyB,GAAzB;AACD;;AAHI;AAlCc,GAAD,CAAtB;AAwCD;AAED;;AACA,MAAM,SAAS,GAAG,OAAO,EAAzB;AAEA,eAAe,SAAf","sourcesContent":["import { defineComponent, Component, App } from 'vue'\n\nexport type Proxyable<T extends string = 'value'> = Component<App & {\n  internalLazyValue: unknown\n  internalValue: unknown\n} & Record<T, any>>\n\nexport function factory<T extends string = 'value'> (prop?: T, event?: string): Proxyable<T>\nexport function factory (\n  prop = 'modelValue',\n  event = 'update:modelValue'\n) {\n  return defineComponent({\n    name: 'proxyable',\n\n    props: {\n      [prop]: {\n        required: false,\n      },\n    },\n\n    data () {\n      return {\n        internalLazyValue: this[prop] as unknown,\n      }\n    },\n\n    computed: {\n      internalValue: {\n        get (): unknown {\n          return this.internalLazyValue\n        },\n        set (val: any) {\n          if (val === this.internalLazyValue) return\n\n          this.internalLazyValue = val\n          console.log(this, !this.$.isUnmounted)\n\n          // Don't emit events if component is being destroyed\n          if (!this.$.isUnmounted) {\n            this.$emit(event, val);\n          }\n        },\n      },\n    },\n\n    watch: {\n      [prop] (val) {\n        this.internalLazyValue = val\n      },\n    },\n  })\n}\n\n/* eslint-disable-next-line @typescript-eslint/no-redeclare */\nconst Proxyable = factory()\n\nexport default Proxyable\n"],"sourceRoot":"","file":"index.js"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dimailn/vuetify",
   "description": "Vue Material Component Framework",
-  "version": "2.7.2-alpha36",
+  "version": "2.7.2-alpha37",
   "author": {
     "name": "John Leider",
     "email": "john@vuetifyjs.com"

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

@@ -77,7 +77,7 @@ describe('VBtn.ts', () => {
     expect(wrapper.html()).toMatchSnapshot()
   })
 
-  it('should register and unregister', () => {
+  it('should register and unregister', async () => {
     const register = jest.fn()
     const unregister = jest.fn()
 
@@ -94,6 +94,7 @@ describe('VBtn.ts', () => {
 
     expect(register).toHaveBeenCalled()
     wrapper.unmount()
+    await nextTick()
     expect(unregister).toHaveBeenCalled()
   })
   it('should use custom active-class', () => {

package/src/components/VDialog/VDialog.ts

@@ -171,7 +171,7 @@ export default baseMixins.extend({
       // if it was dragged onto the overlay (#6969),
       // or if this isn't the topmost dialog (#9907)
       return !(
-        this._isDestroyed ||
+        this.$.isUnmounted ||
         !this.isActive ||
         this.$refs.content.contains(target) ||
         (this.overlay && target && !this.overlay.$el.contains(target))

package/src/components/VItemGroup/VItemGroup.ts

@@ -149,7 +149,7 @@ export const BaseItemGroup = mixins(
       this.updateItem(item, index)
     },
     unregister (item: GroupableInstance) {
-      if (this._isDestroyed) return
+      if (this.$.isUnmounted) return
 
       const index = this.items.indexOf(item)
       const value = this.getValue(item, index)

package/src/components/VMenu/VMenu.ts

@@ -300,7 +300,7 @@ export default baseMixins.extend({
       const target = e.target as HTMLElement
 
       return this.isActive &&
-        !this._isDestroyed &&
+        !this.$.isUnmounted &&
         this.closeOnClick &&
         this.$refs.content &&
         !this.$refs.content.contains(target)

package/src/components/VNavigationDrawer/VNavigationDrawer.ts

@@ -316,7 +316,7 @@ export default baseMixins.extend({
       }
     },
     closeConditional () {
-      return this.isActive && !this._isDestroyed && this.reactsToClick
+      return this.isActive && !this.$.isUnmounted && this.reactsToClick
     },
     genAppend () {
       return this.genPosition('append')

package/src/components/VSelect/VSelect.ts

@@ -360,7 +360,7 @@ export default baseMixins.extend({
       if (!this.isMenuActive) return true
 
       return (
-        !this._isDestroyed &&
+        !this.$.isUnmounted &&
 
         // Click originates from outside the menu content
         // Multiple selects don't close when an item is clicked

package/src/components/VSlideGroup/VSlideGroup.ts

@@ -374,7 +374,7 @@ export const BaseSlideGroup = mixins<options &
     },
     onResize () {
       /* istanbul ignore next */
-      if (this._isDestroyed) return
+      if (this.$.isUnmounted) return
 
       this.setWidths()
     },
@@ -493,7 +493,7 @@ export const BaseSlideGroup = mixins<options &
     },
     setWidths () {
       window.requestAnimationFrame(() => {
-        if (this._isDestroyed) return
+        if (this.$.isUnmounted) return
 
         const content = this.$refs.content as HTMLElement
         const wrapper = this.$refs.wrapper as HTMLElement

package/src/components/VTabs/VTabs.ts

@@ -276,7 +276,7 @@ export default baseMixins.extend({
       }, [slider])
     },
     onResize () {
-      if (this._isDestroyed) return
+      if (this.$.isUnmounted) return
 
       clearTimeout(this.resizeTimeout)
       this.resizeTimeout = window.setTimeout(this.callSlider, 0)

package/src/mixins/detachable/index.ts

@@ -140,7 +140,7 @@ export default mixins<options &
       return scopeIdAttrs
     },
     initDetach () {
-      if (this._isDestroyed ||
+      if (this.$.isUnmounted ||
         !this.$refs.content ||
         this.hasDetached ||
         // Leave menu in place if attached

package/src/mixins/groupable/index.ts

@@ -58,7 +58,9 @@ export function factory<T extends string, C extends Component | null = null> (
     },
 
     beforeUnmount () {
-      this[namespace] && (this[namespace] as any).unregister(this)
+      this.$nextTick(() => {
+        this[namespace] && (this[namespace] as any).unregister(this)
+      })
     },
 
     methods: {

package/src/mixins/proxyable/index.ts

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