chore(Connection): move multipoint connections

Author: SimbiozizV

…components/BezierMultipointConnection.ts …onnections/BezierMultipointConnection.tssrc/react-components/elk/components/BezierMultipointConnection.ts renamed to src/components/canvas/connections/BezierMultipointConnection.ts src/react-components/elk/components/BezierMultipointConnection.ts renamed to src/components/canvas/connections/BezierMultipointConnection.ts

@@ -1,12 +1,13 @@
 import intersects from "intersects";
 
-import { Path2DRenderStyleResult } from "../../../components/canvas/connections/BatchPath2D";
-import { BlockConnection } from "../../../components/canvas/connections/BlockConnection";
-import { isPointInStroke } from "../../../components/canvas/connections/bezierHelpers";
 import { HitBoxData } from "../../../services/HitTest";
+import { TMultipointConnection } from "../../../store/connection/ConnectionState";
 import { curvePolyline } from "../../../utils/shapes/curvePolyline";
 import { trangleArrowForVector } from "../../../utils/shapes/triangle";
-import { TMultipointConnection } from "../types";
+
+import { Path2DRenderStyleResult } from "./BatchPath2D";
+import { BlockConnection } from "./BlockConnection";
+import { isPointInStroke } from "./bezierHelpers";
 
 const DEFAULT_FONT_SIZE = 14;
 

…s/elk/components/MultipointConnection.ts …nvas/connections/MultipointConnection.tssrc/react-components/elk/components/MultipointConnection.ts renamed to src/components/canvas/connections/MultipointConnection.ts src/react-components/elk/components/MultipointConnection.ts renamed to src/components/canvas/connections/MultipointConnection.ts

@@ -1,4 +1,6 @@
 export * from "./BaseConnection";
 export * from "./BlockConnection";
+export * from "./MultipointConnection";
+export * from "./BezierMultipointConnection";
 export * from "./Arrow";
 export * from "./BatchPath2D";

src/components/canvas/connections/index.ts

@@ -1,7 +1 @@
-export { MultipointConnection } from "./components/MultipointConnection";
-export {
-  BezierMultipointConnection,
-  generateBezierParams,
-  bezierCurveLine,
-} from "./components/BezierMultipointConnection";
 export { useElk } from "./hooks/useElk";

src/react-components/elk/index.ts

@@ -1,19 +1,6 @@
-import { TConnection, TConnectionId } from "../../../store/connection/ConnectionState";
+import { TConnectionId, TMultipointConnection } from "../../../store/connection/ConnectionState";
 import { TPoint } from "../../../utils/types/shapes";
 
-export type TLabel = {
-  height?: number;
-  width?: number;
-  x?: number;
-  y?: number;
-  text?: string;
-};
-
-export type TMultipointConnection = TConnection & {
-  points?: TPoint[];
-  labels?: TLabel[];
-};
-
 export type ConverterResult = {
   edges: Record<TConnectionId, Pick<TMultipointConnection, "points" | "labels">>;
   blocks: Record<TConnectionId, TPoint>;

src/react-components/elk/types/index.ts

@@ -6,6 +6,7 @@ import { BaseConnection, TBaseConnectionProps, TBaseConnectionState } from "../.
 import { TGraphLayerContext } from "../../components/canvas/layers/graphLayer/GraphLayer";
 import { TConnectionColors } from "../../graphConfig";
 import { ESelectionStrategy, ISelectionBucket } from "../../services/selection/types";
+import { TPoint } from "../../utils/types/shapes";
 import { TBlockId } from "../block/Block";
 
 import { ConnectionsStore } from "./ConnectionList";
@@ -38,6 +39,19 @@ export type TConnection = {
   selected?: boolean;
 } & (TConnectionBlockPoint | TConnectionPortPoint);
 
+export type TLabel = {
+  height?: number;
+  width?: number;
+  x?: number;
+  y?: number;
+  text?: string;
+};
+
+export type TMultipointConnection = TConnection & {
+  points?: TPoint[];
+  labels?: TLabel[];
+};
+
 export class ConnectionState<T extends TConnection = TConnection> {
   public $state = signal<T>(undefined);
 

src/store/connection/ConnectionState.ts

@@ -5,10 +5,10 @@ import { Description, Meta as StorybookMeta, Title } from "@storybook/addon-docs
 import type { Meta, StoryFn } from "@storybook/react-webpack5";
 import ELK, { ElkNode } from "elkjs";
 
-import { Graph, GraphState, TBlock, TConnection, TGraphConfig } from "../../../index";
-import { GraphCanvas, MultipointConnection, useElk, useGraph, useGraphEvent } from "../../../react-components";
-import { TMultipointConnection } from "../../../react-components/elk/types";
+import { Graph, GraphState, MultipointConnection, TBlock, TConnection, TGraphConfig } from "../../../index";
+import { GraphCanvas, useElk, useGraph, useGraphEvent } from "../../../react-components";
 import { useFn } from "../../../react-components/utils/hooks/useFn";
+import { TMultipointConnection } from "../../../store/connection/ConnectionState";
 import { BlockStory } from "../../main/Block";
 
 import { getExampleConfig } from "./getExampleConfig";