tweak

concrete-utopia · Oct 9, 2024 · 794db8f · 794db8f
1 parent f18cfe9
commit 794db8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/editor/src/components/inspector/flex-section.tsx b/editor/src/components/inspector/flex-section.tsx
@@ -967,7 +967,7 @@ function selectOption(value: GridAutoFlow) {
 }
 
 const unsetSelectOption = regularRadixSelectOption({
-  label: (isOpen) => (isOpen ? 'unset' : 'auto'),
+  label: (isOpen, currentValue) => (isOpen && currentValue !== 'auto' ? 'unset' : 'auto'),
   value: 'auto',
   placeholder: true,
 })

diff --git a/editor/src/uuiui/radix-components.tsx b/editor/src/uuiui/radix-components.tsx
@@ -228,7 +228,7 @@ Separator.displayName = 'Separator'
 type RegularRadixSelectOption = {
   type: 'REGULAR'
   value: string
-  label: string | ((isOpen: boolean) => string)
+  label: string | ((isOpen: boolean, currentValue: string | null) => string)
   icon?: IcnProps
   placeholder?: boolean
 }
@@ -257,12 +257,13 @@ export type RadixSelectOption = RegularRadixSelectOption | Separator
 function optionLabelToString(
   option: RegularRadixSelectOption | null,
   isOpen: boolean,
+  currentValue: string | null,
 ): string | null {
   if (option == null) {
     return null
   }
 
-  const label = typeof option.label === 'string' ? option.label : option.label(isOpen)
+  const label = typeof option.label === 'string' ? option.label : option.label(isOpen, currentValue)
 
   return `${label.charAt(0).toUpperCase()}${label.slice(1)}`
 }
@@ -293,7 +294,7 @@ export const RadixSelect = React.memo(
       [propsOnOpenChange],
     )
 
-    const valueLabel = optionLabelToString(props.value ?? null, isOpen)
+    const valueLabel = optionLabelToString(props.value ?? null, isOpen, props.value?.value ?? null)
 
     return (
       <Select.Root
@@ -365,7 +366,7 @@ export const RadixSelect = React.memo(
                   )
                 }
 
-                const label = optionLabelToString(option, isOpen)
+                const label = optionLabelToString(option, isOpen, props.value?.value ?? null)
                 return (
                   <Select.Item
                     key={`select-option-${props.id}-${index}`}