From 00a59cf29da16f495e18be5e738e7502bf1c8663 Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Wed, 15 Mar 2023 07:20:07 -0700
Subject: [PATCH 1/3] Fix EuiFlyouts to no longer cause page width jump on
 focus trap open

- `ownFocus={false}` and push flyouts should not focus/scroll lock
---
 src/components/flyout/flyout.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/flyout/flyout.tsx b/src/components/flyout/flyout.tsx
index 64e72ffc38e..e5f675d5ec9 100644
--- a/src/components/flyout/flyout.tsx
+++ b/src/components/flyout/flyout.tsx
@@ -405,6 +405,7 @@ export const EuiFlyout = forwardRef(
     let flyout = (
       <EuiFocusTrap
         disabled={isPushed}
+        scrollLock={ownFocus}
         clickOutsideDisables={!ownFocus}
         onClickOutside={onClickOutside}
         {...focusTrapProps}

From 31805c51bd77b47703aefc15fb0af9756b804773 Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Wed, 15 Mar 2023 10:08:10 -0700
Subject: [PATCH 2/3] [misc] Add scroll lock fixes to other fullscreen modes

---
 src/components/code/code_block_full_screen.tsx    | 2 +-
 src/components/image/image_fullscreen_wrapper.tsx | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/code/code_block_full_screen.tsx b/src/components/code/code_block_full_screen.tsx
index 90e47f5556d..a2dc4fabcec 100644
--- a/src/components/code/code_block_full_screen.tsx
+++ b/src/components/code/code_block_full_screen.tsx
@@ -101,7 +101,7 @@ export const EuiCodeBlockFullScreenWrapper: FunctionComponent = ({
 
   return (
     <EuiOverlayMask>
-      <EuiFocusTrap clickOutsideDisables={true}>
+      <EuiFocusTrap scrollLock preventScrollOnFocus clickOutsideDisables={true}>
         <div className="euiCodeBlockFullScreen" css={cssStyles}>
           {children}
         </div>
diff --git a/src/components/image/image_fullscreen_wrapper.tsx b/src/components/image/image_fullscreen_wrapper.tsx
index bbd552a2430..a6a26aa65ae 100644
--- a/src/components/image/image_fullscreen_wrapper.tsx
+++ b/src/components/image/image_fullscreen_wrapper.tsx
@@ -68,7 +68,11 @@ export const EuiImageFullScreenWrapper: FunctionComponent<EuiImageWrapperProps>
 
   return (
     <EuiOverlayMask data-test-subj="fullScreenOverlayMask">
-      <EuiFocusTrap onClickOutside={closeFullScreen}>
+      <EuiFocusTrap
+        scrollLock
+        preventScrollOnFocus
+        onClickOutside={closeFullScreen}
+      >
         <>
           <figure
             aria-label={optionalCaptionText}

From 5fbbaa52898de8cdb41e8d2a940ad37c438c23a3 Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen.3@gmail.com>
Date: Wed, 15 Mar 2023 10:54:44 -0700
Subject: [PATCH 3/3] changelog

---
 upcoming_changelogs/6645.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 upcoming_changelogs/6645.md

diff --git a/upcoming_changelogs/6645.md b/upcoming_changelogs/6645.md
new file mode 100644
index 00000000000..22f561b6789
--- /dev/null
+++ b/upcoming_changelogs/6645.md
@@ -0,0 +1,5 @@
+**Bug fixes**
+
+- Fixed `EuiFlyout` to preserve body scrollbar width on open
+- Fixed `EuiImage`'s full screen mode to not scroll jump & to preserve body scrollbar width on open
+- Fixed `EuiCodeBlock`'s full screen mode to not scroll jump & to preserve body scrollbar width on open