@yuneta/gobj-ui 7.23.104 → 7.23.106

package/README.md

@@ -962,13 +962,18 @@ Two mechanisms, because the question is not the same in the two cases:
   folds have always used. It keeps the zoom because it only translates, and it
   survives a relayout that moves everything, which restoring raw coordinates
   would not.
-- **Across a RELOAD** there is no node to hold on to yet, so the viewport itself
-  is restored: `{zoom, x, y}` as G6 reports them (`getZoom()` + `getPosition()`,
-  the documented pair of `zoomTo()` + `translateTo()`).
+- **Across a RELOAD** the same thing is saved and replayed: the zoom, a NODE,
+  and the viewport pixel that node was on. **Not G6's own position** — an
+  absolute `translateTo()` leaves the camera at `canvasCentre - T/zoom`, so
+  `getPosition()` and `translateTo()` are each other's inverse only at zoom 1,
+  and restoring one with the other brings the zoom back and puts the graph
+  somewhere else. That is the whole reason `yui_graph_place_at()` exists.
 
 Wiring: `C_G6_NODES_TREE` takes a `camera` attr — the viewport to restore on its
 FIRST draw, empty meaning *open fitted* — and publishes **`EV_CAMERA_CHANGED
-{zoom, x, y}`** once a move has settled. The settle is a real time (700 ms of
+{zoom, node, x, y}`** once a move has settled. A saved node this load does not
+have leaves the graph to its opening fit, checked before the zoom is touched:
+a zoom with no framing to go with it is worse than a fit. The settle is a real time (700 ms of
 the browser's `setTimeout`, not a `C_TIMER`): a wheel notch, a pinch and a drag
 each fire `aftertransform` many times, and what is worth saving is where the
 gesture ENDED. It fires for a PAN as well as a zoom — a pan is the reader's just

package/dist/gobj-ui.cjs.js

@@ -54825,7 +54825,7 @@ var attrs_table$4 = [
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "node_labels", 0, true, "A `shape` node says its name under the figure. Off, it is a coloured figure and nothing else"),
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "confirm_delete_node", 0, true, "Ask confirmation before deleting a node"),
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "confirm_unlink_edge", 0, true, "Ask confirmation before unlinking an edge"),
-	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_DICT, "camera", 0, "{}", "Where the reader left the viewport: {zoom, x, y}. Empty = the graph opens fitted. Restored on the FIRST draw and published back as EV_CAMERA_CHANGED once a move settles, so a host can persist it"),
+	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_DICT, "camera", 0, "{}", "Where the reader left the viewport: {zoom, node, x, y} -- a NODE at a viewport pixel, not G6's own position, which does not restore. Empty = the graph opens fitted. Restored on the FIRST draw and published back as EV_CAMERA_CHANGED once a move settles, so a host can persist it"),
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_STRING, "wide", 0, "40px", "Height of header"),
 	(0, _yuneta_gobj_js.SDATA_END)()
 ];
@@ -56711,15 +56711,17 @@ var MIN_READABLE_ZOOM = .5;
 var CAMERA_SETTLE_MS = 700;
 function read_camera(gobj) {
 	let graph = gobj.priv.graph;
-	if (!graph || typeof graph.getZoom !== "function" || typeof graph.getPosition !== "function") return null;
+	if (!graph || typeof graph.getZoom !== "function") return null;
 	try {
 		let z = graph.getZoom();
-		let p = graph.getPosition();
-		if (!(0, _yuneta_gobj_js.is_number)(z) || !p || !(0, _yuneta_gobj_js.is_number)(p[0]) || !(0, _yuneta_gobj_js.is_number)(p[1])) return null;
+		let node = fold_keep_node(gobj);
+		let vp = node ? yui_graph_viewport_of(graph, node) : null;
+		if (!(0, _yuneta_gobj_js.is_number)(z) || !node || !vp || !(0, _yuneta_gobj_js.is_number)(vp[0]) || !(0, _yuneta_gobj_js.is_number)(vp[1])) return null;
 		return {
 			zoom: z,
-			x: p[0],
-			y: p[1]
+			node,
+			x: vp[0],
+			y: vp[1]
 		};
 	} catch (e) {
 		return null;
@@ -56729,11 +56731,12 @@ async function restore_camera(gobj) {
 	let priv = gobj.priv;
 	let graph = priv.graph;
 	let cam = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "camera");
-	if (!graph || (0, _yuneta_gobj_js.empty_json)(cam) || !(0, _yuneta_gobj_js.is_number)(cam.zoom)) return false;
+	if (!graph || (0, _yuneta_gobj_js.empty_json)(cam) || !(0, _yuneta_gobj_js.is_number)(cam.zoom) || !cam.node || !(0, _yuneta_gobj_js.is_number)(cam.x) || !(0, _yuneta_gobj_js.is_number)(cam.y)) return false;
+	if (!yui_graph_viewport_of(graph, cam.node)) return false;
 	priv._camera_restoring = true;
 	try {
 		await graph.zoomTo(cam.zoom);
-		if ((0, _yuneta_gobj_js.is_number)(cam.x) && (0, _yuneta_gobj_js.is_number)(cam.y)) await graph.translateTo([cam.x, cam.y]);
+		await yui_graph_place_at(graph, cam.node, [cam.x, cam.y]);
 		return true;
 	} catch (e) {
 		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: cannot restore the camera: ${e}`);
