@yuneta/gobj-ui 7.26.35 → 7.26.36

package/dist/gobj-ui.cjs.js

@@ -5335,7 +5335,8 @@ var attrs_table$20 = [
 var PRIVATE_DATA$20 = {
 	windows: null,
 	mql: null,
-	mql_handler: null
+	mql_handler: null,
+	lang_shell: null
 };
 var __gclass__$20 = null;
 /******************************
@@ -5357,6 +5358,7 @@ function mt_create$20(gobj) {
 	}
 	build_dock(gobj);
 	yui_shell_watch_changes(gobj);
+	follow_language(gobj);
 	const subscriber = (0, _yuneta_gobj_js.gobj_read_pointer_attr)(gobj, "subscriber");
 	if (subscriber) (0, _yuneta_gobj_js.gobj_subscribe_event)(gobj, null, {}, subscriber);
 }
@@ -5366,6 +5368,10 @@ function mt_create$20(gobj) {
 function mt_destroy$20(gobj) {
 	let priv = gobj.priv;
 	yui_shell_unwatch_changes(gobj);
+	if (priv.lang_shell) {
+		if (!(0, _yuneta_gobj_js.gobj_is_destroying)(priv.lang_shell)) (0, _yuneta_gobj_js.gobj_unsubscribe_event)(priv.lang_shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+		priv.lang_shell = null;
+	}
 	if (priv.mql && priv.mql_handler) {
 		priv.mql.removeEventListener("change", priv.mql_handler);
 		priv.mql = null;
@@ -5377,6 +5383,37 @@ function mt_destroy$20(gobj) {
 *      Local Methods
 ***************************/
 /************************************************************
+*  Hear the language of the shell that holds the dock -- the
+*  dock outlives a shell, so it follows them: the dying one's
+*  subscription goes with it, the next one is heard. The
+*  toggle of a chip whose window's title has a DATA half has a
+*  composed title, which no key carries: it is written again in
+*  the new language (ac_language_changed).
+************************************************************/
+function follow_language(gobj) {
+	let priv = gobj.priv;
+	let shell = yui_shell_of(gobj);
+	if (shell && (0, _yuneta_gobj_js.gobj_is_destroying)(shell)) shell = null;
+	if (shell === priv.lang_shell) return;
+	if (priv.lang_shell && !(0, _yuneta_gobj_js.gobj_is_destroying)(priv.lang_shell)) (0, _yuneta_gobj_js.gobj_unsubscribe_event)(priv.lang_shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+	priv.lang_shell = null;
+	if (shell) {
+		(0, _yuneta_gobj_js.gobj_subscribe_event)(shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+		priv.lang_shell = shell;
+	}
+}
+/************************************************************
+*  The toggle's title and aria-label, in the current language:
+*  the same join as C_YUI_WINDOW's composed_title(), DATA half
+*  first. The title the window registered with when it gave no
+*  halves (a legacy caller).
+************************************************************/
+function chip_title(entry) {
+	let kind = entry.title_key ? (0, i18next.t)(entry.title_key) : "";
+	if (entry.title_prefix && kind) return `${entry.title_prefix} · ${kind}`;
+	return entry.title_prefix || kind || entry.title;
+}
+/************************************************************
 *   Inject the dock stylesheet once (theme-aware).
 ************************************************************/
 function ensure_dock_style() {
@@ -5701,7 +5738,10 @@ function ac_register_window(gobj, event, kw, src) {
 	let entry = {
 		gobj: win,
 		$chip: null,
-		minimized: false
+		minimized: false,
+		title,
+		title_key,
+		title_prefix: prefix
 	};
 	let window_name = (0, _yuneta_gobj_js.gobj_full_name)(win);
 	let $chip = (0, _yuneta_gobj_js.createElement2)([
@@ -5816,10 +5856,36 @@ function ac_toggle_window(gobj, event, kw, src) {
 *   popup layer, or its zone when inline -- may have gone with
 *   it, or be in the new one: place it again. Up to 7.26.34 an
 *   inline dock stayed in the destroyed shell's zone after a
-*   logout, detached, until a window registered.
+*   logout, detached, until a window registered. Its language
+*   is the new shell's too.
 ************************************************************/
 function ac_shell_changed(gobj, event, kw, src) {
 	apply_placement(gobj);
+	follow_language(gobj);
+	return 0;
+}
+/************************************************************
+*   EV_LANGUAGE_CHANGED -- from the shell that holds the dock.
+*   A chip's label re-translates by its key (refresh_language()
+*   reaches its kind half); the toggle's title and aria-label
+*   of a window with a DATA half are COMPOSED, so no key carries
+*   them: written again here. Up to 7.26.35 they stayed in the
+*   language the window was opened in (a reader took the
+*   aria-labelledby, which changed; the tooltip did not).
+************************************************************/
+function ac_language_changed$11(gobj, event, kw, src) {
+	let priv = gobj.priv;
+	for (let entry of priv.windows) {
+		if (!entry.title_prefix || !entry.$chip) continue;
+		let $toggle = entry.$chip.querySelector(".DOCK_CHIP_TOGGLE");
+		if (!$toggle) {
+			(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: a chip without its toggle`);
+			continue;
+		}
+		let title = chip_title(entry);
+		$toggle.setAttribute("title", title);
+		$toggle.setAttribute("aria-label", title);
+	}
 	return 0;
 }
 /***************************
@@ -5843,7 +5909,8 @@ function create_gclass$20(gclass_name) {
 		["EV_MINIMIZE_WINDOW", 0],
 		["EV_FOCUS_WINDOW", 0],
 		["EV_TOGGLE_WINDOW", 0],
-		["EV_SHELL_CHANGED", 0]
+		["EV_SHELL_CHANGED", 0],
+		["EV_LANGUAGE_CHANGED", 0]
 	], [["ST_IDLE", [
 		[
 			"EV_REGISTER_WINDOW",
@@ -5874,6 +5941,11 @@ function create_gclass$20(gclass_name) {
 			"EV_SHELL_CHANGED",
 			ac_shell_changed,
 			null
+		],
+		[
+			"EV_LANGUAGE_CHANGED",
+			ac_language_changed$11,
+			null
 		]
 	]]], gmt$20, 0, attrs_table$20, PRIVATE_DATA$20, 0, 0, 0, 0);
 	if (!__gclass__$20) return -1;

package/dist/gobj-ui.es.js

@@ -5330,7 +5330,8 @@ var attrs_table$20 = [
 var PRIVATE_DATA$20 = {
 	windows: null,
 	mql: null,
-	mql_handler: null
+	mql_handler: null,
+	lang_shell: null
 };
 var __gclass__$20 = null;
 /******************************
@@ -5352,6 +5353,7 @@ function mt_create$20(gobj) {
 	}
 	build_dock(gobj);
 	yui_shell_watch_changes(gobj);
+	follow_language(gobj);
 	const subscriber = gobj_read_pointer_attr(gobj, "subscriber");
 	if (subscriber) gobj_subscribe_event(gobj, null, {}, subscriber);
 }
@@ -5361,6 +5363,10 @@ function mt_create$20(gobj) {
 function mt_destroy$20(gobj) {
 	let priv = gobj.priv;
 	yui_shell_unwatch_changes(gobj);
+	if (priv.lang_shell) {
+		if (!gobj_is_destroying(priv.lang_shell)) gobj_unsubscribe_event(priv.lang_shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+		priv.lang_shell = null;
+	}
 	if (priv.mql && priv.mql_handler) {
 		priv.mql.removeEventListener("change", priv.mql_handler);
 		priv.mql = null;
@@ -5372,6 +5378,37 @@ function mt_destroy$20(gobj) {
 *      Local Methods
 ***************************/
 /************************************************************
+*  Hear the language of the shell that holds the dock -- the
+*  dock outlives a shell, so it follows them: the dying one's
+*  subscription goes with it, the next one is heard. The
+*  toggle of a chip whose window's title has a DATA half has a
+*  composed title, which no key carries: it is written again in
+*  the new language (ac_language_changed).
+************************************************************/
+function follow_language(gobj) {
+	let priv = gobj.priv;
+	let shell = yui_shell_of(gobj);
+	if (shell && gobj_is_destroying(shell)) shell = null;
+	if (shell === priv.lang_shell) return;
+	if (priv.lang_shell && !gobj_is_destroying(priv.lang_shell)) gobj_unsubscribe_event(priv.lang_shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+	priv.lang_shell = null;
+	if (shell) {
+		gobj_subscribe_event(shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+		priv.lang_shell = shell;
+	}
+}
+/************************************************************
+*  The toggle's title and aria-label, in the current language:
+*  the same join as C_YUI_WINDOW's composed_title(), DATA half
+*  first. The title the window registered with when it gave no
+*  halves (a legacy caller).
+************************************************************/
+function chip_title(entry) {
+	let kind = entry.title_key ? t(entry.title_key) : "";
+	if (entry.title_prefix && kind) return `${entry.title_prefix} · ${kind}`;
+	return entry.title_prefix || kind || entry.title;
+}
+/************************************************************
 *   Inject the dock stylesheet once (theme-aware).
 ************************************************************/
 function ensure_dock_style() {
@@ -5696,7 +5733,10 @@ function ac_register_window(gobj, event, kw, src) {
 	let entry = {
 		gobj: win,
 		$chip: null,
-		minimized: false
+		minimized: false,
+		title,
+		title_key,
+		title_prefix: prefix
 	};
 	let window_name = gobj_full_name(win);
 	let $chip = createElement2([
@@ -5811,10 +5851,36 @@ function ac_toggle_window(gobj, event, kw, src) {
 *   popup layer, or its zone when inline -- may have gone with
 *   it, or be in the new one: place it again. Up to 7.26.34 an
 *   inline dock stayed in the destroyed shell's zone after a
-*   logout, detached, until a window registered.
+*   logout, detached, until a window registered. Its language
+*   is the new shell's too.
 ************************************************************/
 function ac_shell_changed(gobj, event, kw, src) {
 	apply_placement(gobj);
+	follow_language(gobj);
+	return 0;
+}
+/************************************************************
+*   EV_LANGUAGE_CHANGED -- from the shell that holds the dock.
+*   A chip's label re-translates by its key (refresh_language()
+*   reaches its kind half); the toggle's title and aria-label
+*   of a window with a DATA half are COMPOSED, so no key carries
+*   them: written again here. Up to 7.26.35 they stayed in the
+*   language the window was opened in (a reader took the
+*   aria-labelledby, which changed; the tooltip did not).
+************************************************************/
+function ac_language_changed$11(gobj, event, kw, src) {
+	let priv = gobj.priv;
+	for (let entry of priv.windows) {
+		if (!entry.title_prefix || !entry.$chip) continue;
+		let $toggle = entry.$chip.querySelector(".DOCK_CHIP_TOGGLE");
+		if (!$toggle) {
+			log_error(`${gobj_short_name(gobj)}: a chip without its toggle`);
+			continue;
+		}
+		let title = chip_title(entry);
+		$toggle.setAttribute("title", title);
+		$toggle.setAttribute("aria-label", title);
+	}
 	return 0;
 }
 /***************************
@@ -5838,7 +5904,8 @@ function create_gclass$20(gclass_name) {
 		["EV_MINIMIZE_WINDOW", 0],
 		["EV_FOCUS_WINDOW", 0],
 		["EV_TOGGLE_WINDOW", 0],
-		["EV_SHELL_CHANGED", 0]
+		["EV_SHELL_CHANGED", 0],
+		["EV_LANGUAGE_CHANGED", 0]
 	], [["ST_IDLE", [
 		[
 			"EV_REGISTER_WINDOW",
@@ -5869,6 +5936,11 @@ function create_gclass$20(gclass_name) {
 			"EV_SHELL_CHANGED",
 			ac_shell_changed,
 			null
+		],
+		[
+			"EV_LANGUAGE_CHANGED",
+			ac_language_changed$11,
+			null
 		]
 	]]], gmt$20, 0, attrs_table$20, PRIVATE_DATA$20, 0, 0, 0, 0);
 	if (!__gclass__$20) return -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.26.35",
+  "version": "7.26.36",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

package/src/c_yui_window_manager.js

@@ -40,6 +40,8 @@ import {
     gobj_short_name,
     gobj_read_pointer_attr,
     gobj_subscribe_event,
+    gobj_unsubscribe_event,
+    gobj_is_destroying,
     gobj_send_event,
     createElement2,
     gobj_write_attr,
@@ -92,9 +94,10 @@ SDATA_END()
 ];
 
 let PRIVATE_DATA = {
-    windows: null,      /*  [{gobj, $chip, minimized}]  */
+    windows: null,      /*  [{gobj, $chip, minimized, title, title_key, title_prefix}]  */
     mql: null,          /*  MediaQueryList when dock_mode is 'responsive'  */
     mql_handler: null,  /*  its change listener (kept for teardown)  */
+    lang_shell: null,   /*  the shell whose EV_LANGUAGE_CHANGED we hear  */
 };
 
 let __gclass__ = null;
@@ -139,6 +142,7 @@ function mt_create(gobj)
      *  a shell is built or destroyed, it places itself again
      *  (ac_shell_changed). Unwatched in mt_destroy.  */
     yui_shell_watch_changes(gobj);
+    follow_language(gobj);
 
     /*
      *  SERVICE subscription model
@@ -157,6 +161,12 @@ function mt_destroy(gobj)
     let priv = gobj.priv;
 
     yui_shell_unwatch_changes(gobj);
+    if(priv.lang_shell) {
+        if(!gobj_is_destroying(priv.lang_shell)) {
+            gobj_unsubscribe_event(priv.lang_shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+        }
+        priv.lang_shell = null;
+    }
 
     if(priv.mql && priv.mql_handler) {
         priv.mql.removeEventListener("change", priv.mql_handler);
@@ -177,6 +187,54 @@ function mt_destroy(gobj)
 
 
 
+/************************************************************
+ *  Hear the language of the shell that holds the dock -- the
+ *  dock outlives a shell, so it follows them: the dying one's
+ *  subscription goes with it, the next one is heard. The
+ *  toggle of a chip whose window's title has a DATA half has a
+ *  composed title, which no key carries: it is written again in
+ *  the new language (ac_language_changed).
+ ************************************************************/
+function follow_language(gobj)
+{
+    let priv = gobj.priv;
+
+    let shell = yui_shell_of(gobj);
+    if(shell && gobj_is_destroying(shell)) {
+        shell = null;
+    }
+    if(shell === priv.lang_shell) {
+        return;
+    }
+    if(priv.lang_shell && !gobj_is_destroying(priv.lang_shell)) {
+        gobj_unsubscribe_event(priv.lang_shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+    }
+    priv.lang_shell = null;
+    if(shell) {
+        gobj_subscribe_event(shell, "EV_LANGUAGE_CHANGED", {}, gobj);
+        priv.lang_shell = shell;
+    }
+}
+
+/************************************************************
+ *  The toggle's title and aria-label, in the current language:
+ *  the same join as C_YUI_WINDOW's composed_title(), DATA half
+ *  first. The title the window registered with when it gave no
+ *  halves (a legacy caller).
+ ************************************************************/
+function chip_title(entry)
+{
+    /*  `title_key` is the window's title, a key its HOST chose.  */
+    let kind = entry.title_key ? t(/* i18n: data */ entry.title_key) : "";
+    if(entry.title_prefix && kind) {
+        return `${entry.title_prefix} · ${kind}`;
+    }
+    return entry.title_prefix || kind || entry.title;
+}
+
+
+
+
 /************************************************************
  *   Inject the dock stylesheet once (theme-aware).
  ************************************************************/
@@ -588,7 +646,8 @@ function ac_register_window(gobj, event, kw, src)
         return item[1].id;
     });
 
-    let entry = {gobj: win, $chip: null, minimized: false};
+    let entry = {gobj: win, $chip: null, minimized: false,
+                 title: title, title_key: title_key, title_prefix: prefix};
     /*  The chip is a CONTAINER of two sibling controls, and no control
      *  itself: the TOGGLE (minimise / bring back, the whole label) and
      *  the ✕ (EV_CLOSE_WINDOW → the window's own teardown →
@@ -735,11 +794,42 @@ function ac_toggle_window(gobj, event, kw, src)
  *   popup layer, or its zone when inline -- may have gone with
  *   it, or be in the new one: place it again. Up to 7.26.34 an
  *   inline dock stayed in the destroyed shell's zone after a
- *   logout, detached, until a window registered.
+ *   logout, detached, until a window registered. Its language
+ *   is the new shell's too.
  ************************************************************/
 function ac_shell_changed(gobj, event, kw, src)
 {
     apply_placement(gobj);
+    follow_language(gobj);
+    return 0;
+}
+
+/************************************************************
+ *   EV_LANGUAGE_CHANGED -- from the shell that holds the dock.
+ *   A chip's label re-translates by its key (refresh_language()
+ *   reaches its kind half); the toggle's title and aria-label
+ *   of a window with a DATA half are COMPOSED, so no key carries
+ *   them: written again here. Up to 7.26.35 they stayed in the
+ *   language the window was opened in (a reader took the
+ *   aria-labelledby, which changed; the tooltip did not).
+ ************************************************************/
+function ac_language_changed(gobj, event, kw, src)
+{
+    let priv = gobj.priv;
+
+    for(let entry of priv.windows) {
+        if(!entry.title_prefix || !entry.$chip) {
+            continue;   // a key alone: data-i18n-title / -aria-label re-translate it
+        }
+        let $toggle = entry.$chip.querySelector(".DOCK_CHIP_TOGGLE");
+        if(!$toggle) {
+            log_error(`${gobj_short_name(gobj)}: a chip without its toggle`);
+            continue;
+        }
+        let title = chip_title(entry);
+        $toggle.setAttribute("title", title);
+        $toggle.setAttribute("aria-label", title);
+    }
     return 0;
 }
 
@@ -782,6 +872,7 @@ function create_gclass(gclass_name)
             ["EV_FOCUS_WINDOW",         ac_focus_window,        null],
             ["EV_TOGGLE_WINDOW",        ac_toggle_window,       null],
             ["EV_SHELL_CHANGED",        ac_shell_changed,       null],
+            ["EV_LANGUAGE_CHANGED",     ac_language_changed,    null],
         ]]
     ];
 
@@ -795,6 +886,7 @@ function create_gclass(gclass_name)
         ["EV_FOCUS_WINDOW",         0],
         ["EV_TOGGLE_WINDOW",        0],
         ["EV_SHELL_CHANGED",        0],
+        ["EV_LANGUAGE_CHANGED",     0],
     ];
 
     __gclass__ = gclass_create(

package/src/window_layer.wiring.test.js

@@ -36,7 +36,7 @@ const {
     gobj_start, gobj_stop, gobj_destroy, gobj_read_attr, gobj_is_destroying,
     set_log_callback,
 } = await import("@yuneta/gobj-js");
-const {register_c_yui_shell, yui_shell_window_layer} = await import("./c_yui_shell.js");
+const {register_c_yui_shell, yui_shell_window_layer, yui_shell_language_changed} = await import("./c_yui_shell.js");
 const {register_c_yui_nav} = await import("./c_yui_nav.js");
 const {register_c_yui_window} = await import("./c_yui_window.js");
 const {register_c_yui_window_manager} = await import("./c_yui_window_manager.js");
@@ -369,3 +369,43 @@ describe("the stacking of the windows", () => {
         expect(z_of(windows) < z_of(drawer)).toBe(true);
     });
 });
+
+describe("the title of a dock chip changes language (REV-CLOUD V23, QA of estadodelaire)", () => {
+    /*  A window with a DATA half (a device id) and a KIND half (a key):
+     *  the toggle's title and aria-label are COMPOSED, so no key carries
+     *  them. Up to 7.26.35 they stayed in the language the window was
+     *  opened in; the dock composes them again on the shell's
+     *  EV_LANGUAGE_CHANGED -- of the shell that holds it now, across a
+     *  logout.  */
+    test("composed again in the new language, and after a logout by the next shell", async () => {
+        const i18next = (await import("i18next")).default;
+        i18next.addResourceBundle("en", "translation", {"device alarms": "Device alarms"}, true, true);
+        i18next.addResourceBundle("es", "translation", {"device alarms": "Alarmas del dispositivo"}, true, true);
+        await i18next.changeLanguage("en");
+
+        const shell = build_shell();
+        const dock = gobj_create_service(`lang_dock_${++seq}`, "C_YUI_WINDOW_MANAGER", {}, yuno);
+        gobj_start(dock);
+        const w = open_window(`lang_w_${seq}`,
+            {title: "device alarms", title_prefix: "DEV-1", manager: dock});
+        const $toggle = gobj_read_attr(dock, "$container").querySelector(".DOCK_CHIP_TOGGLE");
+        expect($toggle.getAttribute("title")).toBe("DEV-1 · Device alarms");
+
+        await i18next.changeLanguage("es");
+        yui_shell_language_changed(shell);
+        expect($toggle.getAttribute("title")).toBe("DEV-1 · Alarmas del dispositivo");
+        expect($toggle.getAttribute("aria-label")).toBe("DEV-1 · Alarmas del dispositivo");
+
+        logout(shell);
+        const shell2 = build_shell();
+        await i18next.changeLanguage("en");
+        yui_shell_language_changed(shell2);
+        expect($toggle.getAttribute("title")).toBe("DEV-1 · Device alarms");
+        expect($toggle.getAttribute("aria-label")).toBe("DEV-1 · Device alarms");
+        expect(errors()).toEqual([]);
+
+        close(w);
+        gobj_destroy(dock);
+        logout(shell2);
+    });
+});