diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx index 9fccba4..625448d 100644 --- a/src/components/Settings.tsx +++ b/src/components/Settings.tsx @@ -76,7 +76,7 @@ import { } from "lucide-react"; import { Separator } from "@/components/ui/separator"; import { Slider } from "@/components/ui/slider"; -import { ScrollArea } from "@/components/ui/scroll-area"; +import { NonOverflowScrollArea, ScrollArea } from "@/components/ui/scroll-area"; import { AppContext } from "@/pages/App"; const TTS_VOICES: string[] = [ @@ -520,8 +520,8 @@ export default (props: { setShow: Dispatch }) => { {Tr("Settings")} - - + + {Tr("Settings")} @@ -1142,7 +1142,7 @@ export default (props: { setShow: Dispatch }) => {

-
+
); diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsx index 138ea4c..b241efe 100644 --- a/src/components/ui/scroll-area.tsx +++ b/src/components/ui/scroll-area.tsx @@ -3,6 +3,24 @@ import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"; import { cn } from "@/lib/utils"; +const NonOverflowScrollArea = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, ...props }, ref) => ( + + aaa + + {children} + + + + +)); + const ScrollArea = React.forwardRef< React.ElementRef, React.ComponentPropsWithoutRef @@ -12,6 +30,7 @@ const ScrollArea = React.forwardRef< className={cn("relative overflow-hidden", className)} {...props} > + aaa {children} @@ -43,4 +62,4 @@ const ScrollBar = React.forwardRef< )); ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName; -export { ScrollArea, ScrollBar }; +export { NonOverflowScrollArea, ScrollArea, ScrollBar };