@panoramax/web-viewer 5.3.0-develop-4e1ca8c3 → 5.3.0-develop-a0d7774d

package/build/esm/components/core/Basic.js

@@ -9,7 +9,7 @@ import BasicStyles from "./Basic.css" with { type: "css" };
 document.adoptedStyleSheets.push(AtkinsonStyles);
 document.adoptedStyleSheets.push(BasicStyles);
 
-const __COMMIT_HASH__ = "4e1ca8c";
+const __COMMIT_HASH__ = "a0d7774";
 const __PACKAGE_VERSION__ = "5.3.0";
 const __PACKAGE_ISSUES_URL__ = "https://gitlab.com/panoramax/clients/web-viewer/-/work_items";
 

package/build/esm/components/menus/SemanticsList.js

@@ -73,8 +73,10 @@ export default class SemanticsList extends LitElement {
 		onceParentAvailable(this).then(() => {
 			this._parent.psv?.addEventListener("picture-loaded", this._onPicChange.bind(this));
 			this._parent.psv?.addEventListener("annotation-focused", e => this.showAnnotation(e.detail.annotationId));
-			this._parent.psv?.addEventListener("annotations-unfocused", () => this._onListItemClick(null));
-			this._parent.psv?.addEventListener("semantics-unfocused", () => this._onListItemClick(null));
+			this._parent.psv?.addEventListener("annotations-unfocused", e => {
+				if(e.detail.source === "user-click") { delete this._prevPsvView; }
+				this._onListItemClick(null);
+			});
 
 			const selectedAnnots = this._parent.psv.getSelectedAnnotations();
 			if(selectedAnnots.length > 0) {

package/build/esm/components/ui/Photo.js

@@ -559,7 +559,14 @@ export default class Photo extends PSViewer {
 			// Check if there is no blocked focus on
 			const ba = this.getSelectedAnnotations().find(a => this._myMarkers.markers["annotation-"+a]?.config?.data?.blockFocus);
 			if(ba) { return; }
-			this.focusOnAnnotation(e.marker.data.id);
+
+			// Check if clicked annotation is not the selected one
+			if(this.getSelectedAnnotations().find(a => e.marker.id.endsWith(a))) {
+				// Skip PSV move due to semantics list
+				this.unfocusAnnotation(false, false, "user-click");
+			} else {
+				this.focusOnAnnotation(e.marker.data.id);
+			}
 		}
 	}
 
@@ -1206,10 +1213,11 @@ export default class Photo extends PSViewer {
 			data: {
 				selected: true,
 				blockFocus
-			}
+			},
+			tooltip: this._parent._t.pnx.semantics_annotation_tooltip_close,
 		});
 		this._myMarkers.gotoMarker(annotationId, 0);
-		this.zoom(65);
+		this.zoom(Math.max(65, this.getZoomLevel()));
 
 		/**
 		 * Event launched on annotation focus
@@ -1228,8 +1236,9 @@ export default class Photo extends PSViewer {
 	 * @memberof Panoramax.components.ui.Photo#
 	 * @param {boolean} [skipEvent=false] Set to true to avoid launching annotations-unfocused event
 	 * @param {boolean} [skipBlocked=false] Set to true to not unfocus blocked annotations
+	 * @param {string} [source] Set which event initiated this call ("user-click" for example)
 	 */
-	unfocusAnnotation(skipEvent = false, skipBlocked = false) {
+	unfocusAnnotation(skipEvent = false, skipBlocked = false, source = null) {
 		const selectedAnnotations = this.getSelectedAnnotations();
 
 		if(selectedAnnotations.length > 0) {
@@ -1250,7 +1259,8 @@ export default class Photo extends PSViewer {
 					data: {
 						selected: false,
 						blockFocus: false,
-					}
+					},
+					tooltip: this._parent._t.pnx.semantics_annotation_tooltip,
 				});
 			});
 
@@ -1258,9 +1268,10 @@ export default class Photo extends PSViewer {
 				/**
 				 * Event for pictures annotation unfocus
 				 * @event Panoramax.components.ui.Photo#annotations-unfocused
-				 * @type {Event}
+				 * @type {CustomEvent}
+				 * @property {string} detail.source The original source event type (user-click, null)
 				 */
-				this.dispatchEvent(new Event("annotations-unfocused"));
+				this.dispatchEvent(new CustomEvent("annotations-unfocused", { detail: { source }}));
 			}
 		}
 	}

package/build/esm/translations/en.json

@@ -219,6 +219,7 @@
         "semantics_features_default_title": "Tag {nb}",
         "semantics_features_subtitle": "{nb} associated properties",
         "semantics_annotation_tooltip": "Click to see details",
+        "semantics_annotation_tooltip_close": "Click to unselect",
         "semantics_show_all_tags": "Show all tags",
         "semantics_hide_all_tags": "Hide all tags",
         "semantics_key": "Key",

package/build/esm/translations/fr.json

@@ -219,6 +219,7 @@
         "semantics_features_default_title": "Tag {nb}",
         "semantics_features_subtitle": "{nb} attributs associés",
         "semantics_annotation_tooltip": "Cliquez pour voir les détails",
+        "semantics_annotation_tooltip_close": "Cliquez pour désélectionner",
         "semantics_show_all_tags": "Voir tous les attributs",
         "semantics_hide_all_tags": "Masquer les attributs",
         "semantics_key": "Clé",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "5.3.0-develop-4e1ca8c3",
+  "version": "5.3.0-develop-a0d7774d",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "./build/cjs/index.js",
   "module": "./build/esm/index.js",