Skip to content

fix: make select.web consistent #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: make select.web consistent #57

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bc6b37
fix: make select.web consistent
bryanmylee Feb 1, 2025
e92545a
fix: web Select.Item `asChild`
bryanmylee Feb 1, 2025
f771f8f
fix: only write to `labelForValueRef` on init
bryanmylee Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions packages/select/src/select.web.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,11 @@ const SelectContext = React.createContext<
| (SharedRootContext & {
open: boolean;
onOpenChange: (open: boolean) => void;
labelForValueRef: React.MutableRefObject<Record<string, string>>;
})
| null
>(null);

/**
* @web Parameter of `onValueChange` has the value of `value` for the `value` and the `label` of the selected Option
* @ex When an Option with a label of Green Apple, the parameter passed to `onValueChange` is { value: 'green-apple', label: 'green-apple' }
*/
const Root = React.forwardRef<RootRef, RootProps>(
(
{
Expand All @@ -73,8 +70,12 @@ const Root = React.forwardRef<RootRef, RootProps>(
onOpenChangeProp?.(value);
}

const labelForValueRef = React.useRef<Record<string, string>>({});
function onStrValueChange(val: string) {
onValueChange({ value: val, label: val });
onValueChange({
value: val,
label: labelForValueRef.current[val] ?? val,
});
}

const Component = asChild ? Slot.View : View;
Expand All @@ -85,6 +86,7 @@ const Root = React.forwardRef<RootRef, RootProps>(
onValueChange,
open,
onOpenChange,
labelForValueRef,
}}
>
<Select.Root
Expand Down Expand Up @@ -225,10 +227,19 @@ const ItemContext = React.createContext<{

const Item = React.forwardRef<ItemRef, ItemProps>(
({ asChild, closeOnPress = true, label, value, children, ...props }, ref) => {
const { labelForValueRef } = useRootContext();
if (!(value in labelForValueRef.current)) {
labelForValueRef.current[value] = label;
}
return (
<ItemContext.Provider value={{ itemValue: value, label: label }}>
<Slot.Pressable ref={ref} {...props}>
<Select.Item textValue={label} value={value} disabled={props.disabled ?? undefined}>
<Select.Item
asChild={asChild}
textValue={label}
value={value}
disabled={props.disabled ?? undefined}
>
<>{children as React.ReactNode}</>
</Select.Item>
</Slot.Pressable>
Expand Down