@yuneta/gobj-ui 7.23.78 → 7.23.80

package/README.md

@@ -1370,10 +1370,24 @@ it. The node holds still on screen while the rest makes room, as a fold does.
 A change of the global mode forgets these exceptions. Consumer i18n keys:
 `closed nodes`, `node labels`, `open node`, `close node`.
 
-The ports of an open card grew with this (radius 10 on a card, 5 on a chip,
-2 px stroke): they are what a link is drawn from and what a resize takes hold
+The ports of an open card grew with this (radius 14 on a card, 8 on a chip
+since `7.23.79`; 10 / 5 in `7.23.75`, 2 px stroke): they are what a link is drawn from and what a resize takes hold
 of, and at radius 6 with a hairline nobody could tell they were either.
 
+**A size nobody chose is not saved** (since `7.23.80`). `Save` collects the
+geometry of every card into `__graphs__`, and it used to write the SIZE and
+the port radius of every card too — so every Save froze the library's size of
+the day into the treedb, and a later default (the bigger ports above) reached
+no saved treedb: the same trap as the invented cascade coordinates, for the
+size. A card on its tier's default now saves its position and nothing else;
+a closed node saves no size at all (a square is not the card's size), its
+entry keeps what it had. And the node's context menu, in edition, has the way
+back: **reset sizes** / **reset topic sizes** forget every saved size, port
+radius and per-port radius — per node and as topic defaults from `resize all`
+— for all topics or the node's, put the library's defaults back on every card
+on the spot, and arm Save. Positions and edge styles are not touched.
+Consumer i18n keys: `reset sizes`, `reset topic sizes`.
+
 ### The legend is the graph's layer control
 
 The legend strip under the toolbar is **always there** now (the *Legend*

package/dist/gobj-ui.cjs.js

@@ -54527,8 +54527,8 @@ var GCLASS_NAME$4 = "C_G6_NODES_TREE";
 var HIGHLIGHT_COLOR = "#f0a020";
 var HIGHLIGHT_HALO = "rgba(240,160,32,0.35)";
 var SELECT_RING = "rgba(59,130,246,0.95)";
-var PORT_R_ENTITY = 10;
-var PORT_R_CHILD = 5;
+var PORT_R_ENTITY = 14;
+var PORT_R_CHILD = 8;
 var PORT_LINE_WIDTH = 2;
 var COMPACT_SIZE = {
 	hierarchical: 32,
@@ -56057,17 +56057,36 @@ function update_geometry(gobj, node_id) {
 	let topic_props = priv._graph_properties[topic_name];
 	if (!(0, _yuneta_gobj_js.is_object)(topic_props.nodes)) topic_props.nodes = {};
 	let node_props = topic_props.nodes[record.id] || {};
-	(0, _yuneta_gobj_js.json_object_update)(node_props, (0, _yuneta_gobj_js.kw_clone_by_keys)(gobj, style, [
+	let picked = (0, _yuneta_gobj_js.kw_clone_by_keys)(gobj, style, [
 		"x",
 		"y",
 		"size",
 		"portR"
-	]));
-	let ports = (nodedata.style || {}).ports || [];
-	let port_sizes = {};
-	for (let i = 0; i < ports.length; i++) if (ports[i].r != null) port_sizes[ports[i].key] = ports[i].r;
-	if (Object.keys(port_sizes).length > 0) node_props.port_sizes = port_sizes;
-	else delete node_props.port_sizes;
+	]);
+	if (node_is_compact(gobj, node_id)) {
+		delete picked.size;
+		delete picked.portR;
+	} else {
+		let desc = nodedata.data.desc;
+		let def_size = card_size_for(desc.node_treedb_type, !!pills_html_of(gobj, nodedata));
+		if ((0, _yuneta_gobj_js.is_array)(picked.size) && picked.size[0] === def_size[0] && picked.size[1] === def_size[1]) {
+			delete picked.size;
+			delete node_props.size;
+		}
+		let def_r = desc.node_treedb_type === "child" ? PORT_R_CHILD : PORT_R_ENTITY;
+		if (picked.portR === def_r) {
+			delete picked.portR;
+			delete node_props.portR;
+		}
+	}
+	(0, _yuneta_gobj_js.json_object_update)(node_props, picked);
+	if (!node_is_compact(gobj, node_id)) {
+		let ports = (nodedata.style || {}).ports || [];
+		let port_sizes = {};
+		for (let i = 0; i < ports.length; i++) if (ports[i].r != null) port_sizes[ports[i].key] = ports[i].r;
+		if (Object.keys(port_sizes).length > 0) node_props.port_sizes = port_sizes;
+		else delete node_props.port_sizes;
+	}
 	topic_props.nodes[record.id] = node_props;
 	nodedata.data.graph_props = node_props;
 }
@@ -59146,6 +59165,8 @@ function build_node_context_menu(gobj, node_id) {
 	if (gobj.priv.edit_mode && !node_is_compact(gobj, node_id)) {
 		items.push(ctx_item("g6-icon-resize", (0, i18next.t)("resize all"), "resize_all_nodes"));
 		items.push(ctx_item("g6-icon-resize", (0, i18next.t)("resize topic nodes"), "resize_topic_nodes"));
+		items.push(ctx_item("g6-icon-undo", (0, i18next.t)("reset sizes"), "reset_all_sizes"));
+		items.push(ctx_item("g6-icon-undo", (0, i18next.t)("reset topic sizes"), "reset_topic_sizes"));
 	}
 	return items;
 }
@@ -59182,6 +59203,12 @@ function handle_context_menu_click(gobj, value) {
 		case "resize_topic_nodes":
 			copy_size_to_nodes(gobj, true);
 			break;
+		case "reset_all_sizes":
+			reset_sizes(gobj, false);
+			break;
+		case "reset_topic_sizes":
+			reset_sizes(gobj, true);
+			break;
 		case "resize_all_ports":
 			copy_size_to_ports(gobj, false);
 			break;
@@ -59243,6 +59270,56 @@ function copy_size_to_nodes(gobj, same_topic_only) {
 	}
 }
 /************************************************************
+*  Forget every SAVED size: the card sizes, the port radii and the
+*  per-port radii, per node and as topic defaults (`resize all`),
+*  for one topic or for all of them. The cards go back to the
+*  library's defaults on the spot, and Save writes the cleared
+*  entries -- a size nobody chose is not written back (see
+*  update_geometry). Positions and edge styles are not touched:
+*  they are a different choice.
+************************************************************/
+function reset_sizes(gobj, same_topic_only) {
+	let priv = gobj.priv;
+	let graph = priv.graph;
+	let topic = "";
+	if (same_topic_only) {
+		let nd = priv._context_node_id ? graph.getNodeData(priv._context_node_id) : null;
+		if (!nd || !nd.data || !nd.data.topic_name) {
+			(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: reset topic sizes without a node`);
+			return;
+		}
+		topic = nd.data.topic_name;
+	}
+	const SIZE_KEYS = [
+		"size",
+		"portR",
+		"port_sizes"
+	];
+	let strip = (props) => {
+		if (!(0, _yuneta_gobj_js.is_object)(props)) return;
+		for (let k of SIZE_KEYS) delete props[k];
+	};
+	for (const [topic_name, props] of Object.entries(priv._graph_properties || {})) {
+		if (topic && topic_name !== topic) continue;
+		if ((0, _yuneta_gobj_js.is_object)(props.nodes)) for (let node_props of Object.values(props.nodes)) strip(node_props);
+		strip(props.defaults);
+	}
+	let ids = [];
+	for (let nd of graph.getNodeData() || []) {
+		if (!nd || !nd.data || !nd.data.desc || is_more_node(nd)) continue;
+		if (topic && nd.data.topic_name !== topic) continue;
+		strip(nd.data.graph_props);
+		if (nd.data.record) strip(nd.data.record._geometry);
+		ids.push(nd.id);
+	}
+	reshape_nodes(gobj, ids);
+	graph.draw().then(() => {
+		update_resize_handles_position(gobj);
+		update_port_resize_handles_position(gobj);
+		mark_graph_dirty(gobj);
+	});
+}
+/************************************************************
 *  Copy the selected port's radius to matching ports.
 *  If same_topic_only=true, only ports in same-topic nodes.
 *  If same_topic_only=false, matching ports in all nodes.

package/dist/gobj-ui.es.js

@@ -54522,8 +54522,8 @@ var GCLASS_NAME$4 = "C_G6_NODES_TREE";
 var HIGHLIGHT_COLOR = "#f0a020";
 var HIGHLIGHT_HALO = "rgba(240,160,32,0.35)";
 var SELECT_RING = "rgba(59,130,246,0.95)";
-var PORT_R_ENTITY = 10;
-var PORT_R_CHILD = 5;
+var PORT_R_ENTITY = 14;
+var PORT_R_CHILD = 8;
 var PORT_LINE_WIDTH = 2;
 var COMPACT_SIZE = {
 	hierarchical: 32,
@@ -56052,17 +56052,36 @@ function update_geometry(gobj, node_id) {
 	let topic_props = priv._graph_properties[topic_name];
 	if (!is_object(topic_props.nodes)) topic_props.nodes = {};
 	let node_props = topic_props.nodes[record.id] || {};
-	json_object_update(node_props, kw_clone_by_keys(gobj, style, [
+	let picked = kw_clone_by_keys(gobj, style, [
 		"x",
 		"y",
 		"size",
 		"portR"
-	]));
-	let ports = (nodedata.style || {}).ports || [];
-	let port_sizes = {};
-	for (let i = 0; i < ports.length; i++) if (ports[i].r != null) port_sizes[ports[i].key] = ports[i].r;
-	if (Object.keys(port_sizes).length > 0) node_props.port_sizes = port_sizes;
-	else delete node_props.port_sizes;
+	]);
+	if (node_is_compact(gobj, node_id)) {
+		delete picked.size;
+		delete picked.portR;
+	} else {
+		let desc = nodedata.data.desc;
+		let def_size = card_size_for(desc.node_treedb_type, !!pills_html_of(gobj, nodedata));
+		if (is_array(picked.size) && picked.size[0] === def_size[0] && picked.size[1] === def_size[1]) {
+			delete picked.size;
+			delete node_props.size;
+		}
+		let def_r = desc.node_treedb_type === "child" ? PORT_R_CHILD : PORT_R_ENTITY;
+		if (picked.portR === def_r) {
+			delete picked.portR;
+			delete node_props.portR;
+		}
+	}
+	json_object_update(node_props, picked);
+	if (!node_is_compact(gobj, node_id)) {
+		let ports = (nodedata.style || {}).ports || [];
+		let port_sizes = {};
+		for (let i = 0; i < ports.length; i++) if (ports[i].r != null) port_sizes[ports[i].key] = ports[i].r;
+		if (Object.keys(port_sizes).length > 0) node_props.port_sizes = port_sizes;
+		else delete node_props.port_sizes;
+	}
 	topic_props.nodes[record.id] = node_props;
 	nodedata.data.graph_props = node_props;
 }
@@ -59141,6 +59160,8 @@ function build_node_context_menu(gobj, node_id) {
 	if (gobj.priv.edit_mode && !node_is_compact(gobj, node_id)) {
 		items.push(ctx_item("g6-icon-resize", t("resize all"), "resize_all_nodes"));
 		items.push(ctx_item("g6-icon-resize", t("resize topic nodes"), "resize_topic_nodes"));
+		items.push(ctx_item("g6-icon-undo", t("reset sizes"), "reset_all_sizes"));
+		items.push(ctx_item("g6-icon-undo", t("reset topic sizes"), "reset_topic_sizes"));
 	}
 	return items;
 }
@@ -59177,6 +59198,12 @@ function handle_context_menu_click(gobj, value) {
 		case "resize_topic_nodes":
 			copy_size_to_nodes(gobj, true);
 			break;
+		case "reset_all_sizes":
+			reset_sizes(gobj, false);
+			break;
+		case "reset_topic_sizes":
+			reset_sizes(gobj, true);
+			break;
 		case "resize_all_ports":
 			copy_size_to_ports(gobj, false);
 			break;
@@ -59238,6 +59265,56 @@ function copy_size_to_nodes(gobj, same_topic_only) {
 	}
 }
 /************************************************************
+*  Forget every SAVED size: the card sizes, the port radii and the
+*  per-port radii, per node and as topic defaults (`resize all`),
+*  for one topic or for all of them. The cards go back to the
+*  library's defaults on the spot, and Save writes the cleared
+*  entries -- a size nobody chose is not written back (see
+*  update_geometry). Positions and edge styles are not touched:
+*  they are a different choice.
+************************************************************/
+function reset_sizes(gobj, same_topic_only) {
+	let priv = gobj.priv;
+	let graph = priv.graph;
+	let topic = "";
+	if (same_topic_only) {
+		let nd = priv._context_node_id ? graph.getNodeData(priv._context_node_id) : null;
+		if (!nd || !nd.data || !nd.data.topic_name) {
+			log_error(`${gobj_short_name(gobj)}: reset topic sizes without a node`);
+			return;
+		}
+		topic = nd.data.topic_name;
+	}
+	const SIZE_KEYS = [
+		"size",
+		"portR",
+		"port_sizes"
+	];
+	let strip = (props) => {
+		if (!is_object(props)) return;
+		for (let k of SIZE_KEYS) delete props[k];
+	};
+	for (const [topic_name, props] of Object.entries(priv._graph_properties || {})) {
+		if (topic && topic_name !== topic) continue;
+		if (is_object(props.nodes)) for (let node_props of Object.values(props.nodes)) strip(node_props);
+		strip(props.defaults);
+	}
+	let ids = [];
+	for (let nd of graph.getNodeData() || []) {
+		if (!nd || !nd.data || !nd.data.desc || is_more_node(nd)) continue;
+		if (topic && nd.data.topic_name !== topic) continue;
+		strip(nd.data.graph_props);
+		if (nd.data.record) strip(nd.data.record._geometry);
+		ids.push(nd.id);
+	}
+	reshape_nodes(gobj, ids);
+	graph.draw().then(() => {
+		update_resize_handles_position(gobj);
+		update_port_resize_handles_position(gobj);
+		mark_graph_dirty(gobj);
+	});
+}
+/************************************************************
 *  Copy the selected port's radius to matching ports.
 *  If same_topic_only=true, only ports in same-topic nodes.
 *  If same_topic_only=false, matching ports in all nodes.

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -253,10 +253,12 @@ const SELECT_RING = "rgba(59,130,246,0.95)";
  *  The ports of an open card. They are what a link is DRAWN from
  *  and what a resize takes hold of, and at a radius of 6 (2 on a
  *  chip) with a hairline stroke nobody could tell they were either:
- *  a port has to look like a handle.
+ *  a port has to look like a handle. 10 / 5 in 7.23.75 was still
+ *  read as a dot on a deployed treedb; 14 / 8 since 7.23.79. A
+ *  saved geometry or a topic default (`resize all`) still wins.
  */
-const PORT_R_ENTITY   = 10;
-const PORT_R_CHILD    = 5;
+const PORT_R_ENTITY   = 14;
+const PORT_R_CHILD    = 8;
 const PORT_LINE_WIDTH = 2;
 
 /*
@@ -2730,26 +2732,50 @@ function update_geometry(gobj, node_id)
         topic_props.nodes = {};
     }
 
-    // Extract geometry from render style
+    /*  Extract geometry from render style -- the POSITION always, the
+     *  SIZE only when somebody chose it. A card on the tier's default
+     *  used to be saved with that default, so every Save froze the
+     *  library's size of the day into `__graphs__` and a later default
+     *  (bigger ports, 7.23.75/79) reached no saved treedb: the same
+     *  trap as the invented cascade coordinates, for the size. And a
+     *  CLOSED node is a square: its render size is not the card's and
+     *  is never saved as one -- the entry keeps what it had.  */
     let node_props = topic_props.nodes[record.id] || {};
-    json_object_update(
-        node_props,
-        kw_clone_by_keys(gobj, style, ["x", "y", "size", "portR"])
-    );
+    let picked = kw_clone_by_keys(gobj, style, ["x", "y", "size", "portR"]);
+    if(node_is_compact(gobj, node_id)) {
+        delete picked.size;
+        delete picked.portR;
+    } else {
+        let desc = nodedata.data.desc;
+        let def_size = card_size_for(desc.node_treedb_type, !!pills_html_of(gobj, nodedata));
+        if(is_array(picked.size) && picked.size[0] === def_size[0] &&
+                picked.size[1] === def_size[1]) {
+            delete picked.size;
+            delete node_props.size;
+        }
+        let def_r = (desc.node_treedb_type === 'child')? PORT_R_CHILD : PORT_R_ENTITY;
+        if(picked.portR === def_r) {
+            delete picked.portR;
+            delete node_props.portR;
+        }
+    }
+    json_object_update(node_props, picked);
 
     // Save per-port radius values (only ports with custom r)
-    let node_style = nodedata.style || {};
-    let ports = node_style.ports || [];
-    let port_sizes = {};
-    for(let i = 0; i < ports.length; i++) {
-        if(ports[i].r != null) {
-            port_sizes[ports[i].key] = ports[i].r;
+    if(!node_is_compact(gobj, node_id)) {
+        let node_style = nodedata.style || {};
+        let ports = node_style.ports || [];
+        let port_sizes = {};
+        for(let i = 0; i < ports.length; i++) {
+            if(ports[i].r != null) {
+                port_sizes[ports[i].key] = ports[i].r;
+            }
+        }
+        if(Object.keys(port_sizes).length > 0) {
+            node_props.port_sizes = port_sizes;
+        } else {
+            delete node_props.port_sizes;
         }
-    }
-    if(Object.keys(port_sizes).length > 0) {
-        node_props.port_sizes = port_sizes;
-    } else {
-        delete node_props.port_sizes;
     }
 
     topic_props.nodes[record.id] = node_props;
@@ -7408,6 +7434,11 @@ function build_node_context_menu(gobj, node_id)
     if(gobj.priv.edit_mode && !node_is_compact(gobj, node_id)) {
         items.push(ctx_item('g6-icon-resize', t('resize all'), 'resize_all_nodes'));
         items.push(ctx_item('g6-icon-resize', t('resize topic nodes'), 'resize_topic_nodes'));
+        /*  The way back: the sizes somebody saved -- or that a Save
+         *  froze before 7.23.80 -- forgotten, the library's defaults
+         *  back on every card.  */
+        items.push(ctx_item('g6-icon-undo', t('reset sizes'), 'reset_all_sizes'));
+        items.push(ctx_item('g6-icon-undo', t('reset topic sizes'), 'reset_topic_sizes'));
     }
 
     return items;
@@ -7458,6 +7489,12 @@ function handle_context_menu_click(gobj, value)
         case 'resize_topic_nodes':
             copy_size_to_nodes(gobj, true);
             break;
+        case 'reset_all_sizes':
+            reset_sizes(gobj, false);
+            break;
+        case 'reset_topic_sizes':
+            reset_sizes(gobj, true);
+            break;
         case 'resize_all_ports':
             copy_size_to_ports(gobj, false);
             break;
@@ -7562,6 +7599,75 @@ function copy_size_to_nodes(gobj, same_topic_only)
     }
 }
 
+/************************************************************
+ *  Forget every SAVED size: the card sizes, the port radii and the
+ *  per-port radii, per node and as topic defaults (`resize all`),
+ *  for one topic or for all of them. The cards go back to the
+ *  library's defaults on the spot, and Save writes the cleared
+ *  entries -- a size nobody chose is not written back (see
+ *  update_geometry). Positions and edge styles are not touched:
+ *  they are a different choice.
+ ************************************************************/
+function reset_sizes(gobj, same_topic_only)
+{
+    let priv = gobj.priv;
+    let graph = priv.graph;
+
+    let topic = "";
+    if(same_topic_only) {
+        let nd = priv._context_node_id? graph.getNodeData(priv._context_node_id) : null;
+        if(!nd || !nd.data || !nd.data.topic_name) {
+            log_error(`${gobj_short_name(gobj)}: reset topic sizes without a node`);
+            return;
+        }
+        topic = nd.data.topic_name;
+    }
+    const SIZE_KEYS = ["size", "portR", "port_sizes"];
+    let strip = (props) => {
+        if(!is_object(props)) {
+            return;
+        }
+        for(let k of SIZE_KEYS) {
+            delete props[k];
+        }
+    };
+
+    /*  The saved entries, on screen or folded away.  */
+    for(const [topic_name, props] of Object.entries(priv._graph_properties || {})) {
+        if(topic && topic_name !== topic) {
+            continue;
+        }
+        if(is_object(props.nodes)) {
+            for(let node_props of Object.values(props.nodes)) {
+                strip(node_props);
+            }
+        }
+        strip(props.defaults);
+    }
+
+    /*  The nodes on screen: their own copy of the entry, then the shape.  */
+    let ids = [];
+    for(let nd of (graph.getNodeData() || [])) {
+        if(!nd || !nd.data || !nd.data.desc || is_more_node(nd)) {
+            continue;
+        }
+        if(topic && nd.data.topic_name !== topic) {
+            continue;
+        }
+        strip(nd.data.graph_props);
+        if(nd.data.record) {
+            strip(nd.data.record._geometry);
+        }
+        ids.push(nd.id);
+    }
+    reshape_nodes(gobj, ids);
+    graph.draw().then(() => {
+        update_resize_handles_position(gobj);
+        update_port_resize_handles_position(gobj);
+        mark_graph_dirty(gobj);
+    });
+}
+
 /************************************************************
  *  Copy the selected port's radius to matching ports.
  *  If same_topic_only=true, only ports in same-topic nodes.