add disabled button class and loading right prop

resources/scripts/components/base/BaseButton.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { computed, ref } from 'vue'
 import SpinnerIcon from '@/scripts/components/icons/SpinnerIcon.vue'
+
 const props = defineProps({
   contentLoading: {
     type: Boolean,
@@ -9,7 +10,7 @@ const props = defineProps({
   defaultClass: {
     type: String,
     default:
-      'inline-flex whitespace-nowrap items-center border font-medium focus:outline-none focus:ring-2 focus:ring-offset-2',
+      'inline-flex whitespace-nowrap items-center border font-medium focus:outline-none focus:ring-2 focus:ring-offset-2 dark:focus:ring-offset-gray-800',
   },
   tag: {
     type: String,
@@ -27,6 +28,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  loadingRight: {
+    type: Boolean,
+    default: false,
+  },
   size: {
     type: String,
     default: 'md',
@@ -81,17 +86,17 @@ const placeHolderSize = computed(() => {
 
 const variantClass = computed(() => {
   return {
-    'border-transparent shadow-sm text-white bg-primary-600 hover:bg-primary-700 focus:ring-primary-500':
+    'border-transparent shadow-sm text-white bg-primary-600 hover:bg-primary-700 focus:ring-primary-500 dark:bg-primary-500 dark:hover:bg-primary-600':
       props.variant === 'primary',
     'border-transparent text-primary-700 bg-primary-100 hover:bg-primary-200 focus:ring-primary-500':
       props.variant === 'secondary',
-    'border-transparent  border-solid border-primary-500 font-normal transition ease-in-out duration-150 text-primary-500 hover:bg-primary-200 shadow-inner focus:ring-primary-500':
+    'border-transparent border-solid border-primary-500 font-normal transition ease-in-out duration-150 text-primary-500 hover:bg-primary-100 shadow-inner focus:ring-primary-500 dark:text-primary-400 dark:border-primary-400 dark:hover:bg-transparent dark:hover:text-primary-500 dark:hover:border-primary-500':
       props.variant == 'primary-outline',
-    'border-gray-200 text-gray-700 bg-white hover:bg-gray-50 focus:ring-primary-500 focus:ring-offset-0':
+    'border-gray-200 text-gray-700 bg-white hover:bg-gray-50 focus:ring-primary-500 focus:ring-offset-0 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:hover:bg-gray-900':
       props.variant == 'white',
     'border-transparent shadow-sm text-white bg-red-600 hover:bg-red-700 focus:ring-red-500':
       props.variant === 'danger',
-    'border-transparent bg-gray-200 border hover:bg-opacity-60 focus:ring-gray-500 focus:ring-offset-0':
+    'border-transparent bg-gray-200 border hover:bg-opacity-60 focus:ring-gray-500 focus:ring-offset-0 dark:bg-gray-600 dark:text-white dark:hover:bg-opacity-60':
       props.variant === 'gray',
   }
 })
@@ -124,6 +129,13 @@ const iconRightClass = computed(() => {
     'ml-3 -mr-1 h-5 w-5': props.size === 'lg' || props.size === 'xl',
   }
 })
+
+const buttonDisabledClass = computed(() => {
+  if (props.disabled || props.loading)
+    return 'cursor-not-allowed bg-opacity-70 dark:!bg-opacity-40 hover:!bg-opacity-70 pointer-event-none'
+
+  return ''
+})
 </script>
 
 <template>
@@ -141,15 +153,17 @@ const iconRightClass = computed(() => {
   <BaseCustomTag
     v-else
     :tag="tag"
-    :disabled="disabled"
+    :disabled="disabled || loading"
-    :class="[defaultClass, sizeClass, variantClass, roundedClass]"
+    :class="[defaultClass, sizeClass, variantClass, roundedClass, buttonDisabledClass]"
   >
-    <SpinnerIcon v-if="loading" :class="[iconLeftClass, iconVariantClass]" />
+    <SpinnerIcon v-if="loading && !loadingRight" :class="[iconLeftClass, iconVariantClass]" />
 
-    <slot v-else name="left" :class="iconLeftClass"></slot>
+    <slot v-else name="left" :class="iconLeftClass" />
 
     <slot />
 
-    <slot name="right" :class="[iconRightClass, iconVariantClass]"></slot>
+    <SpinnerIcon v-if="loading && loadingRight" :class="[iconRightClass, iconVariantClass]" />
+
+    <slot v-else name="right" :class="[iconRightClass, iconVariantClass]" />
   </BaseCustomTag>
 </template>

resources/scripts/components/base/base-editor/BaseEditor.vue

@@ -16,15 +16,13 @@
       text-left
       bg-white
       border border-gray-200
-      dark:border-gray-600
       rounded-md
       min-h-[200px]
       overflow-hidden
-      dark:bg-gray-700 dark:text-white
     "
   >
     <div v-if="editor" class="editor-content">
-      <div class="flex justify-end p-2 border-b border-gray-200 dark:border-gray-600 md:hidden">
+      <div class="flex justify-end p-2 border-b border-gray-200 md:hidden">
         <BaseDropdown width-class="w-48">
           <template #activator>
             <div
@@ -44,7 +42,7 @@
               <dots-vertical-icon class="w-6 h-6 text-gray-600" />
             </div>
           </template>
-          <div class="flex flex-wrap space-x-1 dark:text-white">
+          <div class="flex flex-wrap space-x-1">
             <span
               class="
                 flex
@@ -55,9 +53,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('bold') }"
+              :class="{ 'bg-gray-200': editor.isActive('bold') }"
               @click="editor.chain().focus().toggleBold().run()"
             >
               <bold-icon class="h-3 cursor-pointer fill-current" />
@@ -72,9 +69,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('italic') }"
+              :class="{ 'bg-gray-200': editor.isActive('italic') }"
               @click="editor.chain().focus().toggleItalic().run()"
             >
               <italic-icon class="h-3 cursor-pointer fill-current" />
@@ -89,9 +85,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('strike') }"
+              :class="{ 'bg-gray-200': editor.isActive('strike') }"
               @click="editor.chain().focus().toggleStrike().run()"
             >
               <strikethrough-icon class="h-3 cursor-pointer fill-current" />
@@ -106,9 +101,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('code') }"
+              :class="{ 'bg-gray-200': editor.isActive('code') }"
               @click="editor.chain().focus().toggleCode().run()"
             >
               <coding-icon class="h-3 cursor-pointer fill-current" />
@@ -123,9 +117,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('paragraph') }"
+              :class="{ 'bg-gray-200': editor.isActive('paragraph') }"
               @click="editor.chain().focus().setParagraph().run()"
             >
               <paragraph-icon class="h-3 cursor-pointer fill-current" />
@@ -140,10 +133,9 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
               :class="{
-                'bg-gray-200 dark:bg-gray-900': editor.isActive('heading', { level: 1 }),
+                'bg-gray-200': editor.isActive('heading', { level: 1 }),
               }"
               @click="editor.chain().focus().toggleHeading({ level: 1 }).run()"
             >
@@ -159,10 +151,9 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
               :class="{
-                'bg-gray-200 dark:bg-gray-900': editor.isActive('heading', { level: 2 }),
+                'bg-gray-200': editor.isActive('heading', { level: 2 }),
               }"
               @click="editor.chain().focus().toggleHeading({ level: 2 }).run()"
             >
@@ -178,10 +169,9 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
               :class="{
-                'bg-gray-200 dark:bg-gray-900': editor.isActive('heading', { level: 3 }),
+                'bg-gray-200': editor.isActive('heading', { level: 3 }),
               }"
               @click="editor.chain().focus().toggleHeading({ level: 3 }).run()"
             >
@@ -198,9 +188,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('bulletList') }"
+              :class="{ 'bg-gray-200': editor.isActive('bulletList') }"
               @click="editor.chain().focus().toggleBulletList().run()"
             >
               <list-ul-icon class="h-3 cursor-pointer fill-current" />
@@ -215,9 +204,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('orderedList') }"
+              :class="{ 'bg-gray-200': editor.isActive('orderedList') }"
               @click="editor.chain().focus().toggleOrderedList().run()"
             >
               <list-icon class="h-3 cursor-pointer fill-current" />
