diff --git a/apps/desktop/src/renderer/src/components/ui/markdown/renderers/MarkdownLink.tsx b/apps/desktop/src/renderer/src/components/ui/markdown/renderers/MarkdownLink.tsx index d5c448be8..8030c6b03 100644 --- a/apps/desktop/src/renderer/src/components/ui/markdown/renderers/MarkdownLink.tsx +++ b/apps/desktop/src/renderer/src/components/ui/markdown/renderers/MarkdownLink.tsx @@ -35,7 +35,7 @@ export const MarkdownLink = (props: LinkProps) => { ({ className={cn( "relative", "inline-block transition-all duration-200 ease-out", - "before:absolute before:-inset-x-2 before:inset-y-0 before:z-[-1] before:scale-0 before:rounded-xl before:bg-black/[0.03] before:opacity-0 before:backdrop-blur before:transition-all before:duration-200 before:[transform-origin:var(--origin-x)_var(--origin-y)] hover:before:scale-100 hover:before:opacity-100 dark:before:bg-white/[0.10]", + "before:backdrop-blur-background before:absolute before:-inset-x-2 before:inset-y-0 before:z-[-1] before:scale-0 before:rounded-xl before:bg-black/[0.03] before:opacity-0 before:transition-all before:duration-200 before:[transform-origin:var(--origin-x)_var(--origin-y)] hover:before:scale-100 hover:before:opacity-100 dark:before:bg-white/[0.10]", rest.className, )} > diff --git a/packages/components/src/ui/select/index.tsx b/packages/components/src/ui/select/index.tsx index b4958f90f..35ade3f08 100644 --- a/packages/components/src/ui/select/index.tsx +++ b/packages/components/src/ui/select/index.tsx @@ -2,6 +2,7 @@ import { cn } from "@follow/utils/utils" import * as SelectPrimitive from "@radix-ui/react-select" import * as React from "react" +import { Divider } from "../divider/Divider" import { RootPortal } from "../portal" const Select = SelectPrimitive.Root @@ -19,18 +20,21 @@ const SelectTrigger = React.forwardRef< span]:line-clamp-1", - "ring-accent/20 focus:border-accent/80 duration-200 focus:outline-none focus:ring-2", + "flex w-full items-center justify-between whitespace-nowrap rounded-[5px] bg-transparent", + "outline-none focus-within:outline-transparent", "border-border border", - size === "sm" ? "h-7 p-2 text-sm" : "h-9 px-3 py-2 text-sm", - "hover:border-accent/80", + size === "sm" ? "h-7 px-2.5 text-sm" : "h-9 px-2.5 py-1.5 text-sm", + "placeholder:text-text-secondary", + "disabled:cursor-not-allowed disabled:opacity-50", + "[&>span]:line-clamp-1", className, + props.disabled && "cursor-not-allowed opacity-30", )} {...props} > {children} - + )) @@ -42,10 +46,10 @@ const SelectScrollUpButton = React.forwardRef< >(({ className, ...props }, ref) => ( - + )) SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName @@ -56,10 +60,10 @@ const SelectScrollDownButton = React.forwardRef< >(({ className, ...props }, ref) => ( - + )) SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName @@ -72,7 +76,9 @@ const SelectContent = React.forwardRef< , - React.ComponentPropsWithoutRef ->(({ className, ...props }, ref) => ( + React.ComponentPropsWithoutRef & { + inset?: boolean + } +>(({ className, inset, ...props }, ref) => ( )) @@ -108,19 +116,24 @@ SelectLabel.displayName = SelectPrimitive.Label.displayName const SelectItem = React.forwardRef< React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, children, ...props }, ref) => ( + React.ComponentPropsWithoutRef & { + inset?: boolean + } +>(({ className, children, inset, ...props }, ref) => ( - + {children} @@ -131,12 +144,15 @@ SelectItem.displayName = SelectPrimitive.Item.displayName const SelectSeparator = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef ->(({ className, ...props }, ref) => ( +>(({ ...props }, ref) => ( + > + + )) SelectSeparator.displayName = SelectPrimitive.Separator.displayName