diff --git a/examples/index.css b/examples/index.css index cdb9d96c..29341185 100644 --- a/examples/index.css +++ b/examples/index.css @@ -1,4 +1,4 @@ -@import "../dist/theme-default.css"; +@import "../src/theme-default.css"; body { color: #111; diff --git a/src/components/Edges/Edge.vue b/src/components/Edges/Edge.vue index 22fa741e..140703df 100644 --- a/src/components/Edges/Edge.vue +++ b/src/components/Edges/Edge.vue @@ -2,7 +2,7 @@ import EdgeAnchor from './EdgeAnchor.vue' import { getEdgePositions, getHandle, getSourceTargetNodes, isEdgeVisible } from '~/container/EdgeRenderer/utils' import { isEdge } from '~/utils' -import { ConnectionMode, Edge, EdgeType, Position } from '~/types' +import { ConnectionMode, Edge, EdgePositions, EdgeType, Position } from '~/types' import { useHandle, useHooks, useStore } from '~/composables' interface EdgeProps { @@ -64,7 +64,7 @@ const onEdgeUpdaterMouseEnter = () => (updating.value = true) const onEdgeUpdaterMouseOut = () => (updating.value = false) -const isVisible = ({ sourceX, sourceY, targetX, targetY }: ReturnType) => { +const isVisible = ({ sourceX, sourceY, targetX, targetY }: EdgePositions) => { return store.onlyRenderVisibleElements ? isEdgeVisible({ sourcePos: { x: sourceX, y: sourceY }, diff --git a/src/container/EdgeRenderer/utils.ts b/src/container/EdgeRenderer/utils.ts index 02d3d0f2..24a3ea7b 100644 --- a/src/container/EdgeRenderer/utils.ts +++ b/src/container/EdgeRenderer/utils.ts @@ -1,29 +1,5 @@ -import { BezierEdge, SmoothStepEdge, StepEdge, StraightEdge } from '~/components/Edges' import { rectToBox } from '~/utils' -import { Edge, EdgePositions, EdgeType, ElementId, HandleElement, Node, Position, Transform, XYPosition } from '~/types' - -export function createEdgeTypes(edgeTypes: Record): Record { - const standardTypes: Record = { - default: edgeTypes.default || BezierEdge, - straight: edgeTypes.bezier || StraightEdge, - step: edgeTypes.step || StepEdge, - smoothstep: edgeTypes.step || SmoothStepEdge, - } - - const wrappedTypes = {} as Record - const specialTypes: Record = Object.keys(edgeTypes) - .filter((k) => !['default', 'bezier'].includes(k)) - .reduce((res, key) => { - res[key] = edgeTypes[key] || BezierEdge - - return res - }, wrappedTypes) - - return { - ...standardTypes, - ...specialTypes, - } -} +import { Edge, EdgePositions, ElementId, HandleElement, Node, Position, Transform, XYPosition } from '~/types' export function getHandlePosition(position: Position, node: Node, handle: any | null = null): XYPosition { const x = (handle?.x || 0) + node.__rf?.position?.x diff --git a/src/container/NodeRenderer/utils.ts b/src/container/NodeRenderer/utils.ts deleted file mode 100644 index ca941a5b..00000000 --- a/src/container/NodeRenderer/utils.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { DefaultNode, InputNode, OutputNode } from '~/components/Nodes' -import { NodeType } from '~/types' - -export function createNodeTypes(nodeTypes: Record): Record { - const standardTypes: Record = { - input: nodeTypes.input || InputNode, - default: nodeTypes.default || DefaultNode, - output: nodeTypes.output || OutputNode, - } - - const wrappedTypes = {} as NodeType - const specialTypes: NodeType = Object.keys(nodeTypes) - .filter((k) => !['input', 'default', 'output'].includes(k)) - .reduce((res, key) => { - res[key] = nodeTypes[key] || DefaultNode - - return res - }, wrappedTypes) - - return { - ...standardTypes, - ...specialTypes, - } -} diff --git a/src/container/VueFlow/VueFlow.vue b/src/container/VueFlow/VueFlow.vue index e1abe3cf..1964e8ef 100644 --- a/src/container/VueFlow/VueFlow.vue +++ b/src/container/VueFlow/VueFlow.vue @@ -1,7 +1,5 @@