chore: Replace darkmode mixin with useDarkMode composable [CW-3474] (#9949)

# Pull Request Template

## Description

Replaces darkModeMixin with the new useDarkMode composable and replaces
wll usages of mixin the the composable in components and pages

Fixes
https://linear.app/chatwoot/issue/CW-3474/rewrite-darkmodemixin-mixin-to-a-composable

## Type of change

Please delete options that are not relevant.

- [x] New feature (non-breaking change which adds functionality)

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
This commit is contained in:
Fayaz Ahmed
2024-09-12 00:29:41 +05:30
committed by GitHub
parent 2c17c95eab
commit a76cd7684a
27 changed files with 357 additions and 207 deletions

View File

@@ -1,12 +1,11 @@
<script>
import CardButton from 'shared/components/CardButton.vue';
import darkModeMixin from 'widget/mixins/darkModeMixin.js';
import { useDarkMode } from 'widget/composables/useDarkMode';
export default {
components: {
CardButton,
},
mixins: [darkModeMixin],
props: {
title: {
type: String,
@@ -25,21 +24,30 @@ export default {
default: () => [],
},
},
computed: {},
setup() {
const { getThemeClass } = useDarkMode();
return { getThemeClass };
},
};
</script>
<template>
<div
class="card-message chat-bubble agent"
:class="$dm('bg-white', 'dark:bg-slate-700')"
:class="getThemeClass('bg-white', 'dark:bg-slate-700')"
>
<img class="media" :src="mediaUrl" />
<div class="card-body">
<h4 class="title" :class="$dm('text-black-900', 'dark:text-slate-50')">
<h4
class="title"
:class="getThemeClass('text-black-900', 'dark:text-slate-50')"
>
{{ title }}
</h4>
<p class="body" :class="$dm('text-black-700', 'dark:text-slate-100')">
<p
class="body"
:class="getThemeClass('text-black-700', 'dark:text-slate-100')"
>
{{ description }}
</p>
<CardButton v-for="action in actions" :key="action.id" :action="action" />

View File

@@ -1,10 +1,9 @@
<script>
import { mapGetters } from 'vuex';
import { getContrastingTextColor } from '@chatwoot/utils';
import darkModeMixin from 'widget/mixins/darkModeMixin';
import { useDarkMode } from 'widget/composables/useDarkMode';
export default {
mixins: [darkModeMixin],
props: {
buttonLabel: {
type: String,
@@ -19,6 +18,10 @@ export default {
default: () => [],
},
},
setup() {
const { getThemeClass } = useDarkMode();
return { getThemeClass };
},
data() {
return {
formValues: {},
@@ -33,8 +36,8 @@ export default {
return getContrastingTextColor(this.widgetColor);
},
inputColor() {
return `${this.$dm('bg-white', 'dark:bg-slate-600')}
${this.$dm('text-black-900', 'dark:text-slate-50')}`;
return `${this.getThemeClass('bg-white', 'dark:bg-slate-600')}
${this.getThemeClass('text-black-900', 'dark:text-slate-50')}`;
},
isFormValid() {
return this.items.reduce((acc, { name }) => {
@@ -80,7 +83,7 @@ export default {
<template>
<div
class="form chat-bubble agent"
:class="$dm('bg-white', 'dark:bg-slate-700')"
:class="getThemeClass('bg-white', 'dark:bg-slate-700')"
>
<form @submit.prevent="onSubmit">
<div
@@ -91,7 +94,7 @@ export default {
'has-submitted': hasSubmitted,
}"
>
<label :class="$dm('text-black-900', 'dark:text-slate-50')">{{
<label :class="getThemeClass('text-black-900', 'dark:text-slate-50')">{{
item.label
}}</label>
<input

View File

@@ -3,7 +3,7 @@ import { mapGetters } from 'vuex';
import Spinner from 'shared/components/Spinner.vue';
import { CSAT_RATINGS } from 'shared/constants/messages';
import FluentIcon from 'shared/components/FluentIcon/Index.vue';
import darkModeMixin from 'widget/mixins/darkModeMixin';
import { useDarkMode } from 'widget/composables/useDarkMode';
import { getContrastingTextColor } from '@chatwoot/utils';
export default {
@@ -11,7 +11,6 @@ export default {
Spinner,
FluentIcon,
},
mixins: [darkModeMixin],
props: {
messageContentAttributes: {
type: Object,
@@ -22,6 +21,10 @@ export default {
required: true,
},
},
setup() {
const { getThemeClass } = useDarkMode();
return { getThemeClass };
},
data() {
return {
email: '',
@@ -44,8 +47,8 @@ export default {
return !(this.selectedRating && this.feedback);
},
inputColor() {
return `${this.$dm('bg-white', 'dark:bg-slate-600')}
${this.$dm('text-black-900', 'dark:text-slate-50')}`;
return `${this.getThemeClass('bg-white', 'dark:bg-slate-600')}
${this.getThemeClass('text-black-900', 'dark:text-slate-50')}`;
},
textColor() {
return getContrastingTextColor(this.widgetColor);
@@ -105,10 +108,13 @@ export default {
<template>
<div
class="customer-satisfaction"
:class="$dm('bg-white', 'dark:bg-slate-700')"
:class="getThemeClass('bg-white', 'dark:bg-slate-700')"
:style="{ borderColor: widgetColor }"
>
<h6 class="title" :class="$dm('text-slate-900', 'dark:text-slate-50')">
<h6
class="title"
:class="getThemeClass('text-slate-900', 'dark:text-slate-50')"
>
{{ title }}
</h6>
<div class="ratings">

View File

@@ -1,15 +1,18 @@
<script>
import { formatDate } from 'shared/helpers/DateHelper';
import darkModeMixin from 'widget/mixins/darkModeMixin.js';
import { useDarkMode } from 'widget/composables/useDarkMode';
export default {
mixins: [darkModeMixin],
props: {
date: {
type: String,
required: true,
},
},
setup() {
const { getThemeClass } = useDarkMode();
return { getThemeClass };
},
computed: {
formattedDate() {
return formatDate({
@@ -25,7 +28,7 @@ export default {
<template>
<div
class="date--separator"
:class="$dm('text-slate-700', 'dark:text-slate-200')"
:class="getThemeClass('text-slate-700', 'dark:text-slate-200')"
>
{{ formattedDate }}
</div>

View File

@@ -2,7 +2,6 @@ import DateSeparator from '../DateSeparator.vue';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import Vuex from 'vuex';
import VueI18n from 'vue-i18n';
import darkModeMixin from 'widget/mixins/darkModeMixin.js';
const localVue = createLocalVue();
import i18n from 'dashboard/i18n';
localVue.use(Vuex);
@@ -40,7 +39,6 @@ describe('dateSeparator', () => {
propsData: { date: 'Nov 18, 2019' },
mocks: { $t: msg => msg },
i18n: i18nConfig,
mixins: [darkModeMixin],
});
});