�2.7.3`

KingSora · Apr 22, 2024 · 7fb3bb7 · 7fb3bb7
1 parent 3eae3ff
commit 7fb3bb7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/packages/overlayscrollbars/CHANGELOG.md b/packages/overlayscrollbars/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.7.3
+
+### Improvements
+
+- Use `{ preventScroll: true }` when focusing viewport to prevent unwanted scrolling. [#629](https://github.com/KingSora/OverlayScrollbars/issues/629)
+- Make the scrollbars hidden when `@media print` applies.
+
 ## 2.7.2
 
 ### Bug Fixes

diff --git a/packages/overlayscrollbars/package.json b/packages/overlayscrollbars/package.json
@@ -1,7 +1,7 @@
 {
   "name": "overlayscrollbars",
   "private": true,
-  "version": "2.7.2",
+  "version": "2.7.3",
   "description": "A scrollbar plugin that hides native scrollbars, provides custom styleable overlay scrollbars and keeps the native functionality and feeling.",
   "author": "Rene Haas | KingSora",
   "license": "MIT",

diff --git a/packages/overlayscrollbars/src/setups/scrollbarsSetup/scrollbarsSetup.events.ts b/packages/overlayscrollbars/src/setups/scrollbarsSetup/scrollbarsSetup.events.ts
@@ -202,7 +202,7 @@ export const createScrollbarsSetupEvents = (
             focusedElement === document.body
           ) {
             setT(() => {
-              _viewport.focus();
+              _viewport.focus({ preventScroll: true });
             }, 25);
           }
         }),

diff --git a/packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts b/packages/overlayscrollbars/src/setups/structureSetup/structureSetup.elements.ts
@@ -102,7 +102,7 @@ export const createStructureSetupElements = (
   const getDocumentWindow = () => ownerDocument.defaultView || wnd;
   const focusElm = (customActiveElm: Element | null) => {
     if (customActiveElm && (customActiveElm as HTMLElement).focus) {
-      (customActiveElm as HTMLElement).focus();
+      (customActiveElm as HTMLElement).focus({ preventScroll: true });
     }
   };
   const staticInitializationElement = bind(generalStaticInitializationElement, [targetElement]);
@@ -273,12 +273,11 @@ export const createStructureSetupElements = (
       push(destroyFns, bind(removeAttrs, _viewport, dataAttributeViewport));
     }
 
-    // focus viewport if previously focused element was target, otherwise focus previously focused element
-    focusElm(
-      !viewportIsTarget && initActiveElm === targetElement && docWnd.top === docWnd
-        ? _viewport
-        : initActiveElm
-    );
+    // focus viewport if previously focused element was target
+    if (!viewportIsTarget && initActiveElm === targetElement && docWnd.top === docWnd) {
+      focusElm(_viewport);
+    }
+
     undoInitWrapUndwrapFocus();
 
     // @ts-ignore

diff --git a/packages/overlayscrollbars/src/styles/scrollbars.scss b/packages/overlayscrollbars/src/styles/scrollbars.scss
@@ -96,3 +96,9 @@ body > .os-scrollbar {
   top: 0;
   bottom: 0;
 }
+
+@media print {
+  .os-scrollbar {
+    display: none;
+  }
+}