@yuneta/gobj-ui 7.23.9 → 7.23.10

package/README.md

@@ -964,12 +964,28 @@ gone wrong:
   work — so a marquee shows up in the `machine` trace like every other action.
   Shift+click is not G6's `click-select` at all: this gclass already owns
   `EV_NODE_CLICK`, and adding a second selection owner outside the FSM is how
-  the two end up disagreeing.
-
-Panning gives way while **Shift** is held (`drag-canvas` takes an `enable`
-predicate), or the canvas would pan under the rubber band — G6 binds
-`drag-canvas` straight to the drag events, and its own docs warn that the two
-gestures cannot both be a plain drag.
+  the two end up disagreeing. The band comes from `g6_brush_select_owned.js`,
+  a `brush-select` under our own id with ONE half removed: the built-in also
+  rewrites the `selected` state of every node and every edge on each canvas
+  click, behind the gclass and outside the history pause with which it sets
+  and clears the selection — a recorded command whose before and after are
+  identical, which is a lit Save on a graph nobody has touched (`7.23.10`).
+
+Panning gives way while **Shift** is held AND while the pointer is on a card
+(`drag-canvas` takes an `enable` predicate) — the first because the canvas
+would otherwise pan under the rubber band, the second because it would
+otherwise pan under the node being dragged. That second half is G6's own
+default, and an `enable` REPLACES the default rather than adding to it: while
+it was missing, a drag moved the card at twice the pointer and slid the whole
+graph underneath it (`7.23.10`).
+
+**Undo, Redo and Save are the history plugin, and it follows the MODE.** It is
+installed on entering edition and removed on leaving it — including when
+edition is reached through the mode selector on a graph whose data is already
+loaded, which is the ordinary way in. Before `7.23.10` it was installed at the
+arrival of the last topic of the load and only if the graph was in edition
+right then, so that ordinary way left the graph with dead Undo/Redo buttons
+and a `history_pause()` nothing answered, while Save still lit on its own.
 
 **A delete says what it takes, whether it is one or twenty.** The Delete key
 asks the same question the per-node delete icon asks, built by the same

package/dist/gobj-ui.cjs.js

@@ -47507,6 +47507,58 @@ function inject_svg_icons() {
 	document.body.appendChild(div);
 }
 //#endregion
