@yuneta/gobj-ui 7.23.79 → 7.23.81

package/src/c_g6_nodes_tree.js

@@ -137,6 +137,7 @@ import {
     HistoryEvent,
     EdgeEvent,
     Circle,
+    HTML,
     Toolbar,
     register,
 } from '@antv/g6';
@@ -446,6 +447,8 @@ let PRIVATE_DATA = {
     _edge_icon_el:      null,       // floating properties icon element
     _edge_delete_el:    null,       // floating delete icon element for edge
     _edge_popover_el:   null,       // edge properties popover element
+    _port_icon_el:      null,       // floating port properties icon element
+    _port_popover_el:   null,       // port properties popover element
     _node_icon_el:      null,       // floating node properties icon element
     _node_delete_el:    null,       // floating delete icon element for node
     _node_popover_el:   null,       // node properties popover element
@@ -839,6 +842,7 @@ function register_layouts(gobj)
         register(ExtensionCategory.LAYOUT, 'treedb-tree', TreedbTreeLayout);
         register(ExtensionCategory.LAYOUT, 'treedb-radial', TreedbRadialLayout);
         register(ExtensionCategory.NODE, 'light', LightNode);
+        register(ExtensionCategory.NODE, 'treedb-card', TreedbCard);
     }
 }
 
@@ -940,6 +944,7 @@ function configure_events(gobj)
         update_edge_icon_position(gobj);
         update_node_icon_position(gobj);
         update_link_icon_position(gobj);
+        update_port_icon_position(gobj);
     });
 
     graph.on(NodeEvent.DRAG_END, (evt) => {
@@ -974,6 +979,7 @@ function configure_events(gobj)
         update_edge_icon_position(gobj);
         update_node_icon_position(gobj);
         update_link_icon_position(gobj);
+        update_port_icon_position(gobj);
         update_zoom_readout(gobj);
 
         /*
@@ -2132,12 +2138,32 @@ function card_shape_of(gobj, desc, record, geometry, pills_html)
                 }
             }
         }
+
+        /*  And the SHAPE of each port, the same way: the node's own,
+         *  then the topic's per-port default, then the topic's one
+         *  shape for every port (`all ports` in the port popover).  */
+        let port_shapes = geometry.port_shapes;
+        let default_port_shapes = topic_defaults ? topic_defaults.port_shapes : null;
+        let default_shape = topic_defaults ? topic_defaults.port_shape : null;
+        for(let i = 0; i < style.ports.length; i++) {
+            let key = style.ports[i].key;
+            let shape = is_object(port_shapes) ? port_shapes[key] : null;
+            if(!shape && is_object(default_port_shapes)) {
+                shape = default_port_shapes[key];
+            }
+            if(!shape) {
+                shape = default_shape;
+            }
+            if(shape && str_in_list(PORT_SHAPES, shape)) {
+                style.ports[i].shape = shape;
+            }
+        }
     } else {
         style.port = false;
         style.ports = [];
     }
 
-    return {type: 'html', style: style};
+    return {type: 'treedb-card', style: style};
 }
 
 /************************************************************
@@ -2732,26 +2758,62 @@ function update_geometry(gobj, node_id)
         topic_props.nodes = {};
     }
 
-    // Extract geometry from render style
+    /*  Extract geometry from render style -- the POSITION always, the
+     *  SIZE only when somebody chose it. A card on the tier's default
+     *  used to be saved with that default, so every Save froze the
+     *  library's size of the day into `__graphs__` and a later default
+     *  (bigger ports, 7.23.75/79) reached no saved treedb: the same
+     *  trap as the invented cascade coordinates, for the size. And a
+     *  CLOSED node is a square: its render size is not the card's and
+     *  is never saved as one -- the entry keeps what it had.  */
     let node_props = topic_props.nodes[record.id] || {};
