@yuneta/gobj-ui 7.23.12 → 7.23.14

package/README.md

@@ -854,6 +854,26 @@ structural rather than cosmetic — and none of them is visible in the CSS:
   slop) that re-emits G6's own forwarded event under the name the plugin
   listens for — so `getItems(e)` sees exactly what a right click gives it,
   including the port under the finger.
+- **One finger has to serve three commands, so the press is arbitrated — at
+  the RELEASE** (`press_arbiter.js`, pure and tested): moved → drag; still and
+  let go quickly → the element's own action; still and held past 500ms → the
+  context menu. Firing the menu on a TIMER instead cannot arbitrate anything,
+  because at the moment it fires the gesture is not over: it opened while
+  `drag-element` was already carrying the node, so one press meant both things
+  and the menu sat over a card running away underneath it. Two more things the
+  same press was doing, both fixed with it: `click` is not taken from the DOM
+  either (`@antv/g`'s `onPointerUp` synthesises one), so the press that opened
+  the menu went on to click the node it opened the menu on — the click
+  handlers ask `consume_long_press_click()` first; and the BROWSER's own menu,
+  which opens while the finger is still down, is refused for as long as there
+  is a finger on the glass.
+- **The browser was taking the gesture outright.** G6 puts `touch-action:
+  none` on its canvas and nothing on its HTML nodes, which are ordinary DIVs
+  over it — so a drag that started on a **card** was a page scroll: two
+  `pointermove`s through, then `pointercancel`, and the node stopped dead
+  about 20px in while the page slid. `.graph-container` refuses those gestures
+  whole now; the panels and the context menu keep `touch-action: auto`, so a
+  finger still scrolls what is meant to scroll.
 
 Everything a finger has to LAND on is sized off `(pointer: coarse)`, which
 means **a mouse sees no change at all**: node resize handles become a 14px
@@ -884,9 +904,9 @@ gesture to give them: G6 binds panning and the band to the same plain drag, so
 one of the two has to stand aside. The edit toolbar carries a **selection
 mode** toggle (the dashed marquee, next to `+`): while it is on, a tap picks a
 card and a drag on the background draws the band, and panning is what stands
-aside. It looks **pressed** while it is on (`pressed_state`, an inverted
-neutral chip) rather than taking one of the palette's colours: each of those
-names a KIND of action, and `7.23.11` borrowed undo/redo's violet for it —
+aside. It looks **pressed** while it is on (`7.23.12`, `pressed_state`, an
+inverted neutral chip) rather than taking one of the palette's colours: each of
+those names a KIND of action, and `7.23.11` borrowed undo/redo's violet for it —
 which put the same colour on two neighbouring buttons for two different
 reasons, and carried the whole state change in the hairline of an outline
 glyph. It is deliberately a button and not a heuristic — the toolbar says which
@@ -896,6 +916,19 @@ key. Leaving edition turns it off, and it is not persisted.
 
 **New key for consumers: `selection mode`.**
 
+**The two selects of the toolbar speak the app's language** (`7.23.13`). They
+rendered their raw names — `reading`, `edition`, `dagre`, `manual` — in every
+language, because neither went through `t()` at all: not a missing key, a
+missing call. The label is translated and carries its own `data-i18n`, so it
+follows a language change; the option's `value` is now set EXPLICITLY, because
+an `<option>` with no value answers with its own text and a translated label
+would have sent `"Edición"` to the FSM as the mode to enter.
+
+**New keys for consumers: `reading`, `operation`, `writing`, `edition`,
+`manual`, `dagre`, `antv-dagre`, `d3-force`, `force-atlas2`.** A host that adds
+a layout of its own gets its name untranslated, which is what all of them got
+until now.
+
 ### Tabs opened at runtime, and the two decisions their url costs
 
 `yui_tab_routes.js`. A workspace whose tabs are opened by the operator —

package/dist/gobj-ui.cjs.js

@@ -9503,6 +9503,29 @@ function yui_graph_fold_items(gobj, wide) {
 function yui_graph_refresh_item(gobj, wide) {
 	return camera_button(gobj, "yi-arrows-rotate", "EV_REFRESH", "refresh", wide);
 }
+/***************************************************************
+*              Arbitration
+***************************************************************/
+/************************************************************
+*   Did the finger travel far enough to mean a DRAG?
+*
+*   `press` is what the pointerdown recorded: {x, y, t0}.
+************************************************************/
+function press_moved(press, x, y) {
+	if (!press) return false;
+	return Math.abs(x - press.x) > 10 || Math.abs(y - press.y) > 10;
+}
+/************************************************************
+*   What the press meant, asked when the finger comes up.
+*
+*   Answers "none" when there was no press to arbitrate.
+************************************************************/
+function classify_press(press, x, y, t) {
+	if (!press) return "none";
+	if (press_moved(press, x, y)) return "drag";
+	if (t - press.t0 >= 500) return "long";
+	return "tap";
+}
 //#endregion
 //#region src/g6_touch_gestures.js
 /***********************************************************************
@@ -9539,6 +9562,21 @@ function yui_graph_refresh_item(gobj, wide) {
 *             forwarded event object -- which is why the plugin's
 *             `getItems(e)` receives exactly the shape it expects.
 *
+*             ONE finger has to serve three commands -- move the
+*             node, act on it, open its menu -- so the press is
+*             arbitrated, and arbitrated at the RELEASE:
+*
+*                 moved                -> drag
+*                 still, let go fast   -> the element's own action
+*                 still, held >= 500ms -> the context menu
+*
+*             A menu opened on a TIMER instead cannot be arbitrated
+*             at all: it opens while `drag-element` is already
+*             carrying the node, so the same press means both things
+*             and the user gets a menu over a card running away
+*             underneath it.  `classify_press` is where the three
+*             live, and it is pure.
+*
 *          Both are built on ONE per-graph record of the fingers
 *          on the glass, read from the NATIVE touch events -- see
 *          `touch_state_of` for why the pointer stream, which looks
@@ -9551,11 +9589,6 @@ function yui_graph_refresh_item(gobj, wide) {
 *          All Rights Reserved.
 ***********************************************************************/
 /***************************************************************
-*              Constants
-***************************************************************/
-var LONG_PRESS_MS = 500;
-var LONG_PRESS_SLOP = 10;
-/***************************************************************
 *      Per-graph record of the fingers on the glass
 ***************************************************************/
 var __touch_state__ = /* @__PURE__ */ new WeakMap();
@@ -9582,7 +9615,9 @@ function touch_state_of(graph) {
 	if (state) return state;
 	state = {
 		count: 0,
-		container: null
+		multi: false,
+		container: null,
+		long_press_click: false
 	};
 	__touch_state__.set(graph, state);
 	let container = graph.getCanvas?.()?.getContainer?.();
@@ -9590,11 +9625,16 @@ function touch_state_of(graph) {
 	state.container = container;
 	let read = (event) => {
 		state.count = event.touches ? event.touches.length : 0;
+		if (state.count >= 2) state.multi = true;
+		else if (state.count === 0) state.multi = false;
 	};
 	container.addEventListener("touchstart", read, { passive: true });
 	container.addEventListener("touchmove", read, { passive: true });
 	container.addEventListener("touchend", read, { passive: true });
 	container.addEventListener("touchcancel", read, { passive: true });
+	container.addEventListener("contextmenu", (event) => {
+		if (state.count > 0) event.preventDefault();
+	}, { capture: true });
 	return state;
 }
 /************************************************************
@@ -9695,6 +9735,24 @@ function ensure_pinch_zoom_patch() {
 *      Long press
 ***************************/
 /************************************************************
+*   Is the click being dispatched right now the tail of a long
+*   press?  Answers true ONCE, to the first asker.
+*
+*   @antv/g does not take `click` from the DOM either: it makes
+*   one out of the pointerdown/pointerup pair itself, inside
+*   the same `onPointerUp` that just fed us the release.  So
+*   the press that opened the menu goes on to click whatever it
+*   opened the menu ON -- selecting the node, or worse, dropping
+*   a selection of several -- unless the handler asks.
+************************************************************/
+function consume_long_press_click(graph) {
+	if (!graph) return false;
+	let state = __touch_state__.get(graph);
+	if (!state || !state.long_press_click) return false;
+	state.long_press_click = false;
+	return true;
+}
+/************************************************************
 *   Make a long press open the context menu.
 *
 *   Returns the function that uninstalls it.
@@ -9704,19 +9762,26 @@ function ensure_pinch_zoom_patch() {
 *   the name the plugin listens for, so `getItems(e)` and
 *   `enable(e)` see the same object a right-click would give
 *   them -- same `target`, same `targetType`, same `client`.
+*
+*   `options.enable(event)` decides, at the DOWN, whether this
+*   press is even a candidate.  Pass the plugin's own predicate:
+*   a press on the empty canvas would otherwise arm a menu the
+*   plugin then refuses to show, and swallow the click that
+*   would have cleared the selection.
 ************************************************************/
-function install_long_press_contextmenu(graph) {
+function install_long_press_contextmenu(graph, options) {
 	if (!graph) return () => {};
+	let enable = options?.enable;
 	let state = touch_state_of(graph);
 	let pending = null;
-	let cancel = () => {
-		if (pending) {
-			clearTimeout(pending.timer);
-			pending = null;
-		}
+	let disarm = () => {
+		pending = null;
 	};
 	let fire = (event) => {
-		pending = null;
+		state.long_press_click = true;
+		setTimeout(() => {
+			state.long_press_click = false;
+		}, 0);
 		let swallow = (evt) => {
 			evt.stopPropagation();
 			document.removeEventListener("click", swallow, true);
@@ -9725,51 +9790,60 @@ function install_long_press_contextmenu(graph) {
 		setTimeout(() => {
 			document.removeEventListener("click", swallow, true);
 		}, 1e3);
-		let container = graph.getCanvas?.()?.getContainer?.();
-		if (container) container.addEventListener("contextmenu", (evt) => {
-			evt.preventDefault();
-		}, {
-			once: true,
-			capture: true
-		});
 		graph.emit(`${event.targetType}:${_antv_g6.CommonEvent.CONTEXT_MENU}`, event);
 		graph.emit(_antv_g6.CommonEvent.CONTEXT_MENU, event);
 	};
 	let on_down = (event) => {
-		cancel();
+		disarm();
 		if (event.pointerType !== "touch") return;
-		if (state.count > 1) return;
+		if (state.count > 1 || state.multi) return;
+		if (enable && !enable(event)) return;
 		let x = event.client?.x;
 		let y = event.client?.y;
 		if (x === void 0 || y === void 0) return;
-		let frozen = Object.assign({}, event);
 		pending = {
 			x,
 			y,
-			timer: setTimeout(() => {
-				fire(frozen);
-			}, LONG_PRESS_MS)
+			t0: Date.now(),
+			event: Object.assign({}, event)
 		};
 	};
 	let on_move = (event) => {
 		if (!pending) return;
-		if (state.count > 1) {
-			cancel();
+		if (state.count > 1 || state.multi) {
+			disarm();
 			return;
 		}
 		let x = event.client?.x;
 		let y = event.client?.y;
 		if (x === void 0 || y === void 0) return;
-		if (Math.abs(x - pending.x) > LONG_PRESS_SLOP || Math.abs(y - pending.y) > LONG_PRESS_SLOP) cancel();
+		if (press_moved(pending, x, y)) disarm();
 	};
+	let on_up = (event) => {
+		let press = pending;
+		pending = null;
+		if (!press) return;
+		if (state.multi) return;
+		let x = event.client?.x;
+		let y = event.client?.y;
+		if (x === void 0) x = press.x;
+		if (y === void 0) y = press.y;
+		if (classify_press(press, x, y, Date.now()) !== "long") return;
+		fire(press.event);
+	};
+	let on_touch_cancel = () => {
+		disarm();
+	};
+	state.container?.addEventListener("touchcancel", on_touch_cancel);
 	graph.on(_antv_g6.CommonEvent.POINTER_DOWN, on_down);
 	graph.on(_antv_g6.CommonEvent.POINTER_MOVE, on_move);
-	graph.on(_antv_g6.CommonEvent.POINTER_UP, cancel);
+	graph.on(_antv_g6.CommonEvent.POINTER_UP, on_up);
 	return () => {
-		cancel();
+		disarm();
+		state.container?.removeEventListener("touchcancel", on_touch_cancel);
 		graph.off(_antv_g6.CommonEvent.POINTER_DOWN, on_down);
 		graph.off(_antv_g6.CommonEvent.POINTER_MOVE, on_move);
-		graph.off(_antv_g6.CommonEvent.POINTER_UP, cancel);
+		graph.off(_antv_g6.CommonEvent.POINTER_UP, on_up);
 	};
 }
 //#endregion
@@ -47977,6 +48051,7 @@ function configure_events(gobj) {
 	let priv = gobj.priv;
 	let graph = priv.graph;
 	graph.on(_antv_g6.CanvasEvent.CLICK, (evt) => {
+		if (consume_long_press_click(graph)) return;
 		(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_CANVAS_CLICK", { evt }, gobj);
 	});
 	graph.on(_antv_g6.NodeEvent.DRAG, (evt) => {
@@ -47990,12 +48065,14 @@ function configure_events(gobj) {
 		(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_NODE_DRAG_END", { evt }, gobj);
 	});
 	graph.on(_antv_g6.NodeEvent.CLICK, (evt) => {
+		if (consume_long_press_click(graph)) return;
 		(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_NODE_CLICK", { evt }, gobj);
 	});
 	graph.on(_antv_g6.NodeEvent.CONTEXT_MENU, (evt) => {
 		(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_NODE_CONTEXT_MENU", { evt }, gobj);
 	});
 	graph.on(_antv_g6.EdgeEvent.CLICK, (evt) => {
+		if (consume_long_press_click(graph)) return;
 		(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_EDGE_CLICK", { evt }, gobj);
 	});
 	graph.on("aftertransform", () => {
@@ -48059,6 +48136,9 @@ function configure_plugins(gobj) {
 			update_toolbar(gobj);
 		}
 	});
+	let menu_enable = (e) => {
+		return e.targetType === "node" || e.targetType === "edge";
+	};
 	graph_add_plugin(gobj, "contextmenu", {
 		trigger: "contextmenu",
 		onClick: (value) => {
@@ -48067,12 +48147,10 @@ function configure_plugins(gobj) {
 		getItems: (e) => {
 			return build_context_menu_items(gobj, e);
 		},
-		enable: (e) => {
-			return e.targetType === "node" || e.targetType === "edge";
-		}
+		enable: menu_enable
 	});
 	if (priv._uninstall_long_press) priv._uninstall_long_press();
-	priv._uninstall_long_press = install_long_press_contextmenu(priv.graph);
+	priv._uninstall_long_press = install_long_press_contextmenu(priv.graph, { enable: menu_enable });
 	if ((0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "with_toolbar")) {
 		configure_toolbar(gobj);
 		configure_toolbar_edit(gobj);
@@ -53136,6 +53214,40 @@ function destroy_ui$1(gobj) {
 	}
 }
 /************************************************************
+*  The label of an option of the two selects of the toolbar.
+*
+*  Both of them used to render their RAW names -- `reading`,
+*  `edition`, `dagre`, `manual` -- in every language, because
+*  neither went through `t()` at all. Not a missing key: a
+*  missing call.
+*
+*  Written as one literal per case, and deliberately not as
+*  `t(name)`: a consumer's `validate-locales.mjs` reads
+*  LITERALS, so a variable key is invisible to it -- the app
+*  ships without the entry and nothing says so, because
+*  i18next answers an unknown key with the key itself, which
+*  is exactly the English word that was there before. The
+*  same reason the keys are listed in the README.
+*
+*  The default is what a host that adds a layout of its own
+*  gets: the name it chose, which is what all of them got
+*  until now.
+************************************************************/
+function option_label(name) {
+	switch (name) {
+		case "reading": return (0, i18next.t)("reading");
+		case "operation": return (0, i18next.t)("operation");
+		case "writing": return (0, i18next.t)("writing");
+		case "edition": return (0, i18next.t)("edition");
+		case "manual": return (0, i18next.t)("manual");
+		case "dagre": return (0, i18next.t)("dagre");
+		case "antv-dagre": return (0, i18next.t)("antv-dagre");
+		case "d3-force": return (0, i18next.t)("d3-force");
+		case "force-atlas2": return (0, i18next.t)("force-atlas2");
+		default: return name;
+	}
+}
+/************************************************************
 *
 ************************************************************/
 function make_toolbar(gobj) {
@@ -53178,8 +53290,11 @@ function make_toolbar(gobj) {
 				{ class: "GRAPH_MODE_SELECT" },
 				modes.map((item) => [
 					"option",
-					{},
-					item
+					{
+						value: item,
+						"data-i18n": item
+					},
+					option_label(item)
 				])
 			]],
 			{ change: (evt) => {
@@ -53518,7 +53633,8 @@ function populate_nodes_tree_options(gobj) {
 		for (let name of layout_names) {
 			let option = document.createElement("option");
 			option.value = name;
-			option.textContent = name;
+			option.setAttribute("data-i18n", name);
+			option.textContent = option_label(name);
 			$layout_select.appendChild(option);
 		}
 		let current_layout = (0, _yuneta_gobj_js.gobj_read_str_attr)(priv.gobj_nodes_tree, "layout");