@yuneta/gobj-ui 7.4.5 → 7.5.1

package/dist/gobj-ui.cjs.js

@@ -19971,6 +19971,21 @@ function ac_legend_topic(gobj, event, kw, src) {
 	return 0;
 }
 /************************************************************
+*  The child chose a layout for a treedb nobody has arranged yet.
+*  Only the SELECT is moved: the pick is a default, not the user's
+*  choice, so it is not persisted — the day somebody drags a node the
+*  saved geometry exists and `manual` is right again.
+************************************************************/
+function ac_layout_autoset(gobj, event, kw, src) {
+	let $container = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "$container");
+	if (!$container) return 0;
+	let $select = $container.querySelector(".GRAPH_LAYOUT_SELECT");
+	let layout = kw && kw.layout || "";
+	if (!$select || !layout) return 0;
+	$select.value = layout;
+	return 0;
+}
+/************************************************************
 *  Forward the find down to the graph child.
 ************************************************************/
 function ac_find_nodes$1(gobj, event, kw, src) {
@@ -20171,6 +20186,11 @@ function create_gclass$4(gclass_name) {
 			ac_find_nodes$1,
 			null
 		],
+		[
+			"EV_LAYOUT_AUTOSET",
+			ac_layout_autoset,
+			null
+		],
 		[
 			"EV_TOGGLE_LEGEND",
 			ac_toggle_legend,
@@ -20229,6 +20249,7 @@ function create_gclass$4(gclass_name) {
 		["EV_SET_FOCUS_TOPIC", 0],
 		["EV_FIND_NODES", 0],
 		["EV_FIND_RESULT", 0],
+		["EV_LAYOUT_AUTOSET", 0],
 		["EV_TOGGLE_LEGEND", 0],
 		["EV_LEGEND_TOPIC", 0],
 		["EV_TOPIC_SELECTED", _yuneta_gobj_js.event_flag_t.EVF_OUTPUT_EVENT | _yuneta_gobj_js.event_flag_t.EVF_NO_WARN_SUBS],
@@ -52901,7 +52922,8 @@ var PRIVATE_DATA$1 = {
 	_focus_topic: null,
 	_focus_ids: [],
 	_pending_focus_topic: null,
-	_pending_find: null
+	_pending_find: null,
+	_layout_asked: ""
 };
 var __gclass__$1 = null;
 /******************************
@@ -52912,6 +52934,7 @@ var __gclass__$1 = null;
 ***************************************************************/
 function mt_create$1(gobj) {
 	let priv = gobj.priv;
+	priv._layout_asked = (0, _yuneta_gobj_js.gobj_read_str_attr)(gobj, "layout") || "";
 	let subscriber = (0, _yuneta_gobj_js.gobj_read_pointer_attr)(gobj, "subscriber");
 	if (!subscriber) subscriber = (0, _yuneta_gobj_js.gobj_parent)(gobj);
 	(0, _yuneta_gobj_js.gobj_subscribe_event)(gobj, null, {}, subscriber);
@@ -55678,6 +55701,55 @@ function show_node_detail_popover(gobj, node_id) {
 *  junction diamonds get their neutral fill/stroke re-themed.
 ************************************************************/
 /************************************************************
+*  Has anybody ever PLACED a node of this treedb?
+*
+*  Saved positions live in `__graphs__` (per topic, per node) and, on
+*  older data, in a `_geometry` on the record itself. Both are read.
+************************************************************/
+function has_saved_geometry(gobj) {
+	let priv = gobj.priv;
+	for (let topic of Object.keys(priv._graph_properties || {})) {
+		let props = priv._graph_properties[topic];
+		if (props && (0, _yuneta_gobj_js.is_object)(props.nodes) && Object.keys(props.nodes).length > 0) return true;
+	}
+	for (let topic of Object.keys(priv.records || {})) {
+		let records = priv.records[topic];
+		if (!(0, _yuneta_gobj_js.is_array)(records)) continue;
+		for (let record of records) if (record && (0, _yuneta_gobj_js.is_object)(record._geometry)) return true;
+	}
+	return false;
+}
+/************************************************************
+*  Choose a layout for a treedb nobody has arranged yet.
+*
+*  `manual` means "leave every node where it was put", and where none
+*  was put it means a cascade: get_default_ne_xy() walks x and y
+*  together, so a treedb opened for the first time was a diagonal pile
+*  of cards — 126 of them on a real one — and the only way out was to
+*  know to pick a layout by hand. It is the right default only once
+*  there ARE saved positions to leave alone.
+*
+*  So: nothing saved and no preference of the user's ⇒ dagre. The pick
+*  is deliberately NOT persisted — it is a default, not a choice, and
+*  the moment the user drags one node the geometry exists and `manual`
+*  becomes right again by itself.
+************************************************************/
+function auto_layout(gobj) {
+	let priv = gobj.priv;
+	if (priv._layout_asked) return;
+	if (has_saved_geometry(gobj)) return;
+	if (!priv.graph) return;
+	let name = "dagre";
+	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "layout", name);
+	try {
+		priv.graph.setLayout(_layouts[name]);
+	} catch (e) {
+		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: cannot set the '${name}' layout: ${e}`);
+		return;
+	}
+	(0, _yuneta_gobj_js.gobj_publish_event)(gobj, "EV_LAYOUT_AUTOSET", { layout: name });
+}
+/************************************************************
 *  Show or hide the minimap, deciding by the SIZE of the graph.
 *
 *  A minimap of a graph that already fits on screen is decoration; one
@@ -56532,6 +56604,11 @@ function ac_load_data(gobj, event, kw, src) {
 		graph_draw(gobj).then(() => {
 			create_links(gobj);
 			graph_draw(gobj).then(() => {
+				try {
+					auto_layout(gobj);
+				} catch (e) {
+					(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: auto_layout failed: ${e}`);
+				}
 				graph_layout(gobj).then(() => {
 					if (priv.edit_mode) graph_add_plugin(gobj, "history");
 					else graph_remove_plugin(gobj, "history");
@@ -57172,6 +57249,7 @@ function create_gclass$1(gclass_name) {
 		["EV_FOCUS_TOPIC", 0],
 		["EV_FIND_NODES", 0],
 		["EV_FIND_RESULT", _yuneta_gobj_js.event_flag_t.EVF_OUTPUT_EVENT],
+		["EV_LAYOUT_AUTOSET", _yuneta_gobj_js.event_flag_t.EVF_OUTPUT_EVENT],
 		["EV_CENTER", 0],
 		["EV_FULLSCREEN", 0],
 		["EV_SET_LAYOUT", 0],

package/dist/gobj-ui.es.js

@@ -19958,6 +19958,21 @@ function ac_legend_topic(gobj, event, kw, src) {
 	return 0;
 }
 /************************************************************
+*  The child chose a layout for a treedb nobody has arranged yet.
+*  Only the SELECT is moved: the pick is a default, not the user's
+*  choice, so it is not persisted — the day somebody drags a node the
+*  saved geometry exists and `manual` is right again.
+************************************************************/
+function ac_layout_autoset(gobj, event, kw, src) {
+	let $container = gobj_read_attr(gobj, "$container");
+	if (!$container) return 0;
+	let $select = $container.querySelector(".GRAPH_LAYOUT_SELECT");
+	let layout = kw && kw.layout || "";
+	if (!$select || !layout) return 0;
+	$select.value = layout;
+	return 0;
+}
+/************************************************************
 *  Forward the find down to the graph child.
 ************************************************************/
 function ac_find_nodes$1(gobj, event, kw, src) {
@@ -20158,6 +20173,11 @@ function create_gclass$4(gclass_name) {
 			ac_find_nodes$1,
 			null
 		],
+		[
+			"EV_LAYOUT_AUTOSET",
+			ac_layout_autoset,
+			null
+		],
 		[
 			"EV_TOGGLE_LEGEND",
 			ac_toggle_legend,
@@ -20216,6 +20236,7 @@ function create_gclass$4(gclass_name) {
 		["EV_SET_FOCUS_TOPIC", 0],
 		["EV_FIND_NODES", 0],
 		["EV_FIND_RESULT", 0],
+		["EV_LAYOUT_AUTOSET", 0],
 		["EV_TOGGLE_LEGEND", 0],
 		["EV_LEGEND_TOPIC", 0],
 		["EV_TOPIC_SELECTED", event_flag_t.EVF_OUTPUT_EVENT | event_flag_t.EVF_NO_WARN_SUBS],
@@ -52888,7 +52909,8 @@ var PRIVATE_DATA$1 = {
 	_focus_topic: null,
 	_focus_ids: [],
 	_pending_focus_topic: null,
-	_pending_find: null
+	_pending_find: null,
+	_layout_asked: ""
 };
 var __gclass__$1 = null;
 /******************************
@@ -52899,6 +52921,7 @@ var __gclass__$1 = null;
 ***************************************************************/
 function mt_create$1(gobj) {
 	let priv = gobj.priv;
+	priv._layout_asked = gobj_read_str_attr(gobj, "layout") || "";
 	let subscriber = gobj_read_pointer_attr(gobj, "subscriber");
 	if (!subscriber) subscriber = gobj_parent(gobj);
 	gobj_subscribe_event(gobj, null, {}, subscriber);
@@ -55665,6 +55688,55 @@ function show_node_detail_popover(gobj, node_id) {
 *  junction diamonds get their neutral fill/stroke re-themed.
 ************************************************************/
 /************************************************************
+*  Has anybody ever PLACED a node of this treedb?
+*
+*  Saved positions live in `__graphs__` (per topic, per node) and, on
+*  older data, in a `_geometry` on the record itself. Both are read.
+************************************************************/
+function has_saved_geometry(gobj) {
+	let priv = gobj.priv;
+	for (let topic of Object.keys(priv._graph_properties || {})) {
+		let props = priv._graph_properties[topic];
+		if (props && is_object(props.nodes) && Object.keys(props.nodes).length > 0) return true;
+	}
+	for (let topic of Object.keys(priv.records || {})) {
+		let records = priv.records[topic];
+		if (!is_array(records)) continue;
+		for (let record of records) if (record && is_object(record._geometry)) return true;
+	}
+	return false;
+}
+/************************************************************
+*  Choose a layout for a treedb nobody has arranged yet.
+*
+*  `manual` means "leave every node where it was put", and where none
+*  was put it means a cascade: get_default_ne_xy() walks x and y
+*  together, so a treedb opened for the first time was a diagonal pile
+*  of cards — 126 of them on a real one — and the only way out was to
+*  know to pick a layout by hand. It is the right default only once
+*  there ARE saved positions to leave alone.
+*
+*  So: nothing saved and no preference of the user's ⇒ dagre. The pick
+*  is deliberately NOT persisted — it is a default, not a choice, and
+*  the moment the user drags one node the geometry exists and `manual`
+*  becomes right again by itself.
+************************************************************/
+function auto_layout(gobj) {
+	let priv = gobj.priv;
+	if (priv._layout_asked) return;
+	if (has_saved_geometry(gobj)) return;
+	if (!priv.graph) return;
+	let name = "dagre";
+	gobj_write_attr(gobj, "layout", name);
+	try {
+		priv.graph.setLayout(_layouts[name]);
+	} catch (e) {
+		log_error(`${gobj_short_name(gobj)}: cannot set the '${name}' layout: ${e}`);
+		return;
+	}
+	gobj_publish_event(gobj, "EV_LAYOUT_AUTOSET", { layout: name });
+}
+/************************************************************
 *  Show or hide the minimap, deciding by the SIZE of the graph.
 *
 *  A minimap of a graph that already fits on screen is decoration; one
@@ -56519,6 +56591,11 @@ function ac_load_data(gobj, event, kw, src) {
 		graph_draw(gobj).then(() => {
 			create_links(gobj);
 			graph_draw(gobj).then(() => {
+				try {
+					auto_layout(gobj);
+				} catch (e) {
+					log_error(`${gobj_short_name(gobj)}: auto_layout failed: ${e}`);
+				}
 				graph_layout(gobj).then(() => {
 					if (priv.edit_mode) graph_add_plugin(gobj, "history");
 					else graph_remove_plugin(gobj, "history");
@@ -57159,6 +57236,7 @@ function create_gclass$1(gclass_name) {
 		["EV_FOCUS_TOPIC", 0],
 		["EV_FIND_NODES", 0],
 		["EV_FIND_RESULT", event_flag_t.EVF_OUTPUT_EVENT],
+		["EV_LAYOUT_AUTOSET", event_flag_t.EVF_OUTPUT_EVENT],
 		["EV_CENTER", 0],
 		["EV_FULLSCREEN", 0],
 		["EV_SET_LAYOUT", 0],

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -291,6 +291,7 @@ let PRIVATE_DATA = {
     _focus_ids:         [],         // node ids carrying the focus 'active' state
     _pending_focus_topic: null,     // focus requested before data was loaded
     _pending_find:      null,       // find requested before data was loaded
+    _layout_asked:      "",         // layout the host asked for at create (see mt_create)
 };
 
 let __gclass__ = null;
@@ -312,6 +313,15 @@ function mt_create(gobj)
 {
     let priv = gobj.priv;
 
+    /*  What the HOST asked for, captured before anything overwrites it.
+     *
+     *  `gobj_write_attr()` also writes the private field of the same name,
+     *  so the moment select_layout() resolves the empty preference to
+     *  `manual` and stores it, `priv.layout` reads "manual" and no longer
+     *  says whether anybody ever chose it. auto_layout() needs exactly that
+     *  distinction. */
+    priv._layout_asked = gobj_read_str_attr(gobj, "layout") || "";
+
     /*
      *  CHILD subscription model
      */
@@ -4483,6 +4493,80 @@ function show_node_detail_popover(gobj, node_id)
  *  not re-themed by setTheme()) are regenerated; structural
  *  junction diamonds get their neutral fill/stroke re-themed.
  ************************************************************/
+/************************************************************
+ *  Has anybody ever PLACED a node of this treedb?
+ *
+ *  Saved positions live in `__graphs__` (per topic, per node) and, on
+ *  older data, in a `_geometry` on the record itself. Both are read.
+ ************************************************************/
+function has_saved_geometry(gobj)
+{
+    let priv = gobj.priv;
+
+    for(let topic of Object.keys(priv._graph_properties || {})) {
+        let props = priv._graph_properties[topic];
+        if(props && is_object(props.nodes) && Object.keys(props.nodes).length > 0) {
+            return true;
+        }
+    }
+
+    for(let topic of Object.keys(priv.records || {})) {
+        let records = priv.records[topic];
+        if(!is_array(records)) {
+            continue;
+        }
+        for(let record of records) {
+            if(record && is_object(record._geometry)) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+/************************************************************
+ *  Choose a layout for a treedb nobody has arranged yet.
+ *
+ *  `manual` means "leave every node where it was put", and where none
+ *  was put it means a cascade: get_default_ne_xy() walks x and y
+ *  together, so a treedb opened for the first time was a diagonal pile
+ *  of cards — 126 of them on a real one — and the only way out was to
+ *  know to pick a layout by hand. It is the right default only once
+ *  there ARE saved positions to leave alone.
+ *
+ *  So: nothing saved and no preference of the user's ⇒ dagre. The pick
+ *  is deliberately NOT persisted — it is a default, not a choice, and
+ *  the moment the user drags one node the geometry exists and `manual`
+ *  becomes right again by itself.
+ ************************************************************/
+function auto_layout(gobj)
+{
+    let priv = gobj.priv;
+
+    if(priv._layout_asked) {
+        return;         /*  the user picked one for this treedb  */
+    }
+    if(has_saved_geometry(gobj)) {
+        return;         /*  somebody arranged it: leave it alone  */
+    }
+    if(!priv.graph) {
+        return;
+    }
+
+    let name = "dagre";
+    gobj_write_attr(gobj, "layout", name);
+    try {
+        priv.graph.setLayout(_layouts[name]);
+    } catch(e) {
+        log_error(`${gobj_short_name(gobj)}: cannot set the '${name}' layout: ${e}`);
+        return;
+    }
+    /*  The toolbar's select was filled before the data arrived, so it is
+     *  still showing `manual`: tell it what the graph is actually doing. */
+    gobj_publish_event(gobj, "EV_LAYOUT_AUTOSET", {layout: name});
+}
+
 /************************************************************
  *  Show or hide the minimap, deciding by the SIZE of the graph.
  *
@@ -5770,6 +5854,14 @@ function ac_load_data(gobj, event, kw, src)
         graph_draw(gobj).then(() => { // draw nodes, else the link fails
             create_links(gobj);
             graph_draw(gobj).then(() => {
+                /*  Before the layout runs, and only now: whether anybody has
+                 *  ever placed a node of this treedb is not known until its
+                 *  records and __graphs__ are in. */
+                try {
+                    auto_layout(gobj);
+                } catch(e) {
+                    log_error(`${gobj_short_name(gobj)}: auto_layout failed: ${e}`);
+                }
                 graph_layout(gobj).then(() => {
                     if(priv.edit_mode) {
                         graph_add_plugin(gobj, "history");
@@ -6563,6 +6655,7 @@ function create_gclass(gclass_name)
         ["EV_FOCUS_TOPIC",              0],
         ["EV_FIND_NODES",               0],
         ["EV_FIND_RESULT",              event_flag_t.EVF_OUTPUT_EVENT],
+        ["EV_LAYOUT_AUTOSET",           event_flag_t.EVF_OUTPUT_EVENT],
         ["EV_CENTER",                   0],
         ["EV_FULLSCREEN",               0],
         ["EV_SET_LAYOUT",               0],

package/src/c_yui_treedb_graph.js

@@ -2337,6 +2337,27 @@ function ac_legend_topic(gobj, event, kw, src)
     return 0;
 }
 
+/************************************************************
+ *  The child chose a layout for a treedb nobody has arranged yet.
+ *  Only the SELECT is moved: the pick is a default, not the user's
+ *  choice, so it is not persisted — the day somebody drags a node the
+ *  saved geometry exists and `manual` is right again.
+ ************************************************************/
+function ac_layout_autoset(gobj, event, kw, src)
+{
+    let $container = gobj_read_attr(gobj, "$container");
+    if(!$container) {
+        return 0;
+    }
+    let $select = $container.querySelector(".GRAPH_LAYOUT_SELECT");
+    let layout = (kw && kw.layout) || "";
+    if(!$select || !layout) {
+        return 0;
+    }
+    $select.value = layout;
+    return 0;
+}
+
 /************************************************************
  *  Forward the find down to the graph child.
  ************************************************************/
@@ -2490,6 +2511,7 @@ function create_gclass(gclass_name)
             ["EV_SET_OPERATION_MODE",       ac_set_operation_mode,      null],
             ["EV_SET_FOCUS_TOPIC",          ac_set_focus_topic,         null],
             ["EV_FIND_NODES",               ac_find_nodes,              null],
+            ["EV_LAYOUT_AUTOSET",           ac_layout_autoset,          null],
             ["EV_TOGGLE_LEGEND",            ac_toggle_legend,           null],
             ["EV_LEGEND_TOPIC",             ac_legend_topic,            null],
             ["EV_FIND_RESULT",              ac_find_result,             null],
@@ -2529,6 +2551,7 @@ function create_gclass(gclass_name)
         ["EV_SET_FOCUS_TOPIC",          0],
         ["EV_FIND_NODES",               0],
         ["EV_FIND_RESULT",              0],
+        ["EV_LAYOUT_AUTOSET",           0],
         ["EV_TOGGLE_LEGEND",            0],
         ["EV_LEGEND_TOPIC",             0],
         ["EV_TOPIC_SELECTED",