@yuneta/gobj-ui 7.23.108 → 7.23.110

package/dist/gobj-ui.cjs.js

@@ -9479,7 +9479,10 @@ function mt_create$15(gobj) {
 	let map_settings = (0, _yuneta_gobj_js.json_deep_copy)((0, _yuneta_gobj_js.gobj_read_attr)(gobj, "map_settings"));
 	let $map = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "$map");
 	if ($map) $map.classList.add(GCLASS_NAME$15);
-	Object.assign(map_settings, { container: $map });
+	Object.assign(map_settings, {
+		container: $map,
+		cooperativeGestures: true
+	});
 	priv.onClick = (ev) => {
 		onClick(gobj, ev);
 	};
@@ -10766,6 +10769,51 @@ function yui_graph_update_zoom($container, graph) {
 	$readout.textContent = yui_graph_zoom_text(graph);
 }
 /************************************************************
+*   THE WHEEL SCROLLS; CTRL + WHEEL ZOOMS. In every graph.
+*
+*   The vocabulary of a camera is one vocabulary or it is
+*   nothing: this file exists because the three graphs of the
+*   library were each naming the same gestures differently, and
+*   the wheel was the last one left -- `C_G6_NODES_TREE` scrolled
+*   with it since 7.23.75 while the json graph and the gobj tree
+*   went on zooming.
+*
+*   Why scroll and not zoom: a graph of many nodes is taller than
+*   the screen, and a wheel that zoomed made it a thing to be
+*   looked at from afar or read through a keyhole -- never
+*   scrolled, which is what a wheel does on a map and on every
+*   page. Zoom is Ctrl + wheel (what a trackpad pinch arrives
+*   as), the toolbar's +/-, and the two-finger pinch.
+*
+*   Two things this pair has learnt, both the hard way:
+*
+*   - `enable` on the scroll is what keeps the two apart, and the
+*     two must name the SAME key or the gesture falls between
+*     them: the scroll once stood aside for Meta as well while
+*     the zoom listened for Control alone, so Cmd + wheel neither
+*     scrolled nor zoomed. It is ONE key because a G6 `trigger`
+*     is a CHORD, not a list of alternatives -- `Shortcut.match()`
+*     compares the held keys to the bound ones as a SET.
+*   - `animation: false` on the zoom. The house rule first
+*     (nothing here slides), and then the anchor: `aftertransform`
+*     fires while G6's 200ms easing is still running, so a
+*     re-centring measured a camera that was still moving --
+*     passes of -272, +411, +183, oscillating because the ground
+*     moved between two reads.
+************************************************************/
+function yui_graph_camera_behaviors() {
+	return [{
+		type: "scroll-canvas",
+		key: "scroll-canvas",
+		enable: (event) => !(event && event.ctrlKey)
+	}, {
+		type: "zoom-canvas",
+		key: "zoom-canvas",
+		trigger: ["Control"],
+		animation: false
+	}];
+}
+/************************************************************
 *   The camera cluster: zoom in, zoom out, readout, fit,
 *   actual size.  Returns createElement2 specs, in order.
 *
@@ -12054,16 +12102,13 @@ function build_cell_html(key, value, type, dark, matched, fold) {
 *  forever.  `+3` and `−` need no language.
 ************************************************************/
 var FOLD_SPACER = `<span style="width:24px; flex:0 0 auto;"></span>`;
-var ZOOM_CANVAS$1 = {
-	type: "zoom-canvas",
-	animation: false
-};
+var CAMERA$1 = yui_graph_camera_behaviors();
 var BEHAVIORS_READING$1 = [
 	"drag-canvas",
-	ZOOM_CANVAS$1,
+	...CAMERA$1,
 	"drag-element"
 ];
-var BEHAVIORS_PICKING$1 = ["drag-canvas", ZOOM_CANVAS$1];
+var BEHAVIORS_PICKING$1 = ["drag-canvas", ...CAMERA$1];
 var CARD_HEADER_H$1 = 24;
 var CARD_ROW_H$1 = 22;
 var H_GAP = 60;
