chore: Improvements to dark mode usage in widget (#7873)

chatwoot · Sep 11, 2023 · 8d43101 · 8d43101
1 parent f05535c
commit 8d43101
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
@@ -41,15 +41,15 @@ import {
   ON_CAMPAIGN_MESSAGE_CLICK,
   ON_UNREAD_MESSAGE_CLICK,
 } from './constants/widgetBusEvents';
-
+import darkModeMixin from 'widget/mixins/darkModeMixin';
 import { SDK_SET_BUBBLE_VISIBILITY } from '../shared/constants/sharedFrameEvents';
 
 export default {
   name: 'App',
   components: {
     Spinner,
   },
-  mixins: [availabilityMixin, configMixin, routerMixin],
+  mixins: [availabilityMixin, configMixin, routerMixin, darkModeMixin],
   data() {
     return {
       isMobile: false,
@@ -67,7 +67,6 @@ export default {
       isFetchingList: 'conversation/getIsFetchingList',
       isRightAligned: 'appConfig/isRightAligned',
       isWidgetOpen: 'appConfig/getIsWidgetOpen',
-      darkMode: 'appConfig/darkMode',
       messageCount: 'conversation/getMessageCount',
       unreadMessageCount: 'conversation/getUnreadMessageCount',
       isWidgetStyleFlat: 'appConfig/isWidgetStyleFlat',
@@ -78,12 +77,6 @@ export default {
     isRNWebView() {
       return RNHelper.isRNWebView();
     },
-    prefersDarkMode() {
-      const isOSOnDarkMode =
-        this.darkMode === 'auto' &&
-        window.matchMedia('(prefers-color-scheme: dark)').matches;
-      return isOSOnDarkMode || this.darkMode === 'dark';
-    },
   },
   watch: {
     activeCampaign() {

diff --git a/app/javascript/widget/components/AgentMessageBubble.vue b/app/javascript/widget/components/AgentMessageBubble.vue
@@ -9,8 +9,7 @@
     >
       <div
         v-dompurify-html="formatMessage(message, false)"
-        class="message-content"
-        :class="$dm('text-black-900', 'dark:text-slate-50')"
+        class="message-content text-slate-900 dark:text-slate-50"
       />
       <email-input
         v-if="isTemplateEmail"

diff --git a/app/javascript/widget/components/layouts/ViewWithHeader.vue b/app/javascript/widget/components/layouts/ViewWithHeader.vue
@@ -46,7 +46,10 @@
     >
       <router-view />
     </transition>
-    <branding :disable-branding="disableBranding" />
+    <branding
+      class="bg-slate-25 dark:bg-slate-800"
+      :disable-branding="disableBranding"
+    />
   </div>
 </template>
 <script>