Merge branch 'master' of github.com-rtivital:mantinedev/mantine

mantinedev · Apr 11, 2024 · bef8a16 · bef8a16
2 parents a392d91 + 77692de
commit bef8a16
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/packages/@mantine/core/src/components/PinInput/PinInput.tsx b/packages/@mantine/core/src/components/PinInput/PinInput.tsx
@@ -116,6 +116,9 @@ export interface PinInputProps
 
   /** Props passed down to the hidden input */
   hiddenInputProps?: React.ComponentPropsWithoutRef<'input'>;
+
+  /** Assigns ref of the root element */
+  rootRef?: React.ForwardedRef<HTMLDivElement>;
 }
 
 export type PinInputFactory = Factory<{
@@ -174,6 +177,7 @@ export const PinInput = factory<PinInputFactory>((props, ref) => {
     vars,
     id,
     hiddenInputProps,
+    rootRef,
     ...others
   } = useProps('PinInput', defaultProps, props);
 
@@ -364,6 +368,7 @@ export const PinInput = factory<PinInputFactory>((props, ref) => {
       <Group
         {...others}
         {...getStyles('root')}
+        ref={rootRef}
         role="group"
         id={uuid}
         gap={gap}

diff --git a/packages/@mantine/core/src/components/ScrollArea/ScrollArea.module.css b/packages/@mantine/core/src/components/ScrollArea/ScrollArea.module.css
@@ -81,8 +81,8 @@
     height: var(--scrollarea-scrollbar-size);
     flex-direction: column;
     bottom: 0;
-    inset-inline-end: 0;
-    inset-inline-start: var(--sa-corner-height);
+    inset-inline-start: 0;
+    inset-inline-end: var(--sa-corner-width);
   }
 }
 

diff --git a/packages/@mantine/core/src/components/ScrollArea/ScrollArea.tsx b/packages/@mantine/core/src/components/ScrollArea/ScrollArea.tsx
@@ -134,15 +134,10 @@ export const ScrollArea = factory<ScrollAreaFactory>((_props, ref) => {
         ref={viewportRef}
         data-offset-scrollbars={offsetScrollbars === true ? 'xy' : offsetScrollbars || undefined}
         data-scrollbars={scrollbars || undefined}
-        onScroll={
-          typeof onScrollPositionChange === 'function'
-            ? ({ currentTarget }) =>
-                onScrollPositionChange({
-                  x: currentTarget.scrollLeft,
-                  y: currentTarget.scrollTop,
-                })
-            : undefined
-        }
+        onScroll={(e) => {
+          viewportProps?.onScroll?.(e);
+          onScrollPositionChange?.({ x: e.currentTarget.scrollLeft, y: e.currentTarget.scrollTop });
+        }}
       >
         {children}
       </ScrollAreaViewport>