-    json_object_update(
-        node_props,
-        kw_clone_by_keys(gobj, style, ["x", "y", "size", "portR"])
-    );
+    let picked = kw_clone_by_keys(gobj, style, ["x", "y", "size", "portR"]);
+    if(node_is_compact(gobj, node_id)) {
+        delete picked.size;
+        delete picked.portR;
+    } else {
+        let desc = nodedata.data.desc;
+        let def_size = card_size_for(desc.node_treedb_type, !!pills_html_of(gobj, nodedata));
+        if(is_array(picked.size) && picked.size[0] === def_size[0] &&
+                picked.size[1] === def_size[1]) {
+            delete picked.size;
+            delete node_props.size;
+        }
+        let def_r = (desc.node_treedb_type === 'child')? PORT_R_CHILD : PORT_R_ENTITY;
+        if(picked.portR === def_r) {
+            delete picked.portR;
+            delete node_props.portR;
+        }
+    }
+    json_object_update(node_props, picked);
 
     // Save per-port radius values (only ports with custom r)
-    let node_style = nodedata.style || {};
-    let ports = node_style.ports || [];
-    let port_sizes = {};
-    for(let i = 0; i < ports.length; i++) {
-        if(ports[i].r != null) {
-            port_sizes[ports[i].key] = ports[i].r;
+    if(!node_is_compact(gobj, node_id)) {
+        let node_style = nodedata.style || {};
+        let ports = node_style.ports || [];
+        let port_sizes = {};
+        for(let i = 0; i < ports.length; i++) {
+            if(ports[i].r != null) {
+                port_sizes[ports[i].key] = ports[i].r;
+            }
+        }
+        if(Object.keys(port_sizes).length > 0) {
+            node_props.port_sizes = port_sizes;
+        } else {
+            delete node_props.port_sizes;
+        }
+        // And the shape of each port that is not a circle
+        let port_shapes = {};
+        for(let i = 0; i < ports.length; i++) {
+            if(ports[i].shape && ports[i].shape !== 'circle') {
+                port_shapes[ports[i].key] = ports[i].shape;
+            }
+        }
+        if(Object.keys(port_shapes).length > 0) {
+            node_props.port_shapes = port_shapes;
+        } else {
+            delete node_props.port_shapes;
         }
-    }
-    if(Object.keys(port_sizes).length > 0) {
-        node_props.port_sizes = port_sizes;
-    } else {
-        delete node_props.port_sizes;
     }
 
     topic_props.nodes[record.id] = node_props;
@@ -3461,6 +3523,7 @@ function graph_resize(gobj, width, height)
     update_port_resize_handles_position(gobj);
     update_node_icon_position(gobj);
     update_link_icon_position(gobj);
+    update_port_icon_position(gobj);
 }
 
 function graph_write_behaviors(gobj, behaviors)
@@ -3496,6 +3559,64 @@ function graph_set_behavior(gobj, behavior, set)
     });
 }
 
+/************************************************************
+ *  Custom G6 node: TreedbCard -- G6's html node with ports that
+ *  have a SHAPE.
+ *
+ *  G6 draws every port as a circle (`drawPortShapes` upserts a
+ *  `Circle`, nothing in the port style says otherwise). A port's
+ *  `shape` -- `circle`, `square`, `diamond`, `triangle` -- picks
+ *  the G shape here, by the names G6 registers itself, and `r`
+ *  stays the one size: the half-side of the square, the half-
+ *  diagonal of the diamond, the half-height of the triangle. The
+ *  hit test, the resize handles and the edge's landing point all
+ *  read `r` and none of them care about the outline.
+ ************************************************************/
+const PORT_SHAPES = ['circle', 'square', 'diamond', 'triangle'];
+
+class TreedbCard extends HTML
+{
+    drawPortShapes(attributes, container) {
+        const portsStyle = this.getPortsStyle(attributes);
+        Object.keys(portsStyle).forEach((key) => {
+            const style = portsStyle[key];
+            const shapeKey = `port-${key}`;
+            if(style === false) {
+                this.upsert(shapeKey, 'circle', false, container);
+                return;
+            }
+            let r = Number(style.r) || 0;
+            switch(style.shape) {
+                case 'square':
+                    this.upsert(shapeKey, 'rect', Object.assign({}, style, {
+                        x: -r, y: -r, width: 2 * r, height: 2 * r,
+                    }), container);
+                    break;
+                case 'diamond':
+                    this.upsert(shapeKey, 'polygon', Object.assign({}, style, {
+                        points: [[0, -r], [r, 0], [0, r], [-r, 0]],
+                    }), container);
+                    break;
+                case 'triangle':
+                    this.upsert(shapeKey, 'polygon', Object.assign({}, style, {
+                        points: [[0, -r], [r, r], [-r, r]],
+                    }), container);
+                    break;
+                default:
+                    this.upsert(shapeKey, 'circle', style, container);
+                    break;
+            }
+        });
+    }
+}
+
+/*  A record's card is `treedb-card`; `html` is what it was until
+ *  7.23.81 and what a `+N` chip still is.  */
+function is_card_type(type)
+{
+    return type === 'treedb-card' || type === 'html';
+}
+
 /************************************************************
  *  Custom G6 node: LightNode (circle with status indicator)
  ************************************************************/
