@panoramax/web-viewer 3.2.3-develop-587a6b56 → 3.2.3-develop-4ea4ef45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "3.2.3-develop-587a6b56",
+  "version": "3.2.3-develop-4ea4ef45",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "build/index.js",
   "author": "Panoramax team",

package/src/components/menus/PictureLegend.js

@@ -2,6 +2,7 @@ import { LitElement, html, nothing, css } from "lit";
 import { classMap } from "lit/directives/class-map.js";
 import { fa } from "../../utils/widgets";
 import { faArrowLeft } from "@fortawesome/free-solid-svg-icons/faArrowLeft";
+import { faChevronUp } from "@fortawesome/free-solid-svg-icons/faChevronUp";
 import { faChevronDown } from "@fortawesome/free-solid-svg-icons/faChevronDown";
 import { faUser } from "@fortawesome/free-solid-svg-icons/faUser";
 import { faCalendarAlt } from "@fortawesome/free-solid-svg-icons/faCalendarAlt";
@@ -151,7 +152,7 @@ export default class PictureLegend extends LitElement {
 	_onPicChange(picMeta) {
 		clearTimeout(this._addrTimer1);
 		this._caption = picMeta?.caption;
-		this._expanded = !this.collapsable;
+		this._expanded = this._expanded && this.collapsable;
 		
 		if(picMeta) {
 			const coordsHash = `${picMeta.gps[0]}/${picMeta.gps[1]}`;
@@ -177,8 +178,7 @@ export default class PictureLegend extends LitElement {
 
 	/** @private */
 	_onBackClick() {
-		if(this._expanded && this.collapsable) { this._expanded = false; }
-		else { this._parent.select(); }
+		this._parent._setFocus?.("map");
 	}
 
 	/** @private */
@@ -190,12 +190,14 @@ export default class PictureLegend extends LitElement {
 
 		return html`
 			<div class="headline">
-				<pnx-button
-					kind="superinline"
-					@click=${this._onBackClick}
-				>
-					${fa(faArrowLeft)}
-				</pnx-button>
+				${this._parent._setFocus ? html`
+					<pnx-button
+						kind="superinline"
+						@click=${this._onBackClick}
+					>
+						${fa(faArrowLeft)}
+					</pnx-button>
+				` : nothing}
 
 				<div id="pic-legend-addr">
 					${this._addr?.length > 0 ? this._addr : html`<span class="pnx-placeholder-loading">&nbsp;</span>`}
@@ -236,14 +238,14 @@ export default class PictureLegend extends LitElement {
 				</slot>
 			</div>
 
+			<pnx-picture-metadata class=${shownExpanded} ._parent=${this._parent}></pnx-picture-metadata>
+
 			${this.collapsable ? html`<pnx-button
-				kind="full"
+				kind="inline"
+				size="sm"
 				id="pic-legend-expand"
-				class=${hiddenExpanded}
-				@click=${() => this._expanded = true}
-			>${fa(faChevronDown)}</pnx-button>` : nothing}
-
-			<pnx-picture-metadata class=${shownExpanded} ._parent=${this._parent}></pnx-picture-metadata>
+				@click=${() => this._expanded = !this._expanded}
+			>${this._expanded ? fa(faChevronUp) : fa(faChevronDown)}</pnx-button>` : nothing}
 		`;
 	}
 }

package/src/utils/i18n.js

@@ -7,6 +7,7 @@ import T_fr from "../translations/fr.json";
 import T_hu from "../translations/hu.json";
 import T_it from "../translations/it.json";
 import T_ja from "../translations/ja.json";
+import T_nl from "../translations/nl.json";
 import T_pl from "../translations/pl.json";
 import T_sv from "../translations/sv.json";
 import T_zh_Hant from "../translations/zh_Hant.json";
@@ -14,7 +15,7 @@ import T_zh_Hant from "../translations/zh_Hant.json";
 const FALLBACK_LOCALE = "en";
 const TRANSLATIONS = {
 	"da": T_da, "de": T_de, "eo": T_eo, "en": T_en, "es": T_es, "fr": T_fr,
-	"hu": T_hu, "it": T_it, "ja": T_ja, "pl": T_pl, "sv": T_sv, "zh-Hant": T_zh_Hant,
+	"hu": T_hu, "it": T_it, "ja": T_ja, "nl": T_nl, "pl": T_pl, "sv": T_sv, "zh-Hant": T_zh_Hant,
 	"zh": T_zh_Hant,
 };