@yuneta/gobj-ui 7.5.5 → 7.5.7

package/dist/gobj-ui.cjs.js

@@ -52923,7 +52923,9 @@ var PRIVATE_DATA$1 = {
 	_focus_ids: [],
 	_pending_focus_topic: null,
 	_pending_find: null,
-	_layout_asked: ""
+	_layout_asked: "",
+	_nodes_total: 0,
+	_nodes_placed: 0
 };
 var __gclass__$1 = null;
 /******************************
@@ -53494,6 +53496,8 @@ function create_topic_node(gobj, desc, record) {
 	let node_name = build_node_name(gobj, desc.topic_name, record.id);
 	let xy = get_default_ne_xy(gobj);
 	let geometry = get_node_graph_props(gobj, desc.topic_name, record.id, record);
+	priv._nodes_total++;
+	if (geometry_has_position(geometry)) priv._nodes_placed++;
 	let x = (0, _yuneta_gobj_js.kw_get_int)(gobj, geometry, "x", xy, _yuneta_gobj_js.kw_flag_t.KW_CREATE);
 	let y = (0, _yuneta_gobj_js.kw_get_int)(gobj, geometry, "y", xy, _yuneta_gobj_js.kw_flag_t.KW_CREATE);
 	let ports = build_ports(gobj, desc);
@@ -55701,35 +55705,16 @@ function show_node_detail_popover(gobj, node_id) {
 *  junction diamonds get their neutral fill/stroke re-themed.
 ************************************************************/
 /************************************************************
-*  How many nodes of this treedb carry a saved position, and how many
-*  there are. Positions live in `__graphs__` (per topic, per node) and,
-*  on older data, in a `_geometry` on the record itself; both are read.
+*  Does this geometry carry a POSITION?
+*
+*  An empty object does not. A treedb hands back `_geometry: {}` for a
+*  record nobody ever moved, and a `__graphs__` node entry can hold a
+*  port size and no coordinates — both are objects all the same.
 ************************************************************/
 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 count_saved_geometry(gobj) {
-	let priv = gobj.priv;
-	let saved = 0;
-	let total = 0;
-	for (let topic of Object.keys(priv.records || {})) {
-		let records = priv.records[topic];
-		if (!(0, _yuneta_gobj_js.is_array)(records)) continue;
-		let props = priv._graph_properties ? priv._graph_properties[topic] : null;
-		let nodes = props && (0, _yuneta_gobj_js.is_object)(props.nodes) ? props.nodes : null;
-		for (let record of records) {
-			if (!record) continue;
-			total++;
-			if (nodes && geometry_has_position(nodes[record.id])) saved++;
-			else if (geometry_has_position(record._geometry)) saved++;
-		}
-	}
-	return {
-		saved,
-		total
-	};
-}
 /************************************************************
 *  Choose a layout for a treedb nobody has arranged yet.
 *
@@ -55748,8 +55733,7 @@ function count_saved_geometry(gobj) {
 function auto_layout(gobj) {
 	let priv = gobj.priv;
 	if (priv._layout_asked) return;
-	let g = count_saved_geometry(gobj);
-	if (g.total > 0 && g.saved * 2 > g.total) return;
+	if (priv._nodes_total > 0 && priv._nodes_placed * 2 > priv._nodes_total) return;
 	if (!priv.graph) return;
 	let name = "dagre";
 	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "layout", name);
@@ -56558,10 +56542,12 @@ function ac_descs(gobj, event, kw, src) {
 *  Clear all graph data, from parent
 ************************************************************/
 function ac_clear_data(gobj, event, kw, src) {
-	gobj.priv;
+	let priv = gobj.priv;
 	deselect_node(gobj);
 	hide_create_popover(gobj);
 	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "records", {});
+	priv._nodes_total = 0;
+	priv._nodes_placed = 0;
 	graph_remove_plugin(gobj, "history");
 	update_history_buttons(gobj);
 	graph_clear(gobj);

package/dist/gobj-ui.es.js

