diff --git a/app/src/components/SelectGroup.tsx b/app/src/components/SelectGroup.tsx index dc4fa40..0e4bf80 100644 --- a/app/src/components/SelectGroup.tsx +++ b/app/src/components/SelectGroup.tsx @@ -131,16 +131,17 @@ function SelectGroupMobile(props: SelectGroupProps) { props.onChange?.(value); }} > - + {props.selectGroupTop && ( props.onChange?.(props.selectGroupTop!.name)} + className="touch-manipulation" > @@ -148,7 +149,7 @@ function SelectGroupMobile(props: SelectGroupProps) { {props.list.map((select: SelectItemProps, idx: number) => ( @@ -160,6 +161,7 @@ function SelectGroupMobile(props: SelectGroupProps) { props.onChange?.(props.selectGroupBottom!.name)} + className="touch-manipulation" > diff --git a/app/src/components/ui/select.tsx b/app/src/components/ui/select.tsx index 2924995..dffca91 100644 --- a/app/src/components/ui/select.tsx +++ b/app/src/components/ui/select.tsx @@ -68,41 +68,38 @@ SelectScrollDownButton.displayName = const SelectContent = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef ->(({ className, children, position = "popper", ...props }) => { - return ( - - { - if (!ref) return; - ref.ontouchend = (e) => { - e.preventDefault(); - e.stopPropagation(); - }; - }} +>(({ className, children, position = "popper", ...props }) => ( + + { + if (!ref) return; + ref.ontouchstart = (e) => { + e.stopPropagation(); + }; + }} + className={cn( + "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover 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, + )} + position={position} + {...props} + > + + - - - {children} - - - - - ); -}); + {children} + + + + +)); SelectContent.displayName = SelectPrimitive.Content.displayName; const SelectLabel = React.forwardRef<