@yuneta/gobj-ui 7.5.0 → 7.5.2

package/dist/gobj-ui.cjs.js

@@ -52922,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;
 /******************************
@@ -52933,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);
@@ -55704,16 +55706,21 @@ function show_node_detail_popover(gobj, node_id) {
 *  Saved positions live in `__graphs__` (per topic, per node) and, on
 *  older data, in a `_geometry` on the record itself. Both are read.
 ************************************************************/
+function geometry_has_position(g) {
+	if (!(0, _yuneta_gobj_js.is_object)(g)) return false;
+	return (0, _yuneta_gobj_js.is_number)(g.x) || (0, _yuneta_gobj_js.is_number)(g.y);
+}
 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;
+		if (!props || !(0, _yuneta_gobj_js.is_object)(props.nodes)) continue;
+		for (let node_id of Object.keys(props.nodes)) if (geometry_has_position(props.nodes[node_id])) 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;
+		for (let record of records) if (record && geometry_has_position(record._geometry)) return true;
 	}
 	return false;
 }
@@ -55734,7 +55741,7 @@ function has_saved_geometry(gobj) {
 ************************************************************/
 function auto_layout(gobj) {
 	let priv = gobj.priv;
-	if (priv.layout) return;
+	if (priv._layout_asked) return;
 	if (has_saved_geometry(gobj)) return;
 	if (!priv.graph) return;
 	let name = "dagre";

package/dist/gobj-ui.es.js

@@ -52909,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;
 /******************************
@@ -52920,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);
@@ -55691,16 +55693,21 @@ function show_node_detail_popover(gobj, node_id) {
 *  Saved positions live in `__graphs__` (per topic, per node) and, on
 *  older data, in a `_geometry` on the record itself. Both are read.
 ************************************************************/
+function geometry_has_position(g) {
+	if (!is_object(g)) return false;
+	return is_number(g.x) || is_number(g.y);
+}
 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;
+		if (!props || !is_object(props.nodes)) continue;
+		for (let node_id of Object.keys(props.nodes)) if (geometry_has_position(props.nodes[node_id])) 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;
+		for (let record of records) if (record && geometry_has_position(record._geometry)) return true;
 	}
 	return false;
 }
@@ -55721,7 +55728,7 @@ function has_saved_geometry(gobj) {
 ************************************************************/
 function auto_layout(gobj) {
 	let priv = gobj.priv;
-	if (priv.layout) return;
+	if (priv._layout_asked) return;
 	if (has_saved_geometry(gobj)) return;
 	if (!priv.graph) return;
 	let name = "dagre";

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -47,6 +47,7 @@ import {
     is_array,
     empty_string,
     is_object,
+    is_number,
     kw_get_int,
     kw_get_str,
     kw_get_dict_value,
@@ -291,6 +292,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 +314,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
      */
@@ -4489,14 +4500,31 @@ function show_node_detail_popover(gobj, node_id)
  *  Saved positions live in `__graphs__` (per topic, per node) and, on
  *  older data, in a `_geometry` on the record itself. Both are read.
  ************************************************************/
+function geometry_has_position(g)
+{
+    /*  An EMPTY object is not a position. A treedb hands back `_geometry: {}`
+     *  for a record nobody ever moved, and a node entry can hold a port size
+     *  with no coordinates — both are objects, and taking either for "this
+     *  was arranged" is what kept the cascade in place. Only x or y counts. */
+    if(!is_object(g)) {
+        return false;
+    }
+    return is_number(g.x) || is_number(g.y);
+}
+
 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;
+        if(!props || !is_object(props.nodes)) {
+            continue;
+        }
+        for(let node_id of Object.keys(props.nodes)) {
+            if(geometry_has_position(props.nodes[node_id])) {
+                return true;
+            }
         }
     }
 
@@ -4506,7 +4534,7 @@ function has_saved_geometry(gobj)
             continue;
         }
         for(let record of records) {
-            if(record && is_object(record._geometry)) {
+            if(record && geometry_has_position(record._geometry)) {
                 return true;
             }
         }
@@ -4534,7 +4562,7 @@ function auto_layout(gobj)
 {
     let priv = gobj.priv;
 
-    if(priv.layout) {
+    if(priv._layout_asked) {
         return;         /*  the user picked one for this treedb  */
     }
     if(has_saved_geometry(gobj)) {