@@ -232,9 +220,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('blockquote') }"
+              :class="{ 'bg-gray-200': editor.isActive('blockquote') }"
               @click="editor.chain().focus().toggleBlockquote().run()"
             >
               <quote-icon class="h-3 cursor-pointer fill-current" />
@@ -249,9 +236,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('codeBlock') }"
+              :class="{ 'bg-gray-200': editor.isActive('codeBlock') }"
               @click="editor.chain().focus().toggleCodeBlock().run()"
             >
               <code-block-icon class="h-3 cursor-pointer fill-current" />
@@ -266,9 +252,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('undo') }"
+              :class="{ 'bg-gray-200': editor.isActive('undo') }"
               @click="editor.chain().focus().undo().run()"
             >
               <undo-icon class="h-3 cursor-pointer fill-current" />
@@ -283,9 +268,8 @@
                 rounded-sm
                 cursor-pointer
                 hover:bg-gray-100
-                dark:hover:bg-gray-800
               "
-              :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('redo') }"
+              :class="{ 'bg-gray-200': editor.isActive('redo') }"
               @click="editor.chain().focus().redo().run()"
             >
               <redo-icon class="h-3 cursor-pointer fill-current" />
@@ -293,7 +277,7 @@
           </div>
         </BaseDropdown>
       </div>
-      <div class="hidden p-2 border-b border-gray-200 dark:border-gray-600 md:flex">
+      <div class="hidden p-2 border-b border-gray-200 md:flex">
         <div class="flex flex-wrap space-x-1">
           <span
             class="
@@ -305,9 +289,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('bold') }"
+            :class="{ 'bg-gray-200': editor.isActive('bold') }"
             @click="editor.chain().focus().toggleBold().run()"
           >
             <bold-icon class="h-3 cursor-pointer fill-current" />
