From f3500b8d0a13e95f8af1933c0f9434d077f534cd Mon Sep 17 00:00:00 2001
From: Gabe Rodriguez <grod220@gmail.com>
Date: Fri, 20 Sep 2024 13:54:11 +0200
Subject: [PATCH] Update Select component (#1799)

---
 .../components/ibc/ibc-in/ibc-in-request.tsx  | 26 ++++----
 .../components/ibc/ibc-out/chain-selector.tsx |  8 +--
 packages/ui/components/ui/select/index.tsx    |  1 -
 packages/ui/components/ui/select/select.tsx   | 61 +++++++++++++------
 packages/ui/package.json                      |  2 +-
 pnpm-lock.yaml                                | 16 ++---
 6 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/apps/minifront/src/components/ibc/ibc-in/ibc-in-request.tsx b/apps/minifront/src/components/ibc/ibc-in/ibc-in-request.tsx
index c81829770b..aef1ba0d0b 100644
--- a/apps/minifront/src/components/ibc/ibc-in/ibc-in-request.tsx
+++ b/apps/minifront/src/components/ibc/ibc-in/ibc-in-request.tsx
@@ -47,23 +47,21 @@ export const IbcInRequest = () => {
       )}
       <div className='flex w-full gap-2'>
         <Select onValueChange={v => setCoin(data.find(b => b.displayDenom === v))}>
-          <SelectTrigger className='truncate rounded-lg bg-white p-2' variant='light'>
+          <SelectTrigger className='truncate rounded-lg p-2' variant='light'>
             <SelectValue placeholder='Select Asset' />
           </SelectTrigger>
           <SelectContent className='max-w-52 bg-white text-stone-700'>
-            {data.map(b => {
-              return (
-                <SelectItem value={b.displayDenom} key={b.displayDenom} className='p-2'>
-                  <div className='flex gap-2 text-stone-700'>
-                    <Avatar className='size-6'>
-                      <AvatarImage src={getIconWithUmFallback(b)} />
-                      <Identicon uniqueIdentifier={b.displayDenom} type='gradient' size={22} />
-                    </Avatar>
-                    <span className=''>{b.displayDenom}</span>
-                  </div>
-                </SelectItem>
-              );
-            })}
+            {data.map(b => (
+              <SelectItem value={b.displayDenom} key={b.displayDenom}>
+                <div className='flex items-center gap-2 text-stone-700'>
+                  <Avatar className='size-6'>
+                    <AvatarImage src={getIconWithUmFallback(b)} />
+                    <Identicon uniqueIdentifier={b.displayDenom} type='gradient' size={22} />
+                  </Avatar>
+                  <span className=''>{b.displayDenom}</span>
+                </div>
+              </SelectItem>
+            ))}
           </SelectContent>
         </Select>
         <AmountInput />
diff --git a/apps/minifront/src/components/ibc/ibc-out/chain-selector.tsx b/apps/minifront/src/components/ibc/ibc-out/chain-selector.tsx
index 34fd2463fc..5b75ff3937 100644
--- a/apps/minifront/src/components/ibc/ibc-out/chain-selector.tsx
+++ b/apps/minifront/src/components/ibc/ibc-out/chain-selector.tsx
@@ -6,7 +6,6 @@ import {
   SelectValue,
 } from '@penumbra-zone/ui/components/ui/select';
 import { cn } from '@penumbra-zone/ui/lib/utils';
-import { useState } from 'react';
 import { AllSlices } from '../../../state';
 import { Chain } from '@penumbra-labs/registry';
 import { useStoreShallow } from '../../../utils/use-store-shallow';