@@ -4637,7 +4758,7 @@ function start_node_resize(gobj, e, mx, my)
         }
 
         // HTML nodes: update dx, dy to keep content centered
-        if(nodeType === 'html') {
+        if(is_card_type(nodeType)) {
             updateStyle.dx = -newW / 2;
             updateStyle.dy = -newH / 2;
         }
@@ -4818,6 +4939,7 @@ function select_port(gobj, node_id, port_key)
 
     show_port_resize_handles(gobj);
     show_link_icon_if_fkey(gobj);
+    show_port_icon(gobj);
 }
 
 /************************************************************
@@ -4829,6 +4951,8 @@ function deselect_port(gobj)
 
     exit_linking_mode(gobj);
     hide_link_icon(gobj);
+    hide_port_icon(gobj);
+    hide_port_popover(gobj);
     hide_port_resize_handles(gobj);
     priv._selected_port_key = null;
 }
@@ -4916,6 +5040,272 @@ function update_link_icon_position(gobj)
     }
 }
 
+/************************************************************
+ *  Port properties icon and popover: the gear beside a selected
+ *  port, as the node has its own. The popover has the two things
+ *  a port IS on screen -- its shape and its radius -- and the
+ *  scope: this port, the same port of every card of the topic
+ *  (the hook or fkey column), or every port there is.
+ ************************************************************/
+function port_icon_xy(gobj)
+{
+    let priv = gobj.priv;
+    let graph = priv.graph;
+    let canvasPos = get_port_canvas_position(
+        gobj, priv._selected_node_id, priv._selected_port_key
+    );
+    if(!canvasPos) {
+        return null;
+    }
+    let vp = graph.getViewportByCanvas([canvasPos.x, canvasPos.y]);
+    /*  Under the link icon when there is one (an fkey), in its
+     *  place otherwise.  */
+    let below = priv._link_icon_el? floating_icon_step() : 0;
+    return {
+        x: vp[0] + floating_icon_size() / 2 + 4,
+        y: vp[1] + floating_icon_dy() + below,
+    };
+}
+
+function show_port_icon(gobj)
+{
+    hide_port_icon(gobj);
+
+    let priv = gobj.priv;
+    if(!priv._selected_node_id || !priv._selected_port_key) {
+        return;
+    }
+    let xy = port_icon_xy(gobj);
+    if(!xy) {
+        return;
+    }
+    let icon = create_floating_icon(
+        'gear', '#1890ff', xy.x, xy.y,
+        t('port properties'), () => toggle_port_popover(gobj)
+    );
+    priv.$container.appendChild(icon);
+    priv._port_icon_el = icon;
+}
+
+function hide_port_icon(gobj)
+{
+    hide_overlay(gobj, '_port_icon_el');
+}
+
+function update_port_icon_position(gobj)
+{
+    let priv = gobj.priv;
+    if(!priv._port_icon_el || !priv._selected_node_id || !priv._selected_port_key) {
+        return;
+    }
+    try {
+        let xy = port_icon_xy(gobj);
+        if(!xy) {
+            hide_port_icon(gobj);
+            hide_port_popover(gobj);
+            return;
+        }
+        priv._port_icon_el.style.left = xy.x + 'px';
+        priv._port_icon_el.style.top = xy.y + 'px';
+        if(priv._port_popover_el) {
+            priv._port_popover_el.style.left = (xy.x + floating_popover_dx()) + 'px';
+            priv._port_popover_el.style.top = xy.y + 'px';
+            clamp_popover_position(gobj, priv._port_popover_el);
+        }
+    } catch(e) {
+        hide_port_icon(gobj);
+        hide_port_popover(gobj);
+    }
+}
+
+function toggle_port_popover(gobj)
+{
+    let priv = gobj.priv;
+    if(priv._port_popover_el) {
+        hide_port_popover(gobj);
+    } else {
+        show_port_popover(gobj);
+    }
+}
+
+function hide_port_popover(gobj)
+{
+    hide_overlay(gobj, '_port_popover_el');
+}
+
+/*  The ports of a node with ONE of them rewritten.  */
+function ports_with(ports, port_key, changes)
+{
+    return (ports || []).map((p) => (p.key === port_key)? Object.assign({}, p, changes) : p);
+}
+
+function show_port_popover(gobj)
+{
+    hide_port_popover(gobj);
+
+    let priv = gobj.priv;
+    let graph = priv.graph;
+    let node_id = priv._selected_node_id;
+    let port_key = priv._selected_port_key;
+    if(!node_id || !port_key) {
+        return;
+    }
+    let nodeData = graph.getNodeData(node_id);
+    if(!nodeData || !nodeData.style) {
+        return;
+    }
+    let ports = nodeData.style.ports || [];
+    let port = ports.find((p) => p.key === port_key);
+    if(!port) {
+        return;
+    }
+    let orig_shape = port.shape || 'circle';
+    let orig_r = get_port_radius(gobj, node_id, port_key);
+
+    let xy = port_icon_xy(gobj);
+    if(!xy) {
+        return;
+    }
+    const popover = create_popover_base(
+        xy.x + floating_popover_dx(), xy.y, 'g6-port-popover', '#d9d9d9', 180
+    );
+
+    /*  Live preview on THIS port; the others wait for apply.  */
+    function preview_port() {
+        let r = parseInt(rInput.value) || orig_r;
+        graph.updateNodeData([{id: node_id, style: {
+            ports: ports_with(nodeData.style.ports, port_key, {shape: shapeSelect.value, r: r}),
+        }}]);
+        graph.draw().then(() => {
+            update_port_resize_handles_position(gobj);
+        });
+    }
+
+    create_form_label(popover, 'shape');
+    let shapeSelect = create_form_select(popover, PORT_SHAPES.map((shape) => {
+        return {value: shape, label: t(shape)};
+    }));
+    shapeSelect.value = orig_shape;
+    shapeSelect.addEventListener('change', preview_port);
+
+    create_form_label(popover, 'radius');
+    let rInput = create_form_number_input(popover, orig_r, 2, 40, preview_port);
+
+    create_form_label(popover, 'apply to');
+    let scopeSelect = create_form_select(popover, [
+        {value: 'this', label: t('this port')},
+        {value: 'same_topic', label: t('same port in topic')},
+        {value: 'all', label: t('all ports')},
+    ]);
+
+    create_form_button_row(popover, [
+        {
+            text: 'cancel',
+            style: BTN_STYLE_CANCEL,
+            onClick: () => {
+                graph.updateNodeData([{id: node_id, style: {
+                    ports: ports_with(nodeData.style.ports, port_key, {shape: orig_shape, r: orig_r}),
+                }}]);
+                graph.draw().then(() => {
+                    update_port_resize_handles_position(gobj);
+                });
+                hide_port_popover(gobj);
+            },
+        },
+        {
+            text: 'apply',
+            style: 'flex:1;padding:6px;background:#1890ff;color:#fff;border:none;' +
+                   'border-radius:4px;cursor:pointer;font-size:13px;font-weight:500;',
+            onClick: () => {
+                apply_port_properties(gobj, node_id, port_key,
+                    shapeSelect.value, parseInt(rInput.value) || orig_r, scopeSelect.value
+                );
+            },
+        },
+    ]);
+
+    priv.$container.appendChild(popover);
+    priv._port_popover_el = popover;
+    clamp_popover_position(gobj, popover);
+}
+
+/************************************************************
+ *  Apply a port's shape and radius to one port, to the same port
+ *  of every card of the topic, or to every port -- and remember
+ *  the choice as the topic's default, the way `resize all ports`
+ *  does, so a card that arrives later is born with it.
+ *      scope: 'this', 'same_topic', 'all'
+ ************************************************************/
+function apply_port_properties(gobj, node_id, port_key, shape, r, scope)
+{
+    let priv = gobj.priv;
+    let graph = priv.graph;
+
+    let nodeData = graph.getNodeData(node_id);
+    if(!nodeData || !nodeData.data) {
+        return;
+    }
+    let source_topic = nodeData.data.topic_name;
+
+    if(scope === 'same_topic') {
+        if(!is_object(priv._graph_properties[source_topic])) {
+            priv._graph_properties[source_topic] = {};
+        }
+        let defaults = priv._graph_properties[source_topic].defaults || {};
+        defaults.port_sizes = Object.assign({}, defaults.port_sizes, {[port_key]: r});
+        defaults.port_shapes = Object.assign({}, defaults.port_shapes, {[port_key]: shape});
+        priv._graph_properties[source_topic].defaults = defaults;
+    } else if(scope === 'all') {
+        for(const topic_name of Object.keys(priv.descs || {})) {
+            if(!is_object(priv._graph_properties[topic_name])) {
+                priv._graph_properties[topic_name] = {};
+            }
+            let defaults = priv._graph_properties[topic_name].defaults || {};
+            defaults.portR = r;
+            defaults.port_shape = shape;
+            delete defaults.port_sizes;
+            delete defaults.port_shapes;
+            priv._graph_properties[topic_name].defaults = defaults;
+        }
+    }
+
+    let updates = [];
+    for(let nd of (graph.getNodeData() || [])) {
+        if(!nd || !nd.data || !nd.data.desc || !nd.style || !is_array(nd.style.ports)) {
+            continue;
+        }
+        let new_ports;
+        if(scope === 'this') {
+            if(nd.id !== node_id) {
+                continue;
+            }
+            new_ports = ports_with(nd.style.ports, port_key, {shape: shape, r: r});
+        } else if(scope === 'same_topic') {
+            if(nd.data.topic_name !== source_topic) {
+                continue;
+            }
+            new_ports = ports_with(nd.style.ports, port_key, {shape: shape, r: r});
+        } else {
+            new_ports = nd.style.ports.map((p) => Object.assign({}, p, {shape: shape, r: r}));
+        }
+        let upd = {ports: new_ports};
+        if(scope === 'all') {
+            upd.portR = r;
+        }
+        updates.push({id: nd.id, style: upd});
+    }
+
+    if(updates.length > 0) {
+        graph.updateNodeData(updates);
+        graph.draw().then(() => {
+            update_port_resize_handles_position(gobj);
+            update_port_icon_position(gobj);
+            mark_graph_dirty(gobj);
+        });
+    }
+    hide_port_popover(gobj);
+}
+
 /************************************************************
  *  Get a column descriptor by field id from a topic desc.
  ************************************************************/
