fix dropdown's duplicate icon

ensdomains · Aug 28, 2024 · 8e8af93 · 8e8af93
1 parent 9ac888f
commit 8e8af93
Show file tree

Hide file tree

Showing 3 changed files with 803 additions and 215 deletions.
diff --git a/components/src/components/molecules/Dropdown/Dropdown.tsx b/components/src/components/molecules/Dropdown/Dropdown.tsx
@@ -178,16 +178,18 @@ const MenuButton = React.forwardRef<HTMLElement, BoxProps & MenuButtonProps>(
       transitionTimingFunction="$ease-in-out"
       width="$full"
     >
-      {$icon && (
-        <Box
-          as={$icon}
-          color={$color ? `$${$color}` : '$textPrimary'}
-          flexBasis="$4"
-          flexGrow="0"
-          flexShrink="0"
-          wh="$4"
-        />
-      )}
+      {$icon
+        ? (
+            <Box
+              as={$icon}
+              color={$color ? `$${$color}` : '$textPrimary'}
+              flexBasis="$4"
+              flexGrow="0"
+              flexShrink="0"
+              wh="$4"
+            />
+          )
+        : null}
       {children}
       {$showIndicator && (
         <Box
@@ -273,12 +275,7 @@ const DropdownMenu = React.forwardRef<HTMLDivElement, DropdownMenuProps>(
           setIsOpen(false)
         },
         as: href ? 'a' : 'button',
-        children: (
-          <>
-            {icon}
-            {label}
-          </>
-        ),
+        children: label,
         href,
       } as const
 

diff --git a/docs/package.json b/docs/package.json
@@ -18,7 +18,7 @@
     "eslint-config-next": "^13.5.6",
     "gray-matter": "^4.0.3",
     "lodash": "^4.17.21",
-    "next": "14.2.5",
+    "next": "14.2.7",
     "next-mdx-remote": "^3.0.6",
     "nookies": "^2.5.2",
     "prism-react-renderer": "^1.2.1",