@@ -322,9 +305,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('italic') }"
+            :class="{ 'bg-gray-200': editor.isActive('italic') }"
             @click="editor.chain().focus().toggleItalic().run()"
           >
             <italic-icon class="h-3 cursor-pointer fill-current" />
@@ -339,9 +321,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('strike') }"
+            :class="{ 'bg-gray-200': editor.isActive('strike') }"
             @click="editor.chain().focus().toggleStrike().run()"
           >
             <strikethrough-icon class="h-3 cursor-pointer fill-current" />
@@ -356,9 +337,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('code') }"
+            :class="{ 'bg-gray-200': editor.isActive('code') }"
             @click="editor.chain().focus().toggleCode().run()"
           >
             <coding-icon class="h-3 cursor-pointer fill-current" />
@@ -373,9 +353,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('paragraph') }"
+            :class="{ 'bg-gray-200': editor.isActive('paragraph') }"
             @click="editor.chain().focus().setParagraph().run()"
           >
             <paragraph-icon class="h-3 cursor-pointer fill-current" />
@@ -390,9 +369,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('heading', { level: 1 }) }"
+            :class="{ 'bg-gray-200': editor.isActive('heading', { level: 1 }) }"
             @click="editor.chain().focus().toggleHeading({ level: 1 }).run()"
           >
             H1
@@ -407,9 +385,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('heading', { level: 2 }) }"
+            :class="{ 'bg-gray-200': editor.isActive('heading', { level: 2 }) }"
             @click="editor.chain().focus().toggleHeading({ level: 2 }).run()"
           >
             H2
@@ -424,9 +401,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('heading', { level: 3 }) }"
+            :class="{ 'bg-gray-200': editor.isActive('heading', { level: 3 }) }"
             @click="editor.chain().focus().toggleHeading({ level: 3 }).run()"
           >
             H3
@@ -442,9 +418,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('bulletList') }"
+            :class="{ 'bg-gray-200': editor.isActive('bulletList') }"
             @click="editor.chain().focus().toggleBulletList().run()"
           >
             <list-ul-icon class="h-3 cursor-pointer fill-current" />
@@ -459,9 +434,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('orderedList') }"
+            :class="{ 'bg-gray-200': editor.isActive('orderedList') }"
             @click="editor.chain().focus().toggleOrderedList().run()"
           >
             <list-icon class="h-3 cursor-pointer fill-current" />
@@ -476,9 +450,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('blockquote') }"
+            :class="{ 'bg-gray-200': editor.isActive('blockquote') }"
             @click="editor.chain().focus().toggleBlockquote().run()"
           >
             <quote-icon class="h-3 cursor-pointer fill-current" />
@@ -493,9 +466,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('codeBlock') }"
+            :class="{ 'bg-gray-200': editor.isActive('codeBlock') }"
             @click="editor.chain().focus().toggleCodeBlock().run()"
           >
             <code-block-icon class="h-3 cursor-pointer fill-current" />
@@ -510,9 +482,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('undo') }"
+            :class="{ 'bg-gray-200': editor.isActive('undo') }"
             @click="editor.chain().focus().undo().run()"
           >
             <undo-icon class="h-3 cursor-pointer fill-current" />
@@ -527,9 +498,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive('redo') }"
+            :class="{ 'bg-gray-200': editor.isActive('redo') }"
             @click="editor.chain().focus().redo().run()"
           >
             <redo-icon class="h-3 cursor-pointer fill-current" />
@@ -544,9 +514,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive({ textAlign: 'left' }) }"
+            :class="{ 'bg-gray-200': editor.isActive({ textAlign: 'left' }) }"
             @click="editor.chain().focus().setTextAlign('left').run()"
           >
             <menu-alt2-icon class="h-5 cursor-pointer fill-current" />
@@ -561,9 +530,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive({ textAlign: 'right' }) }"
+            :class="{ 'bg-gray-200': editor.isActive({ textAlign: 'right' }) }"
             @click="editor.chain().focus().setTextAlign('right').run()"
           >
             <menu-alt3-icon class="h-5 cursor-pointer fill-current" />
@@ -578,10 +546,9 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
             :class="{
-              'bg-gray-200 dark:bg-gray-900': editor.isActive({ textAlign: 'justify' }),
+              'bg-gray-200': editor.isActive({ textAlign: 'justify' }),
             }"
             @click="editor.chain().focus().setTextAlign('justify').run()"
           >
@@ -597,9 +564,8 @@
               rounded-sm
               cursor-pointer
               hover:bg-gray-100
-              dark:hover:bg-gray-800
             "
-            :class="{ 'bg-gray-200 dark:bg-gray-900': editor.isActive({ textAlign: 'center' }) }"
+            :class="{ 'bg-gray-200': editor.isActive({ textAlign: 'center' }) }"
             @click="editor.chain().focus().setTextAlign('center').run()"
           >
             <menu-center-icon class="h-5 cursor-pointer fill-current" />