@hpcc-js/graph 2.82.1 → 2.83.0

package/dist/index.es6.js

@@ -5,8 +5,8 @@ import { render, Subgraph as Subgraph$1, Icons, Vertex as Vertex$1, Vertex3, Cen
 import { HTMLTooltip } from '@hpcc-js/html';
 
 var PKG_NAME = "@hpcc-js/graph";
-var PKG_VERSION = "2.82.1";
-var BUILD_VERSION = "2.104.2";
+var PKG_VERSION = "2.83.0";
+var BUILD_VERSION = "2.104.3";
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -16928,11 +16928,11 @@ var Graph2 = /** @class */ (function (_super) {
                 }, d3Event().sourceEvent);
                 context.selectionChanged();
                 var selected = d.element.classed("selected");
-                var annoData = context.resolveAnnoEventNode();
-                context.vertex_click(d.props.origData || d.props, "", selected, annoData);
+                var eventOrigin = context.resolveEventOrigin();
+                context.vertex_click(d.props.origData || d.props, "", selected, eventOrigin);
                 var doClickTime = Date.now();
                 if (doClickTime - context._prevDoClickTime < context.doubleClickMaxDelay()) {
-                    context.vertex_dblclick(d.props.origData || d.props, "", selected, annoData);
+                    context.vertex_dblclick(d.props.origData || d.props, "", selected, eventOrigin);
                 }
                 context._prevDoClickTime = doClickTime;
             }
