fix: use parent refs instead of componentInstance

vuetifyjs · Jun 26, 2018 · fe1bff7 · fe1bff7
1 parent 3fa610f
commit fe1bff7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/components/VBottomSheet/VBottomSheet.js b/src/components/VBottomSheet/VBottomSheet.js
@@ -4,10 +4,10 @@ import VDialog from '../VDialog/VDialog'
 
 /* @vue/component */
 export default {
-  functional: true,
-
   name: 'v-bottom-sheet',
 
+  functional: true,
+
   props: {
     disabled: Boolean,
     fullWidth: Boolean,

diff --git a/src/components/VDialog/VDialog.js b/src/components/VDialog/VDialog.js
@@ -1,5 +1,7 @@
 import VDialogContent from './VDialogContent'
 
+let counter = 0
+
 /* @vue/component */
 export default {
   name: 'v-dialog',
@@ -12,13 +14,17 @@ export default {
     const slots = context.slots()
     const activator = slots.activator && slots.activator[0]
 
+    context.data.ref = context.data.ref || '$_v-dialog-' + counter++
+
     const content = h(VDialogContent, context.data, slots.default)
 
     if (activator) {
       activator.data.on = activator.data.on || {}
       activator.data.on.click = e => {
+        console.log(context.parent.$refs)
         e.preventDefault()
-        if (!content.componentInstance.disabled) content.componentInstance.isActive = true
+        const dialog = context.parent.$refs[context.data.ref]
+        if (!dialog.disabled) dialog.isActive = true
       }
     }