@yuneta/gobj-ui 7.23.77 → 7.23.78

package/README.md

@@ -1250,7 +1250,12 @@ a level or two, with a count on every cut.
 - **The toolbar's fold pair** (the same two chevrons as the JSON graph):
   *expand all* opens every hook on all its children — the reader asking for
   the pile on purpose — and *collapse all* leaves the roots. *Refresh* is the
-  way back to the default depth.
+  way back to the default depth. **Neither moves the zoom** (since `7.23.78`):
+  a fold is not a reason to change the scale the reader chose, and until then
+  both fitted the whole graph — opening everything zoomed out to a strip and
+  closing it zoomed in on the roots, every time. The camera holds the anchor
+  still when there is one, else the first root: the top of the tree, which is
+  where a JSON viewer keeps the eye when it opens or closes everything.
 - **`dagre` reads LEFT TO RIGHT** now, with explicit `nodesep`/`ranksep`: the
   children of a node are a column beside it and the graph reads like a file
   tree. The ports move to the sides with it (fkeys on the left edge, hooks

package/dist/gobj-ui.cjs.js

@@ -60275,11 +60275,36 @@ function ac_expand_all$1(gobj, event, kw, src) {
 		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: expand all with no tree loaded`);
 		return -1;
 	}
+	let keep = fold_keep_node(gobj);
+	let vp = yui_graph_viewport_of(priv.graph, keep);
 	fold_expand_all(priv._fold_model, priv._fold_state);
-	reconcile_fold(gobj, { fit: true });
+	reconcile_fold(gobj, {
+		keep,
+		keep_vp: vp
+	});
 	return 0;
 }
 /************************************************************
+*  The node the camera holds still across a GLOBAL fold: the
+*  anchor when there is one, else the first root -- the top of
+*  the tree, which is where a JSON viewer keeps the eye when it
+*  opens or closes everything. The zoom does not move either way:
+*  a fold is not a reason to change the scale the reader chose,
+*  and until 7.23.78 both buttons fitted the whole graph, so
+*  opening everything zoomed out to a strip and closing it zoomed
+*  in on the roots, every time.
+************************************************************/
+function fold_keep_node(gobj) {
+	let priv = gobj.priv;
+	if (priv.anchor_state === "on" && priv.anchor_id) return priv.anchor_id;
+	let model = priv._fold_model;
+	for (let topic_name of model.topics) {
+		let roots = model.groups.get(fold_root_group_key(topic_name)) || [];
+		if (roots.length) return node_id_of_key(gobj, roots[0]);
+	}
+	return "";
+}
+/************************************************************
 *  The roots alone.
 ************************************************************/
 function ac_collapse_all$1(gobj, event, kw, src) {
@@ -60288,8 +60313,13 @@ function ac_collapse_all$1(gobj, event, kw, src) {
 		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: collapse all with no tree loaded`);
 		return -1;
 	}
+	let keep = fold_keep_node(gobj);
+	let vp = yui_graph_viewport_of(priv.graph, keep);
 	fold_collapse_all(priv._fold_model, priv._fold_state);
