@hpcc-js/graph 2.82.1 → 2.83.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/graph",
-    "version": "2.82.1",
+    "version": "2.83.0",
     "description": "hpcc-js - Viz Graph",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -55,7 +55,7 @@
         "@hpcc-js/api": "^2.12.1",
         "@hpcc-js/common": "^2.71.1",
         "@hpcc-js/html": "^2.42.2",
-        "@hpcc-js/react": "^2.51.1",
+        "@hpcc-js/react": "^2.52.0",
         "@hpcc-js/util": "^2.49.0"
     },
     "devDependencies": {
@@ -88,5 +88,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "e2724f0154c334e8d4cb5a29533b70131ab58938"
+    "gitHead": "3a4f1ba7a59e2e7f5283830e0a884187a6c42fe7"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/graph";
-export const PKG_VERSION = "2.82.1";
-export const BUILD_VERSION = "2.104.2";
+export const PKG_VERSION = "2.83.0";
+export const BUILD_VERSION = "2.104.3";

package/src/graph2/dataGraph.ts

@@ -63,6 +63,8 @@ export class DataGraph extends Graph2 {
     vertexTooltipColumn: publish<this, string>;
     @publish([], "propertyArray", "Annotations", null, { autoExpand: AnnotationColumn })
     vertexAnnotationColumns: publish<this, AnnotationColumn[]>;
+    @publish("", "set", "Vertex expansion FAChar column", function (this: DataGraph) { return this.vertexColumns(); }, { optional: true })
+    vertexExpansionFACharColumn: publish<this, string>;
 
     @publish([], "any", "Edge columns", null, { internal: true })
     edgeColumns: publish<this, string[]>;
@@ -168,7 +170,9 @@ export class DataGraph extends Graph2 {
         const faCharIdx = this.indexOf(columns, this.vertexFACharColumn(), "faChar");
         const vertexTooltipIdx = this.indexOf(columns, this.vertexTooltipColumn(), "tooltip");
         const annotationIdxs = annotationColumns.map(ac => this.indexOf(columns, ac.columnID(), ""));
+        const expansionFACharIdx = this.indexOf(columns, this.vertexExpansionFACharColumn(), "expansionFAChar");
         const vertices: IVertex[] = this.vertices().map((v): IVertex => {
+            const annotationIDs = annotationIdxs.map((ai, i) => !!v[ai] ? annotationColumns[i].annotationID() : undefined).filter(a => !!a);
             return {
                 categoryID: "" + v[catIdx],
                 id: "" + v[idIdx],
@@ -179,8 +183,12 @@ export class DataGraph extends Graph2 {
                 icon: {
                     imageChar: "" + (v[faCharIdx] || this.vertexFAChar())
                 },
-                annotationIDs: annotationIdxs.map((ai, i) => !!v[ai] ? annotationColumns[i].annotationID() : undefined).filter(a => !!a)
-            };
+                annotationIDs,
+                annotations: this.annotations().filter(ann => annotationIDs.indexOf(ann.id) >= 0),
+                expansionIcon: v[expansionFACharIdx] ? {
+                    imageChar: "" + v[expansionFACharIdx]
+                } : undefined
+            } as IVertex;
         });
         const diff = compare2(this._prevVertices, vertices, d => d.id);
         diff.exit.forEach(item => {

package/src/graph2/graph.ts

@@ -1,16 +1,16 @@
 import { d3Event, drag as d3Drag, Palette, select as d3Select, Selection, Spacer, SVGGlowFilter, SVGZoomWidget, ToggleButton, Utility, Widget } from "@hpcc-js/common";
-import { IconEx, Icons, React, render, Subgraph, Vertex, IVertex3, IVertex4Annotation } from "@hpcc-js/react";
+import { IconEx, Icons, React, render, Subgraph, Vertex, IVertex3, IVertex4Annotation, Icon } from "@hpcc-js/react";
 import { getScriptSrc, Graph2 as GraphCollection, hashSum } from "@hpcc-js/util";
 import { HTMLTooltip } from "@hpcc-js/html";
 import "d3-transition";
 import { Circle, Dagre, ForceDirected, ForceDirectedAnimated, Graphviz, ILayout, Null } from "./layouts/index";
 import { Options as FDOptions } from "./layouts/forceDirectedWorker";
-import { EdgePlaceholder, IEdge, IGraphData2, IHierarchy, ISubgraph, IVertex, SubgraphPlaceholder, VertexPlaceholder } from "./layouts/placeholders";
-import { graphviz as gvWorker } from "./layouts/graphvizWorker";
+import type { IEdge, IGraphData2, IHierarchy, ISubgraph, IVertex } from "./layouts/placeholders";
+import { EdgePlaceholder, SubgraphPlaceholder, VertexPlaceholder } from "./layouts/placeholders";
+import { Engine, graphviz as gvWorker } from "./layouts/graphvizWorker";
 import { Tree, RadialTree, Dendrogram, RadialDendrogram } from "./layouts/tree";
 
 import "../../src/graph2/graph.css";
-import { Engine } from "./layouts/graphvizWorker";
 
 const wasmFolder = `${getScriptSrc("/graph/lib-umd/graph2/graph") || getScriptSrc("/graph/dist/index") || "."}/graph/dist`;
 
@@ -186,11 +186,11 @@ export class Graph2 extends SVGZoomWidget {
                     }, d3Event().sourceEvent);
                     context.selectionChanged();
                     const selected = d.element.classed("selected");
-                    const annoData = context.resolveAnnoEventNode();
-                    context.vertex_click(d.props.origData || d.props, "", selected, annoData);
+                    const eventOrigin = context.resolveEventOrigin();
+                    context.vertex_click(d.props.origData || d.props, "", selected, eventOrigin);
                     const 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;
                 }
@@ -200,19 +200,25 @@ export class Graph2 extends SVGZoomWidget {
         this.zoomToFitLimit(1);
     }
 
-    resolveAnnoEventNode(): undefined | IVertex4Annotation {
+    resolveEventOrigin(): { origin: string, data: undefined | IVertex4Annotation | Icon } {
         const d3evt = d3Event();
         const eventPath = d3evt?.sourceEvent?.path ?? d3evt?.path;
-        const anno = eventPath.find(n => n?.hasAttribute("data-anno"));
-        let annoData;
-        if (anno) {
-            try{
-                annoData = JSON.parse(anno.getAttribute("data-anno"));
-            } catch(e) {
-                console.warn("Unexpected annotation data:", anno);
+        const element = eventPath.find(n => n?.hasAttribute && n?.hasAttribute("data-click"));
+        const origin = element ? element.getAttribute("data-click") : "";
+        const dataStr = element ? element.getAttribute("data-click-data") : "";
+        let data = undefined;
+        if (dataStr) {
+            try {
+                data = JSON.parse(dataStr);
+            } catch (e) {
+                console.warn("Unexpected annotation data:", dataStr);
             }
         }
-        return annoData;
+
+        return {
+            origin,
+            data
+        };
     }
 
     iconBarButtons(): Widget[] {
@@ -765,8 +771,8 @@ export class Graph2 extends SVGZoomWidget {
                         Utility.safeRaise(this);
                         context.highlightVertex(d3Select(this), d);
                         const selected = d.element.classed("selected");
-                        const annoData = context.resolveAnnoEventNode();
-                        context.vertex_mousein(d.props.origData || d.props, "", selected, annoData);
+                        const eventOrigin = context.resolveEventOrigin();
+                        context.vertex_mousein(d.props.origData || d.props, "", selected, eventOrigin);
                     })
                     .on("mouseover", function (d) {
                         Utility.safeRaise(this);
@@ -786,14 +792,14 @@ export class Graph2 extends SVGZoomWidget {
                                 .render()
                                 ;
                         }
-                        const annoData = context.resolveAnnoEventNode();
-                        context.vertex_mouseover(d.props.origData || d.props, "", selected, annoData);
+                        const eventOrigin = context.resolveEventOrigin();
+                        context.vertex_mouseover(d.props.origData || d.props, "", selected, eventOrigin);
                     })
                     .on("mouseout", function (d) {
                         context.highlightVertex(null, null);
                         const selected = d.element.classed("selected");
-                        const annoData = context.resolveAnnoEventNode();
-                        context.vertex_mouseout(d.props.origData || d.props, "", selected, annoData);
+                        const eventOrigin = context.resolveEventOrigin();
+                        context.vertex_mouseout(d.props.origData || d.props, "", selected, eventOrigin);
                         if (d.props.tooltip) {
                             context._tooltip.mouseout();
                         }
@@ -1332,14 +1338,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: (w: Graph2) => w.layout() !== "Hierarchy" });

package/src/graph2/layouts/index.ts

@@ -3,5 +3,5 @@ export * from "./dagre";
 export * from "./forceDirected";
 export * from "./geoForceDirected";
 export * from "./graphviz";
-export { ILayout } from "./layout";
+export type { ILayout } from "./layout";
 export * from "./null";

package/src/test.ts

@@ -1,11 +1,12 @@
 import { Palette } from "@hpcc-js/common";
+import { Vertex4, CentroidVertex4 } from "@hpcc-js/react";
 import { Graph } from "./Graph";
 import { Vertex } from "./Vertex";
 import { Edge } from "./Edge";
 import { DataGraph } from "./graph2/dataGraph";
 import { SankeyGraph } from "./graph2/sankeyGraph";
 
-export { Test2 as Test };
+export { Test4 as Test };
 
 export class Test1 extends Graph {
 
@@ -64,7 +65,7 @@ export class Test2 extends DataGraph {
                 imageCharFill: "white"
             }])
 
-            .vertexColumns(["id", "label", "fachar", "centroid", "ann1", "ann2", "ann3"])
+            .vertexColumns(["id", "label", "fachar", "centroid", "ann1", "ann2", "expandedFAChar"])
             .vertexCentroidColumn("centroid")
             .vertexFACharColumn("fachar")
             .vertexIDColumn("id")
@@ -73,6 +74,7 @@ export class Test2 extends DataGraph {
                 { columnID: "ann1", annotationID: "0" } as any,
                 { columnID: "ann2", annotationID: "1" } as any
             ])
+            .vertexExpansionFACharColumn("expandedFAChar")
             .vertices(g.vertices)
 
             .edgeColumns(["source", "target", "label", "weightXXX"])
@@ -84,12 +86,11 @@ export class Test2 extends DataGraph {
             .edges(g.edges)
 
             //  Events  ---
-            .on("vertex_click", () => {
-            })
-            .on("vertex_dblclick", () => {
-            })
-            .on("vertex_mouseover", () => {
-            })
+            .on("vertex_mousein", (vertex, col, sel, anno) => console.info("vertex_mousein", vertex, anno))
+            .on("vertex_mouseout", (vertex, col, sel, anno) => console.info("vertex_mouseout", vertex, anno))
+            .on("vertex_mouseover", (vertex, col, sel, anno) => console.info("vertex_mouseover", vertex, anno))
+            .on("vertex_click", (vertex, col, sel, anno) => console.info("vertex_click", vertex, anno))
+            .on("vertex_dblclick", (vertex, col, sel, anno) => console.info("vertex_dblclick", vertex, anno))
             ;
 
         setTimeout(() => {
@@ -142,6 +143,16 @@ export class Test3 extends SankeyGraph {
     }
 }
 
+export class Test4 extends Test2 {
+    constructor() {
+        super();
+        this
+            .vertexRenderer(Vertex4)
+            .centroidRenderer(CentroidVertex4)
+            ;
+    }
+}
+
 // 8
 let seed = 8;
 function random() {
@@ -199,15 +210,15 @@ function genData(MAX_VERTICES = 200, MAX_EDGES = 200) {
 function genData2() {
     return {
         vertices: [
-            ["a", "myriel@gmail.com", "fa-at", false],
-            [1, "Napoleon", "fa-user-o", false, true, true],
+            ["a", "myriel@gmail.com", "fa-at", false, false, false, "fa-plus"],
+            [1, "Napoleon", "fa-user-o", true, true, true, "fa-plus"],
             [2, "Mlle.Baptistine", "fa-user-o"],
             [3, "Mme.Magloire", "fa-user-o"],
             [4, "CountessdeLo", "fa-user-o"],
             [5, "Geborand", "fa-user-o"],
             [6, "Champtercier", "fa-user-o"],
             [7, "Cravatte", "fa-user-o"],
-            [8, "(561)888-8888", "fa-phone", true],
+            [8, "(561)888-8888", "fa-phone"],
             [9, "123-12-1234", "fa-address-card-o"],
             [10, "192.168.0.100", "fa-globe"],
             [11, "28 Mean Street, FL 33487", "fa-map-o"],

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/graph";
-export declare const PKG_VERSION = "2.82.1";
-export declare const BUILD_VERSION = "2.104.2";
+export declare const PKG_VERSION = "2.83.0";
+export declare const BUILD_VERSION = "2.104.3";
 //# sourceMappingURL=__package__.d.ts.map

package/types/graph2/dataGraph.d.ts

@@ -25,6 +25,7 @@ export declare class DataGraph extends Graph2 {
     vertexFACharColumn: publish<this, string>;
     vertexTooltipColumn: publish<this, string>;
     vertexAnnotationColumns: publish<this, AnnotationColumn[]>;
+    vertexExpansionFACharColumn: publish<this, string>;
     edgeColumns: publish<this, string[]>;
     edges: publish<this, Array<Array<string | number | boolean>>>;
     edgeIDColumn: publish<this, string>;

package/types/graph2/dataGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/dataGraph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dataGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/dataGraph.ts"],"names":[],"mappings":"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"}

package/types/graph2/graph.d.ts

@@ -1,13 +1,14 @@
 import { Palette, Selection, SVGGlowFilter, SVGZoomWidget, ToggleButton, Utility, Widget } from "@hpcc-js/common";
-import { IconEx, React, Vertex, IVertex3, IVertex4Annotation } from "@hpcc-js/react";
+import { IconEx, React, Vertex, IVertex3, IVertex4Annotation, Icon } from "@hpcc-js/react";
 import { Graph2 as GraphCollection } from "@hpcc-js/util";
 import { HTMLTooltip } from "@hpcc-js/html";
 import "d3-transition";
 import { ILayout } from "./layouts/index";
 import { Options as FDOptions } from "./layouts/forceDirectedWorker";
-import { EdgePlaceholder, IEdge, IGraphData2, IHierarchy, ISubgraph, IVertex, SubgraphPlaceholder, VertexPlaceholder } from "./layouts/placeholders";
-import "../../src/graph2/graph.css";
+import type { IEdge, IGraphData2, IHierarchy, ISubgraph, IVertex } from "./layouts/placeholders";
+import { EdgePlaceholder, SubgraphPlaceholder, VertexPlaceholder } from "./layouts/placeholders";
 import { Engine } from "./layouts/graphvizWorker";
+import "../../src/graph2/graph.css";
 export { IGraphData2, ISubgraph, IVertex, IEdge, IHierarchy };
 declare type GraphLayoutType = "Hierarchy" | "DOT" | "Tree" | "Dendrogram" | "RadialTree" | "RadialDendrogram" | "ForceDirected" | "ForceDirected2" | "ForceDirectedHybrid" | "Neato" | "FDP" | "Circle" | "TwoPI" | "Circo" | "None";
 export declare class Graph2 extends SVGZoomWidget {
@@ -38,7 +39,10 @@ export declare class Graph2 extends SVGZoomWidget {
     protected _catPalette: Palette.OrdinalPaletteFunc;
     _svgDefs: any;
     constructor();
-    resolveAnnoEventNode(): undefined | IVertex4Annotation;
+    resolveEventOrigin(): {
+        origin: string;
+        data: undefined | IVertex4Annotation | Icon;
+    };
     iconBarButtons(): Widget[];
     protected _categories: IconEx[];
     categories(): IconEx[];

package/types/graph2/graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/graph2/graph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/graph2/graph.ts"],"names":[],"mappings":"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"}

package/types/graph2/layouts/index.d.ts

@@ -3,6 +3,6 @@ export * from "./dagre";
 export * from "./forceDirected";
 export * from "./geoForceDirected";
 export * from "./graphviz";
-export { ILayout } from "./layout";
+export type { ILayout } from "./layout";
 export * from "./null";
 //# sourceMappingURL=index.d.ts.map

package/types/graph2/layouts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/graph2/layouts/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/graph2/layouts/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,YAAY,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,cAAc,QAAQ,CAAC"}

package/types/test.d.ts

@@ -1,7 +1,7 @@
 import { Graph } from "./Graph";
 import { DataGraph } from "./graph2/dataGraph";
 import { SankeyGraph } from "./graph2/sankeyGraph";
-export { Test2 as Test };
+export { Test4 as Test };
 export declare class Test1 extends Graph {
     constructor();
 }
@@ -11,4 +11,7 @@ export declare class Test2 extends DataGraph {
 export declare class Test3 extends SankeyGraph {
     constructor();
 }
+export declare class Test4 extends Test2 {
+    constructor();
+}
 //# sourceMappingURL=test.d.ts.map

package/types/test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,KAAK,IAAI,IAAI,EAAE,CAAC;AAEzB,qBAAa,KAAM,SAAQ,KAAK;;CAa/B;AAED,qBAAa,KAAM,SAAQ,SAAS;;CA0EnC;AAED,qBAAa,KAAM,SAAQ,WAAW;;CA0CrC"}
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,KAAK,IAAI,IAAI,EAAE,CAAC;AAEzB,qBAAa,KAAM,SAAQ,KAAK;;CAa/B;AAED,qBAAa,KAAM,SAAQ,SAAS;;CA0EnC;AAED,qBAAa,KAAM,SAAQ,WAAW;;CA0CrC;AAED,qBAAa,KAAM,SAAQ,KAAK;;CAQ/B"}

package/types-3.4/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/graph";
-export declare const PKG_VERSION = "2.82.1";
-export declare const BUILD_VERSION = "2.104.2";
+export declare const PKG_VERSION = "2.83.0";
+export declare const BUILD_VERSION = "2.104.3";
 //# sourceMappingURL=__package__.d.ts.map

package/types-3.4/graph2/dataGraph.d.ts

@@ -25,6 +25,7 @@ export declare class DataGraph extends Graph2 {
     vertexFACharColumn: publish<this, string>;
     vertexTooltipColumn: publish<this, string>;
     vertexAnnotationColumns: publish<this, AnnotationColumn[]>;
+    vertexExpansionFACharColumn: publish<this, string>;
     edgeColumns: publish<this, string[]>;
     edges: publish<this, Array<Array<string | number | boolean>>>;
     edgeIDColumn: publish<this, string>;

package/types-3.4/graph2/graph.d.ts

@@ -1,13 +1,14 @@
 import { Palette, Selection, SVGGlowFilter, SVGZoomWidget, ToggleButton, Utility, Widget } from "@hpcc-js/common";
-import { IconEx, React, Vertex, IVertex3, IVertex4Annotation } from "@hpcc-js/react";
+import { IconEx, React, Vertex, IVertex3, IVertex4Annotation, Icon } from "@hpcc-js/react";
 import { Graph2 as GraphCollection } from "@hpcc-js/util";
 import { HTMLTooltip } from "@hpcc-js/html";
 import "d3-transition";
 import { ILayout } from "./layouts/index";
 import { Options as FDOptions } from "./layouts/forceDirectedWorker";
-import { EdgePlaceholder, IEdge, IGraphData2, IHierarchy, ISubgraph, IVertex, SubgraphPlaceholder, VertexPlaceholder } from "./layouts/placeholders";
-import "../../src/graph2/graph.css";
+import { IEdge, IGraphData2, IHierarchy, ISubgraph, IVertex } from "./layouts/placeholders";
+import { EdgePlaceholder, SubgraphPlaceholder, VertexPlaceholder } from "./layouts/placeholders";
 import { Engine } from "./layouts/graphvizWorker";
+import "../../src/graph2/graph.css";
 export { IGraphData2, ISubgraph, IVertex, IEdge, IHierarchy };
 declare type GraphLayoutType = "Hierarchy" | "DOT" | "Tree" | "Dendrogram" | "RadialTree" | "RadialDendrogram" | "ForceDirected" | "ForceDirected2" | "ForceDirectedHybrid" | "Neato" | "FDP" | "Circle" | "TwoPI" | "Circo" | "None";
 export declare class Graph2 extends SVGZoomWidget {
@@ -38,7 +39,10 @@ export declare class Graph2 extends SVGZoomWidget {
     protected _catPalette: Palette.OrdinalPaletteFunc;
     _svgDefs: any;
     constructor();
-    resolveAnnoEventNode(): undefined | IVertex4Annotation;
+    resolveEventOrigin(): {
+        origin: string;
+        data: undefined | IVertex4Annotation | Icon;
+    };
     iconBarButtons(): Widget[];
     protected _categories: IconEx[];
     categories(): IconEx[];

package/types-3.4/test.d.ts

@@ -1,7 +1,7 @@
 import { Graph } from "./Graph";
 import { DataGraph } from "./graph2/dataGraph";
 import { SankeyGraph } from "./graph2/sankeyGraph";
-export { Test2 as Test };
+export { Test4 as Test };
 export declare class Test1 extends Graph {
     constructor();
 }
@@ -11,4 +11,7 @@ export declare class Test2 extends DataGraph {
 export declare class Test3 extends SankeyGraph {
     constructor();
 }
+export declare class Test4 extends Test2 {
+    constructor();
+}
 //# sourceMappingURL=test.d.ts.map