@yuneta/gobj-ui 7.23.91 → 7.23.93

package/README.md

@@ -1257,7 +1257,14 @@ a level or two, with a count on every cut.
   their children. **`fold_page_size`** (default `24`) is how many children of
   one hook are shown at a time; the rest is a **`+N` chip** at the end of the
   page that opens the next one. Both are attrs of `C_YUI_TREEDB_GRAPH`,
-  forwarded to the engine.
+  forwarded to the engine — and since `7.23.93` so are the seven the engine
+  had always had and no host could reach, because this view is what creates
+  the engine and an option it does not forward is an option that does not
+  exist: **`minimap_min_nodes`** (default `30`), **`with_gridline`**,
+  **`with_fullscreen`**, **`with_toolbar`**, **`toolbar_position`**
+  (`right-top`), **`confirm_delete_node`** and **`confirm_unlink_edge`**. The
+  defaults repeat the engine's, so a host that says nothing gets what it got
+  before.
 - **A pill per hook on the card** — `▸ devices 142` folded, `▾ devices 24/142`
   open on a page — in the colour of the child topic, the same colour its hook
   port wears. Tapping it opens or folds that hook, and the card stays where it

package/dist/gobj-ui.cjs.js

@@ -58981,7 +58981,8 @@ function auto_layout(gobj) {
 *  card is a rectangle anyway.
 ************************************************************/
 function refresh_minimap(gobj) {
-	let graph = gobj.priv.graph;
+	let priv = gobj.priv;
+	let graph = priv.graph;
 	if (!graph) return;
 	let threshold = (0, _yuneta_gobj_js.gobj_read_integer_attr)(gobj, "minimap_min_nodes");
 	let n = 0;
@@ -59004,12 +59005,12 @@ function refresh_minimap(gobj) {
 			bottom: "12px",
 			left: "12px",
 			background: "var(--bulma-scheme-main, #fff)",
-			border: "1px solid var(--bulma-border-weak, #ddd)",
+			border: "1px solid var(--bulma-text-weak, #94a3b8)",
 			borderRadius: "6px",
 			boxShadow: "0 2px 8px rgba(0, 0, 0, 0.15)"
 		},
 		maskStyle: {
-			border: "2px solid var(--bulma-link, #3b82f6)",
+			border: "2px solid var(--bulma-link-on-scheme, var(--bulma-link, #3b82f6))",
 			background: "rgba(59, 130, 246, 0.12)"
 		},
 		shape: (id, element_type, element) => {
@@ -59017,8 +59018,8 @@ function refresh_minimap(gobj) {
 			try {
 				let nd = graph.getNodeData(id);
 				let size = nd && nd.style && nd.style.size || [120, 60];
-				let color = nd && nd.data && nd.data.desc && nd.data.desc.color || "#94a3b8";
-				if (is_more_node(nd)) color = "rgba(148, 163, 184, 0.35)";
+				let color = port_rim(nd && nd.data && nd.data.desc && nd.data.desc.color || "#94a3b8", priv.theme);
+				if (is_more_node(nd)) color = priv.theme === "dark" ? "rgba(148, 163, 184, 0.60)" : "rgba(71, 85, 105, 0.65)";
 				return new Rect({ style: {
 					x: -size[0] / 2,
 					y: -size[1] / 2,
@@ -60863,6 +60864,10 @@ function ac_theme$1(gobj, event, kw, src) {
 	refresh_default_edges_theme(gobj, theme);
 	refresh_port_rims(gobj, theme);
 	repaint_more_chips(gobj);
+	if (graph_get_plugin(gobj, "minimap")) {
+		graph_remove_plugin(gobj, "minimap");
+		refresh_minimap(gobj);
+	}
 	graph_draw(gobj).then(() => {
 		update_history_buttons(gobj);
 	});
@@ -61881,6 +61886,13 @@ var attrs_table$3 = [
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "with_treedb_tables", 0, false, "Include treedb tables"),
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_INTEGER, "expand_depth", 0, 2, "Levels of the treedb open when it loads: 1 = the roots alone, 2 = the roots and their children. Forwarded to the G6 child"),
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_INTEGER, "fold_page_size", 0, 24, "Children of one hook shown per page in the graph; a `+N` chip opens the next page. Forwarded to the G6 child"),
+	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_INTEGER, "minimap_min_nodes", 0, 30, "Show the minimap from this many nodes on (0 = never). Forwarded to the G6 child"),
+	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "with_gridline", 0, true, "Draw the grid under the graph. Forwarded to the G6 child"),
+	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "with_fullscreen", 0, true, "Offer the full-screen button. Forwarded to the G6 child"),
+	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "with_toolbar", 0, true, "Float the camera toolbar over the canvas. Forwarded to the G6 child"),
+	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_STRING, "toolbar_position", 0, "right-top", "Where that toolbar floats: top-left, top-right, bottom-left, bottom-right, left-top, right-top. Forwarded to the G6 child"),
+	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "confirm_delete_node", 0, true, "Ask before deleting a node. Forwarded to the G6 child"),
+	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_BOOLEAN, "confirm_unlink_edge", 0, true, "Ask before unlinking an edge. Forwarded to the G6 child"),
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_STRING, "operation_mode", _yuneta_gobj_js.sdata_flag_t.SDF_PERSIST, "reading", "Current operation mode (internal behaviour or role). Changed by the user trough the gui."),
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_STRING, "layout", _yuneta_gobj_js.sdata_flag_t.SDF_PERSIST, "", "Current graph layout. User preference. Changed by the user through the gui."),
 	(0, _yuneta_gobj_js.SDATA)(_yuneta_gobj_js.data_type_t.DTP_LIST, "hidden_topics", _yuneta_gobj_js.sdata_flag_t.SDF_PERSIST, "[]", "Topics hidden from the graph (legend). User preference, per treedb"),