-	reconcile_fold(gobj, { fit: true });
+	reconcile_fold(gobj, {
+		keep,
+		keep_vp: vp
+	});
 	return 0;
 }
 /************************************************************

package/dist/gobj-ui.es.js

@@ -60270,11 +60270,36 @@ function ac_expand_all$1(gobj, event, kw, src) {
 		log_error(`${gobj_short_name(gobj)}: expand all with no tree loaded`);
 		return -1;
 	}
+	let keep = fold_keep_node(gobj);
+	let vp = yui_graph_viewport_of(priv.graph, keep);
 	fold_expand_all(priv._fold_model, priv._fold_state);
-	reconcile_fold(gobj, { fit: true });
+	reconcile_fold(gobj, {
+		keep,
+		keep_vp: vp
+	});
 	return 0;
 }
 /************************************************************
+*  The node the camera holds still across a GLOBAL fold: the
+*  anchor when there is one, else the first root -- the top of
+*  the tree, which is where a JSON viewer keeps the eye when it
+*  opens or closes everything. The zoom does not move either way:
+*  a fold is not a reason to change the scale the reader chose,
+*  and until 7.23.78 both buttons fitted the whole graph, so
+*  opening everything zoomed out to a strip and closing it zoomed
+*  in on the roots, every time.
+************************************************************/
+function fold_keep_node(gobj) {
+	let priv = gobj.priv;
+	if (priv.anchor_state === "on" && priv.anchor_id) return priv.anchor_id;
+	let model = priv._fold_model;
+	for (let topic_name of model.topics) {
+		let roots = model.groups.get(fold_root_group_key(topic_name)) || [];
+		if (roots.length) return node_id_of_key(gobj, roots[0]);
+	}
+	return "";
+}
+/************************************************************
 *  The roots alone.
 ************************************************************/
 function ac_collapse_all$1(gobj, event, kw, src) {
@@ -60283,8 +60308,13 @@ function ac_collapse_all$1(gobj, event, kw, src) {
 		log_error(`${gobj_short_name(gobj)}: collapse all with no tree loaded`);
 		return -1;
 	}
+	let keep = fold_keep_node(gobj);
+	let vp = yui_graph_viewport_of(priv.graph, keep);
 	fold_collapse_all(priv._fold_model, priv._fold_state);
-	reconcile_fold(gobj, { fit: true });
+	reconcile_fold(gobj, {
+		keep,
+		keep_vp: vp
+	});
 	return 0;
 }
 /************************************************************

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -124,6 +124,7 @@ import {
     fold_pending_groups,
     fold_node_key,
     fold_split_group_key,
+    fold_root_group_key,
 } from "./treedb_fold_model.js";
 import {layout_tree, layout_radial} from "./treedb_layout.js";
 
@@ -9079,12 +9080,41 @@ function ac_expand_all(gobj, event, kw, src)
         log_error(`${gobj_short_name(gobj)}: expand all with no tree loaded`);
         return -1;
     }
+    let keep = fold_keep_node(gobj);
+    let vp = yui_graph_viewport_of(priv.graph, keep);
     fold_expand_all(priv._fold_model, priv._fold_state);
-    reconcile_fold(gobj, {fit: true});
+    reconcile_fold(gobj, {keep: keep, keep_vp: vp});
 
     return 0;
 }
 
+/************************************************************
+ *  The node the camera holds still across a GLOBAL fold: the
+ *  anchor when there is one, else the first root -- the top of
+ *  the tree, which is where a JSON viewer keeps the eye when it
+ *  opens or closes everything. The zoom does not move either way:
+ *  a fold is not a reason to change the scale the reader chose,
+ *  and until 7.23.78 both buttons fitted the whole graph, so
+ *  opening everything zoomed out to a strip and closing it zoomed
+ *  in on the roots, every time.
+ ************************************************************/
+function fold_keep_node(gobj)
+{
+    let priv = gobj.priv;
+
+    if(priv.anchor_state === "on" && priv.anchor_id) {
+        return priv.anchor_id;
+    }
+    let model = priv._fold_model;
+    for(let topic_name of model.topics) {
+        let roots = model.groups.get(fold_root_group_key(topic_name)) || [];
+        if(roots.length) {
+            return node_id_of_key(gobj, roots[0]);
+        }
+    }
+    return "";
+}
+
 /************************************************************
  *  The roots alone.
  ************************************************************/
@@ -9096,8 +9126,10 @@ function ac_collapse_all(gobj, event, kw, src)
         log_error(`${gobj_short_name(gobj)}: collapse all with no tree loaded`);
         return -1;
     }
+    let keep = fold_keep_node(gobj);
+    let vp = yui_graph_viewport_of(priv.graph, keep);
     fold_collapse_all(priv._fold_model, priv._fold_state);
-    reconcile_fold(gobj, {fit: true});
+    reconcile_fold(gobj, {keep: keep, keep_vp: vp});
 
     return 0;
 }