@hpcc-js/graph 2.83.1 → 2.84.0

package/src/graph2/layouts/placeholders.ts

@@ -1,57 +1,66 @@
 import { Selection } from "@hpcc-js/common";
-import { Edge, Subgraph, Vertex } from "@hpcc-js/react";
 
-export interface ISubgraph extends Subgraph {
-    id: string;
+export interface BaseProps {
+    id: string | number;
     origData?: any;
 }
 
-export interface IVertex extends Vertex {
-    id: string;
-    origData?: any;
+export interface VertexProps extends BaseProps {
+    text: string;
+    categoryID?: string;
     centroid?: boolean;
     hidden?: boolean;
     tooltip?: string;
+    annotationIDs?: string[];
+}
+
+export interface SubgraphProps extends BaseProps {
+    text: string;
+    width?: number;
+    height?: number;
 }
 
-export interface IEdge extends Edge {
-    id: string;
-    source: IVertex;
-    target: IVertex;
+export type Point = [number, number];
+
+export interface EdgeProps extends BaseProps {
+    source: VertexProps;
+    target: VertexProps;
     label?: string;
+    labelPos?: Point;
+    weight?: number;
+    strokeDasharray?: string;
+    strokeWidth?: number;
     color?: string;
     fontFamily?: string;
-    origData?: any;
 }
 
-export interface IHierarchy {
-    id: string;
-    parent: ISubgraph;
-    child: ISubgraph | IVertex;
+export interface HierarchyBase<SG extends SubgraphProps, V extends VertexProps> {
+    id: string | number;
+    parent: SG;
+    child: SG | V;
 }
 
-export interface IGraphData2 {
-    subgraphs?: ISubgraph[];
-    vertices: IVertex[];
-    edges: IEdge[];
-    hierarchy?: IHierarchy[];
+export interface IGraphData2<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps> {
+    subgraphs?: SG[];
+    vertices: V[];
+    edges: E[];
+    hierarchy?: HierarchyBase<SG, V>[];
 }
 
-export interface SubgraphPlaceholder {
-    id: string;
-    element?: Selection<SVGGElement, SubgraphPlaceholder, SVGGElement, any>;
-    props: ISubgraph;
+export interface SubgraphPlaceholder<SG extends SubgraphProps = SubgraphProps> {
+    id: string | number;
+    element?: Selection<SVGGElement, SubgraphPlaceholder<SG>, SVGGElement, any>;
+    props: SG;
 
     //  Dagre / Graphviz Properties  ---
     x?: number; // The node’s current x-position
     y?: number; // The node’s current y-position
 }
 
-export interface VertexPlaceholder {
-    id: string;
-    element?: Selection<SVGGElement, VertexPlaceholder, SVGGElement, any>;
-    props: IVertex;
-    centroid?: boolean;
+export interface VertexPlaceholder<V extends VertexProps = VertexProps> {
+    id: string | number;
+    element?: Selection<SVGGElement, VertexPlaceholder<V>, SVGGElement, any>;
+    props: V;
 
     //  D3 Assigned Properties  ---
     index?: number; // The node’s zero-based index into nodes
@@ -73,14 +82,14 @@ export interface VertexPlaceholder {
     lng?: number;
 }
 
-export interface EdgePlaceholder {
-    id: string;
-    element?: Selection<SVGGElement, EdgePlaceholder, SVGGElement, any>;
-    elementPath?: Selection<SVGPathElement, EdgePlaceholder, SVGGElement, any>;
-    elementText?: Selection<SVGTextElement, EdgePlaceholder, SVGGElement, any>;
-    props: IEdge;
-    source: VertexPlaceholder; // The link’s source node
-    target: VertexPlaceholder; // The link’s target node
+export interface EdgePlaceholder<E extends EdgeProps = EdgeProps, V extends VertexProps = VertexProps> {
+    id: string | number;
+    element?: Selection<SVGGElement, EdgePlaceholder<E, V>, SVGGElement, any>;
+    elementPath?: Selection<SVGPathElement, EdgePlaceholder<E, V>, SVGGElement, any>;
+    elementText?: Selection<SVGTextElement, EdgePlaceholder<E, V>, SVGGElement, any>;
+    props: E;
+    source: VertexPlaceholder<V>; // The link’s source node
+    target: VertexPlaceholder<V>; // The link’s target node
 
     //  D3 Assigned Properties  ---
     index?: number; // The zero-based index into links, assigned by this method

package/src/graph2/layouts/tree.ts

@@ -169,7 +169,7 @@ export class TidyTreeBase extends Layout {
                 if (centroid === undefined) {
                     centroid = v;
                 }
-                if (v.centroid) {
+                if (v.props.centroid) {
                     centroid = v;
                     break;
                 }

package/src/graph2/sankeyGraph.ts

@@ -3,9 +3,9 @@ import { compare2 } from "@hpcc-js/util";
 import { sankey as d3Sankey, sankeyLinkHorizontal as d3SankeyLinkHorizontal } from "d3-sankey";
 import { select as d3Select } from "d3-selection";
 import { AnnotationColumn, toJsonObj } from "./dataGraph";
-import { IEdge, IVertex } from "./graph";
 
 import "../../src/graph2/sankeyGraph.css";
+import { EdgeProps, VertexProps } from "./graphT";
 
 export class SankeyGraph extends SVGWidget {
     @publish([], "any", "Vertex Columns", null, { internal: true })
@@ -55,9 +55,9 @@ export class SankeyGraph extends SVGWidget {
         this._drawStartPos = "origin";
     }
 
-    private _prevVertices: readonly IVertex[] = [];
-    private _masterVertices: IVertex[] = [];
-    private _masterVerticesMap: { [key: string]: IVertex } = {};
+    private _prevVertices: readonly VertexProps[] = [];
+    private _masterVertices: VertexProps[] = [];
+    private _masterVerticesMap: { [key: string]: VertexProps } = {};
     mergeVertices() {
         const columns = this.vertexColumns();
         const annotationColumns = this.vertexAnnotationColumns();
@@ -65,10 +65,9 @@ export class SankeyGraph extends SVGWidget {
         const idIdx = this.indexOf(columns, this.vertexIDColumn(), "id");
         const labelIdx = this.indexOf(columns, this.vertexLabelColumn(), "label");
         const centroidIdx = this.indexOf(columns, this.vertexCentroidColumn(), "centroid");
-        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 vertices: IVertex[] = this.vertices().map((v): IVertex => {
+        const vertices: VertexProps[] = this.vertices().map((v): VertexProps => {
             return {
                 categoryID: "" + v[catIdx],
                 id: "" + v[idIdx],
@@ -76,9 +75,6 @@ export class SankeyGraph extends SVGWidget {
                 tooltip: "" + v[vertexTooltipIdx],
                 origData: toJsonObj(v, columns),
                 centroid: !!v[centroidIdx],
-                icon: {
-                    imageChar: "" + (v[faCharIdx] || this.vertexFAChar())
-                },
                 annotationIDs: annotationIdxs.map((ai, i) => !!v[ai] ? annotationColumns[i].annotationID() : undefined).filter(a => !!a)
             };
         });
@@ -98,8 +94,8 @@ export class SankeyGraph extends SVGWidget {
         return retVal >= 0 ? retVal : columns.indexOf(defColumn);
     }
 
-    protected _prevEdges: readonly IEdge[] = [];
-    protected _masterEdges: IEdge[] = [];
+    protected _prevEdges: readonly EdgeProps[] = [];
+    protected _masterEdges: EdgeProps[] = [];
     mergeEdges() {
         const columns = this.edgeColumns();
         const idIdx = this.indexOf(columns, this.edgeIDColumn(), "id");
@@ -107,7 +103,7 @@ export class SankeyGraph extends SVGWidget {
         const targetIdx = this.indexOf(columns, this.edgeTargetColumn(), "target");
         const labelIdx = this.indexOf(columns, this.edgeLabelColumn(), "label");
         const weightIdx = this.indexOf(columns, this.edgeWeightColumn(), "weight");
-        const edges: IEdge[] = this.edges().map(e => {
+        const edges: EdgeProps[] = this.edges().map(e => {
             const source = this._masterVerticesMap["" + e[sourceIdx]];
             if (!source) console.error(`Invalid edge source entity "${e[sourceIdx]}" does not exist.`);
             const target = this._masterVerticesMap["" + e[targetIdx]];

package/src/graph2/subgraph.tsx

@@ -0,0 +1,30 @@
+// , Shape, Text,
+import { React, Text } from "@hpcc-js/react";
+import { SubgraphProps } from "./layouts/placeholders";
+
+export interface BasicSubgraphProps extends SubgraphProps {
+    label?: string;
+    labelFill?: string;
+    labelHeight?: number,
+    rectFill?: string;
+    rectStroke?: string;
+    rectStrokeWidth?: number;
+}
+
+export const BasicSubgraph: React.FunctionComponent<BasicSubgraphProps> = ({
+    label = "",
+    labelFill = "black",
+    labelHeight = 12,
+    width = 0,
+    height = 0,
+    rectFill: fill,
+    rectStroke: stroke = "#627ae7",
+    rectStrokeWidth: strokeWidth = 2
+}) => {
+    return <g transform={`translate(${-width / 2} ${-height / 2})`}>
+        <rect width={width} height={height} fill={fill} stroke={stroke} style={{ strokeWidth }} />
+        <g transform={`translate(8 ${8 + labelHeight})`}>
+            <Text text={label} fill={labelFill} height={labelHeight} />
+        </g>
+    </g>;
+};

package/src/graph2/vertex.tsx

@@ -0,0 +1,31 @@
+// , Shape, Text,
+import { React, Text } from "@hpcc-js/react";
+import { VertexProps } from "./layouts/placeholders";
+
+export interface BasicVertexProps extends VertexProps {
+    textFill?: string;
+    textHeight?: number,
+    scale?: number,
+    circleRadius?: number,
+    circleFill?: string,
+    circleStroke?: string,
+    circleStrokeWidth?: number
+}
+
+export const BasicVertex: React.FunctionComponent<BasicVertexProps> = ({
+    text,
+    textFill = "black",
+    textHeight = 12,
+    scale = 1,
+    circleRadius = 16,
+    circleFill = "#a2bcf9",
+    circleStroke = "#627ae7",
+    circleStrokeWidth = 2
+}) => {
+    return <g transform={`scale(${scale})`}>
+        <circle cx="0" cy="0" r={circleRadius} fill={circleFill} stroke={circleStroke} style={{ strokeWidth: circleStrokeWidth }} />
+        <g transform={`translate(0 ${circleRadius + textHeight})`}>
+            <Text text={text} fill={textFill} height={textHeight}></Text>
+        </g>
+    </g>;
+};

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/graph";
-export declare const PKG_VERSION = "2.83.1";
-export declare const BUILD_VERSION = "2.104.5";
+export declare const PKG_VERSION = "2.84.0";
+export declare const BUILD_VERSION = "2.104.8";
 //# sourceMappingURL=__package__.d.ts.map

package/types/graph2/dataGraph.d.ts

@@ -1,7 +1,7 @@
 import { PropertyExt, publish, Widget } from "@hpcc-js/common";
 import { Graph2 } from "./graph";
-import { IEdge } from "./layouts/placeholders";
-export declare function toJsonObj(row: any, columns: any): {};
+import { BasicEdgeProps } from "./edge";
+export declare function toJsonObj<T>(row: any, columns: any): T;
 export declare class AnnotationColumn extends PropertyExt {
     columnID: publish<this, string>;
     annotationID: publish<this, string>;
@@ -49,8 +49,8 @@ export declare class DataGraph extends Graph2 {
     private _masterVertices;
     private _masterVerticesMap;
     mergeVertices(): void;
-    protected _prevEdges: readonly IEdge[];
-    protected _masterEdges: IEdge[];
+    protected _prevEdges: readonly BasicEdgeProps[];
+    protected _masterEdges: BasicEdgeProps[];
     private _masterEdgesMap;
     mergeEdges(): void;
     private _prevHierarchy;

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/edge.d.ts

@@ -0,0 +1,9 @@
+import { React } from "@hpcc-js/react";
+import { EdgeProps as EdgeProps } from "./layouts/placeholders";
+export interface BasicEdgeProps extends EdgeProps {
+    labelFill?: string;
+    labelHeight?: number;
+    path?: string;
+}
+export declare const BasicEdge: React.FunctionComponent<BasicEdgeProps>;
+//# sourceMappingURL=edge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"edge.d.ts","sourceRoot":"","sources":["../../src/graph2/edge.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAQ,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,IAAI,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEhE,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAmB7D,CAAC"}

package/types/graph2/graph.d.ts

@@ -1,156 +1,33 @@
-import { Palette, Selection, SVGGlowFilter, SVGZoomWidget, ToggleButton, Utility, Widget } from "@hpcc-js/common";
-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 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 {
-    private _toggleHierarchy;
-    private _toggleForceDirected;
-    private _toggleForceDirected2;
-    private _toggleCircle;
-    private _toggleDot;
-    private _toggleNeato;
-    private _toggleFDP;
-    private _toggleTwoPI;
-    private _toggleCirco;
-    private _toggleT;
-    private _toggleRT;
-    private _toggleD;
-    private _toggleRD;
-    protected _graphData: GraphCollection<VertexPlaceholder, EdgePlaceholder, SubgraphPlaceholder>;
-    protected _prevDoClickTime: number;
-    protected _centroidFilter: SVGGlowFilter;
-    protected _svgDefsAnn: any;
-    protected _svgDefsCat: any;
-    protected _subgraphG: Selection<SVGGElement, any, SVGGElement, any>;
-    protected _edgeG: Selection<SVGGElement, any, SVGGElement, any>;
-    protected _vertexG: Selection<SVGGElement, any, SVGGElement, any>;
-    protected _tooltip: HTMLTooltip;
-    protected _selection: Utility.SelectionBag;
-    private _dragHandler;
-    protected _catPalette: Palette.OrdinalPaletteFunc;
-    _svgDefs: any;
+import { React, SubgraphProps, VertexProps } from "@hpcc-js/react";
+import { BasicEdgeProps } from "./edge";
+import { GraphReactT } from "./graphReactT";
+export declare class Graph2 extends GraphReactT<SubgraphProps, VertexProps, BasicEdgeProps> {
     constructor();
-    resolveEventOrigin(): {
-        origin: string;
-        data: undefined | IVertex4Annotation | Icon;
-    };
-    iconBarButtons(): Widget[];
-    protected _categories: IconEx[];
-    categories(): IconEx[];
-    categories(_: IconEx[]): this;
-    protected _annotations: IconEx[];
-    annotations(): IconEx[];
-    annotations(_: IconEx[]): this;
-    private _origData;
-    data(): IGraphData2;
-    data(_: IGraphData2, merge?: boolean): this;
-    selected(vertex: IVertex, _?: Array<IVertex>): boolean;
-    selection(_: Array<IVertex | ISubgraph | IEdge>): this;
-    selection(): Array<IVertex | ISubgraph | IEdge>;
-    graphData(): GraphCollection<VertexPlaceholder, EdgePlaceholder>;
-    resetLayout(): this;
-    layoutRunning(): boolean;
-    protected _layoutAlgo: ILayout;
-    layoutAlgo(layout: ILayout): Promise<void>;
-    layoutClick(layout: GraphLayoutType): void;
-    updateIconBarItem(tb: ToggleButton, tbLayout: GraphLayoutType): void;
-    updateIconBar(): void;
-    getNeighborMap(vertex: VertexPlaceholder): {
-        vertices: {};
-        edges: {};
-    };
-    centerOnItem(id: string): void;
-    hideVertex(id: string): this;
-    showVertex(id: string): this;
-    protected highlight: {
-        zoom: number;
-        opacity: number;
-        edge: string;
-    };
-    highlightVerticies(vertexMap?: {
-        [id: string]: boolean;
-    }): this;
-    highlightEdges(edgeMap: any): this;
-    highlightVertex(_element: any, d: VertexPlaceholder): void;
-    highlightEdge(_element: any, d: EdgePlaceholder): void;
-    moveSubgraphPlaceholder(sp: SubgraphPlaceholder, transition: boolean): this;
-    moveEdgePlaceholder(ep: EdgePlaceholder, transition: boolean): this;
-    moveVertexPlaceholder(vp: VertexPlaceholder, transition: boolean, moveNeighbours: boolean): this;
-    moveSubgraphs(transition: boolean): this;
-    moveEdges(transition: boolean): this;
-    moveVertices(transition: boolean): this;
-    project(pos: number, clip?: boolean): number;
-    rproject(pos: number): number;
-    projectPlacholder(vp: VertexPlaceholder): {
-        x: number;
-        y: number;
-    };
-    categoryID(id: string | number, prefix?: "cat" | "ann"): string;
-    updateCategories(): void;
-    updateAnnotations(): void;
-    updateEdges(): this;
-    private _centroidRenderer;
-    centroidRenderer(): React.FunctionComponent;
-    centroidRenderer(_: React.FunctionComponent): this;
-    private _vertexRenderer;
-    vertexRenderer(): React.FunctionComponent;
-    vertexRenderer(_: React.FunctionComponent): this;
-    vertexMapper(props: IVertex, origRow: any): Vertex | IVertex3;
-    updateVertices(): this;
-    calcProps(isCentroid: boolean, props: any): any;
-    hasSubgraphs(): boolean;
-    updateSubgraphs(): this;
+    calcProps(_props: VertexProps): VertexProps;
+    protected _reactVertexRenderer2: React.FunctionComponent<VertexProps>;
+    vertexRenderer(): React.FunctionComponent<VertexProps>;
+    vertexRenderer(_: React.FunctionComponent<VertexProps>): this;
+    protected _reactCentroidRenderer: React.FunctionComponent<VertexProps>;
+    centroidRenderer(): React.FunctionComponent<VertexProps>;
+    centroidRenderer(_: React.FunctionComponent<VertexProps>): this;
     enter(domNode: any, element: any): void;
-    protected forceDirectedOptions(): FDOptions;
-    private layoutOptions;
-    private _prevLayout;
-    updateLayout(): void;
     update(domNode: any, element: any): void;
-    exit(domNode: any, element: any): void;
-    render(callback?: (w: Widget) => void): this;
-    private _prevWidth;
-    private _prevHeight;
-    private _prevTransformScale;
-    private _transformScale;
-    zoomed(transform: any): void;
-    centroids(): VertexPlaceholder[];
-    selectionChanged(): void;
-    tooltipHTML(data: any): any;
-    subgraph_click(row: any, _col: any, sel: any): void;
-    vertex_click(row: any, _col: any, sel: any, data: any): void;
-    vertex_dblclick(row: any, _col: any, sel: any, data: any): void;
-    vertex_mousein(row: any, _col: any, sel: any, data: any): void;
-    vertex_mouseover(row: any, _col: any, sel: any, data: any): void;
-    vertex_mouseout(row: any, _col: any, sel: any, data: any): void;
-    edge_click(row: any, _col: any, sel: any): void;
-    edge_mouseover(element: any, d: any): void;
-    edge_mouseout(_element: any, _d: any): void;
-    progress(what: "start" | "stop" | "layout-start" | "layout-tick" | "layout-stop"): void;
 }
 export interface Graph2 {
-    allowDragging(): boolean;
-    allowDragging(_: boolean): this;
-    dragSingleNeighbors(): boolean;
-    dragSingleNeighbors(_: boolean): this;
-    layout(): GraphLayoutType;
-    layout(_: GraphLayoutType): this;
-    applyScaleOnLayout(): boolean;
-    applyScaleOnLayout(_: boolean): this;
-    highlightOnMouseOverVertex(): boolean;
-    highlightOnMouseOverVertex(_: boolean): this;
-    highlightOnMouseOverEdge(): boolean;
-    highlightOnMouseOverEdge(_: boolean): this;
-    transitionDuration(): number;
-    transitionDuration(_: number): this;
+    vertexTextHeight(): number;
+    vertexTextHeight(_: number): this;
+    vertexTextPadding(): number;
+    vertexTextPadding(_: number): this;
+    vertexIconHeight(): number;
+    vertexIconHeight(_: number): this;
+    vertexIconPadding(): number;
+    vertexIconPadding(_: number): this;
+    vertexIconStrokeWidth(): number;
+    vertexIconStrokeWidth(_: number): this;
+    vertexIconFontFamily(): string;
+    vertexIconFontFamily(_: string): this;
+    vertexLabelFontFamily(): string;
+    vertexLabelFontFamily(_: string): this;
     centroidColor(): string;
     centroidColor(_: string): this;
     centroidScale(): number;
@@ -169,91 +46,5 @@ export interface Graph2 {
     centroidIconFontFamily(_: string): this;
     centroidLabelFontFamily(): string;
     centroidLabelFontFamily(_: string): this;
-    vertexTextHeight(): number;
-    vertexTextHeight(_: number): this;
-    vertexTextPadding(): number;
-    vertexTextPadding(_: number): this;
-    vertexIconHeight(): number;
-    vertexIconHeight(_: number): this;
-    vertexIconPadding(): number;
-    vertexIconPadding(_: number): this;
-    vertexIconStrokeWidth(): number;
-    vertexIconStrokeWidth(_: number): this;
-    vertexIconFontFamily(): string;
-    vertexIconFontFamily(_: string): this;
-    vertexLabelFontFamily(): string;
-    vertexLabelFontFamily(_: string): this;
-    highlightSelectedPathToCentroid(): boolean;
-    highlightSelectedPathToCentroid(_: boolean): this;
-    edgeArcDepth(): number;
-    edgeArcDepth(_: number): this;
-    minScale(): number;
-    minScale(_: number): this;
-    maxScale(): number;
-    maxScale(_: number): this;
-    showEdgeLabels(): boolean;
-    showEdgeLabels(_: boolean): this;
-    showEdgeLabelsOnHighlight(): boolean;
-    showEdgeLabelsOnHighlight(_: boolean): this;
-    showVertexLabels(): boolean;
-    showVertexLabels(_: boolean): this;
-    showVertexLabelsOnHighlight(): boolean;
-    showVertexLabelsOnHighlight(_: boolean): this;
-    hierarchyRankDirection(): "TB" | "BT" | "LR" | "RL";
-    hierarchyRankDirection(_: "TB" | "BT" | "LR" | "RL"): this;
-    hierarchyNodeSeparation(): number;
-    hierarchyNodeSeparation(_: number): this;
-    hierarchyEdgeSeparation(): number;
-    hierarchyEdgeSeparation(_: number): this;
-    hierarchyRankSeparation(): number;
-    hierarchyRankSeparation(_: number): this;
-    hierarchyDigraph(): boolean;
-    hierarchyDigraph(_: boolean): this;
-    forceDirectedAlpha(): number;
-    forceDirectedAlpha(_: number): this;
-    forceDirectedAlphaMin(): number;
-    forceDirectedAlphaMin(_: number): this;
-    forceDirectedAlphaDecay(): number;
-    forceDirectedAlphaDecay(_: number): this;
-    forceDirectedRepulsionStrength(): number;
-    forceDirectedRepulsionStrength(_: number): this;
-    forceDirectedVelocityDecay(): number;
-    forceDirectedVelocityDecay(_: number): this;
-    forceDirectedIterations(): number;
-    forceDirectedIterations(_: number): this;
-    forceDirectedLinkDistance(): number;
-    forceDirectedLinkDistance(_: number): this;
-    forceDirectedLinkStrength(): number;
-    forceDirectedLinkStrength(_: number): this;
-    forceDirectedPinCentroid(): boolean;
-    forceDirectedPinCentroid(_: boolean): this;
-    forceDirectedForceStrength(): number;
-    forceDirectedForceStrength(_: number): this;
-    forceDirectedMinDistance(): number;
-    forceDirectedMinDistance(_: number): this;
-    forceDirectedMaxDistance(): number;
-    forceDirectedMaxDistance(_: number): this;
-    treeRankDirection(): "TB" | "LR";
-    treeRankDirection(_: "TB" | "LR"): this;
-    edgeColor(): string;
-    edgeColor(_: string): this;
-    edgeStrokeWidth(): number;
-    edgeStrokeWidth(_: number): this;
-    tooltipWidth(): number;
-    tooltipWidth(_: number): this;
-    tooltipHeight(): number;
-    tooltipHeight(_: number): this;
-    enableTooltipPointerEvents(): boolean;
-    enableTooltipPointerEvents(_: boolean): this;
-    tooltipCloseDelay(): number;
-    tooltipCloseDelay(_: number): this;
-    doubleClickMaxDelay(): number;
-    doubleClickMaxDelay(_: number): this;
-    wasmFolder(): string;
-    wasmFolder(_: string): this;
 }
-export declare function graphviz(dot: string, engine?: Engine, _wasmFolder?: string): {
-    terminate: () => void;
-    response: Promise<string>;
-};
 //# sourceMappingURL=graph.d.ts.map

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":"AAAA,OAAO,EAAE,KAAK,EAAY,aAAa,EAAU,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAa,cAAc,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,MAAO,SAAQ,WAAW,CAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC;;IAW/E,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IA6B3C,SAAS,CAAC,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACtE,cAAc,IAAI,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC;IACtD,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,IAAI;IAO7D,SAAS,CAAC,sBAAsB,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACvE,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC;IACxD,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,IAAI;IAO/D,KAAK,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAItB,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;CAI1B;AAGD,MAAM,WAAW,MAAM;IACnB,gBAAgB,IAAI,MAAM,CAAC;IAC3B,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,gBAAgB,IAAI,MAAM,CAAC;IAC3B,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qBAAqB,IAAI,MAAM,CAAC;IAChC,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,oBAAoB,IAAI,MAAM,CAAC;IAC/B,oBAAoB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,qBAAqB,IAAI,MAAM,CAAC;IAChC,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvC,aAAa,IAAI,MAAM,CAAC;IACxB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,IAAI,MAAM,CAAC;IACxB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kBAAkB,IAAI,MAAM,CAAC;IAC7B,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,mBAAmB,IAAI,MAAM,CAAC;IAC9B,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,kBAAkB,IAAI,MAAM,CAAC;IAC7B,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,mBAAmB,IAAI,MAAM,CAAC;IAC9B,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,uBAAuB,IAAI,MAAM,CAAC;IAClC,uBAAuB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,sBAAsB,IAAI,MAAM,CAAC;IACjC,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,uBAAuB,IAAI,MAAM,CAAC;IAClC,uBAAuB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5C"}

package/types/graph2/graphReactT.d.ts

@@ -0,0 +1,15 @@
+import { React, SubgraphProps, VertexProps } from "@hpcc-js/react";
+import { EdgeProps, GraphT } from "./graphT";
+export declare class GraphReactT<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps> extends GraphT<SG, V, E> {
+    constructor(subgraphRenderer: React.FunctionComponent<SG>, vertexRenderer: React.FunctionComponent<V>, edgeRenderer: React.FunctionComponent<E>);
+    private _reactSubgraphRenderer;
+    subgraphRenderer(): React.FunctionComponent<SG>;
+    subgraphRenderer(_: React.FunctionComponent<SG>): this;
+    private _reactVertexRenderer;
+    vertexRenderer(): React.FunctionComponent<V>;
+    vertexRenderer(_: React.FunctionComponent<V>): this;
+    private _reactEdgeRenderer;
+    edgeRenderer(): React.FunctionComponent<E>;
+    edgeRenderer(_: React.FunctionComponent<E>): this;
+}
+//# sourceMappingURL=graphReactT.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"graphReactT.d.ts","sourceRoot":"","sources":["../../src/graph2/graphReactT.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAMxD,qBAAa,WAAW,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,SAAS,CAAE,SAAQ,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEvG,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAI/I,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAC/C,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,IAAI;IAQtD,OAAO,CAAC,oBAAoB,CAA6B;IACzD,cAAc,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC5C,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI;IAQnD,OAAO,CAAC,kBAAkB,CAA6B;IACvD,YAAY,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC1C,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI;CAOpD"}