@yuneta/gobj-ui 7.23.144 → 7.23.145

package/dist/gobj-ui.cjs.js

@@ -60735,6 +60735,23 @@ function auto_layout(gobj) {
 	return true;
 }
 /************************************************************
+*  Paint the minimap again from where the nodes are NOW.
+*
+*  It repaints off the graph's draw events, and a layout emits none:
+*  G6 moves the nodes with a SILENT draw. So after a layout change
+*  the minimap went on showing the arrangement before it.
+************************************************************/
+function repaint_minimap(gobj) {
+	let plugin = graph_get_plugin(gobj, "minimap");
+	if (!plugin || plugin.destroyed) return;
+	try {
+		plugin.renderMinimap();
+		plugin.renderMask();
+	} catch (e) {
+		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: repaint_minimap failed: ${e}`);
+	}
+}
+/************************************************************
 *  Show or hide the minimap, deciding by the SIZE of the graph.
 *
 *  A minimap of a graph that already fits on screen is decoration; one
@@ -62506,7 +62523,10 @@ async function reconcile_fold_apply(gobj, opts, visible) {
 		(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: refresh_minimap failed: ${e}`);
 	}
 	await graph_draw(gobj);
-	if (changed || opts.relayout) await graph_layout(gobj);
+	if (changed || opts.relayout) {
+		await graph_layout(gobj);
+		repaint_minimap(gobj);
+	}
 	if (!(opts.restore && await restore_camera(gobj))) {
 		if (opts.fit) await graph_fit_readable(gobj);
 		else if (opts.keep && opts.keep_vp) await yui_graph_place_at(graph, opts.keep, opts.keep_vp);
@@ -63272,15 +63292,38 @@ function ac_fullscreen(gobj, event, kw, src) {
 }
 /************************************************************
 *  Layout change
+*
+*  A new layout moves EVERY node, so the camera cannot stay on the
+*  coordinates it had: it would look at empty grid where the old
+*  arrangement was. It goes through the reconcile instead, which
+*  holds the node the reader was looking at on the same pixel (the
+*  zoom is kept) and fits only if nothing is left in view.
 ************************************************************/
 function ac_set_layout$1(gobj, event, kw, src) {
-	gobj.priv;
+	let priv = gobj.priv;
+	let graph = priv.graph;
 	let layout = select_layout(gobj, kw.layout);
+	priv._layout_asked = (0, _yuneta_gobj_js.gobj_read_str_attr)(gobj, "layout");
 	apply_layout_direction(gobj);
-	graph_set_layout(gobj, layout).then(() => {
+	let done = () => {
 		configure_behaviour(gobj);
 		update_toolbar(gobj);
-	});
+	};
+	if (!priv._fold_model || !graph || !graph.rendered) {
+		graph_set_layout(gobj, layout).then(() => {
+			repaint_minimap(gobj);
+			done();
+		});
+		return 0;
+	}
+	let keep = camera_anchor_node(gobj);
+	let vp = keep ? yui_graph_viewport_of(graph, keep) : null;
+	graph.setLayout(layout);
+	reconcile_fold(gobj, {
+		relayout: true,
+		keep,
+		keep_vp: vp
+	}).then(done);
 	return 0;
 }
 /************************************************************

package/dist/gobj-ui.es.js

@@ -60730,6 +60730,23 @@ function auto_layout(gobj) {
 	return true;
 }
 /************************************************************
+*  Paint the minimap again from where the nodes are NOW.
+*
+*  It repaints off the graph's draw events, and a layout emits none:
+*  G6 moves the nodes with a SILENT draw. So after a layout change
+*  the minimap went on showing the arrangement before it.
+************************************************************/
+function repaint_minimap(gobj) {
+	let plugin = graph_get_plugin(gobj, "minimap");
+	if (!plugin || plugin.destroyed) return;
+	try {
+		plugin.renderMinimap();
+		plugin.renderMask();
+	} catch (e) {
+		log_error(`${gobj_short_name(gobj)}: repaint_minimap failed: ${e}`);
+	}
+}
+/************************************************************
 *  Show or hide the minimap, deciding by the SIZE of the graph.
 *
 *  A minimap of a graph that already fits on screen is decoration; one
@@ -62501,7 +62518,10 @@ async function reconcile_fold_apply(gobj, opts, visible) {
 		log_error(`${gobj_short_name(gobj)}: refresh_minimap failed: ${e}`);
 	}
 	await graph_draw(gobj);
-	if (changed || opts.relayout) await graph_layout(gobj);
+	if (changed || opts.relayout) {
+		await graph_layout(gobj);
+		repaint_minimap(gobj);
+	}
 	if (!(opts.restore && await restore_camera(gobj))) {
 		if (opts.fit) await graph_fit_readable(gobj);
 		else if (opts.keep && opts.keep_vp) await yui_graph_place_at(graph, opts.keep, opts.keep_vp);
@@ -63267,15 +63287,38 @@ function ac_fullscreen(gobj, event, kw, src) {
 }
 /************************************************************
 *  Layout change
+*
+*  A new layout moves EVERY node, so the camera cannot stay on the
+*  coordinates it had: it would look at empty grid where the old
+*  arrangement was. It goes through the reconcile instead, which
+*  holds the node the reader was looking at on the same pixel (the
+*  zoom is kept) and fits only if nothing is left in view.
 ************************************************************/
 function ac_set_layout$1(gobj, event, kw, src) {
-	gobj.priv;
+	let priv = gobj.priv;
+	let graph = priv.graph;
 	let layout = select_layout(gobj, kw.layout);
+	priv._layout_asked = gobj_read_str_attr(gobj, "layout");
 	apply_layout_direction(gobj);
-	graph_set_layout(gobj, layout).then(() => {
+	let done = () => {
 		configure_behaviour(gobj);
 		update_toolbar(gobj);
-	});
+	};
+	if (!priv._fold_model || !graph || !graph.rendered) {
+		graph_set_layout(gobj, layout).then(() => {
+			repaint_minimap(gobj);
+			done();
+		});
+		return 0;
+	}
+	let keep = camera_anchor_node(gobj);
+	let vp = keep ? yui_graph_viewport_of(graph, keep) : null;
+	graph.setLayout(layout);
+	reconcile_fold(gobj, {
+		relayout: true,
+		keep,
+		keep_vp: vp
+	}).then(done);
 	return 0;
 }
 /************************************************************

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -7124,6 +7124,27 @@ function auto_layout(gobj)
     return true;
 }
 
+/************************************************************
+ *  Paint the minimap again from where the nodes are NOW.
+ *
+ *  It repaints off the graph's draw events, and a layout emits none:
+ *  G6 moves the nodes with a SILENT draw. So after a layout change
+ *  the minimap went on showing the arrangement before it.
+ ************************************************************/
+function repaint_minimap(gobj)
+{
+    let plugin = graph_get_plugin(gobj, "minimap");
+    if(!plugin || plugin.destroyed) {
+        return;
+    }
+    try {
+        plugin.renderMinimap();
+        plugin.renderMask();
+    } catch(e) {
+        log_error(`${gobj_short_name(gobj)}: repaint_minimap failed: ${e}`);
+    }
+}
+
 /************************************************************
  *  Show or hide the minimap, deciding by the SIZE of the graph.
  *
@@ -9772,6 +9793,7 @@ async function reconcile_fold_apply(gobj, opts, visible)
     await graph_draw(gobj);
     if(changed || opts.relayout) {
         await graph_layout(gobj);
+        repaint_minimap(gobj);
     }
 
     /*  THE VIEWPORT, and only here.
@@ -10924,18 +10946,44 @@ function ac_fullscreen(gobj, event, kw, src)
 
 /************************************************************
  *  Layout change
+ *
+ *  A new layout moves EVERY node, so the camera cannot stay on the
+ *  coordinates it had: it would look at empty grid where the old
+ *  arrangement was. It goes through the reconcile instead, which
+ *  holds the node the reader was looking at on the same pixel (the
+ *  zoom is kept) and fits only if nothing is left in view.
  ************************************************************/
 function ac_set_layout(gobj, event, kw, src)
 {
     let priv = gobj.priv;
+    let graph = priv.graph;
     let layout = select_layout(gobj, kw.layout);
+
+    /*  The reader chose it: a later load must not auto-lay it back.  */
+    priv._layout_asked = gobj_read_str_attr(gobj, "layout");
+
     /*  The ports turn with the reading direction, before the lines
      *  are laid out from them.  */
     apply_layout_direction(gobj);
-    graph_set_layout(gobj, layout).then(() => {
+
+    let done = () => {
         configure_behaviour(gobj);
         update_toolbar(gobj);
-    });
+    };
+
+    if(!priv._fold_model || !graph || !graph.rendered) {
+        /*  No records yet: nothing on screen to hold still.  */
+        graph_set_layout(gobj, layout).then(() => {
+            repaint_minimap(gobj);
+            done();
+        });
+        return 0;
+    }
+
+    let keep = camera_anchor_node(gobj);
+    let vp = keep? yui_graph_viewport_of(graph, keep) : null;
+    graph.setLayout(layout);
+    reconcile_fold(gobj, {relayout: true, keep: keep, keep_vp: vp}).then(done);
 
     return 0;
 }