From f487cf10719063c2ffd9aef762e4dbbd6757cea1 Mon Sep 17 00:00:00 2001
From: isstuev <isstuev@gmail.com>
Date: Sun, 23 Jun 2024 12:02:22 +0300
Subject: [PATCH] tag theme fix

---
 theme/components/Tag/Tag.ts                 | 13 +++++++------
 ui/shared/tagGroupSelect/TagGroupSelect.tsx |  5 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/theme/components/Tag/Tag.ts b/theme/components/Tag/Tag.ts
index 5976077a02..6ea4c41d10 100644
--- a/theme/components/Tag/Tag.ts
+++ b/theme/components/Tag/Tag.ts
@@ -25,12 +25,13 @@ const variants = {
         color: 'blue.400',
         opacity: 0.76,
       },
-    },
-  })),
-  selectActive: definePartsStyle((props) => ({
-    container: {
-      bg: mode('blue.500', 'blue.900')(props),
-      color: 'whiteAlpha.800',
+      [`
+        &[data-selected=true],
+        &[data-selected=true][aria-selected=true]
+      `]: {
+        bg: mode('blue.500', 'blue.900')(props),
+        color: 'whiteAlpha.800',
+      },
     },
   })),
 };
diff --git a/ui/shared/tagGroupSelect/TagGroupSelect.tsx b/ui/shared/tagGroupSelect/TagGroupSelect.tsx
index eb0e89d122..4bf53b2ce1 100644
--- a/ui/shared/tagGroupSelect/TagGroupSelect.tsx
+++ b/ui/shared/tagGroupSelect/TagGroupSelect.tsx
@@ -34,12 +34,13 @@ const TagGroupSelect = <T extends string>({ items, value, isMulti, onChange }: P
   return (
     <HStack>
       { items.map(item => {
-        const isActive = isMulti ? value.includes(item.id) : value === item.id;
+        const isSelected = isMulti ? value.includes(item.id) : value === item.id;
         return (
           <Tag
+            variant="select"
             key={ item.id }
             data-id={ item.id }
-            variant={ isActive ? 'selectActive' : 'select' }
+            data-selected={ isSelected }
             fontWeight={ 500 }
             cursor="pointer"
             onClick={ onItemClick }