@krainovsd/graph 0.8.4 → 0.9.0

package/lib/esm/module/GraphCanvas/lib/utils/pointer-getter.js

@@ -1,6 +1,12 @@
 function pointerGetter(mouseEvent, areaRect, areaTransform) {
-    const px = (mouseEvent.clientX - areaRect.left - areaTransform.x) / areaTransform.k;
-    const py = (mouseEvent.clientY - areaRect.top - areaTransform.y) / areaTransform.k;
+    const clientX = "clientX" in mouseEvent
+        ? mouseEvent.clientX
+        : (mouseEvent.touches[0]?.clientX ?? mouseEvent.changedTouches[0]?.clientX);
+    const clientY = "clientX" in mouseEvent
+        ? mouseEvent.clientY
+        : (mouseEvent.touches[0]?.clientY ?? mouseEvent.changedTouches[0]?.clientY);
+    const px = (clientX - areaRect.left - areaTransform.x) / areaTransform.k;
+    const py = (clientY - areaRect.top - areaTransform.y) / areaTransform.k;
     return [px, py];
 }
 

package/lib/esm/module/GraphCanvas/lib/utils/pointer-getter.js.map

@@ -1 +1 @@
-{"version":3,"file":"pointer-getter.js","sources":["../../../../../../src/module/GraphCanvas/lib/utils/pointer-getter.ts"],"sourcesContent":["import type { ZoomTransform } from \"d3-zoom\";\n\nexport function pointerGetter(\n  mouseEvent: MouseEvent,\n  areaRect: DOMRect,\n  areaTransform: ZoomTransform,\n) {\n  const px = (mouseEvent.clientX - areaRect.left - areaTransform.x) / areaTransform.k;\n  const py = (mouseEvent.clientY - areaRect.top - areaTransform.y) / areaTransform.k;\n\n  return [px, py];\n}\n"],"names":[],"mappings":"SAEgB,aAAa,CAC3B,UAAsB,EACtB,QAAiB,EACjB,aAA4B,EAAA;AAE5B,IAAA,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,GAAG,aAAa,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC;AACnF,IAAA,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,GAAG,aAAa,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC;AAElF,IAAA,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC;AACjB;;;;"}
+{"version":3,"file":"pointer-getter.js","sources":["../../../../../../src/module/GraphCanvas/lib/utils/pointer-getter.ts"],"sourcesContent":["import type { ZoomTransform } from \"d3-zoom\";\n\nexport function pointerGetter(\n  mouseEvent: MouseEvent | TouchEvent,\n  areaRect: DOMRect,\n  areaTransform: ZoomTransform,\n) {\n  const clientX =\n    \"clientX\" in mouseEvent\n      ? mouseEvent.clientX\n      : (mouseEvent.touches[0]?.clientX ?? mouseEvent.changedTouches[0]?.clientX);\n  const clientY =\n    \"clientX\" in mouseEvent\n      ? mouseEvent.clientY\n      : (mouseEvent.touches[0]?.clientY ?? mouseEvent.changedTouches[0]?.clientY);\n\n  const px = (clientX - areaRect.left - areaTransform.x) / areaTransform.k;\n  const py = (clientY - areaRect.top - areaTransform.y) / areaTransform.k;\n\n  return [px, py];\n}\n"],"names":[],"mappings":"SAEgB,aAAa,CAC3B,UAAmC,EACnC,QAAiB,EACjB,aAA4B,EAAA;AAE5B,IAAA,MAAM,OAAO,GACX,SAAS,IAAI;UACT,UAAU,CAAC;WACV,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;AAC/E,IAAA,MAAM,OAAO,GACX,SAAS,IAAI;UACT,UAAU,CAAC;WACV,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;AAE/E,IAAA,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,GAAG,aAAa,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC;AACxE,IAAA,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,GAAG,aAAa,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC;AAEvE,IAAA,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC;AACjB;;;;"}

package/lib/index.d.ts