@@ -7410,6 +7800,11 @@ function build_node_context_menu(gobj, node_id)
     if(gobj.priv.edit_mode && !node_is_compact(gobj, node_id)) {
         items.push(ctx_item('g6-icon-resize', t('resize all'), 'resize_all_nodes'));
         items.push(ctx_item('g6-icon-resize', t('resize topic nodes'), 'resize_topic_nodes'));
+        /*  The way back: the sizes somebody saved -- or that a Save
+         *  froze before 7.23.80 -- forgotten, the library's defaults
+         *  back on every card.  */
+        items.push(ctx_item('g6-icon-undo', t('reset sizes'), 'reset_all_sizes'));
+        items.push(ctx_item('g6-icon-undo', t('reset topic sizes'), 'reset_topic_sizes'));
     }
 
     return items;
@@ -7424,6 +7819,9 @@ function build_port_context_menu(gobj, node_id, port_key)
 
     if(gobj.priv.edit_mode) {
         inject_svg_icons();
+        /*  The popover, for a finger: the gear beside the port needs
+         *  the port selected first, and a long press is the menu.  */
+        items.push(ctx_item('g6-icon-edit', t('port properties'), 'port_properties'));
         items.push(ctx_item('g6-icon-resize', t('resize all ports'), 'resize_all_ports'));
         items.push(ctx_item('g6-icon-resize', t('resize topic ports'), 'resize_topic_ports'));
     }
