From cfefc9354b6763477fc14e9918d5dd6a28fec848 Mon Sep 17 00:00:00 2001
From: Vitaly Rtishchev <rtivital@gmail.com>
Date: Sun, 14 Aug 2022 11:00:52 +0300
Subject: [PATCH] [@mantine/core] Modal: Fix incorrect scrollbar offset on
 Windows/Linux (#1721)

---
 src/mantine-core/src/Modal/Modal.story.tsx | 17 ++++++++++++++++-
 src/mantine-core/src/Modal/Modal.styles.ts |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/mantine-core/src/Modal/Modal.story.tsx b/src/mantine-core/src/Modal/Modal.story.tsx
index 420793bcf8d..fe57c466d1c 100644
--- a/src/mantine-core/src/Modal/Modal.story.tsx
+++ b/src/mantine-core/src/Modal/Modal.story.tsx
@@ -11,6 +11,16 @@ import { Menu } from '../Menu/Menu';
 import { Modal } from './Modal';
 import { MultiSelect } from '../MultiSelect/MultiSelect';
 
+const content = Array(20)
+  .fill(0)
+  .map((_, index) => (
+    <p key={index}>
+      Lorem ipsum dolor sit amet consectetur adipisicing elit. Suscipit, eum nihil odit, voluptatem
+      quae quibusdam sint omnis corporis beatae quod sunt magni sequi consequatur rem necessitatibus
+      quia eos! Accusamus, doloribus!
+    </p>
+  ));
+
 function WrappedModal(
   props: Omit<React.ComponentPropsWithoutRef<typeof Modal>, 'opened' | 'onClose'>
 ) {
@@ -81,4 +91,9 @@ storiesOf('Modal', module)
       <WrappedModal title="Modal with default radius">default radius</WrappedModal>
     </MantineProvider>
   ))
-  .add('Fullscreen', () => <WrappedModal fullScreen>Full screen modal</WrappedModal>);
+  .add('Fullscreen', () => (
+    <>
+      <WrappedModal fullScreen>Full screen modal</WrappedModal>
+      {content}
+    </>
+  ));
diff --git a/src/mantine-core/src/Modal/Modal.styles.ts b/src/mantine-core/src/Modal/Modal.styles.ts
index 6fc907b035b..b7638e26283 100644
--- a/src/mantine-core/src/Modal/Modal.styles.ts
+++ b/src/mantine-core/src/Modal/Modal.styles.ts
@@ -76,7 +76,7 @@ export default createStyles(
       marginTop: centered ? 'auto' : undefined,
       marginBottom: centered ? 'auto' : undefined,
       zIndex: 1,
-      marginLeft: 'calc(var(--removed-scroll-width, 0px) * -1)',
+      marginLeft: fullScreen ? undefined : 'calc(var(--removed-scroll-width, 0px) * -1)',
       ...getFullScreenStyles(fullScreen),
     },