@@ -16941,21 +16941,26 @@ var Graph2 = /** @class */ (function (_super) {
         _this.zoomToFitLimit(1);
         return _this;
     }
-    Graph2.prototype.resolveAnnoEventNode = function () {
+    Graph2.prototype.resolveEventOrigin = function () {
         var _a, _b;
         var d3evt = d3Event();
         var eventPath = (_b = (_a = d3evt === null || d3evt === void 0 ? void 0 : d3evt.sourceEvent) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : d3evt === null || d3evt === void 0 ? void 0 : d3evt.path;
-        var anno = eventPath.find(function (n) { return n === null || n === void 0 ? void 0 : n.hasAttribute("data-anno"); });
-        var annoData;
-        if (anno) {
+        var element = eventPath.find(function (n) { return (n === null || n === void 0 ? void 0 : n.hasAttribute) && (n === null || n === void 0 ? void 0 : n.hasAttribute("data-click")); });
+        var origin = element ? element.getAttribute("data-click") : "";
+        var dataStr = element ? element.getAttribute("data-click-data") : "";
+        var data = undefined;
+        if (dataStr) {
             try {
-                annoData = JSON.parse(anno.getAttribute("data-anno"));
+                data = JSON.parse(dataStr);
             }
             catch (e) {
-                console.warn("Unexpected annotation data:", anno);
+                console.warn("Unexpected annotation data:", dataStr);
             }
         }
-        return annoData;
+        return {
+            origin: origin,
+            data: data
+        };
     };
     Graph2.prototype.iconBarButtons = function () {
         return this._iconBar.buttons();
@@ -17415,8 +17420,8 @@ var Graph2 = /** @class */ (function (_super) {
             Utility.safeRaise(this);
             context.highlightVertex(select(this), d);
             var selected = d.element.classed("selected");
-            var annoData = context.resolveAnnoEventNode();
-            context.vertex_mousein(d.props.origData || d.props, "", selected, annoData);
+            var eventOrigin = context.resolveEventOrigin();
+            context.vertex_mousein(d.props.origData || d.props, "", selected, eventOrigin);
         })
             .on("mouseover", function (d) {
             Utility.safeRaise(this);
@@ -17435,14 +17440,14 @@ var Graph2 = /** @class */ (function (_super) {
                     .visible(true)
                     .render();
             }
-            var annoData = context.resolveAnnoEventNode();
-            context.vertex_mouseover(d.props.origData || d.props, "", selected, annoData);
+            var eventOrigin = context.resolveEventOrigin();
+            context.vertex_mouseover(d.props.origData || d.props, "", selected, eventOrigin);
         })
             .on("mouseout", function (d) {
             context.highlightVertex(null, null);
             var selected = d.element.classed("selected");
-            var annoData = context.resolveAnnoEventNode();
-            context.vertex_mouseout(d.props.origData || d.props, "", selected, annoData);
+            var eventOrigin = context.resolveEventOrigin();
+            context.vertex_mouseout(d.props.origData || d.props, "", selected, eventOrigin);
             if (d.props.tooltip) {
                 context._tooltip.mouseout();
             }
@@ -17801,14 +17806,14 @@ Graph2.prototype.publish("centroidIconHeight", 50, "number", "Centroid Icon Heig
 Graph2.prototype.publish("centroidIconPadding", 10, "number", "Centroid Icon Padding");
 Graph2.prototype.publish("centroidIconStrokeWidth", 4, "number", "Centroid Icon Stroke Width");
 Graph2.prototype.publish("centroidIconFontFamily", "FontAwesome", "string", "Centroid Icon Font Family");
-Graph2.prototype.publish("centroidLabelFontFamily", "FontAwesome", "string", "Centroid Label Font Family");
+Graph2.prototype.publish("centroidLabelFontFamily", "Verdana", "string", "Centroid Label Font Family");
 Graph2.prototype.publish("vertexTextHeight", 10, "number", "Vertex Text Height");
 Graph2.prototype.publish("vertexTextPadding", 4, "number", "Vertex Text Padding");
 Graph2.prototype.publish("vertexIconHeight", 50, "number", "Vertex Icon Height");
 Graph2.prototype.publish("vertexIconPadding", 10, "number", "Vertex Icon Padding");
 Graph2.prototype.publish("vertexIconStrokeWidth", 0, "number", "Vertex Icon Stroke Width");
 Graph2.prototype.publish("vertexIconFontFamily", "FontAwesome", "string", "Vertex Icon Font Family");
-Graph2.prototype.publish("vertexLabelFontFamily", "FontAwesome", "string", "Vertex Label Font Family");
+Graph2.prototype.publish("vertexLabelFontFamily", "Verdana", "string", "Vertex Label Font Family");
 Graph2.prototype.publish("highlightSelectedPathToCentroid", true, "boolean", "Highlight path to Center Vertex (for selected vertices)");
 Graph2.prototype.publish("hierarchyRankDirection", "TB", "set", "Direction for Rank Nodes", ["TB", "BT", "LR", "RL"], { disable: function (w) { return w.layout() !== "Hierarchy"; } });
 Graph2.prototype.publish("hierarchyNodeSeparation", 50, "number", "Number of pixels that separate nodes horizontally in the layout", null, { disable: function (w) { return w.layout() !== "Hierarchy"; } });
@@ -17961,7 +17966,9 @@ var DataGraph = /** @class */ (function (_super) {
         var faCharIdx = this.indexOf(columns, this.vertexFACharColumn(), "faChar");
         var vertexTooltipIdx = this.indexOf(columns, this.vertexTooltipColumn(), "tooltip");
         var annotationIdxs = annotationColumns.map(function (ac) { return _this.indexOf(columns, ac.columnID(), ""); });
+        var expansionFACharIdx = this.indexOf(columns, this.vertexExpansionFACharColumn(), "expansionFAChar");
         var vertices = this.vertices().map(function (v) {
+            var annotationIDs = annotationIdxs.map(function (ai, i) { return !!v[ai] ? annotationColumns[i].annotationID() : undefined; }).filter(function (a) { return !!a; });
             return {
                 categoryID: "" + v[catIdx],
                 id: "" + v[idIdx],
@@ -17972,7 +17979,11 @@ var DataGraph = /** @class */ (function (_super) {
                 icon: {
                     imageChar: "" + (v[faCharIdx] || _this.vertexFAChar())
                 },
-                annotationIDs: annotationIdxs.map(function (ai, i) { return !!v[ai] ? annotationColumns[i].annotationID() : undefined; }).filter(function (a) { return !!a; })
+                annotationIDs: annotationIDs,
+                annotations: _this.annotations().filter(function (ann) { return annotationIDs.indexOf(ann.id) >= 0; }),
+                expansionIcon: v[expansionFACharIdx] ? {
+                    imageChar: "" + v[expansionFACharIdx]
+                } : undefined
             };
         });
         var diff = compare2(this._prevVertices, vertices, function (d) { return d.id; });
@@ -18125,6 +18136,10 @@ var DataGraph = /** @class */ (function (_super) {
         publish([], "propertyArray", "Annotations", null, { autoExpand: AnnotationColumn }),
         __metadata("design:type", Function)
     ], DataGraph.prototype, "vertexAnnotationColumns", void 0);
+    __decorate([
+        publish("", "set", "Vertex expansion FAChar column", function () { return this.vertexColumns(); }, { optional: true }),
+        __metadata("design:type", Function)
+    ], DataGraph.prototype, "vertexExpansionFACharColumn", void 0);
     __decorate([
         publish([], "any", "Edge columns", null, { internal: true }),
         __metadata("design:type", Function)