@@ -20,7 +19,6 @@ const chainSelectorSelector = (state: AllSlices) => ({
 export const ChainSelector = () => {
   const { chain, setChain } = useStoreShallow(chainSelectorSelector);
   const chains = useChains();
-  const [openSelect, setOpenSelect] = useState(false);
 
   return (
     <div className='flex flex-col gap-3 rounded-lg border bg-background px-4 pb-5 pt-3'>
@@ -28,10 +26,8 @@ export const ChainSelector = () => {
       <Select
         value={chain?.displayName ?? ''}
         onValueChange={v => setChain(chains.data?.find(i => i.displayName === v))}
-        open={openSelect}
-        onOpenChange={open => setOpenSelect(open)}
       >
-        <SelectTrigger open={openSelect}>
+        <SelectTrigger className='border-none'>
           <SelectValue placeholder='Select chain'>
             {chain && (
               <div className='flex gap-2'>
@@ -41,7 +37,7 @@ export const ChainSelector = () => {
             )}
           </SelectValue>
         </SelectTrigger>
-        <SelectContent className='left-[-17px]'>
+        <SelectContent>
           {chains.data?.map((i, index) => (
             <SelectItem
               key={index}
diff --git a/packages/ui/components/ui/select/index.tsx b/packages/ui/components/ui/select/index.tsx
index 3764d02b78..2e129aab12 100644
--- a/packages/ui/components/ui/select/index.tsx
+++ b/packages/ui/components/ui/select/index.tsx
@@ -7,7 +7,6 @@ export {
   SelectSeparator,
   SelectTrigger,
   SelectValue,
-  type SelectTriggerProps,
 } from './select';
 export { SelectAccount, type SelectAccountProps } from './select-account';
 export { SelectList } from './select-list';
diff --git a/packages/ui/components/ui/select/select.tsx b/packages/ui/components/ui/select/select.tsx
index 6c2120efb4..68b80928ea 100644
--- a/packages/ui/components/ui/select/select.tsx
+++ b/packages/ui/components/ui/select/select.tsx
@@ -2,15 +2,15 @@
 
 import * as React from 'react';
 import * as SelectPrimitive from '@radix-ui/react-select';
-import { cn } from '../../../lib/utils';
-import { ChevronDownIcon } from '@radix-ui/react-icons';
-import { cva, type VariantProps } from 'class-variance-authority';
+import { ChevronDown, ChevronUp } from 'lucide-react';
+import { cn } from '../../../lib/utils.ts';
+import { cva, VariantProps } from 'class-variance-authority';
 
 const selectVariants = cva('', {
   variants: {
     variant: {
-      dark: 'text-muted',
-      light: 'text-stone-700',
+      dark: 'bg-background text-muted',
+      light: 'bg-white text-stone-700',
     },
   },
   defaultVariants: {
@@ -27,18 +27,17 @@ const SelectValue = SelectPrimitive.Value;
 export interface SelectTriggerProps
   extends React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>,
     VariantProps<typeof selectVariants> {
-  open?: boolean;
   textColor?: string;
 }
 
 const SelectTrigger = React.forwardRef<
   React.ElementRef<typeof SelectPrimitive.Trigger>,
   SelectTriggerProps
->(({ className, children, open, variant, ...props }, ref) => (
+>(({ className, children, variant, ...props }, ref) => (
   <SelectPrimitive.Trigger
     ref={ref}
     className={cn(
-      'flex w-full items-center justify-between bg-background ring-offset-background focus:outline-none focus:ring-0 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 text-[15px] leading-[22px] font-bold text-light-brown',
+      'flex h-10 w-full items-center justify-between rounded-md border border-input px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
       selectVariants({ variant }),
       className,
     )}
@@ -46,18 +45,40 @@ const SelectTrigger = React.forwardRef<
   >
     {children}
     <SelectPrimitive.Icon asChild>
-      <ChevronDownIcon
-        className={cn(
-          'h-6 w-6 transition-all duration-500',
-          open && 'rotate-180',
-          selectVariants({ variant }),
-        )}
-      />
+      <ChevronDown className='size-4 opacity-50' />
     </SelectPrimitive.Icon>
   </SelectPrimitive.Trigger>
 ));
 SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
 
+const SelectScrollUpButton = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollUpButton
+    ref={ref}
+    className={cn('flex cursor-default items-center justify-center py-1', className)}
+    {...props}
+  >
+    <ChevronUp className='size-4' />
+  </SelectPrimitive.ScrollUpButton>
+));
+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
+
+const SelectScrollDownButton = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollDownButton
+    ref={ref}
+    className={cn('flex cursor-default items-center justify-center py-1', className)}
+    {...props}
+  >
+    <ChevronDown className='size-4' />
+  </SelectPrimitive.ScrollDownButton>
+));
+SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;
+
 const SelectContent = React.forwardRef<
   React.ElementRef<typeof SelectPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
@@ -66,7 +87,7 @@ const SelectContent = React.forwardRef<
     <SelectPrimitive.Content
       ref={ref}
       className={cn(
-        'relative z-50 border border-t-0 overflow-hidden rounded-b-md bg-background text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 px-4',
+        'relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-background text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
         position === 'popper' &&
           'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
         className,
@@ -74,15 +95,17 @@ const SelectContent = React.forwardRef<
       position={position}
       {...props}
     >
+      <SelectScrollUpButton />
       <SelectPrimitive.Viewport
         className={cn(
-          '',
+          'p-1',
           position === 'popper' &&
             'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]',
         )}
       >
         {children}
       </SelectPrimitive.Viewport>
+      <SelectScrollDownButton />
     </SelectPrimitive.Content>
   </SelectPrimitive.Portal>
 ));
@@ -107,7 +130,7 @@ const SelectItem = React.forwardRef<
   <SelectPrimitive.Item
     ref={ref}
     className={cn(
-      'relative flex w-full select-none items-center font-bold text-muted-foreground outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 cursor-pointer py-[10px]',
+      'relative flex w-full cursor-default select-none items-center text-muted-foreground rounded-sm py-1.5 px-2 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
       className,
     )}
     {...props}
@@ -138,4 +161,6 @@ export {
   SelectLabel,
   SelectItem,
   SelectSeparator,
+  SelectScrollUpButton,
+  SelectScrollDownButton,
 };
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 350f1fd719..a415c9b7b3 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -63,7 +63,7 @@
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-progress": "^1.0.3",
     "@radix-ui/react-radio-group": "^1.2.0",
-    "@radix-ui/react-select": "^2.0.0",
+    "@radix-ui/react-select": "^2.1.1",
     "@radix-ui/react-slider": "^1.1.2",
     "@radix-ui/react-slot": "^1.0.2",
     "@radix-ui/react-switch": "^1.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ab457086f9..3e3798aa9d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -657,7 +657,7 @@ importers:
         specifier: ^1.2.0
         version: 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-select':
-        specifier: ^2.0.0
+        specifier: ^2.1.1
         version: 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-slider':
         specifier: ^1.1.2
@@ -739,7 +739,7 @@ importers:
         version: 3.0.1
       postcss:
         specifier: ^8.4.38
-        version: 8.4.39
+        version: 7.0.39
       react:
         specifier: ^18.3.1
         version: 18.3.1
@@ -782,7 +782,7 @@ importers:
         version: 8.1.11(@types/react-dom@18.3.0)(@types/react@18.3.3)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/addon-interactions':
         specifier: ^8.1.1
-        version: 8.1.11(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.1)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))
+        version: 8.1.11(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))
       '@storybook/addon-links':
         specifier: ^8.1.1
         version: 8.1.11(react@18.3.1)
@@ -16270,11 +16270,11 @@ snapshots:
     dependencies:
       '@storybook/global': 5.0.0
 
-  '@storybook/addon-interactions@8.1.11(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.1)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))':
+  '@storybook/addon-interactions@8.1.11(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))':
     dependencies:
       '@storybook/global': 5.0.0
       '@storybook/instrumenter': 8.1.11
-      '@storybook/test': 8.1.11(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.1)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))
+      '@storybook/test': 8.1.11(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))
       '@storybook/types': 8.1.11
       polished: 4.3.1
       ts-dedent: 2.2.0
@@ -17078,14 +17078,14 @@ snapshots:
       - prettier
       - supports-color
 
-  '@storybook/test@8.1.11(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.1)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))':
+  '@storybook/test@8.1.11(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))':
     dependencies:
       '@storybook/client-logger': 8.1.11
       '@storybook/core-events': 8.1.11
       '@storybook/instrumenter': 8.1.11
       '@storybook/preview-api': 8.1.11
       '@testing-library/dom': 10.1.0
-      '@testing-library/jest-dom': 6.4.5(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.1)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))
+      '@testing-library/jest-dom': 6.4.5(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))
       '@testing-library/user-event': 14.5.2(@testing-library/dom@10.1.0)
       '@vitest/expect': 1.6.0
       '@vitest/spy': 1.6.0
@@ -17368,7 +17368,7 @@ snapshots:
       lz-string: 1.5.0
       pretty-format: 27.5.1
 
-  '@testing-library/jest-dom@6.4.5(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.1)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))':
+  '@testing-library/jest-dom@6.4.5(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(terser@5.31.1))':
     dependencies:
       '@adobe/css-tools': 4.4.0
       '@babel/runtime': 7.24.7