@@ -52910,7 +52910,9 @@ var PRIVATE_DATA$1 = {
 	_focus_ids: [],
 	_pending_focus_topic: null,
 	_pending_find: null,
-	_layout_asked: ""
+	_layout_asked: "",
+	_nodes_total: 0,
+	_nodes_placed: 0
 };
 var __gclass__$1 = null;
 /******************************
@@ -53481,6 +53483,8 @@ function create_topic_node(gobj, desc, record) {
 	let node_name = build_node_name(gobj, desc.topic_name, record.id);
 	let xy = get_default_ne_xy(gobj);
 	let geometry = get_node_graph_props(gobj, desc.topic_name, record.id, record);
+	priv._nodes_total++;
+	if (geometry_has_position(geometry)) priv._nodes_placed++;
 	let x = kw_get_int(gobj, geometry, "x", xy, kw_flag_t.KW_CREATE);
 	let y = kw_get_int(gobj, geometry, "y", xy, kw_flag_t.KW_CREATE);
 	let ports = build_ports(gobj, desc);
@@ -55688,35 +55692,16 @@ function show_node_detail_popover(gobj, node_id) {
 *  junction diamonds get their neutral fill/stroke re-themed.
 ************************************************************/
 /************************************************************
-*  How many nodes of this treedb carry a saved position, and how many
-*  there are. Positions live in `__graphs__` (per topic, per node) and,
-*  on older data, in a `_geometry` on the record itself; both are read.
+*  Does this geometry carry a POSITION?
+*
+*  An empty object does not. A treedb hands back `_geometry: {}` for a
+*  record nobody ever moved, and a `__graphs__` node entry can hold a
+*  port size and no coordinates — both are objects all the same.
 ************************************************************/
 function geometry_has_position(g) {
 	if (!is_object(g)) return false;
 	return is_number(g.x) || is_number(g.y);
 }
-function count_saved_geometry(gobj) {
-	let priv = gobj.priv;
-	let saved = 0;
-	let total = 0;
-	for (let topic of Object.keys(priv.records || {})) {
-		let records = priv.records[topic];
-		if (!is_array(records)) continue;
-		let props = priv._graph_properties ? priv._graph_properties[topic] : null;
-		let nodes = props && is_object(props.nodes) ? props.nodes : null;
-		for (let record of records) {
-			if (!record) continue;
-			total++;
-			if (nodes && geometry_has_position(nodes[record.id])) saved++;
-			else if (geometry_has_position(record._geometry)) saved++;
-		}
-	}
-	return {
-		saved,
-		total
-	};
-}
 /************************************************************
 *  Choose a layout for a treedb nobody has arranged yet.
 *
@@ -55735,8 +55720,7 @@ function count_saved_geometry(gobj) {
 function auto_layout(gobj) {
 	let priv = gobj.priv;
 	if (priv._layout_asked) return;
-	let g = count_saved_geometry(gobj);
-	if (g.total > 0 && g.saved * 2 > g.total) return;
+	if (priv._nodes_total > 0 && priv._nodes_placed * 2 > priv._nodes_total) return;
 	if (!priv.graph) return;
 	let name = "dagre";
 	gobj_write_attr(gobj, "layout", name);
@@ -56545,10 +56529,12 @@ function ac_descs(gobj, event, kw, src) {
 *  Clear all graph data, from parent
 ************************************************************/
 function ac_clear_data(gobj, event, kw, src) {
-	gobj.priv;
+	let priv = gobj.priv;
 	deselect_node(gobj);
 	hide_create_popover(gobj);
 	gobj_write_attr(gobj, "records", {});
+	priv._nodes_total = 0;
+	priv._nodes_placed = 0;
 	graph_remove_plugin(gobj, "history");
 	update_history_buttons(gobj);
 	graph_clear(gobj);

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -293,6 +293,8 @@ let PRIVATE_DATA = {
     _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)
+    _nodes_total:       0,          // nodes built so far (auto_layout)
+    _nodes_placed:      0,          // ...of which carried a saved position
 };
 
 let __gclass__ = null;
