update: Remove wrapEdge and wrapNode files

* implement Edge.tsx and Node.vue to wrap the components accordingly
refactor!: Removing callbacks from props in favor of events
chore: upgrade vue and vite vue plugin
This commit is contained in:
Braks
2021-08-08 19:28:45 +02:00
parent ffd41fb679
commit 25c92ecd84
40 changed files with 1224 additions and 3349 deletions
+118
View File
@@ -0,0 +1,118 @@
<template>
<svg :width="width" :height="height" class="revue-flow__edges">
<MarkerDefinitions :color="arrowHeadColor" />
<g :transform="transformStyle">
<template v-for="edge of edges" :key="edge.id">
<Edge
:edge="edge"
:marker-end-id="markerEndId"
:onlyRenderVisibleElements="onlyRenderVisibleElements"
:type="edgeTypes[edge.type]"
/>
<ConnectionLine
v-if="renderConnectionLine"
:connectionLineStyle="connectionLineStyle"
:connectionLineType="connectionLineType"
:CustomConnectionLineComponent="connectionLineComponent"
/>
</template>
</g>
</svg>
</template>
<script lang="ts">
import { computed, CSSProperties, defineComponent, inject, PropType } from 'vue';
import Edge from '../../components/Edges/Edge.vue';
import ConnectionLine from '../../components/ConnectionLine/ConnectionLine.vue';
import { ConnectionLineType, ConnectionLineComponent, ConnectionMode, RevueFlowStore } from '../../types';
import MarkerDefinitions from './MarkerDefinitions.vue';
interface EdgeRendererProps {
edgeTypes: any;
connectionLineType: ConnectionLineType;
connectionLineStyle?: CSSProperties;
connectionLineComponent?: ConnectionLineComponent;
connectionMode?: ConnectionMode;
arrowHeadColor: string;
markerEndId?: string;
onlyRenderVisibleElements: boolean;
edgeUpdaterRadius?: number;
}
const EdgeRenderer = defineComponent({
name: 'EdgeRenderer',
components: {
Edge,
ConnectionLine,
MarkerDefinitions
},
props: {
edgeTypes: {
type: Object,
required: false,
default: undefined
},
connectionLineType: {
type: String as PropType<EdgeRendererProps['connectionLineType']>,
required: false,
default: undefined
},
connectionLineStyle: {
type: Object as PropType<EdgeRendererProps['connectionLineStyle']>,
required: false,
default: undefined
},
connectionLineComponent: {
type: Object as PropType<EdgeRendererProps['connectionLineComponent']>,
required: false,
default: undefined
},
connectionMode: {
type: String as PropType<EdgeRendererProps['connectionMode']>,
required: false,
default: undefined
},
arrowHeadColor: {
type: String as PropType<EdgeRendererProps['arrowHeadColor']>,
required: false,
default: undefined
},
markerEndId: {
type: String as PropType<EdgeRendererProps['markerEndId']>,
required: false,
default: undefined
},
onlyRenderVisibleElements: {
type: Boolean as PropType<EdgeRendererProps['onlyRenderVisibleElements']>,
required: false,
default: undefined
},
edgeUpdaterRadius: {
type: Number as PropType<EdgeRendererProps['edgeUpdaterRadius']>,
required: false,
default: undefined
}
},
setup() {
const store = inject<RevueFlowStore>('store')!;
const edges = computed(() => store.edges);
const transform = computed(() => store.transform);
const transformStyle = computed(() => {
return `translate(${transform.value?.[0]},${transform.value?.[1]}) scale(${transform.value?.[2]})`;
});
const renderConnectionLine = computed(() => store.connectionNodeId && store.connectionHandleType);
const width = computed(() => store.width);
const height = computed(() => store.height);
return {
transform,
transformStyle,
renderConnectionLine,
edges,
width,
height
};
}
});
export default EdgeRenderer;
</script>
+30
View File
@@ -0,0 +1,30 @@
<template>
<marker
:id="id"
class="revue-flow__arrowhead"
markerWidth="12.5"
markerHeight="12.5"
viewBox="-10 -10 20 20"
orient="auto"
refX="0"
refY="0"
>
<slot></slot>
</marker>
</template>
<script lang="ts">
import { defineComponent, PropType } from 'vue';
interface MarkerProps {
id: string;
}
export default defineComponent({
props: {
id: {
type: String as PropType<MarkerProps['id']>,
required: true
}
}
});
</script>
@@ -1,72 +0,0 @@
import { defineComponent, PropType } from 'vue';
interface MarkerProps {
id: string;
}
const Marker = defineComponent({
props: {
id: {
type: String as PropType<MarkerProps['id']>,
required: true
}
},
setup(props, { slots }) {
return () => (
<marker
class="revue-flow__arrowhead"
id={props.id}
markerWidth="12.5"
markerHeight="12.5"
viewBox="-10 -10 20 20"
orient="auto"
refX="0"
refY="0"
>
{slots.default ? slots.default() : ''}
</marker>
);
}
});
interface MarkerDefinitionsProps {
color: string;
}
const MarkerDefinitions = defineComponent({
name: 'MarkerDefinitions',
props: {
color: {
type: String as PropType<MarkerDefinitionsProps['color']>,
required: true
}
},
setup(props) {
return () => (
<defs>
<Marker id="revue-flow__arrowclosed">
<polyline
stroke={props.color}
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="1"
fill={props.color}
points="-5,-4 0,0 -5,4 -5,-4"
/>
</Marker>
<Marker id="revue-flow__arrow">
<polyline
stroke={props.color}
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="1.5"
fill="none"
points="-5,-4 0,0 -5,4"
/>
</Marker>
</defs>
);
}
});
export default MarkerDefinitions;
@@ -0,0 +1,45 @@
<template>
<defs>
<Marker id="revue-flow__arrowclosed">
<polyline
:stroke="color"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="1"
:fill="color"
points="-5,-4 0,0 -5,4 -5,-4"
/>
</Marker>
<Marker id="revue-flow__arrow">
<polyline
:stroke="color"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="1.5"
fill="none"
points="-5,-4 0,0 -5,4"
/>
</Marker>
</defs>
</template>
<script lang="ts">
import { defineComponent, PropType } from 'vue';
import Marker from './Marker.vue';
interface MarkerDefinitionsProps {
color: string;
}
const MarkerDefinitions = defineComponent({
name: 'MarkerDefinitions',
components: { Marker },
props: {
color: {
type: String as PropType<MarkerDefinitionsProps['color']>,
required: true
}
}
});
export default MarkerDefinitions;
</script>
-363
View File
@@ -1,363 +0,0 @@
import ConnectionLine from '../../components/ConnectionLine/index';
import { isEdge } from '../../utils/graph';
import { getEdgePositions, getHandle, isEdgeVisible, getSourceTargetNodes } from './utils';
import {
Position,
Edge,
Node,
Elements,
Connection,
ConnectionLineType,
ConnectionLineComponent,
ConnectionMode,
Transform,
OnEdgeUpdateFunc,
RevueFlowStore,
HandleType
} from '../../types';
import { computed, CSSProperties, defineComponent, inject, PropType } from 'vue';
import MarkerDefinitions from './MarkerDefinitions';
interface EdgeRendererProps {
edgeTypes: any;
connectionLineType: ConnectionLineType;
connectionLineStyle?: CSSProperties;
connectionLineComponent?: ConnectionLineComponent;
connectionMode?: ConnectionMode;
onElementClick?: (event: MouseEvent, element: Node | Edge) => void;
onEdgeDoubleClick?: (event: MouseEvent, edge: Edge) => void;
arrowHeadColor: string;
markerEndId?: string;
onlyRenderVisibleElements: boolean;
onEdgeUpdate?: OnEdgeUpdateFunc;
onEdgeContextMenu?: (event: MouseEvent, edge: Edge) => void;
onEdgeMouseEnter?: (event: MouseEvent, edge: Edge) => void;
onEdgeMouseMove?: (event: MouseEvent, edge: Edge) => void;
onEdgeMouseLeave?: (event: MouseEvent, edge: Edge) => void;
onEdgeUpdateStart?: (event: MouseEvent, edge: Edge) => void;
onEdgeUpdateEnd?: (event: MouseEvent, edge: Edge) => void;
edgeUpdaterRadius?: number;
}
interface EdgeWrapperProps {
edge: Edge;
props: EdgeRendererProps;
nodes: Node[];
selectedElements: Elements | null;
elementsSelectable: boolean;
transform: Transform;
width: number;
height: number;
onlyRenderVisibleElements: boolean;
connectionMode?: ConnectionMode;
}
const EdgeCmp = defineComponent({
props: {
edge: {
type: Object as PropType<EdgeWrapperProps['edge']>,
required: true
},
props: {
type: Object as PropType<EdgeWrapperProps['props']>,
required: true
},
nodes: {
type: Array as unknown as PropType<EdgeWrapperProps['nodes']>,
required: true
},
selectedElements: {
type: Array as unknown as PropType<EdgeWrapperProps['selectedElements']>,
required: false,
default: undefined
},
elementsSelectable: {
type: Boolean as PropType<EdgeWrapperProps['elementsSelectable']>,
required: false,
default: false
},
transform: {
type: Array as unknown as PropType<EdgeWrapperProps['transform']>,
required: false,
default: () => []
},
width: {
type: Number as PropType<EdgeWrapperProps['width']>,
required: false,
default: undefined
},
height: {
type: Number as PropType<EdgeWrapperProps['height']>,
required: false,
default: undefined
},
onlyRenderVisibleElements: {
type: Boolean as PropType<EdgeWrapperProps['onlyRenderVisibleElements']>,
required: false,
default: false
},
connectionMode: {
type: String as PropType<EdgeWrapperProps['connectionMode']>,
required: false,
default: undefined
}
},
setup(props) {
const nodes = computed(() => getSourceTargetNodes(props.edge, props.nodes));
const onConnectEdge = (connection: Connection) => {
props.props.onEdgeUpdate?.(props.edge, connection);
};
if (!nodes.value.sourceNode) {
console.log(`couldn't create edge for source id: ${props.edge.source}; edge id: ${props.edge.id}`);
return () => null;
}
if (!nodes.value.targetNode) {
console.log(`couldn't create edge for target id: ${props.edge.target}; edge id: ${props.edge.id}`);
return () => null;
}
const EdgeComponent: any = props.props.edgeTypes[props.edge.type as string] || props.props.edgeTypes.default;
const targetNodeBounds = computed(() => nodes.value.targetNode?.__rf.handleBounds);
// when connection type is loose we can define all handles as sources
const targetNodeHandles = computed(() =>
props.connectionMode === ConnectionMode.Strict
? targetNodeBounds.value?.target
: targetNodeBounds.value?.target || targetNodeBounds.value?.source
);
const sourceHandle = computed(
() => nodes.value.sourceNode && getHandle(nodes.value.sourceNode.__rf.handleBounds.source, props.edge.sourceHandle || null)
);
const targetHandle = computed(() => getHandle(targetNodeHandles.value, props.edge.targetHandle || null));
const sourcePosition = computed(() => (sourceHandle.value ? sourceHandle.value.position : Position.Bottom));
const targetPosition = computed(() => (targetHandle.value ? targetHandle.value.position : Position.Top));
const edgePositions = computed(() => {
return (
nodes.value.sourceNode &&
nodes.value.targetNode &&
getEdgePositions(
nodes.value.sourceNode,
sourceHandle.value,
sourcePosition.value,
nodes.value.targetNode,
targetHandle.value,
targetPosition.value
)
);
});
const isVisible = computed(() => {
return props.onlyRenderVisibleElements
? edgePositions.value &&
isEdgeVisible({
sourcePos: { x: edgePositions.value?.sourceX, y: edgePositions.value?.sourceY },
targetPos: { x: edgePositions.value?.targetX, y: edgePositions.value?.targetY },
width: props.width || 0,
height: props.height || 0,
transform: props.transform
})
: true;
});
if (!isVisible.value) {
return null;
}
const isSelected = computed(() => props.selectedElements?.some((elm) => isEdge(elm) && elm.id === props.edge.id) || false);
return () => (
<EdgeComponent
key={props.edge.id}
id={props.edge.id}
class={props.edge.className}
type={props.edge.type}
data={props.edge.data}
onClick={props.props.onElementClick}
selected={isSelected}
animated={props.edge.animated}
label={props.edge.label}
labelStyle={props.edge.labelStyle}
labelShowBg={props.edge.labelShowBg}
labelBgStyle={props.edge.labelBgStyle}
labelBgPadding={props.edge.labelBgPadding}
labelBgBorderRadius={props.edge.labelBgBorderRadius}
style={props.edge.style}
arrowHeadType={props.edge.arrowHeadType}
source={props.edge.source}
target={props.edge.target}
sourceHandleId={props.edge.sourceHandle}
targetHandleId={props.edge.targetHandle}
sourceX={edgePositions.value?.sourceX}
sourceY={edgePositions.value?.sourceY}
targetX={edgePositions.value?.targetX}
targetY={edgePositions.value?.targetY}
sourcePosition={sourcePosition}
targetPosition={targetPosition}
elementsSelectable={props.elementsSelectable}
markerEndId={props.props.markerEndId}
isHidden={props.edge.isHidden}
onConnectEdge={onConnectEdge}
handleEdgeUpdate={typeof props.props.onEdgeUpdate !== 'undefined'}
onContextMenu={props.props.onEdgeContextMenu}
onMouseEnter={props.props.onEdgeMouseEnter}
onMouseMove={props.props.onEdgeMouseMove}
onMouseLeave={props.props.onEdgeMouseLeave}
edgeUpdaterRadius={props.props.edgeUpdaterRadius}
onEdgeDoubleClick={props.props.onEdgeDoubleClick}
onEdgeUpdateStart={props.props.onEdgeUpdateStart}
onEdgeUpdateEnd={props.props.onEdgeUpdateEnd}
/>
);
}
});
const EdgeRenderer = defineComponent({
name: 'EdgeRenderer',
components: {
EdgeCmp,
ConnectionLine,
MarkerDefinitions
},
props: {
edgeTypes: {
type: Object,
required: false,
default: undefined
},
connectionLineType: {
type: String as PropType<EdgeRendererProps['connectionLineType']>,
required: false,
default: undefined
},
connectionLineStyle: {
type: Object as PropType<EdgeRendererProps['connectionLineStyle']>,
required: false,
default: undefined
},
connectionLineComponent: {
type: Object as PropType<EdgeRendererProps['connectionLineComponent']>,
required: false,
default: undefined
},
connectionMode: {
type: String as PropType<EdgeRendererProps['connectionMode']>,
required: false,
default: undefined
},
onElementClick: {
type: Function as unknown as PropType<EdgeRendererProps['onElementClick']>,
required: false,
default: undefined
},
onEdgeDoubleClick: {
type: Function as unknown as PropType<EdgeRendererProps['onEdgeDoubleClick']>,
required: false,
default: undefined
},
arrowHeadColor: {
type: String as PropType<EdgeRendererProps['arrowHeadColor']>,
required: false,
default: undefined
},
markerEndId: {
type: String as PropType<EdgeRendererProps['markerEndId']>,
required: false,
default: undefined
},
onlyRenderVisibleElements: {
type: Boolean as PropType<EdgeRendererProps['onlyRenderVisibleElements']>,
required: false,
default: undefined
},
onEdgeUpdate: {
type: Function as unknown as PropType<EdgeRendererProps['onEdgeUpdate']>,
required: false,
default: undefined
},
onEdgeContextMenu: {
type: Function as unknown as PropType<EdgeRendererProps['onEdgeContextMenu']>,
required: false,
default: undefined
},
onEdgeMouseEnter: {
type: Function as unknown as PropType<EdgeRendererProps['onEdgeMouseEnter']>,
required: false,
default: undefined
},
onEdgeMouseMove: {
type: Function as unknown as PropType<EdgeRendererProps['onEdgeMouseMove']>,
required: false,
default: undefined
},
onEdgeMouseLeave: {
type: Function as unknown as PropType<EdgeRendererProps['onEdgeMouseLeave']>,
required: false,
default: undefined
},
onEdgeUpdateStart: {
type: Function as unknown as PropType<EdgeRendererProps['onEdgeUpdateStart']>,
required: false,
default: undefined
},
onEdgeUpdateEnd: {
type: Function as unknown as PropType<EdgeRendererProps['onEdgeUpdateEnd']>,
required: false,
default: undefined
},
edgeUpdaterRadius: {
type: Number as PropType<EdgeRendererProps['edgeUpdaterRadius']>,
required: false,
default: undefined
}
},
setup(props) {
const store = inject<RevueFlowStore>('store');
const transform = computed(() => store?.transform);
const transformStyle = computed(() => {
return `translate(${transform.value?.[0]},${transform.value?.[1]}) scale(${transform.value?.[2]})`;
});
const renderConnectionLine = computed(() => store?.connectionNodeId && store?.connectionHandleType);
return () => (
<svg width={store?.width} height={store?.height} class="revue-flow__edges">
<MarkerDefinitions color={props.arrowHeadColor as string} />
<g transform={transformStyle.value}>
{store?.edges.map((edge: Edge) => (
<EdgeCmp
key={edge.id}
edge={edge}
props={props as any}
nodes={store?.nodes}
selectedElements={store?.selectedElements}
elementsSelectable={store?.elementsSelectable}
transform={store?.transform}
width={store?.width}
height={store?.height}
onlyRenderVisibleElements={props.onlyRenderVisibleElements}
/>
))}
{renderConnectionLine.value && (
<ConnectionLine
nodes={store?.nodes}
connectionNodeId={store?.connectionNodeId as string}
connectionHandleId={store?.connectionHandleId as string}
connectionHandleType={store?.connectionHandleType as HandleType}
connectionPositionX={store?.connectionPosition.x}
connectionPositionY={store?.connectionPosition.y}
transform={store?.transform}
connectionLineStyle={props.connectionLineStyle}
connectionLineType={props.connectionLineType}
isConnectable={store?.nodesConnectable}
CustomConnectionLineComponent={props.connectionLineComponent}
/>
)}
</g>
</svg>
);
}
});
export default EdgeRenderer;
+6 -8
View File
@@ -1,22 +1,20 @@
import { DefineComponent } from 'vue';
import { BezierEdge, StepEdge, SmoothStepEdge, StraightEdge } from '../../components/Edges';
import wrapEdge from '../../components/Edges/wrapEdge';
import { rectToBox } from '../../utils/graph';
import { EdgeTypesType, Position, Node, XYPosition, ElementId, HandleElement, Transform, Edge, WrapEdgeProps } from '../../types';
import { EdgeTypesType, Position, Node, XYPosition, ElementId, HandleElement, Transform, Edge } from '../../types';
export function createEdgeTypes(edgeTypes: EdgeTypesType): EdgeTypesType {
const standardTypes: EdgeTypesType = {
default: wrapEdge(edgeTypes.default || BezierEdge) as DefineComponent<WrapEdgeProps>,
straight: wrapEdge(edgeTypes.bezier || StraightEdge) as DefineComponent<WrapEdgeProps>,
step: wrapEdge(edgeTypes.step || StepEdge) as DefineComponent<WrapEdgeProps>,
smoothstep: wrapEdge(edgeTypes.step || SmoothStepEdge) as DefineComponent<WrapEdgeProps>
default: edgeTypes.default || BezierEdge,
straight: edgeTypes.bezier || StraightEdge,
step: edgeTypes.step || StepEdge,
smoothstep: edgeTypes.step || SmoothStepEdge
};
const wrappedTypes = {} as EdgeTypesType;
const specialTypes: EdgeTypesType = Object.keys(edgeTypes)
.filter((k) => !['default', 'bezier'].includes(k))
.reduce((res, key) => {
res[key] = wrapEdge(edgeTypes[key] || BezierEdge) as DefineComponent<WrapEdgeProps>;
res[key] = edgeTypes[key] || BezierEdge;
return res;
}, wrappedTypes);