@salesforcedevs/dx-components 1.37.0 → 1.37.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.37.0",
+    "version": "1.37.1",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -44,5 +44,5 @@
         "luxon": "3.4.4",
         "msw": "^2.12.4"
     },
-    "gitHead": "9c95fcffb4aaa1cf71a06334fc3b854b39c8a5b0"
+    "gitHead": "0425dec453ebb79ed0041e1c8ea18fccf893d425"
 }

package/src/modules/dx/scrollManager/scrollManager.ts

@@ -5,6 +5,7 @@ import { track } from "dxUtils/analytics";
 const RESTORE_SCROLL_EVENT_NAME = "restore-scroll";
 const SCROLL_EVENT_NAME = "scroll";
 const GLOBAL_NAV_TOGGLE_EVENT_NAME = "toggle_global_nav";
+const FULLSCREEN_CHANGE_EVENT_NAME = "fullscreenchange";
 
 const LOAD_TIME_SCROLL_RESTORE_DELAY = 750;
 const REDUNDANT_INSTANCE_ERROR_MESSAGE =
@@ -55,6 +56,7 @@ export default class ScrollManager extends LightningElement {
     private scrolledSevenFivePercent = false;
     private scrolledOneHundredPercent = false;
     private scrollUnlocked = false;
+    private lastKnownScrollTop = 0;
 
     renderedCallback() {
         scrollUnlocked = window.location.hash !== ""; // if we have anchor links, skip the entire scroll restore
@@ -105,15 +107,39 @@ export default class ScrollManager extends LightningElement {
                 GLOBAL_NAV_TOGGLE_EVENT_NAME,
                 this.onGlobalNavToggle
             );
+            document.addEventListener(
+                FULLSCREEN_CHANGE_EVENT_NAME,
+                this.onFullscreenChange
+            );
         } else {
             console.error(REDUNDANT_INSTANCE_ERROR_MESSAGE);
         }
     }
 
     onWindowScroll = () => {
+        if (!document.fullscreenElement) {
+            this.lastKnownScrollTop = (
+                document.scrollingElement || document.body
+            ).scrollTop;
+        }
         this.updateScrollState();
     };
 
+    /*
+        Preserve the last valid scroll position, as fullscreen temporarily resets it to 0.
+        Used to restore the original position on exit.
+    */
+    onFullscreenChange = () => {
+        const isExitingFullscreen = !document.fullscreenElement;
+        if (isExitingFullscreen && this.lastKnownScrollTop > 0) {
+            const target = this.lastKnownScrollTop;
+            requestAnimationFrame(() => {
+                document.body.scrollTop = document.documentElement.scrollTop =
+                    target;
+            });
+        }
+    };
+
     onGlobalNavToggle = (event: Event) => {
         const isGlobalNavShowing: boolean = (event as CustomEvent).detail;
         HTML_ELEMENT?.setAttribute(
@@ -208,5 +234,9 @@ export default class ScrollManager extends LightningElement {
             GLOBAL_NAV_TOGGLE_EVENT_NAME,
             this.onGlobalNavToggle
         );
+        document.removeEventListener(
+            FULLSCREEN_CHANGE_EVENT_NAME,
+            this.onFullscreenChange
+        );
     }
 }