Exit fullscreen with correct old size.

pfh · Aug 15, 2023 · 9145037 · 9145037
1 parent 5af71e4
commit 9145037
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/inst/htmlwidgets/langevitour.js b/inst/htmlwidgets/langevitour.js
@@ -132,10 +132,8 @@ HTMLWidgets.widget({
                 // Supplied width and height are based on getBoundingClientRect.
                 // Wrong eg when using revealjs and slide is scaled.
                 // Ignore.
-                width = el.offsetWidth;
-                height = el.offsetHeight;
-
-                tour.resize(width, height);
+                //
+                // tour.resize(width, height);
             }
         };
     }

diff --git a/inst/htmlwidgets/lib/langevitour-pack.js b/inst/htmlwidgets/lib/langevitour-pack.js
diff --git a/inst/htmlwidgets/lib/langevitour-pack.js.map b/inst/htmlwidgets/lib/langevitour-pack.js.map
diff --git a/lib/langevitour.js b/lib/langevitour.js
diff --git a/lib/langevitour.js.map b/lib/langevitour.js.map
diff --git a/src/langevitour.ts b/src/langevitour.ts
@@ -391,7 +391,7 @@ export class Langevitour extends EventTarget {
 
         let handleWindowSize = () => {
             let el = this.shadowDiv;
-            if (document.fullscreenElement !== el) 
+            if (document.fullscreenElement !== el || this.originalWidth < 0) 
                 return;
             let width = window.innerWidth;
             let height = window.innerHeight;
@@ -408,8 +408,10 @@ export class Langevitour extends EventTarget {
             let el = this.shadowDiv;
             if (document.fullscreenElement === el) {
                 // Stash original size
-                this.originalWidth = this.width;
-                this.originalHeight = this.height;
+                if (this.originalWidth < 0) {
+                    this.originalWidth = this.width;
+                    this.originalHeight = this.height;
+                }
                 handleWindowSize();
                 // ... further window resize events may occur while full screen ...
             } else if (this.originalWidth >= 0) {