fix: theme null on .v-popper

Akryum · Mar 11, 2022 · 25db8e8 · 25db8e8
1 parent b7ba8b6
commit 25db8e8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/docs/src/guide/custom-component.md b/packages/docs/src/guide/custom-component.md
@@ -138,7 +138,7 @@ export default {
 
   mixins: [
     PopperMethods,
-    ThemeClass,
+    ThemeClass(),
   ],
 
   inheritAttrs: false,

diff --git a/packages/floating-vue/src/components/PopperContent.vue b/packages/floating-vue/src/components/PopperContent.vue
@@ -81,7 +81,7 @@ export default defineComponent({
   },
 
   mixins: [
-    ThemeClass,
+    ThemeClass(),
   ],
 
   props: {

diff --git a/packages/floating-vue/src/components/PopperWrapper.vue b/packages/floating-vue/src/components/PopperWrapper.vue
@@ -79,7 +79,7 @@ export default defineComponent({
 
   mixins: [
     PopperMethods,
-    ThemeClass,
+    ThemeClass('finalTheme'),
   ],
 
   inheritAttrs: false,

diff --git a/packages/floating-vue/src/components/ThemeClass.ts b/packages/floating-vue/src/components/ThemeClass.ts
@@ -1,10 +1,10 @@
 import { getThemeClasses } from '../config'
 
 // @vue/component
-export default {
+export default (prop = 'theme') => ({
   computed: {
     themeClass () {
-      return getThemeClasses(this.theme)
+      return getThemeClasses(this[prop])
     },
   },
-}
+})