@@ -1224,6 +1226,19 @@ function create_topic_node(gobj, desc, record)
     let node_name = build_node_name(gobj, desc.topic_name, record.id);
     let xy = get_default_ne_xy(gobj);
     let geometry = get_node_graph_props(gobj, desc.topic_name, record.id, record);
+
+    /*  Counted HERE, and before the two kw_get_int() below, because those
+     *  carry KW_CREATE: `get_node_graph_props()` hands back the record's own
+     *  `_geometry` object when it has one — and `{}` is one — so the very
+     *  next lines WRITE the invented cascade coordinates into it. Ask the
+     *  question a moment later and every node of every treedb answers
+     *  "placed", which is exactly how the dagre default kept refusing to
+     *  fire: 126 of 126, all of them positions the app had just made up. */
+    priv._nodes_total++;
+    if(geometry_has_position(geometry)) {
+        priv._nodes_placed++;
+    }
+
     let x = kw_get_int(gobj, geometry, "x", xy, kw_flag_t.KW_CREATE);
     let y = kw_get_int(gobj, geometry, "y", xy, kw_flag_t.KW_CREATE);
 
@@ -4495,52 +4510,20 @@ function show_node_detail_popover(gobj, node_id)
  *  junction diamonds get their neutral fill/stroke re-themed.
  ************************************************************/
 /************************************************************
- *  How many nodes of this treedb carry a saved position, and how many
- *  there are. Positions live in `__graphs__` (per topic, per node) and,
- *  on older data, in a `_geometry` on the record itself; both are read.
+ *  Does this geometry carry a POSITION?
+ *
+ *  An empty object does not. A treedb hands back `_geometry: {}` for a
+ *  record nobody ever moved, and a `__graphs__` node entry can hold a
+ *  port size and no coordinates — both are objects all the same.
  ************************************************************/
 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 `__graphs__`
-     *  node entry can hold a port size with no coordinates — both are
-     *  objects, and taking either for "this was placed" is wrong. */
     if(!is_object(g)) {
         return false;
     }
     return is_number(g.x) || is_number(g.y);
 }
 
-function count_saved_geometry(gobj)
-{
-    let priv = gobj.priv;
-    let saved = 0;
-    let total = 0;
-
-    for(let topic of Object.keys(priv.records || {})) {
-        let records = priv.records[topic];
-        if(!is_array(records)) {
-            continue;
-        }
-        let props = priv._graph_properties? priv._graph_properties[topic] : null;
-        let nodes = (props && is_object(props.nodes))? props.nodes : null;
-
-        for(let record of records) {
-            if(!record) {
-                continue;
-            }
-            total++;
-            if(nodes && geometry_has_position(nodes[record.id])) {
-                saved++;
-            } else if(geometry_has_position(record._geometry)) {
-                saved++;
-            }
-        }
-    }
-
-    return {saved: saved, total: total};
-}
-
 /************************************************************
  *  Choose a layout for a treedb nobody has arranged yet.
  *
@@ -4570,8 +4553,10 @@ function auto_layout(gobj)
      *  that forced this had exactly ONE node of 126 carrying a geometry,
      *  and it was `{x:100, y:100}` — the first cascade slot, saved. One
      *  leftover is not an arrangement. A majority is. */
-    let g = count_saved_geometry(gobj);
-    if(g.total > 0 && g.saved * 2 > g.total) {
+    /*  MOST of the nodes, not one of them: the app saves a position it
+     *  invented as readily as one a human chose, so a single stored
+     *  coordinate proves nothing. One leftover is not an arrangement. */
+    if(priv._nodes_total > 0 && priv._nodes_placed * 2 > priv._nodes_total) {
         return;         /*  somebody arranged it: leave it alone  */
     }
     if(!priv.graph) {
@@ -5791,6 +5776,11 @@ function ac_clear_data(gobj, event, kw, src)
 
     gobj_write_attr(gobj, "records", {});
 
+    /*  The node counters belong to the data that is going away: a refresh
+     *  that kept them would decide the layout on the previous treedb. */
+    priv._nodes_total = 0;
+    priv._nodes_placed = 0;
+
     graph_remove_plugin(gobj, "history");
     update_history_buttons(gobj);
     graph_clear(gobj);