@@ -17628,16 +17673,13 @@ var attrs_table$9 = [
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_INTEGER, "collapse_threshold", 0, 10, "Auto-collapse a node whose direct children exceed this number. 0 disables auto-collapse."),
 	(0, _yuneta_gobj_js.SDATA_END)()
 ];
-var ZOOM_CANVAS = {
-	type: "zoom-canvas",
-	animation: false
-};
+var CAMERA = yui_graph_camera_behaviors();
 var BEHAVIORS_READING = [
 	"drag-canvas",
-	ZOOM_CANVAS,
+	...CAMERA,
 	"drag-element"
 ];
-var BEHAVIORS_PICKING = ["drag-canvas", ZOOM_CANVAS];
+var BEHAVIORS_PICKING = ["drag-canvas", ...CAMERA];
 var VIEW_STORE_PREFIX = "yui_gobj_tree_view:";
 function view_store_key(gobj) {
 	return VIEW_STORE_PREFIX + (0, _yuneta_gobj_js.gobj_name)(gobj);
@@ -55731,38 +55773,16 @@ function build_ports(gobj, desc) {
 ************************************************************/
 var LR_LAYOUTS = ["dagre"];
 /************************************************************
-*  The camera behaviors every operation mode shares.
-*
-*  The wheel SCROLLS, as it does on a map and on every page: a
-*  graph of many nodes is taller than the screen, and a wheel
-*  that zoomed instead made it a thing to be looked at from afar
-*  or read through a keyhole -- never scrolled. Zoom is Ctrl +
-*  wheel (which is also what a trackpad pinch arrives as), the
-*  toolbar's +/-, and the two-finger pinch of g6_touch_gestures.
-*  `enable` on the scroll keeps the two apart: a Ctrl wheel is
-*  the zoom's, so the scroll stands aside for it.
-*
-*  And the two have to name the SAME key, or the gesture falls
-*  between them: the scroll stood aside for Meta as well, while
-*  the zoom listened for Control alone, so Cmd + wheel neither
-*  scrolled nor zoomed. It is ONE key and not two because a G6
-*  `trigger` is a CHORD, not a list of alternatives -- its
-*  `Shortcut.match()` compares the held keys to the bound ones
-*  as a SET, so ["Control", "Meta"] means both keys down at
-*  once. Control it is, on every platform: it is what a
-*  trackpad pinch arrives as, so a Mac keeps its pinch and
-*  gains nothing to press by mistake.
+*  The camera behaviors every operation mode shares: the wheel
+*  SCROLLS and Ctrl + wheel zooms.
+*
+*  Written in `yui_graph_camera.js` now, with the reasoning and
+*  the two traps, so the json graph and the gobj tree speak it
+*  too. It was the last gesture of the camera that this graph
+*  said one way and its siblings another.
 ************************************************************/
 function camera_behaviors() {
-	return [{
-		type: "scroll-canvas",
-		key: "scroll-canvas",
-		enable: (event) => !(event && event.ctrlKey)
-	}, {
-		type: "zoom-canvas",
-		key: "zoom-canvas",
-		trigger: ["Control"]
-	}];
+	return yui_graph_camera_behaviors();
 }
 function layout_direction(gobj) {
 	return (0, _yuneta_gobj_js.str_in_list)(LR_LAYOUTS, gobj.priv.layout) ? "LR" : "TB";

package/dist/gobj-ui.es.js

@@ -9474,7 +9474,10 @@ function mt_create$15(gobj) {
 	let map_settings = json_deep_copy(gobj_read_attr(gobj, "map_settings"));
 	let $map = gobj_read_attr(gobj, "$map");
 	if ($map) $map.classList.add(GCLASS_NAME$15);
-	Object.assign(map_settings, { container: $map });
+	Object.assign(map_settings, {
+		container: $map,
+		cooperativeGestures: true
+	});
 	priv.onClick = (ev) => {
 		onClick(gobj, ev);
 	};
@@ -10761,6 +10764,51 @@ function yui_graph_update_zoom($container, graph) {
 	$readout.textContent = yui_graph_zoom_text(graph);
 }
 /************************************************************
+*   THE WHEEL SCROLLS; CTRL + WHEEL ZOOMS. In every graph.
+*
+*   The vocabulary of a camera is one vocabulary or it is
+*   nothing: this file exists because the three graphs of the
+*   library were each naming the same gestures differently, and
+*   the wheel was the last one left -- `C_G6_NODES_TREE` scrolled
+*   with it since 7.23.75 while the json graph and the gobj tree
+*   went on zooming.
+*
+*   Why scroll and not zoom: a graph of many nodes is taller than
+*   the screen, and a wheel that zoomed made it a thing to be
+*   looked at from afar or read through a keyhole -- never
+*   scrolled, which is what a wheel does on a map and on every
+*   page. Zoom is Ctrl + wheel (what a trackpad pinch arrives
+*   as), the toolbar's +/-, and the two-finger pinch.
+*
+*   Two things this pair has learnt, both the hard way:
+*
+*   - `enable` on the scroll is what keeps the two apart, and the
+*     two must name the SAME key or the gesture falls between
+*     them: the scroll once stood aside for Meta as well while
+*     the zoom listened for Control alone, so Cmd + wheel neither
+*     scrolled nor zoomed. It is ONE key because a G6 `trigger`
+*     is a CHORD, not a list of alternatives -- `Shortcut.match()`
+*     compares the held keys to the bound ones as a SET.
+*   - `animation: false` on the zoom. The house rule first
+*     (nothing here slides), and then the anchor: `aftertransform`
+*     fires while G6's 200ms easing is still running, so a
+*     re-centring measured a camera that was still moving --
+*     passes of -272, +411, +183, oscillating because the ground
+*     moved between two reads.
+************************************************************/
+function yui_graph_camera_behaviors() {
+	return [{
+		type: "scroll-canvas",
+		key: "scroll-canvas",
+		enable: (event) => !(event && event.ctrlKey)
+	}, {
+		type: "zoom-canvas",
+		key: "zoom-canvas",
+		trigger: ["Control"],
+		animation: false
+	}];
+}
+/************************************************************
 *   The camera cluster: zoom in, zoom out, readout, fit,
 *   actual size.  Returns createElement2 specs, in order.
 *
@@ -12049,16 +12097,13 @@ function build_cell_html(key, value, type, dark, matched, fold) {
 *  forever.  `+3` and `−` need no language.
 ************************************************************/
 var FOLD_SPACER = `<span style="width:24px; flex:0 0 auto;"></span>`;
-var ZOOM_CANVAS$1 = {
-	type: "zoom-canvas",
-	animation: false
-};
+var CAMERA$1 = yui_graph_camera_behaviors();
 var BEHAVIORS_READING$1 = [
 	"drag-canvas",
-	ZOOM_CANVAS$1,
+	...CAMERA$1,
 	"drag-element"
 ];
-var BEHAVIORS_PICKING$1 = ["drag-canvas", ZOOM_CANVAS$1];
+var BEHAVIORS_PICKING$1 = ["drag-canvas", ...CAMERA$1];
 var CARD_HEADER_H$1 = 24;
 var CARD_ROW_H$1 = 22;
 var H_GAP = 60;
@@ -17623,16 +17668,13 @@ var attrs_table$9 = [
 	SDATA(data_type_t.DTP_INTEGER, "collapse_threshold", 0, 10, "Auto-collapse a node whose direct children exceed this number. 0 disables auto-collapse."),
 	SDATA_END()
 ];
-var ZOOM_CANVAS = {
-	type: "zoom-canvas",
-	animation: false
-};
+var CAMERA = yui_graph_camera_behaviors();
 var BEHAVIORS_READING = [
 	"drag-canvas",
-	ZOOM_CANVAS,
+	...CAMERA,
 	"drag-element"
 ];
-var BEHAVIORS_PICKING = ["drag-canvas", ZOOM_CANVAS];
+var BEHAVIORS_PICKING = ["drag-canvas", ...CAMERA];
 var VIEW_STORE_PREFIX = "yui_gobj_tree_view:";
 function view_store_key(gobj) {
 	return VIEW_STORE_PREFIX + gobj_name(gobj);
@@ -55726,38 +55768,16 @@ function build_ports(gobj, desc) {
 ************************************************************/
 var LR_LAYOUTS = ["dagre"];
 /************************************************************
-*  The camera behaviors every operation mode shares.
-*
-*  The wheel SCROLLS, as it does on a map and on every page: a
-*  graph of many nodes is taller than the screen, and a wheel
-*  that zoomed instead made it a thing to be looked at from afar
-*  or read through a keyhole -- never scrolled. Zoom is Ctrl +
-*  wheel (which is also what a trackpad pinch arrives as), the
-*  toolbar's +/-, and the two-finger pinch of g6_touch_gestures.
-*  `enable` on the scroll keeps the two apart: a Ctrl wheel is
-*  the zoom's, so the scroll stands aside for it.
-*
-*  And the two have to name the SAME key, or the gesture falls
-*  between them: the scroll stood aside for Meta as well, while
-*  the zoom listened for Control alone, so Cmd + wheel neither
-*  scrolled nor zoomed. It is ONE key and not two because a G6
-*  `trigger` is a CHORD, not a list of alternatives -- its
-*  `Shortcut.match()` compares the held keys to the bound ones
-*  as a SET, so ["Control", "Meta"] means both keys down at
-*  once. Control it is, on every platform: it is what a
-*  trackpad pinch arrives as, so a Mac keeps its pinch and
-*  gains nothing to press by mistake.
+*  The camera behaviors every operation mode shares: the wheel
+*  SCROLLS and Ctrl + wheel zooms.
+*
+*  Written in `yui_graph_camera.js` now, with the reasoning and
+*  the two traps, so the json graph and the gobj tree speak it
+*  too. It was the last gesture of the camera that this graph
+*  said one way and its siblings another.
 ************************************************************/
 function camera_behaviors() {
-	return [{
-		type: "scroll-canvas",
-		key: "scroll-canvas",
-		enable: (event) => !(event && event.ctrlKey)
-	}, {
-		type: "zoom-canvas",
-		key: "zoom-canvas",
-		trigger: ["Control"]
-	}];
+	return yui_graph_camera_behaviors();
 }
 function layout_direction(gobj) {
 	return str_in_list(LR_LAYOUTS, gobj.priv.layout) ? "LR" : "TB";

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -110,6 +110,7 @@ import {delete_impact} from "./delete_impact.js";
 import {
     yui_graph_center_on,
     yui_graph_viewport_of,
+    yui_graph_camera_behaviors,
     yui_graph_place_at,
 } from "./yui_graph_camera.js";
 import {
@@ -1955,42 +1956,17 @@ function build_ports(gobj, desc)
 const LR_LAYOUTS = ["dagre"];
 
 /************************************************************
- *  The camera behaviors every operation mode shares.
+ *  The camera behaviors every operation mode shares: the wheel
+ *  SCROLLS and Ctrl + wheel zooms.
  *
- *  The wheel SCROLLS, as it does on a map and on every page: a
- *  graph of many nodes is taller than the screen, and a wheel
- *  that zoomed instead made it a thing to be looked at from afar
- *  or read through a keyhole -- never scrolled. Zoom is Ctrl +
- *  wheel (which is also what a trackpad pinch arrives as), the
- *  toolbar's +/-, and the two-finger pinch of g6_touch_gestures.
- *  `enable` on the scroll keeps the two apart: a Ctrl wheel is
- *  the zoom's, so the scroll stands aside for it.
- *
- *  And the two have to name the SAME key, or the gesture falls
- *  between them: the scroll stood aside for Meta as well, while
- *  the zoom listened for Control alone, so Cmd + wheel neither
- *  scrolled nor zoomed. It is ONE key and not two because a G6
- *  `trigger` is a CHORD, not a list of alternatives -- its
- *  `Shortcut.match()` compares the held keys to the bound ones
- *  as a SET, so ["Control", "Meta"] means both keys down at
- *  once. Control it is, on every platform: it is what a
- *  trackpad pinch arrives as, so a Mac keeps its pinch and
- *  gains nothing to press by mistake.
+ *  Written in `yui_graph_camera.js` now, with the reasoning and
+ *  the two traps, so the json graph and the gobj tree speak it
+ *  too. It was the last gesture of the camera that this graph
+ *  said one way and its siblings another.
  ************************************************************/
 function camera_behaviors()
 {
-    return [
-        {
-            type: "scroll-canvas",
-            key: "scroll-canvas",
-            enable: (event) => !(event && event.ctrlKey),
-        },
-        {
-            type: "zoom-canvas",
-            key: "zoom-canvas",
-            trigger: ["Control"],
-        },
-    ];
+    return yui_graph_camera_behaviors();
 }
 
 function layout_direction(gobj)

package/src/c_yui_gobj_tree_js.js

@@ -58,6 +58,7 @@ import {yui_toolbar, yui_toolbar_icon} from "./yui_toolbar.js";
 import {attach_clear} from "./yui_inputs.js";
 import {
     yui_graph_camera_items,
+    yui_graph_camera_behaviors,
     yui_graph_anchor_item,
     yui_graph_update_anchor,
     yui_graph_center_on,
@@ -130,10 +131,15 @@ SDATA_END()
  *  reads the easing had moved the ground. With the zoom instantaneous
  *  the camera is still by the time anything measures it.
  */
-const ZOOM_CANVAS = {type: 'zoom-canvas', animation: false};
-
-const BEHAVIORS_READING = ['drag-canvas', ZOOM_CANVAS, 'drag-element'];
-const BEHAVIORS_PICKING = ['drag-canvas', ZOOM_CANVAS];
+/*  The wheel SCROLLS and Ctrl + wheel zooms, like every other graph
+ *  of the library: the pair, and the reasoning, live in
+ *  `yui_graph_camera.js`. This view used to zoom on a bare wheel --
+ *  the same gesture meaning two different things in two graphs a
+ *  reader has open side by side.  */
+const CAMERA = yui_graph_camera_behaviors();
+
+const BEHAVIORS_READING = ['drag-canvas', ...CAMERA, 'drag-element'];
+const BEHAVIORS_PICKING = ['drag-canvas', ...CAMERA];
 
 /*
  *  Where this view is remembered between visits.

package/src/c_yui_json_graph.js

@@ -51,6 +51,7 @@ import {yui_toolbar, yui_toolbar_icon} from "./yui_toolbar.js";
 import {attach_clear} from "./yui_inputs.js";
 import {
     yui_graph_camera_items,
+    yui_graph_camera_behaviors,
     yui_graph_anchor_item,
     yui_graph_update_anchor,
     yui_graph_center_on,
@@ -978,10 +979,15 @@ const FOLD_SPACER = `<span style="width:24px; flex:0 0 auto;"></span>`;
  *  reads the easing had moved the ground. With the zoom instantaneous
  *  the camera is still by the time anything measures it.
  */
-const ZOOM_CANVAS = {type: 'zoom-canvas', animation: false};
-
-const BEHAVIORS_READING = ['drag-canvas', ZOOM_CANVAS, 'drag-element'];
-const BEHAVIORS_PICKING = ['drag-canvas', ZOOM_CANVAS];
+/*  The wheel SCROLLS and Ctrl + wheel zooms, like every other graph
+ *  of the library: the pair, and the reasoning, live in
+ *  `yui_graph_camera.js`. This view used to zoom on a bare wheel --
+ *  the same gesture meaning two different things in two graphs a
+ *  reader has open side by side.  */
+const CAMERA = yui_graph_camera_behaviors();
+
+const BEHAVIORS_READING = ['drag-canvas', ...CAMERA, 'drag-element'];
+const BEHAVIORS_PICKING = ['drag-canvas', ...CAMERA];
 
 /*
  *  The card's geometry, in ONE place.

package/src/c_yui_map.js

@@ -119,6 +119,19 @@ function mt_create(gobj)
     }
     Object.assign(map_settings, {
         container: $map,
+        /*  THE WHEEL DOES NOT ZOOM; Ctrl + wheel does -- the same
+         *  vocabulary as the three graphs (`yui_graph_camera.js`), so a
+         *  reader with a map and a graph open does not have to remember
+         *  which is which. maplibre calls it `cooperativeGestures`, and
+         *  it never blocks a wheel carrying ctrlKey, so a trackpad PINCH
+         *  keeps zooming on every platform (a Mac gets Cmd as well, its
+         *  own convention, which costs nothing).
+         *
+         *  HERE and not in the attr's default value: a JSON attr is
+         *  replaced WHOLESALE by a host that passes its own, so a
+         *  default is a suggestion -- the demo passes `map_settings` and
+         *  never saw it. This is the house gesture, not a suggestion.  */
+        cooperativeGestures: true,
     });
 
     /*-----------------------------*

package/src/yui_graph_camera.js

@@ -99,6 +99,56 @@ export function yui_graph_update_zoom($container, graph)
     $readout.textContent = yui_graph_zoom_text(graph);
 }
 
+/************************************************************
+ *   THE WHEEL SCROLLS; CTRL + WHEEL ZOOMS. In every graph.
+ *
+ *   The vocabulary of a camera is one vocabulary or it is
+ *   nothing: this file exists because the three graphs of the
+ *   library were each naming the same gestures differently, and
+ *   the wheel was the last one left -- `C_G6_NODES_TREE` scrolled
+ *   with it since 7.23.75 while the json graph and the gobj tree
+ *   went on zooming.
+ *
+ *   Why scroll and not zoom: a graph of many nodes is taller than
+ *   the screen, and a wheel that zoomed made it a thing to be
+ *   looked at from afar or read through a keyhole -- never
+ *   scrolled, which is what a wheel does on a map and on every
+ *   page. Zoom is Ctrl + wheel (what a trackpad pinch arrives
+ *   as), the toolbar's +/-, and the two-finger pinch.
+ *
+ *   Two things this pair has learnt, both the hard way:
+ *
+ *   - `enable` on the scroll is what keeps the two apart, and the
+ *     two must name the SAME key or the gesture falls between
+ *     them: the scroll once stood aside for Meta as well while
+ *     the zoom listened for Control alone, so Cmd + wheel neither
+ *     scrolled nor zoomed. It is ONE key because a G6 `trigger`
+ *     is a CHORD, not a list of alternatives -- `Shortcut.match()`
+ *     compares the held keys to the bound ones as a SET.
+ *   - `animation: false` on the zoom. The house rule first
+ *     (nothing here slides), and then the anchor: `aftertransform`
+ *     fires while G6's 200ms easing is still running, so a
+ *     re-centring measured a camera that was still moving --
+ *     passes of -272, +411, +183, oscillating because the ground
+ *     moved between two reads.
+ ************************************************************/
+export function yui_graph_camera_behaviors()
+{
+    return [
+        {
+            type: "scroll-canvas",
+            key: "scroll-canvas",
+            enable: (event) => !(event && event.ctrlKey),
+        },
+        {
+            type: "zoom-canvas",
+            key: "zoom-canvas",
+            trigger: ["Control"],
+            animation: false,
+        },
+    ];
+}
+
 /************************************************************
  *   The camera cluster: zoom in, zoom out, readout, fit,
  *   actual size.  Returns createElement2 specs, in order.