From 6c738bfbfb91126774aacd73e753e11c19532733 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Tue, 8 Nov 2022 09:11:44 +0100
Subject: [PATCH] fix(core): fall back to default node or edge type

---
 packages/core/src/auto-imports.d.ts           |  4 +--
 packages/core/src/components/Edges/Wrapper.ts |  4 +--
 .../core/src/components/Nodes/NodeWrapper.vue |  4 +--
 packages/core/src/utils/graph.ts              | 30 +++++++++----------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/core/src/auto-imports.d.ts b/packages/core/src/auto-imports.d.ts
index 2adf0673..126ce898 100644
--- a/packages/core/src/auto-imports.d.ts
+++ b/packages/core/src/auto-imports.d.ts
@@ -52,8 +52,8 @@ declare global {
   const customRef: typeof import('vue')['customRef']
   const debouncedRef: typeof import('@vueuse/core')['debouncedRef']
   const debouncedWatch: typeof import('@vueuse/core')['debouncedWatch']
-  const defaultEdgeTypes: typeof import('./store/index')['defaultEdgeTypes']
-  const defaultNodeTypes: typeof import('./store/index')['defaultNodeTypes']
+  const defaultEdgeTypes: typeof import('./store/state')['defaultEdgeTypes']
+  const defaultNodeTypes: typeof import('./store/state')['defaultNodeTypes']
   const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
   const defineComponent: typeof import('vue')['defineComponent']
   const eagerComputed: typeof import('@vueuse/core')['eagerComputed']
diff --git a/packages/core/src/components/Edges/Wrapper.ts b/packages/core/src/components/Edges/Wrapper.ts
index 08be1182..d2adcfd3 100644
--- a/packages/core/src/components/Edges/Wrapper.ts
+++ b/packages/core/src/components/Edges/Wrapper.ts
@@ -143,7 +143,7 @@ const Wrapper = defineComponent({
           'data-id': props.id,
           'class': [
             'vue-flow__edge',
-            `vue-flow__edge-${props.name}`,
+            `vue-flow__edge-${props.type === false ? 'default' : props.name}`,
             {
               updating: mouseOver,
               selected: edge.selected,
@@ -161,7 +161,7 @@ const Wrapper = defineComponent({
         [
           updating
             ? null
-            : h(props.type as any, {
+            : h(props.type === false ? defaultEdgeTypes.default : props.type, {
                 id: props.id,
                 sourceNode: props.sourceNode,
                 targetNode: props.targetNode,
diff --git a/packages/core/src/components/Nodes/NodeWrapper.vue b/packages/core/src/components/Nodes/NodeWrapper.vue
index a9fb6173..7d135bf4 100644
--- a/packages/core/src/components/Nodes/NodeWrapper.vue
+++ b/packages/core/src/components/Nodes/NodeWrapper.vue
@@ -194,7 +194,7 @@ export default {
     ref="nodeElement"
     class="vue-flow__node"
     :class="[
-      `vue-flow__node-${name}`,
+      `vue-flow__node-${type === false ? 'default' : type}`,
       noPanClassName,
       {
         dragging,
@@ -218,7 +218,7 @@ export default {
     @dblclick="onDoubleClick"
   >
     <component
-      :is="type"
+      :is="type === false ? defaultNodeTypes.default : type"
       :id="node.id"
       :type="node.type"
       :data="node.data"
diff --git a/packages/core/src/utils/graph.ts b/packages/core/src/utils/graph.ts
index 27a25658..122590db 100644
--- a/packages/core/src/utils/graph.ts
+++ b/packages/core/src/utils/graph.ts
@@ -108,21 +108,21 @@ export const parseEdge = (edge: Edge, defaults?: Partial<GraphEdge>): GraphEdge
   defaults = !isGraphEdge(edge)
     ? ({
         ...defaults,
-        sourceHandle: edge.sourceHandle ? edge.sourceHandle.toString() : undefined,
-        targetHandle: edge.targetHandle ? edge.targetHandle.toString() : undefined,
-        type: edge.type,
-        source: edge.source.toString(),
-        target: edge.target.toString(),
-        z: 0,
-        sourceX: 0,
-        sourceY: 0,
-        targetX: 0,
-        targetY: 0,
-        updatable: edge.updatable,
-        selectable: edge.selectable,
-        data: shallowReactive(edge.data || {}),
-        events: shallowReactive(edge.events || {}),
-        label: edge.label && !isString(edge.label) ? markRaw(edge.label) : edge.label,
+        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,
+        z: 0 || defaults?.z,
+        sourceX: 0 || defaults?.sourceX,
+        sourceY: 0 || defaults?.sourceY,
+        targetX: 0 || defaults?.targetX,
+        targetY: 0 || defaults?.targetY,
+        updatable: edge.updatable ?? defaults?.updatable,
+        selectable: edge.selectable ?? defaults?.selectable,
+        data: shallowReactive(edge.data || defaults?.data || {}),
+        events: shallowReactive(edge.events || defaults?.events || {}),
+        label: (edge.label && !isString(edge.label) ? markRaw(edge.label) : edge.label) || defaults?.label,
       } as GraphEdge)
     : defaults