chore(core): cleanup

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
bcakmakoglu · Mar 22, 2023 · 44b37ed · 44b37ed
1 parent baaabbe
commit 44b37ed
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/packages/core/src/container/VueFlow/VueFlow.vue b/packages/core/src/container/VueFlow/VueFlow.vue
@@ -114,20 +114,22 @@ const modelValue = useVModel(props, 'modelValue', emit)
 const modelNodes = useVModel(props, 'nodes', emit)
 const modelEdges = useVModel(props, 'edges', emit)
 
-const { vueFlowRef, id, hooks, getNodeTypes, getEdgeTypes, $reset, ...rest } = useVueFlow(props)
+const { vueFlowRef, hooks, getNodeTypes, getEdgeTypes, ...rest } = useVueFlow(props)
 
 const dispose = useWatch({ modelValue, nodes: modelNodes, edges: modelEdges }, props, {
   vueFlowRef,
-  id,
   hooks,
   getNodeTypes,
   getEdgeTypes,
-  $reset,
   ...rest,
 })
 
+useHooks(emit, hooks)
+
 const el = ref<HTMLDivElement>()
 
+provide(Slots, useSlots())
+
 onUnmounted(() => {
   dispose()
 })
@@ -136,17 +138,11 @@ onMounted(() => {
   vueFlowRef.value = el.value!
 })
 
-useHooks(emit, hooks)
-
-provide(Slots, useSlots())
-
 defineExpose<VueFlowStore>({
   vueFlowRef,
-  id,
   hooks,
   getNodeTypes,
   getEdgeTypes,
-  $reset,
   ...rest,
 })
 </script>

diff --git a/packages/core/src/utils/graph.ts b/packages/core/src/utils/graph.ts
@@ -67,11 +67,12 @@ export const isGraphNode = <Data = ElementData>(element: MaybeElement): element
 
 export const isRect = (obj: any): obj is Rect => !!obj.width && !!obj.height && !!obj.x && !!obj.y
 
-export function parseNode(node: Node, defaults?: Partial<GraphNode>): GraphNode {
-  let defaultValues = defaults
+export function parseNode(node: Node, defaults: Partial<GraphNode> = {}): GraphNode {
+  let initialState = defaults
+
   if (!isGraphNode(node)) {
-    defaultValues = {
-      type: node.type ?? 'default',
+    initialState = {
+      type: node.type ?? defaults.type ?? 'default',
       dimensions: markRaw({
         width: 0,
         height: 0,
@@ -99,31 +100,31 @@ export function parseNode(node: Node, defaults?: Partial<GraphNode>): GraphNode
   }
 
   return {
-    ...defaultValues,
+    ...initialState,
     ...(node as GraphNode),
     id: node.id.toString(),
   }
 }
 
-export function parseEdge(edge: Edge, defaults?: Partial<GraphEdge>): GraphEdge {
-  const events = isDef(edge.events) ? edge.events : defaults?.events && isDef(defaults?.events) ? defaults?.events : {}
-  const data = isDef(edge.data) ? edge.data : defaults?.data && isDef(defaults?.data) ? defaults?.data : {}
+export function parseEdge(edge: Edge, defaults: Partial<GraphEdge> = {}): GraphEdge {
+  const events = isDef(edge.events) ? edge.events : defaults.events && isDef(defaults.events) ? defaults.events : {}
+  const data = isDef(edge.data) ? edge.data : defaults.data && isDef(defaults.data) ? defaults.data : {}
 
   defaults = !isGraphEdge(edge)
     ? ({
         ...defaults,
-        sourceHandle: (edge.sourceHandle ? edge.sourceHandle.toString() : undefined) || defaults?.sourceHandle,
-        targetHandle: (edge.targetHandle ? edge.targetHandle.toString() : undefined) || defaults?.targetHandle,
-        type: edge.type ?? defaults?.type ?? 'default',
-        source: edge.source.toString() || defaults?.source,
-        target: edge.target.toString() || defaults?.target,
-        updatable: edge.updatable ?? defaults?.updatable,
-        selectable: edge.selectable ?? defaults?.selectable,
-        focusable: edge.focusable ?? defaults?.focusable,
+        sourceHandle: (edge.sourceHandle ? edge.sourceHandle.toString() : undefined) || defaults.sourceHandle,
+        targetHandle: (edge.targetHandle ? edge.targetHandle.toString() : undefined) || defaults.targetHandle,
+        type: edge.type ?? defaults.type ?? 'default',
+        source: edge.source.toString() || defaults.source,
+        target: edge.target.toString() || defaults.target,
+        updatable: edge.updatable ?? defaults.updatable,
+        selectable: edge.selectable ?? defaults.selectable,
+        focusable: edge.focusable ?? defaults.focusable,
         data,
         events: markRaw(events),
-        label: (edge.label && !isString(edge.label) ? markRaw(edge.label) : edge.label) || defaults?.label,
-        interactionWidth: edge.interactionWidth || defaults?.interactionWidth,
+        label: (edge.label && !isString(edge.label) ? markRaw(edge.label) : edge.label) || defaults.label,
+        interactionWidth: edge.interactionWidth || defaults.interactionWidth,
       } as GraphEdge)
     : defaults
 
@@ -166,6 +167,7 @@ export function addEdge(edgeParams: Edge | Connection, elements: Elements, defau
   }
 
   let edge
+
   if (isEdge(edgeParams)) {
     edge = { ...edgeParams }
   } else {
@@ -174,9 +176,13 @@ export function addEdge(edgeParams: Edge | Connection, elements: Elements, defau
       id: getEdgeId(edgeParams),
     } as Edge
   }
+
   edge = parseEdge(edge, defaults)
+
   if (connectionExists(edge, elements)) return elements
+
   elements.push(edge)
+
   return elements
 }
 

diff --git a/packages/core/src/utils/store.ts b/packages/core/src/utils/store.ts
@@ -76,9 +76,9 @@ export function createGraphNodes(nodes: Node[], findNode: Actions['findNode'], c
     return parsed
   })
 
-  graphNodes.forEach((node) => {
-    const nextNodes = [...graphNodes, ...currGraphNodes]
+  const nextNodes = [...graphNodes, ...currGraphNodes]
 
+  graphNodes.forEach((node) => {
     const parentNode = nextNodes.find((n) => n.id === node.parentNode)
 
     if (node.parentNode && !parentNode) {