@@ -63916,6 +63919,7 @@ function ac_layout_autoset(gobj, event, kw, src) {
 function ac_camera_changed(gobj, event, kw, src) {
 	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "camera", {
 		zoom: kw.zoom,
+		node: kw.node,
 		x: kw.x,
 		y: kw.y
 	});

package/dist/gobj-ui.es.js

@@ -54820,7 +54820,7 @@ var attrs_table$4 = [
 	SDATA(data_type_t.DTP_BOOLEAN, "node_labels", 0, true, "A `shape` node says its name under the figure. Off, it is a coloured figure and nothing else"),
 	SDATA(data_type_t.DTP_BOOLEAN, "confirm_delete_node", 0, true, "Ask confirmation before deleting a node"),
 	SDATA(data_type_t.DTP_BOOLEAN, "confirm_unlink_edge", 0, true, "Ask confirmation before unlinking an edge"),
-	SDATA(data_type_t.DTP_DICT, "camera", 0, "{}", "Where the reader left the viewport: {zoom, x, y}. Empty = the graph opens fitted. Restored on the FIRST draw and published back as EV_CAMERA_CHANGED once a move settles, so a host can persist it"),
+	SDATA(data_type_t.DTP_DICT, "camera", 0, "{}", "Where the reader left the viewport: {zoom, node, x, y} -- a NODE at a viewport pixel, not G6's own position, which does not restore. Empty = the graph opens fitted. Restored on the FIRST draw and published back as EV_CAMERA_CHANGED once a move settles, so a host can persist it"),
 	SDATA(data_type_t.DTP_STRING, "wide", 0, "40px", "Height of header"),
 	SDATA_END()
 ];
@@ -56706,15 +56706,17 @@ var MIN_READABLE_ZOOM = .5;
 var CAMERA_SETTLE_MS = 700;
 function read_camera(gobj) {
 	let graph = gobj.priv.graph;
-	if (!graph || typeof graph.getZoom !== "function" || typeof graph.getPosition !== "function") return null;
+	if (!graph || typeof graph.getZoom !== "function") return null;
 	try {
 		let z = graph.getZoom();
-		let p = graph.getPosition();
-		if (!is_number(z) || !p || !is_number(p[0]) || !is_number(p[1])) return null;
+		let node = fold_keep_node(gobj);
+		let vp = node ? yui_graph_viewport_of(graph, node) : null;
+		if (!is_number(z) || !node || !vp || !is_number(vp[0]) || !is_number(vp[1])) return null;
 		return {
 			zoom: z,
-			x: p[0],
-			y: p[1]
+			node,
+			x: vp[0],
+			y: vp[1]
 		};
 	} catch (e) {
 		return null;
@@ -56724,11 +56726,12 @@ async function restore_camera(gobj) {
 	let priv = gobj.priv;
 	let graph = priv.graph;
 	let cam = gobj_read_attr(gobj, "camera");
-	if (!graph || empty_json(cam) || !is_number(cam.zoom)) return false;
+	if (!graph || empty_json(cam) || !is_number(cam.zoom) || !cam.node || !is_number(cam.x) || !is_number(cam.y)) return false;
+	if (!yui_graph_viewport_of(graph, cam.node)) return false;
 	priv._camera_restoring = true;
 	try {
 		await graph.zoomTo(cam.zoom);
-		if (is_number(cam.x) && is_number(cam.y)) await graph.translateTo([cam.x, cam.y]);
+		await yui_graph_place_at(graph, cam.node, [cam.x, cam.y]);
 		return true;
 	} catch (e) {
 		log_error(`${gobj_short_name(gobj)}: cannot restore the camera: ${e}`);
@@ -63911,6 +63914,7 @@ function ac_layout_autoset(gobj, event, kw, src) {
 function ac_camera_changed(gobj, event, kw, src) {
 	gobj_write_attr(gobj, "camera", {
 		zoom: kw.zoom,
+		node: kw.node,
 		x: kw.x,
 		y: kw.y
 	});

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -444,7 +444,7 @@ SDATA(data_type_t.DTP_BOOLEAN,  "confirm_delete_node",  0,  true,   "Ask confirm
 SDATA(data_type_t.DTP_BOOLEAN,  "confirm_unlink_edge",  0,  true,   "Ask confirmation before unlinking an edge"),
 
 /*---------------- Camera ----------------*/
-SDATA(data_type_t.DTP_DICT,     "camera",               0,  "{}",   "Where the reader left the viewport: {zoom, x, y}. Empty = the graph opens fitted. Restored on the FIRST draw and published back as EV_CAMERA_CHANGED once a move settles, so a host can persist it"),
+SDATA(data_type_t.DTP_DICT,     "camera",               0,  "{}",   "Where the reader left the viewport: {zoom, node, x, y} -- a NODE at a viewport pixel, not G6's own position, which does not restore. Empty = the graph opens fitted. Restored on the FIRST draw and published back as EV_CAMERA_CHANGED once a move settles, so a host can persist it"),
 
 SDATA(data_type_t.DTP_STRING,   "wide",                 0,  "40px", "Height of header"),
 
@@ -3370,21 +3370,35 @@ const MIN_READABLE_ZOOM = 0.5;
  ************************************************************/
 const CAMERA_SETTLE_MS = 700;
 
+/*  A camera is saved as a NODE at a VIEWPORT PIXEL, plus the zoom --
+ *  never as G6's own position.
+ *
+ *  `translateTo()` does not take viewport pixels: an absolute translate
+ *  leaves the camera at `canvasCentre - T/zoom`, so `getPosition()` and
+ *  `translateTo()` are only each other's inverse at zoom 1. Restoring
+ *  one with the other brought the zoom back and put the graph somewhere
+ *  else, which is exactly what it looks like -- and the reason to write
+ *  the pair down (`yui_graph_place_at`, gobj-ui 7.23.29) was that it
+ *  had already cost fifteen iterations once.
+ *
+ *  A node and a pixel is also the SAME thing the folds keep across a
+ *  rebuild. One idea, used twice.  */
 function read_camera(gobj)
 {
     let priv = gobj.priv;
     let graph = priv.graph;
 
-    if(!graph || typeof graph.getZoom !== "function" || typeof graph.getPosition !== "function") {
+    if(!graph || typeof graph.getZoom !== "function") {
         return null;
     }
     try {
         let z = graph.getZoom();
-        let p = graph.getPosition();
-        if(!is_number(z) || !p || !is_number(p[0]) || !is_number(p[1])) {
+        let node = fold_keep_node(gobj);
+        let vp = node? yui_graph_viewport_of(graph, node) : null;
+        if(!is_number(z) || !node || !vp || !is_number(vp[0]) || !is_number(vp[1])) {
             return null;
         }
-        return {zoom: z, x: p[0], y: p[1]};
+        return {zoom: z, node: node, x: vp[0], y: vp[1]};
     } catch(e) {
         return null;    /*  between renders: there is no camera to read  */
     }
@@ -3398,15 +3412,21 @@ async function restore_camera(gobj)
     let graph = priv.graph;
     let cam = gobj_read_attr(gobj, "camera");
 
-    if(!graph || empty_json(cam) || !is_number(cam.zoom)) {
+    if(!graph || empty_json(cam) || !is_number(cam.zoom) ||
+            !cam.node || !is_number(cam.x) || !is_number(cam.y)) {
+        return false;   /*  nothing saved, or saved by a version that wrote
+                            G6's own position -- which never restored  */
+    }
+    /*  Checked BEFORE the zoom is touched: a saved node that this load
+     *  does not have (the treedb changed under it) must leave the graph
+     *  to its opening fit, not at a zoom with no framing to go with it.  */
+    if(!yui_graph_viewport_of(graph, cam.node)) {
         return false;
     }
     priv._camera_restoring = true;
     try {
         await graph.zoomTo(cam.zoom);
-        if(is_number(cam.x) && is_number(cam.y)) {
-            await graph.translateTo([cam.x, cam.y]);
-        }
+        await yui_graph_place_at(graph, cam.node, [cam.x, cam.y]);
         return true;
     } catch(e) {
         log_error(`${gobj_short_name(gobj)}: cannot restore the camera: ${e}`);

package/src/c_yui_treedb_graph.js

@@ -2900,8 +2900,13 @@ function ac_layout_autoset(gobj, event, kw, src)
  ************************************************************/
 function ac_camera_changed(gobj, event, kw, src)
 {
+    /*  `node` travels with the rest and is not optional: a camera is a
+     *  NODE at a viewport pixel, and one rebuilt here as `{zoom, x, y}`
+     *  -- which is what this did -- is a camera the engine refuses to
+     *  restore, so the graph came back at the right zoom in the wrong
+     *  place. Copy the fields the contract names, all of them.  */
     gobj_write_attr(gobj, "camera", {
-        zoom: kw.zoom, x: kw.x, y: kw.y
+        zoom: kw.zoom, node: kw.node, x: kw.x, y: kw.y
     });
     gobj_save_persistent_attrs(gobj, "camera");
     return 0;