@@ -61964,6 +61976,13 @@ function mt_create$3(gobj) {
 		fkey_port_position: "top",
 		expand_depth: (0, _yuneta_gobj_js.gobj_read_integer_attr)(gobj, "expand_depth"),
 		fold_page_size: (0, _yuneta_gobj_js.gobj_read_integer_attr)(gobj, "fold_page_size"),
+		minimap_min_nodes: (0, _yuneta_gobj_js.gobj_read_integer_attr)(gobj, "minimap_min_nodes"),
+		with_gridline: (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "with_gridline"),
+		with_fullscreen: (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "with_fullscreen"),
+		with_toolbar: (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "with_toolbar"),
+		toolbar_position: (0, _yuneta_gobj_js.gobj_read_str_attr)(gobj, "toolbar_position"),
+		confirm_delete_node: (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "confirm_delete_node"),
+		confirm_unlink_edge: (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "confirm_unlink_edge"),
 		hidden_topics: (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "hidden_topics") || [],
 		main_topic: (0, _yuneta_gobj_js.gobj_read_str_attr)(gobj, "main_topic") || "",
 		loose_topics: (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "loose_topics") || [],

package/dist/gobj-ui.es.js

@@ -58976,7 +58976,8 @@ function auto_layout(gobj) {
 *  card is a rectangle anyway.
 ************************************************************/
 function refresh_minimap(gobj) {
-	let graph = gobj.priv.graph;
+	let priv = gobj.priv;
+	let graph = priv.graph;
 	if (!graph) return;
 	let threshold = gobj_read_integer_attr(gobj, "minimap_min_nodes");
 	let n = 0;
@@ -58999,12 +59000,12 @@ function refresh_minimap(gobj) {
 			bottom: "12px",
 			left: "12px",
 			background: "var(--bulma-scheme-main, #fff)",
-			border: "1px solid var(--bulma-border-weak, #ddd)",
+			border: "1px solid var(--bulma-text-weak, #94a3b8)",
 			borderRadius: "6px",
 			boxShadow: "0 2px 8px rgba(0, 0, 0, 0.15)"
 		},
 		maskStyle: {
-			border: "2px solid var(--bulma-link, #3b82f6)",
+			border: "2px solid var(--bulma-link-on-scheme, var(--bulma-link, #3b82f6))",
 			background: "rgba(59, 130, 246, 0.12)"
 		},
 		shape: (id, element_type, element) => {
@@ -59012,8 +59013,8 @@ function refresh_minimap(gobj) {
 			try {
 				let nd = graph.getNodeData(id);
 				let size = nd && nd.style && nd.style.size || [120, 60];
-				let color = nd && nd.data && nd.data.desc && nd.data.desc.color || "#94a3b8";
-				if (is_more_node(nd)) color = "rgba(148, 163, 184, 0.35)";
+				let color = port_rim(nd && nd.data && nd.data.desc && nd.data.desc.color || "#94a3b8", priv.theme);
+				if (is_more_node(nd)) color = priv.theme === "dark" ? "rgba(148, 163, 184, 0.60)" : "rgba(71, 85, 105, 0.65)";
 				return new Rect({ style: {
 					x: -size[0] / 2,
 					y: -size[1] / 2,
@@ -60858,6 +60859,10 @@ function ac_theme$1(gobj, event, kw, src) {
 	refresh_default_edges_theme(gobj, theme);
 	refresh_port_rims(gobj, theme);
 	repaint_more_chips(gobj);
+	if (graph_get_plugin(gobj, "minimap")) {
+		graph_remove_plugin(gobj, "minimap");
+		refresh_minimap(gobj);
+	}
 	graph_draw(gobj).then(() => {
 		update_history_buttons(gobj);
 	});
@@ -61876,6 +61881,13 @@ var attrs_table$3 = [
 	SDATA(data_type_t.DTP_BOOLEAN, "with_treedb_tables", 0, false, "Include treedb tables"),
 	SDATA(data_type_t.DTP_INTEGER, "expand_depth", 0, 2, "Levels of the treedb open when it loads: 1 = the roots alone, 2 = the roots and their children. Forwarded to the G6 child"),
 	SDATA(data_type_t.DTP_INTEGER, "fold_page_size", 0, 24, "Children of one hook shown per page in the graph; a `+N` chip opens the next page. Forwarded to the G6 child"),
+	SDATA(data_type_t.DTP_INTEGER, "minimap_min_nodes", 0, 30, "Show the minimap from this many nodes on (0 = never). Forwarded to the G6 child"),
+	SDATA(data_type_t.DTP_BOOLEAN, "with_gridline", 0, true, "Draw the grid under the graph. Forwarded to the G6 child"),
+	SDATA(data_type_t.DTP_BOOLEAN, "with_fullscreen", 0, true, "Offer the full-screen button. Forwarded to the G6 child"),
+	SDATA(data_type_t.DTP_BOOLEAN, "with_toolbar", 0, true, "Float the camera toolbar over the canvas. Forwarded to the G6 child"),
+	SDATA(data_type_t.DTP_STRING, "toolbar_position", 0, "right-top", "Where that toolbar floats: top-left, top-right, bottom-left, bottom-right, left-top, right-top. Forwarded to the G6 child"),
+	SDATA(data_type_t.DTP_BOOLEAN, "confirm_delete_node", 0, true, "Ask before deleting a node. Forwarded to the G6 child"),
+	SDATA(data_type_t.DTP_BOOLEAN, "confirm_unlink_edge", 0, true, "Ask before unlinking an edge. Forwarded to the G6 child"),
 	SDATA(data_type_t.DTP_STRING, "operation_mode", sdata_flag_t.SDF_PERSIST, "reading", "Current operation mode (internal behaviour or role). Changed by the user trough the gui."),
 	SDATA(data_type_t.DTP_STRING, "layout", sdata_flag_t.SDF_PERSIST, "", "Current graph layout. User preference. Changed by the user through the gui."),
 	SDATA(data_type_t.DTP_LIST, "hidden_topics", sdata_flag_t.SDF_PERSIST, "[]", "Topics hidden from the graph (legend). User preference, per treedb"),
@@ -61959,6 +61971,13 @@ function mt_create$3(gobj) {
 		fkey_port_position: "top",
 		expand_depth: gobj_read_integer_attr(gobj, "expand_depth"),
 		fold_page_size: gobj_read_integer_attr(gobj, "fold_page_size"),
+		minimap_min_nodes: gobj_read_integer_attr(gobj, "minimap_min_nodes"),
+		with_gridline: gobj_read_bool_attr(gobj, "with_gridline"),
+		with_fullscreen: gobj_read_bool_attr(gobj, "with_fullscreen"),
+		with_toolbar: gobj_read_bool_attr(gobj, "with_toolbar"),
+		toolbar_position: gobj_read_str_attr(gobj, "toolbar_position"),
+		confirm_delete_node: gobj_read_bool_attr(gobj, "confirm_delete_node"),
+		confirm_unlink_edge: gobj_read_bool_attr(gobj, "confirm_unlink_edge"),
 		hidden_topics: gobj_read_attr(gobj, "hidden_topics") || [],
 		main_topic: gobj_read_str_attr(gobj, "main_topic") || "",
 		loose_topics: gobj_read_attr(gobj, "loose_topics") || [],

package/package.json

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

package/src/c_g6_nodes_tree.js

@@ -6985,7 +6985,16 @@ function refresh_minimap(gobj)
                 bottom:       "12px",
                 left:         "12px",
                 background:   "var(--bulma-scheme-main, #fff)",
-                border:       "1px solid var(--bulma-border-weak, #ddd)",
+                /*  A mid grey and not a `--bulma-border-*` token: those
+                 *  are made for a line INSIDE a surface, and this one has
+                 *  to separate a floating panel from the CANVAS behind
+                 *  it -- which is near-black in one scheme and white in
+                 *  the other. `border-weak` was 1.43:1 over the dark
+                 *  canvas and 1.18 over the light one; every border token
+                 *  fails at least one of them. This one is 4.6 on both.
+                 *  (The box-shadow below separates it only where there
+                 *  is light to cast a shadow on.)  */
+                border:       "1px solid var(--bulma-text-weak, #94a3b8)",
                 borderRadius: "6px",
                 boxShadow:    "0 2px 8px rgba(0, 0, 0, 0.15)",
             },
@@ -6993,7 +7002,7 @@ function refresh_minimap(gobj)
              *  invisible over a dark minimap. A link-coloured outline
              *  reads on both.  */
             maskStyle: {
-                border:     "2px solid var(--bulma-link, #3b82f6)",
+                border:     "2px solid var(--bulma-link-on-scheme, var(--bulma-link, #3b82f6))",
                 background: "rgba(59, 130, 246, 0.12)",
             },
             shape: (id, element_type, element) => {
@@ -7003,12 +7012,24 @@ function refresh_minimap(gobj)
                 try {
                     let nd = graph.getNodeData(id);
                     let size = (nd && nd.style && nd.style.size) || [120, 60];
-                    let color = (nd && nd.data && nd.data.desc && nd.data.desc.color)
-                        || "#94a3b8";
+                    /*  The topic's colour PUSHED TOWARDS THE SURFACE, the
+                     *  same treatment a port's rim takes: a block here is
+                     *  the topic colour on the panel's own background, and
+                     *  on the light scheme the palette's yellow was 1.61:1
+                     *  on white -- a minimap whose content could not be
+                     *  told from its paper. 3.80 in light, 9.11 in dark.  */
+                    let color = port_rim(
+                        (nd && nd.data && nd.data.desc && nd.data.desc.color) || "#94a3b8",
+                        priv.theme
+                    );
                     if(is_more_node(nd)) {
-                        /*  A `+N` chip is a cut, not a card: a faint
-                         *  mark at that scale.  */
-                        color = "rgba(148, 163, 184, 0.35)";
+                        /*  A `+N` chip is a cut, not a card: quieter than a
+                         *  block, and still visible. The slate had to become
+                         *  a DARK slate on a white panel -- raising the alpha
+                         *  of the light one only ever reached 1.86.  */
+                        color = (priv.theme === "dark")
+                            ? "rgba(148, 163, 184, 0.60)"    /*  3.35:1  */
+                            : "rgba(71, 85, 105, 0.65)";     /*  3.19:1  */
                     }
                     return new RectGeometry({
                         style: {
@@ -9809,6 +9830,14 @@ function ac_theme(gobj, event, kw, src)
     refresh_port_rims(gobj, theme);
     repaint_more_chips(gobj);
 
+    /*  The minimap paints its blocks from the theme (see its `shape`),
+     *  and it is created ONCE: rebuilt, or it keeps the colours of the
+     *  scheme it was born in.  */
+    if(graph_get_plugin(gobj, "minimap")) {
+        graph_remove_plugin(gobj, "minimap");
+        refresh_minimap(gobj);
+    }
+
     graph_draw(gobj).then(() => {
         // Restore toolbar icon states lost when G6 re-renders the DOM
         update_history_buttons(gobj);

package/src/c_yui_treedb_graph.js

@@ -115,6 +115,19 @@ SDATA(data_type_t.DTP_BOOLEAN,  "with_treedb_tables",0, false,  "Include treedb
 SDATA(data_type_t.DTP_INTEGER,  "expand_depth",     0,  2,      "Levels of the treedb open when it loads: 1 = the roots alone, 2 = the roots and their children. Forwarded to the G6 child"),
 SDATA(data_type_t.DTP_INTEGER,  "fold_page_size",   0,  24,     "Children of one hook shown per page in the graph; a `+N` chip opens the next page. Forwarded to the G6 child"),
 
+/*---------------- Forwarded to the G6 child (its own defaults) ----------------*/
+/*  Options the ENGINE has always had and no host could reach: this view
+ *  creates the child, so an option it does not forward is an option that
+ *  does not exist. The defaults repeat the child's -- a host that says
+ *  nothing gets exactly what it got before.  */
+SDATA(data_type_t.DTP_INTEGER,  "minimap_min_nodes", 0, 30,    "Show the minimap from this many nodes on (0 = never). Forwarded to the G6 child"),
+SDATA(data_type_t.DTP_BOOLEAN,  "with_gridline",    0,  true,  "Draw the grid under the graph. Forwarded to the G6 child"),
+SDATA(data_type_t.DTP_BOOLEAN,  "with_fullscreen",  0,  true,  "Offer the full-screen button. Forwarded to the G6 child"),
+SDATA(data_type_t.DTP_BOOLEAN,  "with_toolbar",     0,  true,  "Float the camera toolbar over the canvas. Forwarded to the G6 child"),
+SDATA(data_type_t.DTP_STRING,   "toolbar_position", 0,  "right-top", "Where that toolbar floats: top-left, top-right, bottom-left, bottom-right, left-top, right-top. Forwarded to the G6 child"),
+SDATA(data_type_t.DTP_BOOLEAN,  "confirm_delete_node", 0, true, "Ask before deleting a node. Forwarded to the G6 child"),
+SDATA(data_type_t.DTP_BOOLEAN,  "confirm_unlink_edge", 0, true, "Ask before unlinking an edge. Forwarded to the G6 child"),
+
 /*---------------- User last selections  ----------------*/
 SDATA(data_type_t.DTP_STRING,   "operation_mode",   sdata_flag_t.SDF_PERSIST, "reading", "Current operation mode (internal behaviour or role). Changed by the user trough the gui."),
 SDATA(data_type_t.DTP_STRING,   "layout",           sdata_flag_t.SDF_PERSIST, "", "Current graph layout. User preference. Changed by the user through the gui."),
@@ -256,6 +269,13 @@ function mt_create(gobj)
             fkey_port_position: "top",
             expand_depth: gobj_read_integer_attr(gobj, "expand_depth"),
             fold_page_size: gobj_read_integer_attr(gobj, "fold_page_size"),
+            minimap_min_nodes: gobj_read_integer_attr(gobj, "minimap_min_nodes"),
+            with_gridline: gobj_read_bool_attr(gobj, "with_gridline"),
+            with_fullscreen: gobj_read_bool_attr(gobj, "with_fullscreen"),
+            with_toolbar: gobj_read_bool_attr(gobj, "with_toolbar"),
+            toolbar_position: gobj_read_str_attr(gobj, "toolbar_position"),
+            confirm_delete_node: gobj_read_bool_attr(gobj, "confirm_delete_node"),
+            confirm_unlink_edge: gobj_read_bool_attr(gobj, "confirm_unlink_edge"),
             hidden_topics: gobj_read_attr(gobj, "hidden_topics") || [],
             main_topic: gobj_read_str_attr(gobj, "main_topic") || "",
             loose_topics: gobj_read_attr(gobj, "loose_topics") || [],