@@ -22,11 +22,11 @@ interface LinkInterface<NodeData extends Record<string, unknown>, LinkData exten
 type ZoomEventInterface = D3ZoomEvent<HTMLCanvasElement, unknown>;
 type DragEventInterface<NodeData extends Record<string, unknown>> = D3DragEvent<HTMLElement, unknown, NodeInterface<NodeData>>;
 type ListenersInterface<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>> = {
-    onContextMenu?: (event: MouseEvent, node?: NodeInterface<NodeData>) => void;
-    onClick?: (event: MouseEvent, node?: NodeInterface<NodeData>) => void;
-    onDoubleClick?: (event: MouseEvent, node?: NodeInterface<NodeData>) => void;
-    onWheelClick?: (event: MouseEvent, node?: NodeInterface<NodeData>) => void;
-    onMove?: (event: MouseEvent, node?: NodeInterface<NodeData>) => void;
+    onContextMenu?: (event: MouseEvent, node: NodeInterface<NodeData> | undefined, link: LinkInterface<NodeData, LinkData> | undefined) => void;
+    onClick?: (event: MouseEvent | TouchEvent, node: NodeInterface<NodeData> | undefined, link: LinkInterface<NodeData, LinkData> | undefined) => void;
+    onDoubleClick?: (event: MouseEvent | TouchEvent, node: NodeInterface<NodeData> | undefined, link: LinkInterface<NodeData, LinkData> | undefined) => void;
+    onWheelClick?: (event: MouseEvent, node: NodeInterface<NodeData> | undefined, link: LinkInterface<NodeData, LinkData> | undefined) => void;
+    onMove?: (event: MouseEvent | TouchEvent, node: NodeInterface<NodeData> | undefined, link: LinkInterface<NodeData, LinkData> | undefined) => void;
     onZoom?: (event: ZoomEventInterface) => void;
     onDragSubject?: (event: DragEventInterface<NodeData>, state: GraphState<NodeData, LinkData>) => NodeInterface<NodeData> | undefined;
     onDraw?: (state: GraphState<NodeData, LinkData>, toggleHighlightStatus: (status: boolean) => void, clearHighlightState: () => void) => void;
@@ -38,19 +38,33 @@ type ListenersInterface<NodeData extends Record<string, unknown>, LinkData exten
 };
 
 type GraphSettingsInterface<NodeData extends Record<string, unknown>> = {
-    highlightOnlyRoot?: boolean;
-    highlightFadingMin?: number;
-    highlightLinkFadingMin?: number;
-    highlightArrowFadingMin?: number;
-    highlightColorFadingMin?: number;
-    highlightTextFadingMin?: number;
-    highlightSizingAdditional?: number;
-    highlightTextSizingAdditional?: number;
-    highlightTextShiftXAdditional?: number;
-    highlightTextShiftYAdditional?: number;
-    highlightTextWeightAdditional?: number;
-    highlightTextWidthAdditional?: number;
-    highlightByHover?: boolean;
+    highlightByNodeOnlyRoot?: boolean;
+    highlightByNodeNodeFadingMin?: number;
+    highlightByNodeLinkFadingMin?: number;
+    highlightByNodeArrowFadingMin?: number;
+    highlightByNodeNodeColorFadingMin?: number;
+    highlightByNodeTextFadingMin?: number;
+    highlightByNodeNodeSizingAdditional?: number;
+    highlightByNodeTextSizingAdditional?: number;
+    highlightByNodeTextShiftXAdditional?: number;
+    highlightByNodeTextShiftYAdditional?: number;
+    highlightByNodeTextWeightAdditional?: number;
+    highlightByNodeTextWidthAdditional?: number;
+    highlightByLinkOnlyRoot?: boolean;
+    highlightByLinkNodeFadingMin?: number;
+    highlightByLinkLinkFadingMin?: number;
+    highlightByLinkArrowFadingMin?: number;
+    highlightByLinkNodeColorFadingMin?: number;
+    highlightByLinkTextFadingMin?: number;
+    highlightByLinkNodeSizingAdditional?: number;
+    highlightByLinkTextSizingAdditional?: number;
+    highlightByLinkTextShiftXAdditional?: number;
+    highlightByLinkTextShiftYAdditional?: number;
+    highlightByLinkTextWeightAdditional?: number;
+    highlightByLinkTextWidthAdditional?: number;
+    highlightByHoverNode?: boolean;
+    highlightByHoverLink?: boolean;
+    hoverLinkThreshold?: number;
     highlightDownStep?: number;
     highlightUpStep?: number;
     stickAfterDrag?: boolean;
@@ -107,11 +121,16 @@ type NodeOptionsInterface<NodeData extends Record<string, unknown>, LinkData ext
     textDraw?: ((node: NodeInterface<NodeData>, options: Required<NodeOptionsInterface<NodeData, LinkData>>, state: GraphState<NodeData, LinkData>) => void) | null;
     nodeExtraDraw?: ((node: NodeInterface<NodeData>, options: Required<NodeOptionsInterface<NodeData, LinkData>>, state: GraphState<NodeData, LinkData>) => void) | null;
     textExtraDraw?: ((node: NodeInterface<NodeData>, options: Required<NodeOptionsInterface<NodeData, LinkData>>, state: GraphState<NodeData, LinkData>) => void) | null;
-    highlightFading?: boolean;
-    highlightSizing?: boolean;
-    highlightTextFading?: boolean;
-    highlightTextSizing?: boolean;
-    highlightColor?: boolean;
+    highlightByNodeNodeFading?: boolean;
+    highlightByNodeNodeSizing?: boolean;
+    highlightByNodeTextFading?: boolean;
+    highlightByNodeTextSizing?: boolean;
+    highlightByNodeNodeColor?: boolean;
+    highlightByLinkNodeFading?: boolean;
+    highlightByLinkNodeSizing?: boolean;
+    highlightByLinkTextFading?: boolean;
+    highlightByLinkTextSizing?: boolean;
+    highlightByLinkNodeColor?: boolean;
     borderColor?: string;
     borderWidth?: number;
     radius?: number;
@@ -143,13 +162,15 @@ type LinkOptionsInterface<NodeData extends Record<string, unknown>, LinkData ext
     alpha?: number;
     color?: string;
     width?: number;
-    highlightFading?: boolean;
+    highlightByNodeLinkFading?: boolean;
+    highlightByNodeArrowFading?: boolean;
+    highlightByLinkLinkFading?: boolean;
+    highlightByLinkArrowFading?: boolean;
     pretty?: boolean;
     arrow?: boolean;
     arrowAlpha?: number;
     arrowColor?: string;
     arrowSize?: number;
-    arrowHighlightFading?: boolean;
     arrowReverseAppear?: boolean;
     particleAlpha?: number;
     particleColor?: string;
@@ -180,6 +201,7 @@ type GraphState<NodeData extends Record<string, unknown>, LinkData extends Recor
     simulationWorking: boolean;
     isDragging: boolean;
     highlightedNode: NodeInterface<NodeData> | null;
+    highlightedLink: LinkInterface<NodeData, LinkData> | null;
     highlightedNeighbors: Set<string | number> | null;
     highlightProgress: number;
     highlightWorking: boolean;
@@ -235,6 +257,7 @@ declare class GraphCanvas<NodeData extends Record<string, unknown>, LinkData ext
     private nodeOptionsCache;
     private isDragging;
     private highlightedNode;
+    private highlightedLink;
     private highlightedNeighbors;
     private highlightProgress;
     private highlightWorking;
@@ -287,6 +310,15 @@ declare function nodeRadiusGetter({ radiusFlexible, radiusInitial, linkCount, ra
 declare function linkIterationExtractor<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>, Result extends string | number | boolean | Record<string, unknown> | unknown[]>(link: LinkInterface<NodeData, LinkData>, i: number, links: LinkInterface<NodeData, LinkData>[], state: GraphState<NodeData, LinkData>, option: LinkIterationPropsInterface<NodeData, LinkData, Result> | Result, optionConstantGetter: undefined): Result;
 declare function linkIterationExtractor<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>, Result extends string | number | boolean | Record<string, unknown> | unknown[]>(link: LinkInterface<NodeData, LinkData>, i: number, links: LinkInterface<NodeData, LinkData>[], state: GraphState<NodeData, LinkData>, option: LinkIterationPropsInterface<NodeData, LinkData, Result> | Result, optionConstantGetter: LinkIterationPropsInterface<NodeData, LinkData, Required<Result>> | Required<Result>): Required<Result>;
 
+type NodeByPointerGetterOptions<NodeData extends Record<string, unknown>> = {
+    mouseEvent: MouseEvent | TouchEvent;
+    areaRect: DOMRect | undefined;
+    areaTransform: ZoomTransform;
+    nodes: NodeInterface<NodeData>[];
+    graphSettings: Required<GraphSettingsInterface<NodeData>>;
+};
+declare function nodeByPointerGetter<NodeData extends Record<string, unknown>>({ areaRect, areaTransform, mouseEvent, nodes, graphSettings, }: NodeByPointerGetterOptions<NodeData>): NodeInterface<NodeData> | undefined;
+
 declare function nodeIterationExtractor<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>, Result extends string | number | boolean | Record<string, unknown> | unknown[] | undefined | null>(node: NodeInterface<NodeData>, i: number, nodes: NodeInterface<NodeData>[], state: GraphState<NodeData, LinkData>, option: NodeIterationPropsInterface<NodeData, LinkData, Result> | Result, optionConstantGetter: undefined): Result;
 declare function nodeIterationExtractor<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>, Result extends string | number | boolean | Record<string, unknown> | unknown[] | undefined | null>(node: NodeInterface<NodeData>, i: number, nodes: NodeInterface<NodeData>[], state: GraphState<NodeData, LinkData>, option: NodeIterationPropsInterface<NodeData, LinkData, Result> | Result, optionConstantGetter: NodeIterationPropsInterface<NodeData, LinkData, Result> | Result): Required<Result>;
 
@@ -327,6 +359,15 @@ type GetParticlePositionOptions = {
 };
 declare function getParticlePosition(opts: GetParticlePositionOptions): void;
 
+type LinkByPointerGetterOptions<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>> = {
+    mouseEvent: MouseEvent | TouchEvent;
+    areaRect: DOMRect | undefined;
+    areaTransform: ZoomTransform;
+    links: LinkInterface<NodeData, LinkData>[];
+    graphSettings: Required<GraphSettingsInterface<NodeData>>;
+};
+declare function linkByPointerGetter<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>>({ areaRect, areaTransform, mouseEvent, links, graphSettings, }: LinkByPointerGetterOptions<NodeData, LinkData>): LinkInterface<NodeData, LinkData> | undefined;
+
 declare function colorToRgb(color: string): string | null;
 
 declare function extractRgb(color: string | null): {
@@ -367,4 +408,4 @@ declare function getGraphControls<NodeData extends Record<string, unknown>>(keys
 declare function getNodeControls<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>>(keys?: (keyof NodeOptionsInterface<NodeData, LinkData>)[]): GraphSettingsInputInterface<keyof NodeOptionsInterface<NodeData, LinkData>>[];
 declare function getLinkControls<NodeData extends Record<string, unknown>, LinkData extends Record<string, unknown>>(keys?: (keyof LinkOptionsInterface<NodeData, LinkData>)[]): GraphSettingsInputInterface<keyof LinkOptionsInterface<NodeData, LinkData>>[];
 
-export { type CachedNodeTextInterface, type DragEventInterface, type ForceSettingsInterface, GraphCanvas, type GraphCanvasInterface, type GraphCanvasSimulation, type GraphParticle, type GraphSettingsInterface, type GraphState, type LinkInterface, type LinkIterationPropsInterface, type LinkOptionsInterface, type LinkSettingsInterface, type ListenersInterface, type NodeInterface, type NodeIterationPropsInterface, type NodeOptionsInterface, type NodeSettingsInterface, type RGB, type TextStyleEnum, type ZoomEventInterface, animationByProgress, calculateLinkPositionByRadius, colorToRgb, drawText, extractRgb, fadeRgb, getForceControls, getGraphControls, getLinkControls, getNodeControls, getParticlePosition, linkIterationExtractor, linkOptionsGetter, nodeIterationExtractor, nodeOptionsGetter, nodeRadiusGetter, rgbAnimationByProgress };
+export { type CachedNodeTextInterface, type DragEventInterface, type ForceSettingsInterface, GraphCanvas, type GraphCanvasInterface, type GraphCanvasSimulation, type GraphParticle, type GraphSettingsInterface, type GraphState, type LinkInterface, type LinkIterationPropsInterface, type LinkOptionsInterface, type LinkSettingsInterface, type ListenersInterface, type NodeInterface, type NodeIterationPropsInterface, type NodeOptionsInterface, type NodeSettingsInterface, type RGB, type TextStyleEnum, type ZoomEventInterface, animationByProgress, calculateLinkPositionByRadius, colorToRgb, drawText, extractRgb, fadeRgb, getForceControls, getGraphControls, getLinkControls, getNodeControls, getParticlePosition, linkByPointerGetter, linkIterationExtractor, linkOptionsGetter, nodeByPointerGetter, nodeIterationExtractor, nodeOptionsGetter, nodeRadiusGetter, rgbAnimationByProgress };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krainovsd/graph",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "description": "Krainov graph",
   "type": "module",
   "author": "KrainovSD <denislosev48@gmail.com>",