+//#region src/g6_brush_select_owned.js
+/***********************************************************************
+*          g6_brush_select_owned.js
+*
+*          The rubber band, for a graph whose FSM owns the selection.
+*
+*          Why this exists
+*          ----------------
+*          G6 v5 `brush-select` does two things: it draws the band and
+*          it keeps the `selected` element state.  The second one is
+*          not ours to give away -- `C_G6_NODES_TREE` owns the
+*          selection, sets it in `set_selection()` and clears it in
+*          `deselect_node()`, both with the history recorder paused,
+*          because a selection is not an edit.
+*
+*          The built-in disagrees on one path: on EVERY canvas click
+*          it calls `clearElementsStates()`, which writes the state of
+*          every node and every edge of the graph -- whether or not
+*          any of them carried it -- outside our pause.  G6's history
+*          then records the redraw as a command whose `original` and
+*          `current` are identical: an undo entry that undoes nothing,
+*          and a Save button lit on a graph nobody has touched.  One
+*          click on the background was enough.
+*
+*          So this subclass drops that half and keeps the band.  The
+*          selection still clears on a canvas click -- through
+*          `EV_CANVAS_CLICK`, where the gclass has always cleared it.
+*
+*          Registered under its OWN id: the built-in `brush-select` is
+*          right for a graph that does not own its selection, and no
+*          other consumer of this library asked for this.
+*
+*          Copyright (c) 2026, ArtGins.
+*          All Rights Reserved.
+***********************************************************************/
+/************************************************************
+*  Same band, no state bookkeeping behind the gclass's back
+************************************************************/
+var BrushSelectOwned = class extends _antv_g6.BrushSelect {
+	clearElementsStates() {}
+};
+/************************************************************
+*  Register once, under our own id
+************************************************************/
+var BRUSH_SELECT_OWNED = "yui-brush-select";
+var __brush_select_registered__ = false;
+function ensure_brush_select_owned() {
+	if (__brush_select_registered__) return;
+	(0, _antv_g6.register)(_antv_g6.ExtensionCategory.BEHAVIOR, BRUSH_SELECT_OWNED, BrushSelectOwned);
+	__brush_select_registered__ = true;
+}
+//#endregion
 //#region src/c_g6_nodes_tree.js
 /***********************************************************************
 *          c_g6_nodes_tree.js
@@ -47565,6 +47617,7 @@ var YuiToolbar = class extends _antv_g6.Toolbar {
 };
 (0, _antv_g6.register)(_antv_g6.ExtensionCategory.PLUGIN, "yui-toolbar", YuiToolbar);
 ensure_drag_canvas_patch();
+ensure_brush_select_owned();
 ensure_pinch_zoom_patch();
 /***************************************************************
 *              Constants
@@ -48315,12 +48368,16 @@ function configure_behaviour(gobj) {
 				{
 					type: "drag-canvas",
 					key: "drag-canvas",
-					enable: (event) => !event.shiftKey
+					enable: (event) => {
+						if (event.shiftKey) return false;
+						if ("targetType" in event) return event.targetType === "canvas";
+						return true;
+					}
 				},
 				"zoom-canvas",
 				"drag-element",
 				{
-					type: "brush-select",
+					type: BRUSH_SELECT_OWNED,
 					key: "brush-select",
 					trigger: ["shift"],
 					enableElements: ["node"],
@@ -48904,6 +48961,30 @@ function history_resume(gobj) {
 	gobj.priv._history_paused = false;
 }
 /************************************************************
+*  The history plugin exists while the graph is in EDITION,
+*  and only there.
+*
+*  It used to be installed at one MOMENT -- the arrival of the
+*  last topic of the load -- and only if the graph happened to
+*  be in edition right then. Entering edition afterwards, which
+*  is the ordinary way in (the graph opens in reading and the
+*  mode selector is next to it), left no history at all: Undo
+*  and Redo were dead buttons that never even lit, `history_
+*  pause()` had no `beforeAddCommand` to answer, and the Save
+*  button was told the graph was dirty by `mark_graph_dirty()`
+*  alone -- which is why a move offered Save without Undo.
+*
+*  So it follows the MODE, and every place that changes the
+*  mode calls this.
+************************************************************/
+function sync_history_plugin(gobj) {
+	let priv = gobj.priv;
+	if (!priv.graph || !priv.graph_rendered) return;
+	if (priv.edit_mode) graph_add_plugin(gobj, "history");
+	else graph_remove_plugin(gobj, "history");
+	update_history_buttons(gobj);
+}
+/************************************************************
 *
 ************************************************************/
 function update_history_buttons(gobj) {
@@ -49194,6 +49275,7 @@ function graph_add_plugin(gobj, plugin_key, options) {
 	let priv = gobj.priv;
 	let graph = priv.graph;
 	let plugin = graph_get_plugin(gobj, plugin_key);
+	let existed = !!plugin;
 	if (!plugin) {
 		let plugin_def = {
 			key: plugin_key,
@@ -49204,7 +49286,7 @@ function graph_add_plugin(gobj, plugin_key, options) {
 	}
 	plugin = graph_get_plugin(gobj, plugin_key);
 	switch (plugin_key) {
-		case "history": if (plugin) {
+		case "history": if (plugin && !existed) {
 			plugin.on(_antv_g6.HistoryEvent.CHANGE, () => {
 				update_history_buttons(gobj);
 			});
@@ -51935,8 +52017,7 @@ function ac_load_data(gobj, event, kw, src) {
 					if (auto_laid) graph_fit_readable(gobj).catch((e) => {
 						(0, _yuneta_gobj_js.log_error)(`${(0, _yuneta_gobj_js.gobj_short_name)(gobj)}: cannot fit the graph: ${e}`);
 					});
-					if (priv.edit_mode) graph_add_plugin(gobj, "history");
-					else graph_remove_plugin(gobj, "history");
+					sync_history_plugin(gobj);
 					if (priv._pending_focus_topic !== null) {
 						let ft = priv._pending_focus_topic;
 						priv._pending_focus_topic = null;
@@ -52238,6 +52319,7 @@ function ac_set_operation_mode$1(gobj, event, kw, src) {
 	(0, _yuneta_gobj_js.gobj_write_attr)(gobj, "operation_mode", kw.operation_mode);
 	configure_behaviour(gobj);
 	update_toolbar(gobj);
+	sync_history_plugin(gobj);
 	return 0;
 }
 /************************************************************

package/dist/gobj-ui.es.js

@@ -5,7 +5,7 @@ import { createJSONEditor } from "vanilla-jsoneditor";
 import { TabulatorFull } from "tabulator-tables";
 import * as maplibregl from "maplibre-gl";
 import uPlot from "uplot";
-import { BaseLayout, CanvasEvent, Circle, CommonEvent, DragCanvas, EdgeEvent, ExtensionCategory, Graph, HistoryEvent, NodeEvent, Toolbar, ZoomCanvas, register } from "@antv/g6";
+import { BaseLayout, BrushSelect, CanvasEvent, Circle, CommonEvent, DragCanvas, EdgeEvent, ExtensionCategory, Graph, HistoryEvent, NodeEvent, Toolbar, ZoomCanvas, register } from "@antv/g6";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -47494,6 +47494,58 @@ function inject_svg_icons() {
 	document.body.appendChild(div);
 }
 //#endregion
+//#region src/g6_brush_select_owned.js
+/***********************************************************************
+*          g6_brush_select_owned.js
+*
+*          The rubber band, for a graph whose FSM owns the selection.
+*
+*          Why this exists
+*          ----------------
+*          G6 v5 `brush-select` does two things: it draws the band and
+*          it keeps the `selected` element state.  The second one is
+*          not ours to give away -- `C_G6_NODES_TREE` owns the
+*          selection, sets it in `set_selection()` and clears it in
+*          `deselect_node()`, both with the history recorder paused,
+*          because a selection is not an edit.
+*
+*          The built-in disagrees on one path: on EVERY canvas click
+*          it calls `clearElementsStates()`, which writes the state of
+*          every node and every edge of the graph -- whether or not
+*          any of them carried it -- outside our pause.  G6's history
+*          then records the redraw as a command whose `original` and
+*          `current` are identical: an undo entry that undoes nothing,
+*          and a Save button lit on a graph nobody has touched.  One
+*          click on the background was enough.
+*
+*          So this subclass drops that half and keeps the band.  The
+*          selection still clears on a canvas click -- through
+*          `EV_CANVAS_CLICK`, where the gclass has always cleared it.
+*
+*          Registered under its OWN id: the built-in `brush-select` is
+*          right for a graph that does not own its selection, and no
+*          other consumer of this library asked for this.
+*
+*          Copyright (c) 2026, ArtGins.
+*          All Rights Reserved.
+***********************************************************************/
+/************************************************************
+*  Same band, no state bookkeeping behind the gclass's back
+************************************************************/
+var BrushSelectOwned = class extends BrushSelect {
+	clearElementsStates() {}
+};
+/************************************************************
+*  Register once, under our own id
+************************************************************/
+var BRUSH_SELECT_OWNED = "yui-brush-select";
+var __brush_select_registered__ = false;
+function ensure_brush_select_owned() {
+	if (__brush_select_registered__) return;
+	register(ExtensionCategory.BEHAVIOR, BRUSH_SELECT_OWNED, BrushSelectOwned);
+	__brush_select_registered__ = true;
+}
+//#endregion
 //#region src/c_g6_nodes_tree.js
 /***********************************************************************
 *          c_g6_nodes_tree.js
@@ -47552,6 +47604,7 @@ var YuiToolbar = class extends Toolbar {
 };
 register(ExtensionCategory.PLUGIN, "yui-toolbar", YuiToolbar);
 ensure_drag_canvas_patch();
+ensure_brush_select_owned();
 ensure_pinch_zoom_patch();
 /***************************************************************
 *              Constants
@@ -48302,12 +48355,16 @@ function configure_behaviour(gobj) {
 				{
 					type: "drag-canvas",
 					key: "drag-canvas",
-					enable: (event) => !event.shiftKey
+					enable: (event) => {
+						if (event.shiftKey) return false;
+						if ("targetType" in event) return event.targetType === "canvas";
+						return true;
+					}
 				},
 				"zoom-canvas",
 				"drag-element",
 				{
-					type: "brush-select",
+					type: BRUSH_SELECT_OWNED,
 					key: "brush-select",
 					trigger: ["shift"],
 					enableElements: ["node"],
@@ -48891,6 +48948,30 @@ function history_resume(gobj) {
 	gobj.priv._history_paused = false;
 }
 /************************************************************
+*  The history plugin exists while the graph is in EDITION,
+*  and only there.
+*
+*  It used to be installed at one MOMENT -- the arrival of the
+*  last topic of the load -- and only if the graph happened to
+*  be in edition right then. Entering edition afterwards, which
+*  is the ordinary way in (the graph opens in reading and the
+*  mode selector is next to it), left no history at all: Undo
+*  and Redo were dead buttons that never even lit, `history_
+*  pause()` had no `beforeAddCommand` to answer, and the Save
+*  button was told the graph was dirty by `mark_graph_dirty()`
+*  alone -- which is why a move offered Save without Undo.
+*
+*  So it follows the MODE, and every place that changes the
+*  mode calls this.
+************************************************************/
+function sync_history_plugin(gobj) {
+	let priv = gobj.priv;
+	if (!priv.graph || !priv.graph_rendered) return;
+	if (priv.edit_mode) graph_add_plugin(gobj, "history");
+	else graph_remove_plugin(gobj, "history");
+	update_history_buttons(gobj);
+}
+/************************************************************
 *
 ************************************************************/
 function update_history_buttons(gobj) {
@@ -49181,6 +49262,7 @@ function graph_add_plugin(gobj, plugin_key, options) {
 	let priv = gobj.priv;
 	let graph = priv.graph;
 	let plugin = graph_get_plugin(gobj, plugin_key);
+	let existed = !!plugin;
 	if (!plugin) {
 		let plugin_def = {
 			key: plugin_key,
@@ -49191,7 +49273,7 @@ function graph_add_plugin(gobj, plugin_key, options) {
 	}
 	plugin = graph_get_plugin(gobj, plugin_key);
 	switch (plugin_key) {
-		case "history": if (plugin) {
+		case "history": if (plugin && !existed) {
 			plugin.on(HistoryEvent.CHANGE, () => {
 				update_history_buttons(gobj);
 			});
@@ -51922,8 +52004,7 @@ function ac_load_data(gobj, event, kw, src) {
 					if (auto_laid) graph_fit_readable(gobj).catch((e) => {
 						log_error(`${gobj_short_name(gobj)}: cannot fit the graph: ${e}`);
 					});
-					if (priv.edit_mode) graph_add_plugin(gobj, "history");
-					else graph_remove_plugin(gobj, "history");
+					sync_history_plugin(gobj);
 					if (priv._pending_focus_topic !== null) {
 						let ft = priv._pending_focus_topic;
 						priv._pending_focus_topic = null;
@@ -52225,6 +52306,7 @@ function ac_set_operation_mode$1(gobj, event, kw, src) {
 	gobj_write_attr(gobj, "operation_mode", kw.operation_mode);
 	configure_behaviour(gobj);
 	update_toolbar(gobj);
+	sync_history_plugin(gobj);
 	return 0;
 }
 /************************************************************

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -103,6 +103,10 @@ import i18next, {t} from "i18next";
 
 import {inject_svg_icons} from "./lib_icons.js";
 import {ensure_drag_canvas_patch} from "./g6_drag_canvas_touch.js";
+import {
+    ensure_brush_select_owned,
+    BRUSH_SELECT_OWNED,
+} from "./g6_brush_select_owned.js";
 import {
     ensure_pinch_zoom_patch,
     install_long_press_contextmenu,
@@ -176,6 +180,7 @@ class YuiToolbar extends Toolbar
 }
 register(ExtensionCategory.PLUGIN, 'yui-toolbar', YuiToolbar);
 ensure_drag_canvas_patch();
+ensure_brush_select_owned();
 ensure_pinch_zoom_patch();
 
 /***************************************************************
@@ -1410,11 +1415,28 @@ function configure_behaviour(gobj)
                 /*  Panning gives way while Shift is held: that is the
                  *  marquee's gesture, and G6 binds drag-canvas straight
                  *  to the drag events, so without this the canvas pans
-                 *  under the rubber band.  */
+                 *  under the rubber band.
+                 *
+                 *  And it gives way to a NODE drag, which is what G6's
+                 *  own default `enable` says and what this one has to
+                 *  repeat: `enable` REPLACES it, it does not add to it.
+                 *  Dropping the `targetType` half made every drag of a
+                 *  card pan the canvas as well as move the card -- the
+                 *  card ran at twice the pointer and the whole graph
+                 *  slid underneath it, on a move whose RESULT was
+                 *  right, because a pan writes nothing.  */
                 {
                     type: "drag-canvas",
                     key: "drag-canvas",
-                    enable: (event) => !event.shiftKey,
+                    enable: (event) => {
+                        if(event.shiftKey) {
+                            return false;
+                        }
+                        if('targetType' in event) {
+                            return event.targetType === 'canvas';
+                        }
+                        return true;    /* a key, not a pointer */
+                    },
                 },
                 "zoom-canvas",
                 /*  Moves EVERY node in the `selected` state, not just
@@ -1429,7 +1451,12 @@ function configure_behaviour(gobj)
                  *  ids travel with the event and the action does not
                  *  have to race it.  */
                 {
-                    type: "brush-select",
+                    /*  Ours: the built-in also rewrites the state of
+                     *  EVERY element on a canvas click, behind the
+                     *  gclass's back and outside its history pause --
+                     *  a command that changed nothing, and a Save
+                     *  button lit on a graph nobody had touched.  */
+                    type: BRUSH_SELECT_OWNED,
                     key: "brush-select",
                     trigger: ["shift"],
                     enableElements: ["node"],
@@ -2370,6 +2397,42 @@ function history_resume(gobj)
     gobj.priv._history_paused = false;
 }
 
+/************************************************************
+ *  The history plugin exists while the graph is in EDITION,
+ *  and only there.
+ *
+ *  It used to be installed at one MOMENT -- the arrival of the
+ *  last topic of the load -- and only if the graph happened to
+ *  be in edition right then. Entering edition afterwards, which
+ *  is the ordinary way in (the graph opens in reading and the
+ *  mode selector is next to it), left no history at all: Undo
+ *  and Redo were dead buttons that never even lit, `history_
+ *  pause()` had no `beforeAddCommand` to answer, and the Save
+ *  button was told the graph was dirty by `mark_graph_dirty()`
+ *  alone -- which is why a move offered Save without Undo.
+ *
+ *  So it follows the MODE, and every place that changes the
+ *  mode calls this.
+ ************************************************************/
+function sync_history_plugin(gobj)
+{
+    let priv = gobj.priv;
+
+    if(!priv.graph || !priv.graph_rendered) {
+        /*  Nothing to hang a plugin on yet: the load path calls
+         *  this again once the graph is drawn.  */
+        return;
+    }
+
+    if(priv.edit_mode) {
+        graph_add_plugin(gobj, "history");
+    } else {
+        graph_remove_plugin(gobj, "history");
+    }
+
+    update_history_buttons(gobj);
+}
+
 /************************************************************
  *
  ************************************************************/
@@ -2775,6 +2838,7 @@ function graph_add_plugin(gobj, plugin_key, options)
     let graph = priv.graph;
 
     let plugin = graph_get_plugin(gobj, plugin_key);
+    let existed = !!plugin;
     if(!plugin) {
         let plugin_def = {
             key: plugin_key,
@@ -2790,7 +2854,11 @@ function graph_add_plugin(gobj, plugin_key, options)
 
     switch(plugin_key) {
         case "history":
-            if(plugin) {
+            /*  Wired once per INSTANCE: this is called again on every
+             *  load and on every entry into edition, and a second
+             *  listener on the same emitter is a second repaint of the
+             *  same two buttons.  */
+            if(plugin && !existed) {
                 plugin.on(HistoryEvent.CHANGE, () => {
                     update_history_buttons(gobj);
                 });
@@ -3563,10 +3631,10 @@ function toggle_in_selection(gobj, node_id)
 {
     let priv = gobj.priv;
 
-    /*  The union of the two views of the same thing. A brush clears
-     *  G6's state on pointerdown without telling anybody, so reading
-     *  only the state could drop a card that is on screen wearing a
-     *  ring.  */
+    /*  The union of the two views of the same thing: either can hold
+     *  an id the other lost -- G6's state is what a drag moves, the
+     *  painted set is what the reader can see -- and a card on screen
+     *  wearing a ring belongs to the selection whichever view has it.  */
     let current = new Set(selected_node_ids(gobj));
     for(let id of (priv._selected_paint_ids || [])) {
         current.add(id);
@@ -7000,11 +7068,7 @@ function ac_load_data(gobj, event, kw, src)
                             log_error(`${gobj_short_name(gobj)}: cannot fit the graph: ${e}`);
                         });
                     }
-                    if(priv.edit_mode) {
-                        graph_add_plugin(gobj, "history");
-                    } else {
-                        graph_remove_plugin(gobj, "history");
-                    }
+                    sync_history_plugin(gobj);
                     /*  Nodes exist and are positioned now: apply a focus
                      *  requested before the data was ready (deep link). */
                     if(priv._pending_focus_topic !== null) {
@@ -7462,6 +7526,10 @@ function ac_set_operation_mode(gobj, event, kw, src)
     gobj_write_attr(gobj, "operation_mode", kw.operation_mode);
     configure_behaviour(gobj);
     update_toolbar(gobj);
+
+    /*  `configure_behaviour` is what decides `edit_mode`, and the
+     *  history plugin belongs to that decision.  */
+    sync_history_plugin(gobj);
     return 0;
 }
 

package/src/g6_brush_select_owned.js

@@ -0,0 +1,69 @@
+/***********************************************************************
+ *          g6_brush_select_owned.js
+ *
+ *          The rubber band, for a graph whose FSM owns the selection.
+ *
+ *          Why this exists
+ *          ----------------
+ *          G6 v5 `brush-select` does two things: it draws the band and
+ *          it keeps the `selected` element state.  The second one is
+ *          not ours to give away -- `C_G6_NODES_TREE` owns the
+ *          selection, sets it in `set_selection()` and clears it in
+ *          `deselect_node()`, both with the history recorder paused,
+ *          because a selection is not an edit.
+ *
+ *          The built-in disagrees on one path: on EVERY canvas click
+ *          it calls `clearElementsStates()`, which writes the state of
+ *          every node and every edge of the graph -- whether or not
+ *          any of them carried it -- outside our pause.  G6's history
+ *          then records the redraw as a command whose `original` and
+ *          `current` are identical: an undo entry that undoes nothing,
+ *          and a Save button lit on a graph nobody has touched.  One
+ *          click on the background was enough.
+ *
+ *          So this subclass drops that half and keeps the band.  The
+ *          selection still clears on a canvas click -- through
+ *          `EV_CANVAS_CLICK`, where the gclass has always cleared it.
+ *
+ *          Registered under its OWN id: the built-in `brush-select` is
+ *          right for a graph that does not own its selection, and no
+ *          other consumer of this library asked for this.
+ *
+ *          Copyright (c) 2026, ArtGins.
+ *          All Rights Reserved.
+ ***********************************************************************/
+import {
+    BrushSelect,
+    ExtensionCategory,
+    register,
+} from '@antv/g6';
+
+/************************************************************
+ *  Same band, no state bookkeeping behind the gclass's back
+ ************************************************************/
+class BrushSelectOwned extends BrushSelect {
+    clearElementsStates() {
+        /*
+         *  Deliberately empty. The gclass clears the selection from
+         *  its own EV_CANVAS_CLICK action, with history paused.
+         */
+    }
+}
+
+/************************************************************
+ *  Register once, under our own id
+ ************************************************************/
+const BRUSH_SELECT_OWNED = 'yui-brush-select';
+
+let __brush_select_registered__ = false;
+
+function ensure_brush_select_owned()
+{
+    if(__brush_select_registered__) {
+        return;
+    }
+    register(ExtensionCategory.BEHAVIOR, BRUSH_SELECT_OWNED, BrushSelectOwned);
+    __brush_select_registered__ = true;
+}
+
+export { ensure_brush_select_owned, BRUSH_SELECT_OWNED };