@yuneta/gobj-ui 7.23.139 → 7.23.140

package/dist/gobj-ui.cjs.js

@@ -911,6 +911,7 @@ var PRIVATE_DATA$21 = {
 	navs: [],
 	item_index: {},
 	section_pos: {},
+	route_mru: [],
 	sub_routes: {},
 	event_handlers: {},
 	hash_handler: null,
@@ -1619,6 +1620,7 @@ function navigate_to(gobj, route, depth, no_drain) {
 	stage.active_route = matched_route;
 	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "current_route", route);
 	remember_position(gobj, route);
+	remember_route(gobj, route);
 	update_secondary_nav_visibility(gobj, entry);
 	close_all_drawers(gobj);
 	close_toolbar_dropdown(gobj);
@@ -2645,6 +2647,40 @@ function remembered_position(gobj, route) {
 	return last;
 }
 /************************************************************
+*  Every route the shell lands on, newest last, a route once.
+*  Bounded: it answers "where was the reader last under X", and
+*  a page that has been open all day has no business growing it.
+************************************************************/
+var ROUTE_MRU_MAX = 64;
+function remember_route(gobj, route) {
+	let mru = gobj.priv.route_mru;
+	let i = mru.indexOf(route);
+	if (i >= 0) mru.splice(i, 1);
+	mru.push(route);
+	if (mru.length > ROUTE_MRU_MAX) mru.splice(0, mru.length - ROUTE_MRU_MAX);
+}
+/************************************************************
+*  Where the reader last was UNDER `route`: the most recent
+*  visited route that is `route` itself or lies below it, or
+*  `route` when none does. A mirror of the url for the page, like
+*  the section memory -- never stored, never applied on its own:
+*  a control that wants to go back to a view AS IT WAS LEFT asks,
+*  and navigates there itself.
+*
+*  What it is for: a treedb graph's focus lives in the url
+*  (`<graph>/<topic>`), so a button that opened the bare route
+*  took the focus away every time it was used.
+************************************************************/
+function yui_shell_last_route_under(shell_gobj, route) {
+	let priv = shell_gobj && shell_gobj.priv;
+	if (!priv || !(0, _yuneta_gobj_js.is_array)(priv.route_mru) || !route) return route;
+	for (let i = priv.route_mru.length - 1; i >= 0; i--) {
+		let r = priv.route_mru[i];
+		if (r === route || r.indexOf(route + "/") === 0) return r;
+	}
+	return route;
+}
+/************************************************************
 *  Resolve the shell that governs `gobj`: the nearest
 *  C_YUI_SHELL ancestor, else the last shell created on the
 *  page (apps have exactly one).  Null when no shell exists —
@@ -21908,15 +21944,12 @@ function cmd_get_topic_data$1(gobj, cmd, kw, src) {
 ************************************************************/
 function build_ui$6(gobj) {
 	let source_url = (0, _yuneta_gobj_js.gobj_read_str_attr)(gobj, "source_url") || "";
-	let routes = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "card_action_routes");
-	let graph_tpl = (0, _yuneta_gobj_js.is_object)(routes) && typeof routes.graph === "string" ? routes.graph : "";
-	let graph_href = /\/\{topic\}$/.test(graph_tpl) ? graph_tpl.replace(/\/\{topic\}$/, "") : "";
+	let graph_href = graph_route_of(gobj);
 	let graph_items = [];
 	if (graph_href) graph_items.push([
-		"a",
+		"button",
 		{
 			class: "button TREEDB_GRAPH_BTN",
-			href: graph_href,
 			style: "margin-left:auto;",
 			title: (0, i18next.t)("graph"),
 			"aria-label": (0, i18next.t)("graph"),
@@ -21931,7 +21964,11 @@ function build_ui$6(gobj) {
 			"span",
 			{ i18n: "graph" },
 			"graph"
-		]]
+		]],
+		{ click: (evt) => {
+			evt.stopPropagation();
+			(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_OPEN_GRAPH", {}, gobj);
+		} }
 	]);
 	let $container = (0, _yuneta_gobj_js.createElement2)([
 		"div",
@@ -22092,6 +22129,17 @@ function build_ui$6(gobj) {
 	if ((0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "with_cards_landing")) show_topics_landing(gobj);
 }
 /************************************************************
+*  The graph's route with no topic: the host's card template
+*  `card_action_routes.graph` without its trailing `/{topic}`,
+*  as a ROUTE (no `#`). "" when the host gives no such template.
+************************************************************/
+function graph_route_of(gobj) {
+	let routes = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "card_action_routes");
+	let tpl = (0, _yuneta_gobj_js.is_object)(routes) && typeof routes.graph === "string" ? routes.graph : "";
+	if (!/\/\{topic\}$/.test(tpl)) return "";
+	return tpl.replace(/\/\{topic\}$/, "").replace(/^#/, "");
+}
+/************************************************************
 *  Is the backend session live? The Raw JSON viewer issues a remote
 *  print-tranger, so it only makes sense with a session — the remote
 *  (C_IEVENT_CLI) is in ST_SESSION exactly while connected.
@@ -23460,6 +23508,26 @@ function ac_open_json$1(gobj, event, kw, src) {
 	return 0;
 }
 /********************************************
+*  Open the graph where the reader left it: its last visited
+*  route under the graph's base -- `<graph>/<topic>` when a topic
+*  was focused there -- or the bare base when the graph was never
+*  opened in this page. A user move: pushed, so Back returns.
+********************************************/
+function ac_open_graph(gobj, event, kw, src) {
+	let base = graph_route_of(gobj);
+	if (!base) {
+		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: open graph with no graph route`);
+		return -1;
+	}
+	let shell = yui_shell_of(gobj);
+	if (!shell) {
+		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: open graph with no shell`);
+		return -1;
+	}
+	yui_shell_navigate(shell, yui_shell_last_route_under(shell, base), { push: true });
+	return 0;
+}
+/********************************************
 *  The viewer asked to load a collapsed subtree (tranger mode only):
 *  re-issue print-tranger for that path.
 ********************************************/
@@ -23558,6 +23626,11 @@ function create_gclass$6(gclass_name) {
 			ac_open_json$1,
 			null
 		],
+		[
+			"EV_OPEN_GRAPH",
+			ac_open_graph,
+			null
+		],
 		[
 			"EV_EXPAND_PATH",
 			ac_json_expand_path$1,
@@ -23622,6 +23695,7 @@ function create_gclass$6(gclass_name) {
 		["EV_RECORD_WRITTEN", _yuneta_gobj_js.event_flag_t.EVF_OUTPUT_EVENT | _yuneta_gobj_js.event_flag_t.EVF_NO_WARN_SUBS],
 		["EV_REFRESH_TOPIC", 0],
 		["EV_OPEN_JSON", 0],
+		["EV_OPEN_GRAPH", 0],
 		["EV_EXPAND_PATH", 0],
 		["EV_JSON_CLOSED", 0],
 		["EV_SHOW", 0],

package/dist/gobj-ui.es.js

@@ -906,6 +906,7 @@ var PRIVATE_DATA$21 = {
 	navs: [],
 	item_index: {},
 	section_pos: {},
+	route_mru: [],
 	sub_routes: {},
 	event_handlers: {},
 	hash_handler: null,
@@ -1614,6 +1615,7 @@ function navigate_to(gobj, route, depth, no_drain) {
 	stage.active_route = matched_route;
 	gobj_write_attr(gobj, "current_route", route);
 	remember_position(gobj, route);
+	remember_route(gobj, route);
 	update_secondary_nav_visibility(gobj, entry);
 	close_all_drawers(gobj);
 	close_toolbar_dropdown(gobj);
@@ -2640,6 +2642,40 @@ function remembered_position(gobj, route) {
 	return last;
 }
 /************************************************************
+*  Every route the shell lands on, newest last, a route once.
+*  Bounded: it answers "where was the reader last under X", and
+*  a page that has been open all day has no business growing it.
+************************************************************/
+var ROUTE_MRU_MAX = 64;
+function remember_route(gobj, route) {
+	let mru = gobj.priv.route_mru;
+	let i = mru.indexOf(route);
+	if (i >= 0) mru.splice(i, 1);
+	mru.push(route);
+	if (mru.length > ROUTE_MRU_MAX) mru.splice(0, mru.length - ROUTE_MRU_MAX);
+}
+/************************************************************
+*  Where the reader last was UNDER `route`: the most recent
+*  visited route that is `route` itself or lies below it, or
+*  `route` when none does. A mirror of the url for the page, like
+*  the section memory -- never stored, never applied on its own:
+*  a control that wants to go back to a view AS IT WAS LEFT asks,
+*  and navigates there itself.
+*
+*  What it is for: a treedb graph's focus lives in the url
+*  (`<graph>/<topic>`), so a button that opened the bare route
+*  took the focus away every time it was used.
+************************************************************/
+function yui_shell_last_route_under(shell_gobj, route) {
+	let priv = shell_gobj && shell_gobj.priv;
+	if (!priv || !is_array(priv.route_mru) || !route) return route;
+	for (let i = priv.route_mru.length - 1; i >= 0; i--) {
+		let r = priv.route_mru[i];
+		if (r === route || r.indexOf(route + "/") === 0) return r;
+	}
+	return route;
+}
+/************************************************************
 *  Resolve the shell that governs `gobj`: the nearest
 *  C_YUI_SHELL ancestor, else the last shell created on the
 *  page (apps have exactly one).  Null when no shell exists —
@@ -21903,15 +21939,12 @@ function cmd_get_topic_data$1(gobj, cmd, kw, src) {
 ************************************************************/
 function build_ui$6(gobj) {
 	let source_url = gobj_read_str_attr(gobj, "source_url") || "";
-	let routes = gobj_read_attr(gobj, "card_action_routes");
-	let graph_tpl = is_object(routes) && typeof routes.graph === "string" ? routes.graph : "";
-	let graph_href = /\/\{topic\}$/.test(graph_tpl) ? graph_tpl.replace(/\/\{topic\}$/, "") : "";
+	let graph_href = graph_route_of(gobj);
 	let graph_items = [];
 	if (graph_href) graph_items.push([
-		"a",
+		"button",
 		{
 			class: "button TREEDB_GRAPH_BTN",
-			href: graph_href,
 			style: "margin-left:auto;",
 			title: t("graph"),
 			"aria-label": t("graph"),
@@ -21926,7 +21959,11 @@ function build_ui$6(gobj) {
 			"span",
 			{ i18n: "graph" },
 			"graph"
-		]]
+		]],
+		{ click: (evt) => {
+			evt.stopPropagation();
+			gobj_send_event(gobj, "EV_OPEN_GRAPH", {}, gobj);
+		} }
 	]);
 	let $container = createElement2([
 		"div",
@@ -22087,6 +22124,17 @@ function build_ui$6(gobj) {
 	if (gobj_read_bool_attr(gobj, "with_cards_landing")) show_topics_landing(gobj);
 }
 /************************************************************
+*  The graph's route with no topic: the host's card template
+*  `card_action_routes.graph` without its trailing `/{topic}`,
+*  as a ROUTE (no `#`). "" when the host gives no such template.
+************************************************************/
+function graph_route_of(gobj) {
+	let routes = gobj_read_attr(gobj, "card_action_routes");
+	let tpl = is_object(routes) && typeof routes.graph === "string" ? routes.graph : "";
+	if (!/\/\{topic\}$/.test(tpl)) return "";
+	return tpl.replace(/\/\{topic\}$/, "").replace(/^#/, "");
+}
+/************************************************************
 *  Is the backend session live? The Raw JSON viewer issues a remote
 *  print-tranger, so it only makes sense with a session — the remote
 *  (C_IEVENT_CLI) is in ST_SESSION exactly while connected.
@@ -23455,6 +23503,26 @@ function ac_open_json$1(gobj, event, kw, src) {
 	return 0;
 }
 /********************************************
+*  Open the graph where the reader left it: its last visited
+*  route under the graph's base -- `<graph>/<topic>` when a topic
+*  was focused there -- or the bare base when the graph was never
+*  opened in this page. A user move: pushed, so Back returns.
+********************************************/
+function ac_open_graph(gobj, event, kw, src) {
+	let base = graph_route_of(gobj);
+	if (!base) {
+		log_error(`${gobj_short_name(gobj)}: open graph with no graph route`);
+		return -1;
+	}
+	let shell = yui_shell_of(gobj);
+	if (!shell) {
+		log_error(`${gobj_short_name(gobj)}: open graph with no shell`);
+		return -1;
+	}
+	yui_shell_navigate(shell, yui_shell_last_route_under(shell, base), { push: true });
+	return 0;
+}
+/********************************************
 *  The viewer asked to load a collapsed subtree (tranger mode only):
 *  re-issue print-tranger for that path.
 ********************************************/
@@ -23553,6 +23621,11 @@ function create_gclass$6(gclass_name) {
 			ac_open_json$1,
 			null
 		],
+		[
+			"EV_OPEN_GRAPH",
+			ac_open_graph,
+			null
+		],
 		[
 			"EV_EXPAND_PATH",
 			ac_json_expand_path$1,
@@ -23617,6 +23690,7 @@ function create_gclass$6(gclass_name) {
 		["EV_RECORD_WRITTEN", event_flag_t.EVF_OUTPUT_EVENT | event_flag_t.EVF_NO_WARN_SUBS],
 		["EV_REFRESH_TOPIC", 0],
 		["EV_OPEN_JSON", 0],
+		["EV_OPEN_GRAPH", 0],
 		["EV_EXPAND_PATH", 0],
 		["EV_JSON_CLOSED", 0],
 		["EV_SHOW", 0],

package/package.json

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

package/src/c_yui_node.js

@@ -1324,6 +1324,12 @@ function ac_add_node(gobj, event, kw, src)
     if(spec.link) {
         kw_child.link = spec.link;
     }
+    /*  A declared attr of this gclass that the spec could not reach: a
+     *  node whose children are workspaces (a treedb: its topics, its
+     *  graph) is declared in the config like every other one.  */
+    if(spec.remember_position) {
+        kw_child.remember_position = true;
+    }
     let child = gobj_create_pure_child(spec.id, GCLASS_NAME, kw_child, gobj);
 
     let index = (typeof kw.index === "number") ? kw.index : priv.children.length;

package/src/c_yui_shell.js

@@ -117,6 +117,10 @@ let PRIVATE_DATA = {
     /*  Section route -> last position visited inside it.  Mirrors the
      *  url for the duration of the page; see remember_position(). */
     section_pos:     {},
+    /*  The routes visited, newest last, bounded -- for "where did the
+     *  reader leave this subtree" (yui_shell_last_route_under). Same
+     *  nature as section_pos: a mirror of the url, for the page.  */
+    route_mru:       [],
     /*  Sub-route contributor registry (ROUTING.md): a mounted view
      *  declares the deep, view-owned children of its base route
      *  (topics, /info, /schema, focus topics — subpaths that are NOT
@@ -1465,6 +1469,7 @@ function navigate_to(gobj, route, depth, no_drain)
     stage.active_route = matched_route;
     gobj_write_attr(gobj, "current_route", route);
     remember_position(gobj, route);
+    remember_route(gobj, route);
 
     /*  Show/hide secondary navs according to parent item */
     update_secondary_nav_visibility(gobj, entry);
@@ -3187,6 +3192,54 @@ function remembered_position(gobj, route)
     return last;
 }
 
+/************************************************************
+ *  Every route the shell lands on, newest last, a route once.
+ *  Bounded: it answers "where was the reader last under X", and
+ *  a page that has been open all day has no business growing it.
+ ************************************************************/
+const ROUTE_MRU_MAX = 64;
+
+function remember_route(gobj, route)
+{
+    let priv = gobj.priv;
+    let mru = priv.route_mru;
+    let i = mru.indexOf(route);
+    if(i >= 0) {
+        mru.splice(i, 1);
+    }
+    mru.push(route);
+    if(mru.length > ROUTE_MRU_MAX) {
+        mru.splice(0, mru.length - ROUTE_MRU_MAX);
+    }
+}
+
+/************************************************************
+ *  Where the reader last was UNDER `route`: the most recent
+ *  visited route that is `route` itself or lies below it, or
+ *  `route` when none does. A mirror of the url for the page, like
+ *  the section memory -- never stored, never applied on its own:
+ *  a control that wants to go back to a view AS IT WAS LEFT asks,
+ *  and navigates there itself.
+ *
+ *  What it is for: a treedb graph's focus lives in the url
+ *  (`<graph>/<topic>`), so a button that opened the bare route
+ *  took the focus away every time it was used.
+ ************************************************************/
+function yui_shell_last_route_under(shell_gobj, route)
+{
+    let priv = shell_gobj && shell_gobj.priv;
+    if(!priv || !is_array(priv.route_mru) || !route) {
+        return route;
+    }
+    for(let i = priv.route_mru.length - 1; i >= 0; i--) {
+        let r = priv.route_mru[i];
+        if(r === route || r.indexOf(route + "/") === 0) {
+            return r;
+        }
+    }
+    return route;
+}
+
 /************************************************************
  *  Resolve the shell that governs `gobj`: the nearest
  *  C_YUI_SHELL ancestor, else the last shell created on the
@@ -3609,6 +3662,7 @@ export {
     yui_shell_of,
     yui_shell_zone,
     yui_shell_navigate,
+    yui_shell_last_route_under,
     yui_shell_nav_map,
     yui_shell_set_sub_routes,
     yui_shell_register_event_handler,

package/src/c_yui_treedb_topics.js

@@ -58,7 +58,12 @@ import {
 import "./c_yui_treedb_topics.css";
 
 import {yui_shell_show_error, yui_shell_show_modal, yui_shell_popup_layer} from "./shell_modals.js";
-import {yui_shell_of, yui_shell_set_sub_routes} from "./c_yui_shell.js";
+import {
+    yui_shell_of,
+    yui_shell_set_sub_routes,
+    yui_shell_navigate,
+    yui_shell_last_route_under,
+} from "./c_yui_shell.js";
 import {nodes_answer} from "./nodes_answer.js";
 import {yui_toolbar_icon} from "./yui_toolbar.js";
 
@@ -254,26 +259,28 @@ function build_ui(gobj)
 {
     let source_url = gobj_read_str_attr(gobj, "source_url") || "";
 
-    /*  The whole treedb as a graph, with NO topic focused. A card's graph
-     *  icon lands on `<graph route>/<topic>`, and that segment is a
-     *  FOCUS: going through a card was the only way in, and it always
-     *  arrived with that topic highlighted. The route is the card's
-     *  template without its `/{topic}`; a host whose template does not
-     *  end in it, or gives none, gets no button.  */
-    let routes = gobj_read_attr(gobj, "card_action_routes");
-    let graph_tpl = is_object(routes) && typeof routes.graph === "string"? routes.graph : "";
-    let graph_href = /\/\{topic\}$/.test(graph_tpl)? graph_tpl.replace(/\/\{topic\}$/, "") : "";
+    /*  The treedb as a graph, AS THE READER LEFT IT. The route is the
+     *  card template without its `/{topic}`; a host whose template does
+     *  not end in it, or gives none, gets no button. Not a fixed link:
+     *  the graph's focus lives in its url (`<graph>/<topic>`), so the
+     *  bare route took it away every time -- the click asks the shell
+     *  where the reader last was under that route (ac_open_graph).  */
+    let graph_href = graph_route_of(gobj);
     let graph_items = [];
     if(graph_href) {
         graph_items.push(
-            ['a', {class: 'button TREEDB_GRAPH_BTN',
-                   href: graph_href,
-                   style: 'margin-left:auto;',
-                   title: t('graph'), 'aria-label': t('graph'),
-                   'data-i18n-title': 'graph', 'data-i18n-aria-label': 'graph'}, [
+            ['button', {class: 'button TREEDB_GRAPH_BTN',
+                        style: 'margin-left:auto;',
+                        title: t('graph'), 'aria-label': t('graph'),
+                        'data-i18n-title': 'graph', 'data-i18n-aria-label': 'graph'}, [
                 ['span', {class: 'icon'}, [yui_toolbar_icon('yi-hexagon-nodes')]],
                 ['span', {i18n: 'graph'}, 'graph']
-            ]]
+            ], {
+                click: (evt) => {
+                    evt.stopPropagation();
+                    gobj_send_event(gobj, "EV_OPEN_GRAPH", {}, gobj);
+                }
+            }]
         );
     }
 
@@ -389,6 +396,21 @@ function build_ui(gobj)
     }
 }
 
+/************************************************************
+ *  The graph's route with no topic: the host's card template
+ *  `card_action_routes.graph` without its trailing `/{topic}`,
+ *  as a ROUTE (no `#`). "" when the host gives no such template.
+ ************************************************************/
+function graph_route_of(gobj)
+{
+    let routes = gobj_read_attr(gobj, "card_action_routes");
+    let tpl = (is_object(routes) && typeof routes.graph === "string")? routes.graph : "";
+    if(!/\/\{topic\}$/.test(tpl)) {
+        return "";
+    }
+    return tpl.replace(/\/\{topic\}$/, "").replace(/^#/, "");
+}
+
 /************************************************************
  *  Is the backend session live? The Raw JSON viewer issues a remote
  *  print-tranger, so it only makes sense with a session — the remote
@@ -2476,6 +2498,28 @@ function ac_open_json(gobj, event, kw, src)
     return 0;
 }
 
+/********************************************
+ *  Open the graph where the reader left it: its last visited
+ *  route under the graph's base -- `<graph>/<topic>` when a topic
+ *  was focused there -- or the bare base when the graph was never
+ *  opened in this page. A user move: pushed, so Back returns.
+ ********************************************/
+function ac_open_graph(gobj, event, kw, src)
+{
+    let base = graph_route_of(gobj);
+    if(!base) {
+        log_error(`${gobj_short_name(gobj)}: open graph with no graph route`);
+        return -1;
+    }
+    let shell = yui_shell_of(gobj);
+    if(!shell) {
+        log_error(`${gobj_short_name(gobj)}: open graph with no shell`);
+        return -1;
+    }
+    yui_shell_navigate(shell, yui_shell_last_route_under(shell, base), {push: true});
+    return 0;
+}
+
 /********************************************
  *  The viewer asked to load a collapsed subtree (tranger mode only):
  *  re-issue print-tranger for that path.
@@ -2556,6 +2600,7 @@ function create_gclass(gclass_name)
             ["EV_DELETE_RECORD",        ac_delete_record,           null],
             ["EV_REFRESH_TOPIC",        ac_refresh_topic,           null],
             ["EV_OPEN_JSON",            ac_open_json,               null],
+            ["EV_OPEN_GRAPH",           ac_open_graph,              null],
             ["EV_EXPAND_PATH",          ac_json_expand_path,        null],
             ["EV_JSON_CLOSED",          ac_json_closed,             null],
             ["EV_SHOW",                 ac_show,                    null],
@@ -2586,6 +2631,7 @@ function create_gclass(gclass_name)
                                     event_flag_t.EVF_NO_WARN_SUBS],
         ["EV_REFRESH_TOPIC",        0],
         ["EV_OPEN_JSON",            0],
+        ["EV_OPEN_GRAPH",           0],
         ["EV_EXPAND_PATH",          0],
         ["EV_JSON_CLOSED",          0],
         ["EV_SHOW",                 0],