fix(VTabs): tabs default color

vuetifyjs · Jul 15, 2019 · 79016c3 · 79016c3
1 parent d526302
commit 79016c3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/packages/vuetify/src/components/VTabs/VTabs.ts b/packages/vuetify/src/components/VTabs/VTabs.ts
@@ -119,7 +119,7 @@ export default baseMixins.extend<options>().extend({
     },
     computedColor (): string {
       if (this.color) return this.color
-      else if (this.isDark && !this.rootIsDark) return 'white'
+      else if (this.isDark && !this.appIsDark) return 'white'
       else return 'primary'
     },
   },

diff --git a/packages/vuetify/src/components/VTabs/VTabsItems.ts b/packages/vuetify/src/components/VTabs/VTabsItems.ts
@@ -23,16 +23,7 @@ export default VWindow.extend({
       }
     },
     isDark (): boolean {
-      if (this.dark === true) {
-        // explicitly dark
-        return true
-      } else if (this.light === true) {
-        // explicitly light
-        return false
-      } else {
-        // inherit from root
-        return this.rootIsDark
-      }
+      return this.rootIsDark
     },
   },
 

diff --git a/packages/vuetify/src/mixins/selectable/index.ts b/packages/vuetify/src/mixins/selectable/index.ts
@@ -44,7 +44,7 @@ export default mixins(
     computedColor (): string | undefined {
       if (!this.isActive) return undefined
       if (this.color) return this.color
-      if (this.isDark && !this.rootIsDark) return 'white'
+      if (this.isDark && !this.appIsDark) return 'white'
       return 'accent'
     },
     isMultiple (): boolean {

diff --git a/packages/vuetify/src/mixins/themeable/index.ts b/packages/vuetify/src/mixins/themeable/index.ts
@@ -55,6 +55,9 @@ const Themeable = Vue.extend<Themeable>().extend({
   },
 
   computed: {
+    appIsDark (): boolean {
+      return this.$vuetify.theme.dark || false
+    },
     isDark (): boolean {
       if (this.dark === true) {
         // explicitly dark
@@ -83,7 +86,7 @@ const Themeable = Vue.extend<Themeable>().extend({
         return false
       } else {
         // inherit from v-app
-        return this.$vuetify.theme.dark || false
+        return this.appIsDark
       }
     },
     rootThemeClasses (): Dictionary<boolean> {

diff --git a/packages/vuetify/src/mixins/validatable/__tests__/validatable.spec.ts b/packages/vuetify/src/mixins/validatable/__tests__/validatable.spec.ts
@@ -14,7 +14,14 @@ describe('validatable.ts', () => {
   let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
   beforeEach(() => {
     mountFunction = (options?: MountOptions<Instance>) => {
-      return mount(Mock, options)
+      return mount(Mock, {
+        mocks: {
+          $vuetify: {
+            theme: { dark: false },
+          },
+        },
+        ...options,
+      })
     }
   })
 

diff --git a/packages/vuetify/src/mixins/validatable/index.ts b/packages/vuetify/src/mixins/validatable/index.ts
@@ -73,7 +73,7 @@ export default mixins(
       // have a white color. If the entire app
       // is setup to be dark, then they will
       // like want to use their primary color
-      if (this.isDark && !this.rootIsDark) return 'white'
+      if (this.isDark && !this.appIsDark) return 'white'
       else return 'primary'
     },
     hasError (): boolean {