@@ -7460,6 +7858,18 @@ function handle_context_menu_click(gobj, value)
         case 'resize_topic_nodes':
             copy_size_to_nodes(gobj, true);
             break;
+        case 'reset_all_sizes':
+            reset_sizes(gobj, false);
+            break;
+        case 'reset_topic_sizes':
+            reset_sizes(gobj, true);
+            break;
+        case 'port_properties':
+            if(priv._context_node_id && priv._context_port_key) {
+                select_port(gobj, priv._context_node_id, priv._context_port_key);
+                show_port_popover(gobj);
+            }
+            break;
         case 'resize_all_ports':
             copy_size_to_ports(gobj, false);
             break;
@@ -7546,7 +7956,7 @@ function copy_size_to_nodes(gobj, same_topic_only)
         }
 
         // Recalculate dx/dy for HTML nodes
-        if(nd.type === 'html') {
+        if(is_card_type(nd.type)) {
             updateStyle.dx = -source_size[0] / 2;
             let h = source_size.length > 1 ? source_size[1] : source_size[0];
             updateStyle.dy = -h / 2;
@@ -7564,6 +7974,75 @@ function copy_size_to_nodes(gobj, same_topic_only)
     }
 }
 
+/************************************************************
+ *  Forget every SAVED size: the card sizes, the port radii and the
+ *  per-port radii, per node and as topic defaults (`resize all`),
+ *  for one topic or for all of them. The cards go back to the
+ *  library's defaults on the spot, and Save writes the cleared
+ *  entries -- a size nobody chose is not written back (see
+ *  update_geometry). Positions and edge styles are not touched:
+ *  they are a different choice.
+ ************************************************************/
+function reset_sizes(gobj, same_topic_only)
+{
+    let priv = gobj.priv;
+    let graph = priv.graph;
+
+    let topic = "";
+    if(same_topic_only) {
+        let nd = priv._context_node_id? graph.getNodeData(priv._context_node_id) : null;
+        if(!nd || !nd.data || !nd.data.topic_name) {
+            log_error(`${gobj_short_name(gobj)}: reset topic sizes without a node`);
+            return;
+        }
+        topic = nd.data.topic_name;
+    }
+    const SIZE_KEYS = ["size", "portR", "port_sizes"];
+    let strip = (props) => {
+        if(!is_object(props)) {
+            return;
+        }
+        for(let k of SIZE_KEYS) {
+            delete props[k];
+        }
+    };
+
+    /*  The saved entries, on screen or folded away.  */
+    for(const [topic_name, props] of Object.entries(priv._graph_properties || {})) {
+        if(topic && topic_name !== topic) {
+            continue;
+        }
+        if(is_object(props.nodes)) {
+            for(let node_props of Object.values(props.nodes)) {
+                strip(node_props);
+            }
+        }
+        strip(props.defaults);
+    }
+
+    /*  The nodes on screen: their own copy of the entry, then the shape.  */
+    let ids = [];
+    for(let nd of (graph.getNodeData() || [])) {
+        if(!nd || !nd.data || !nd.data.desc || is_more_node(nd)) {
+            continue;
+        }
+        if(topic && nd.data.topic_name !== topic) {
+            continue;
+        }
+        strip(nd.data.graph_props);
+        if(nd.data.record) {
+            strip(nd.data.record._geometry);
+        }
+        ids.push(nd.id);
+    }
+    reshape_nodes(gobj, ids);
+    graph.draw().then(() => {
+        update_resize_handles_position(gobj);
+        update_port_resize_handles_position(gobj);
+        mark_graph_dirty(gobj);
+    });
+}
+
 /************************************************************
  *  Copy the selected port's radius to matching ports.
  *  If same_topic_only=true, only ports in same-topic nodes.
@@ -8314,6 +8793,7 @@ async function reconcile_fold_apply(gobj, opts, visible)
     update_edge_icon_position(gobj);
     update_node_icon_position(gobj);
     update_link_icon_position(gobj);
+    update_port_icon_position(gobj);
 
     return changed;
 }

package/src/lib_graph.css

@@ -86,6 +86,7 @@
 .graph-container .g6-create-popover,
 .graph-container .g6-node-popover,
 .graph-container .g6-edge-popover,
+.graph-container .g6-port-popover,
 .graph-container .g6-node-detail {
     -webkit-user-select: text;
     user-select: text;
@@ -99,6 +100,7 @@
 .graph-container .g6-create-popover,
 .graph-container .g6-node-popover,
 .graph-container .g6-edge-popover,
+.graph-container .g6-port-popover,
 .graph-container .g6-node-detail,
 .graph-container .g6-contextmenu {
     touch-action: auto;