@yuneta/gobj-ui 7.5.1 → 7.5.3

package/dist/gobj-ui.cjs.js

@@ -55706,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;
 }
@@ -55736,6 +55741,7 @@ function has_saved_geometry(gobj) {
 ************************************************************/
 function auto_layout(gobj) {
 	let priv = gobj.priv;
+	(0, _yuneta_gobj_js.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: auto_layout: asked='${priv._layout_asked}' saved=${has_saved_geometry(gobj)} graph=${!!priv.graph} topics=${Object.keys(priv.records || {}).length} gprops=${JSON.stringify(Object.keys(priv._graph_properties || {}))}`);
 	if (priv._layout_asked) return;
 	if (has_saved_geometry(gobj)) return;
 	if (!priv.graph) return;
@@ -55747,6 +55753,7 @@ function auto_layout(gobj) {
 		(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.log_warning)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: auto_layout: set '${name}'`);
 	(0, _yuneta_gobj_js.gobj_publish_event)(gobj, "EV_LAYOUT_AUTOSET", { layout: name });
 }
 /************************************************************

package/dist/gobj-ui.es.js

@@ -55693,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;
 }
@@ -55723,6 +55728,7 @@ function has_saved_geometry(gobj) {
 ************************************************************/
 function auto_layout(gobj) {
 	let priv = gobj.priv;
+	log_warning(`${gobj_short_name(gobj)}: auto_layout: asked='${priv._layout_asked}' saved=${has_saved_geometry(gobj)} graph=${!!priv.graph} topics=${Object.keys(priv.records || {}).length} gprops=${JSON.stringify(Object.keys(priv._graph_properties || {}))}`);
 	if (priv._layout_asked) return;
 	if (has_saved_geometry(gobj)) return;
 	if (!priv.graph) return;
@@ -55734,6 +55740,7 @@ function auto_layout(gobj) {
 		log_error(`${gobj_short_name(gobj)}: cannot set the '${name}' layout: ${e}`);
 		return;
 	}
+	log_warning(`${gobj_short_name(gobj)}: auto_layout: set '${name}'`);
 	gobj_publish_event(gobj, "EV_LAYOUT_AUTOSET", { layout: name });
 }
 /************************************************************

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.5.1",
+  "version": "7.5.3",
   "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,
@@ -4499,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;
+            }
         }
     }
 
@@ -4516,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;
             }
         }
@@ -4544,6 +4562,13 @@ function auto_layout(gobj)
 {
     let priv = gobj.priv;
 
+    log_warning(`${gobj_short_name(gobj)}: auto_layout: ` +
+                `asked='${priv._layout_asked}' ` +
+                `saved=${has_saved_geometry(gobj)} ` +
+                `graph=${!!priv.graph} ` +
+                `topics=${Object.keys(priv.records || {}).length} ` +
+                `gprops=${JSON.stringify(Object.keys(priv._graph_properties || {}))}`);
+
     if(priv._layout_asked) {
         return;         /*  the user picked one for this treedb  */
     }
@@ -4564,6 +4589,7 @@ function auto_layout(gobj)
     }
     /*  The toolbar's select was filled before the data arrived, so it is
      *  still showing `manual`: tell it what the graph is actually doing. */
+    log_warning(`${gobj_short_name(gobj)}: auto_layout: set '${name}'`);
     gobj_publish_event(gobj, "EV_LAYOUT_AUTOSET", {layout: name});
 }