Skip to content

armgit / ui

Public Imported from GitHub
0
TypeScript

Preserve scroll area viewport styles while controlling overflow

Andrew Luof1936f3a8606
diff --git a/apps/v4/registry/bases/radix/document-scroll-area.tsx b/apps/v4/registry/bases/radix/document-scroll-area.tsx
index 12abff2..48e664f 100644
--- a/apps/v4/registry/bases/radix/document-scroll-area.tsx
+++ b/apps/v4/registry/bases/radix/document-scroll-area.tsx
@@ -35,8 +35,11 @@ export function ScrollArea({
const {
className: viewportPropsClassName,
ref: viewportPropsRef,
+ style: viewportStyle,
...resolvedViewportProps
} = viewportProps ?? {}
+ const resolvedViewportStyle = { ...viewportStyle }
+ delete resolvedViewportStyle.overflow
const composedViewportRef = React.useMemo(
() => composeRefs(localViewportRef, viewportPropsRef, viewportRef),
[viewportPropsRef, viewportRef]
@@ -107,6 +110,7 @@ export function ScrollArea({
>
<ScrollAreaPrimitive.Viewport
{...resolvedViewportProps}
+ style={resolvedViewportStyle}
ref={composedViewportRef}
data-slot="scroll-area-viewport"
className={cn(