@panoramax/web-viewer 4.0.1-develop-b776b1ef → 4.0.1-develop-c7df5a60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "4.0.1-develop-b776b1ef",
+  "version": "4.0.1-develop-c7df5a60",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "build/index.js",
   "author": "Panoramax team",

package/src/components/core/PhotoViewer.js

@@ -323,7 +323,11 @@ export default class PhotoViewer extends Basic {
 		for(let cn of this.grid.childNodes) {
 			if(cn.getAttribute("slot") !== "bg") {
 				cn.addEventListener("focusin", () => keytonone());
-				cn.addEventListener("focusout", () => keytopsv());
+				cn.addEventListener("focusout", () => {
+					if(this.popup.getAttribute("visible") === null) {
+						keytopsv();
+					}
+				});
 			}
 		}
 	}

package/src/components/core/Viewer.js

@@ -336,11 +336,11 @@ export default class Viewer extends PhotoViewer {
 		};
 		const keytopsv = () => {
 			this.psv.startKeyboardControl();
-			this.map?.keyboard?.disable();
+			this.map.keyboard.disable();
 		};
 		const keytonone = () => {
 			this.psv.stopKeyboardControl();
-			this.map?.keyboard?.disable();
+			this.map.keyboard.disable();
 		};
 		const keytofocused = () => {
 			if(this.map && this.isMapWide()) { keytomap(); }
@@ -350,6 +350,7 @@ export default class Viewer extends PhotoViewer {
 		// General focus change
 		this.addEventListener("focus-changed", e => {
 			if(e.detail.focus === "map") { keytomap(); }
+			if(this.popup.getAttribute("visible")) { keytonone(); }
 			else { keytopsv(); }
 		});
 
@@ -361,7 +362,11 @@ export default class Viewer extends PhotoViewer {
 		for(let cn of this.grid.childNodes) {
 			if(cn.getAttribute("slot") !== "bg") {
 				cn.addEventListener("focusin", () => keytonone());
-				cn.addEventListener("focusout", () => keytofocused());
+				cn.addEventListener("focusout", () => {
+					if(this.popup.getAttribute("visible") === null) {
+						keytofocused();
+					}
+				});
 			}
 		}
 	}

package/src/components/ui/widgets/Player.js

@@ -105,6 +105,7 @@ export default class Player extends LitElement {
 				dir="row"
 				size=${this.size}
 				class="pnx-print-hidden"
+				style=${!this._activePrev && !this._activePlay && !this._activeNext ? "display: none": ""}
 			>
 				<pnx-button
 					kind="superflat"