fix(core): add missing Type generic to edge types

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
braks
2023-04-11 20:28:02 +02:00
committed by Braks
parent aae4a28702
commit aaeb6dc4b8
+15 -6
View File
@@ -1,7 +1,7 @@
import type { CSSProperties, Component, VNode } from 'vue'
import type { ClassFunc, ElementData, Position, StyleFunc, Styles } from './flow'
import type { GraphNode } from './node'
import type { DefaultEdgeTypes, EdgeComponent, EdgeTextProps } from './components'
import type { EdgeComponent, EdgeTextProps } from './components'
import type { CustomEvent, EdgeEventsHandler, EdgeEventsOn } from './hooks'
/** Edge markers */
@@ -58,14 +58,17 @@ export interface EdgeLabelOptions {
labelBgBorderRadius?: number
}
export interface DefaultEdge<Data = ElementData, CustomEvents extends Record<string, CustomEvent> = any>
extends EdgeLabelOptions {
export interface DefaultEdge<
Data = ElementData,
CustomEvents extends Record<string, CustomEvent> = any,
Type extends string = string,
> extends EdgeLabelOptions {
/** Unique edge id */
id: string
/** An edge label */
label?: string | VNode | Component<EdgeTextProps>
/** Edge type, can be a default type or a custom type */
type?: keyof DefaultEdgeTypes | string
type?: Type
/** Source node id */
source: string
/** Target node id */
@@ -132,8 +135,8 @@ export type BezierEdgeType<Data = ElementData, CustomEvents extends Record<strin
pathOptions?: BezierPathOptions
}
export type Edge<Data = ElementData, CustomEvents extends Record<string, CustomEvent> = any> =
| DefaultEdge<Data, CustomEvents>
export type Edge<Data = ElementData, CustomEvents extends Record<string, CustomEvent> = any, Type extends string = string> =
| DefaultEdge<Data, CustomEvents, Type>
| SmoothStepEdgeType<Data, CustomEvents>
| BezierEdgeType<Data, CustomEvents>
@@ -217,3 +220,9 @@ export type SmoothStepEdgeProps = EdgePositions &
Omit<BaseEdgeProps, 'labelX' | 'labelY' | 'path'> &
Pick<EdgeProps, 'sourcePosition' | 'targetPosition'> &
SmoothStepPathOptions
export type ToGraphEdge<T extends Edge> = GraphEdge<
T extends Edge<infer Data> ? Data : never,
T extends Edge<never, infer CustomEvents> ? CustomEvents : never,
T extends Edge<never, never, infer Type> ? Type : never
>