From 37f4985c2f4affa6e77583359a564957ec74703d Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Thu, 29 Dec 2022 09:23:00 +0100 Subject: [PATCH] refactor(core): move edge prop types Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com> --- .../core/src/components/Edges/BezierEdge.ts | 7 +------ .../src/components/Edges/SimpleBezierEdge.ts | 6 +----- .../src/components/Edges/SmoothStepEdge.ts | 7 +------ .../core/src/components/Edges/StepEdge.ts | 6 +----- .../core/src/components/Edges/StraightEdge.ts | 4 +--- packages/core/src/components/Edges/index.ts | 10 +++++----- packages/core/src/index.ts | 5 ----- packages/core/src/types/edge.ts | 20 +++++++++++++++++++ 8 files changed, 30 insertions(+), 35 deletions(-) diff --git a/packages/core/src/components/Edges/BezierEdge.ts b/packages/core/src/components/Edges/BezierEdge.ts index 5994de15..eb431095 100644 --- a/packages/core/src/components/Edges/BezierEdge.ts +++ b/packages/core/src/components/Edges/BezierEdge.ts @@ -1,12 +1,7 @@ import type { FunctionalComponent } from 'vue' import BaseEdge from './BaseEdge' +import type { BezierEdgeProps } from '~/types' import { Position } from '~/types' -import type { BaseEdgeProps, BezierPathOptions, EdgePositions, EdgeProps } from '~/types' - -export type BezierEdgeProps = EdgePositions & - BezierPathOptions & - Omit & - Pick const BezierEdge: FunctionalComponent = function ( { sourcePosition = Position.Bottom, targetPosition = Position.Top, ...props }, diff --git a/packages/core/src/components/Edges/SimpleBezierEdge.ts b/packages/core/src/components/Edges/SimpleBezierEdge.ts index 2f616162..9d6b36c2 100644 --- a/packages/core/src/components/Edges/SimpleBezierEdge.ts +++ b/packages/core/src/components/Edges/SimpleBezierEdge.ts @@ -1,11 +1,7 @@ import type { FunctionalComponent } from 'vue' import BaseEdge from './BaseEdge' +import type { SimpleBezierEdgeProps } from '~/types' import { Position } from '~/types' -import type { BaseEdgeProps, EdgePositions, EdgeProps } from '~/types' - -export type SimpleBezierEdgeProps = EdgePositions & - Omit & - Pick const SimpleBezierEdge: FunctionalComponent = function ( { sourcePosition = Position.Bottom, targetPosition = Position.Top, ...props }, diff --git a/packages/core/src/components/Edges/SmoothStepEdge.ts b/packages/core/src/components/Edges/SmoothStepEdge.ts index d9916eef..add3e84b 100644 --- a/packages/core/src/components/Edges/SmoothStepEdge.ts +++ b/packages/core/src/components/Edges/SmoothStepEdge.ts @@ -1,13 +1,8 @@ import type { FunctionalComponent } from 'vue' import BaseEdge from './BaseEdge' -import type { BaseEdgeProps, EdgePositions, EdgeProps, SmoothStepPathOptions } from '~/types' +import type { SmoothStepEdgeProps } from '~/types' import { Position } from '~/types' -export type SmoothStepEdgeProps = EdgePositions & - Omit & - Pick & - SmoothStepPathOptions - const SmoothStepEdge: FunctionalComponent = function ( { sourcePosition = Position.Bottom, targetPosition = Position.Top, ...props }, { attrs }, diff --git a/packages/core/src/components/Edges/StepEdge.ts b/packages/core/src/components/Edges/StepEdge.ts index 9a8d3d88..c645e5b7 100644 --- a/packages/core/src/components/Edges/StepEdge.ts +++ b/packages/core/src/components/Edges/StepEdge.ts @@ -1,10 +1,6 @@ import type { FunctionalComponent } from 'vue' import SmoothStepEdge from './SmoothStepEdge' -import type { BaseEdgeProps, EdgePositions, EdgeProps } from '~/types' - -export type StepEdgeProps = EdgePositions & - Omit & - Pick +import type { StepEdgeProps } from '~/types' const StepEdge: FunctionalComponent = function (props, { attrs }) { return h(SmoothStepEdge, { ...props, ...attrs, borderRadius: 0 }) diff --git a/packages/core/src/components/Edges/StraightEdge.ts b/packages/core/src/components/Edges/StraightEdge.ts index e36028dd..640a91da 100644 --- a/packages/core/src/components/Edges/StraightEdge.ts +++ b/packages/core/src/components/Edges/StraightEdge.ts @@ -1,8 +1,6 @@ import type { FunctionalComponent } from 'vue' import BaseEdge from './BaseEdge' -import type { BaseEdgeProps, EdgePositions } from '~/types' - -export type StraightEdgeProps = EdgePositions & Omit +import type { StraightEdgeProps } from '~/types' const StraightEdge: FunctionalComponent = function (props, { attrs }) { const [path, labelX, labelY] = getStraightPath(props) diff --git a/packages/core/src/components/Edges/index.ts b/packages/core/src/components/Edges/index.ts index 67e61b69..9e04e9b8 100644 --- a/packages/core/src/components/Edges/index.ts +++ b/packages/core/src/components/Edges/index.ts @@ -1,9 +1,9 @@ export { default as BaseEdge } from './BaseEdge' -export { default as BezierEdge, BezierEdgeProps } from './BezierEdge' -export { default as SimpleBezierEdge, SimpleBezierEdgeProps } from './SimpleBezierEdge' -export { default as StepEdge, StepEdgeProps } from './StepEdge' -export { default as SmoothStepEdge, SmoothStepEdgeProps } from './SmoothStepEdge' -export { default as StraightEdge, StraightEdgeProps } from './StraightEdge' +export { default as BezierEdge } from './BezierEdge' +export { default as SimpleBezierEdge } from './SimpleBezierEdge' +export { default as StepEdge } from './StepEdge' +export { default as SmoothStepEdge } from './SmoothStepEdge' +export { default as StraightEdge } from './StraightEdge' export { default as EdgeAnchor } from './EdgeAnchor' export { default as EdgeText } from './EdgeText.vue' export { default as EdgeWrapper } from './EdgeWrapper' diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index eff9e555..7f5bc80e 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -11,15 +11,10 @@ export { default as Panel } from './components/Panel/Panel.vue' export { StraightEdge, - StraightEdgeProps, StepEdge, - StepEdgeProps, BezierEdge, - BezierEdgeProps, SimpleBezierEdge, - SimpleBezierEdgeProps, SmoothStepEdge, - SmoothStepEdgeProps, BaseEdge, EdgeText, EdgeLabelRenderer, diff --git a/packages/core/src/types/edge.ts b/packages/core/src/types/edge.ts index b81f4ef5..3566266c 100644 --- a/packages/core/src/types/edge.ts +++ b/packages/core/src/types/edge.ts @@ -188,3 +188,23 @@ export interface BaseEdgeProps extends EdgeLabelOptions { markerEnd?: string interactionWidth?: number } + +export type BezierEdgeProps = EdgePositions & + BezierPathOptions & + Omit & + Pick + +export type SimpleBezierEdgeProps = EdgePositions & + Omit & + Pick + +export type StraightEdgeProps = EdgePositions & Omit + +export type StepEdgeProps = EdgePositions & + Omit & + Pick + +export type SmoothStepEdgeProps = EdgePositions & + Omit & + Pick & + SmoothStepPathOptions