From 0db4595ad9e007f80de6207e7cc86afaed767909 Mon Sep 17 00:00:00 2001
From: lyqht <estee.tsw@gmail.com>
Date: Fri, 16 Feb 2024 14:24:12 +0800
Subject: [PATCH] fix combobox dark mode ui

---
 src/App.vue                               |  4 +--
 src/components/ui/Combobox/Combobox.vue   | 33 ++++++++++++++++-------
 src/components/ui/command/CommandItem.vue |  7 ++++-
 src/index.css                             |  2 +-
 tailwind.config.js                        |  2 --
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index fadf59b..4537e45 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -294,8 +294,8 @@ onMounted(() => {
 </script>
 
 <template>
-  <main :class="{ dark: isDark }">
-    <div class="relative grid place-items-center bg-white p-8 dark:bg-zinc-900 md:px-6">
+  <main>
+    <div class="relative grid place-items-center bg-white p-8 md:px-6 dark:bg-zinc-900">
       <div
         class="mb-8 flex w-full flex-row flex-wrap justify-between gap-4 md:mb-4 md:w-5/6 md:ps-4"
       >
diff --git a/src/components/ui/Combobox/Combobox.vue b/src/components/ui/Combobox/Combobox.vue
index ca5bc7c..9125193 100644
--- a/src/components/ui/Combobox/Combobox.vue
+++ b/src/components/ui/Combobox/Combobox.vue
@@ -24,27 +24,40 @@ defineProps<{
 <template>
   <Popover v-model:open="open">
     <PopoverTrigger as-child>
-      <Button variant="outline" role="combobox" :aria-expanded="open"
-        class="w-fit justify-between focus-visible:ring-1 bg-zinc-50 dark:bg-zinc-800 text-zinc-900 dark:text-zinc-100">
+      <Button
+        variant="outline"
+        role="combobox"
+        :aria-expanded="open"
+        class="w-fit justify-between focus-visible:ring-1 bg-zinc-50 dark:bg-zinc-800 text-zinc-900 dark:text-zinc-100 dark:hover:bg-zinc-900 dark:hover:text-zinc-100"
+      >
         {{ value ? items.find((item) => item.value === value)?.label : 'Select item...' }}
         <ChevronsUpDown class="ml-2 h-4 w-4 shrink-0 opacity-50" />
       </Button>
     </PopoverTrigger>
     <PopoverContent class="w-fit p-0">
-      <Command>
+      <Command class="bg-zinc-50 dark:bg-zinc-800 text-zinc-900 dark:text-zinc-100">
         <CommandInput class="h-9" placeholder="Search item..." />
         <CommandEmpty>No item found.</CommandEmpty>
         <CommandList>
           <CommandGroup>
-            <CommandItem v-for="item in items" :key="item.value" :value="item.value" @select="(ev) => {
-                if (typeof ev.detail.value === 'string') {
-                  value = ev.detail.value
+            <CommandItem
+              v-for="item in items"
+              :key="item.value"
+              :value="item.value"
+              class="bg-zinc-50 dark:bg-zinc-800 text-zinc-900 dark:text-zinc-100"
+              @select="
+                (ev) => {
+                  if (typeof ev.detail.value === 'string') {
+                    value = ev.detail.value
+                  }
+                  open = false
                 }
-                open = false
-              }
-              ">
+              "
+            >
               {{ item.label }}
-              <Check :class="cn('ml-auto h-4 w-4', value === item.value ? 'opacity-100' : 'opacity-0')" />
+              <Check
+                :class="cn('ml-auto h-4 w-4', value === item.value ? 'opacity-100' : 'opacity-0')"
+              />
             </CommandItem>
           </CommandGroup>
         </CommandList>
diff --git a/src/components/ui/command/CommandItem.vue b/src/components/ui/command/CommandItem.vue
index c373d12..d3e2388 100644
--- a/src/components/ui/command/CommandItem.vue
+++ b/src/components/ui/command/CommandItem.vue
@@ -19,7 +19,12 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
 <template>
   <ComboboxItem
     v-bind="forwarded"
-    :class="cn('relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[highlighted]:bg-accent data-[disabled]:pointer-events-none data-[disabled]:opacity-50', props.class)"
+    :class="
+      cn(
+        'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[highlighted]:bg-accent dark:data-[highlighted]:bg-zinc-800 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+        props.class
+      )
+    "
   >
     <slot />
   </ComboboxItem>
diff --git a/src/index.css b/src/index.css
index 10b7e9c..fd861eb 100644
--- a/src/index.css
+++ b/src/index.css
@@ -36,7 +36,7 @@
     --radius: 0.5rem;
   }
  
-  .dark {
+  :root[class~="dark"]{
     --background: 222.2 84% 4.9%;
     --foreground: 210 40% 98%;
  
diff --git a/tailwind.config.js b/tailwind.config.js
index 9a96938..4646bea 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,8 +1,6 @@
 import animate from 'tailwindcss-animate'
 
 /** @type {import('tailwindcss').Config} */
-export const darkMode = ['class']
-export const safelist = ['dark']
 export const content = [
   './pages/**/*.{ts,tsx,vue}',
   './components/**/*.{ts,tsx,vue}',