diff --git a/examples/Edges/CustomLabel.vue b/examples/Edges/CustomLabel.vue
index 364a9df4..67073d7d 100644
--- a/examples/Edges/CustomLabel.vue
+++ b/examples/Edges/CustomLabel.vue
@@ -1,4 +1,10 @@
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+interface CustomLabelProps {
+  text: string
+}
+
+const props = defineProps<CustomLabelProps>()
+</script>
 <template>
-  <tspan dy="10" x="0">I am a `tspan`</tspan>
+  <tspan dy="10" x="0">{{ props.text }}</tspan>
 </template>
diff --git a/examples/Edges/EdgesExample.vue b/examples/Edges/EdgesExample.vue
index f5c52274..477c89fe 100644
--- a/examples/Edges/EdgesExample.vue
+++ b/examples/Edges/EdgesExample.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import CustomEdge from './CustomEdge.vue'
 import CustomEdge2 from './CustomEdge2.vue'
+import CustomLabel from './CustomLabel.vue'
 import Flow, {
   MiniMap,
   Controls,
@@ -37,7 +38,12 @@ const initialElements = [
     id: 'e5-6',
     source: '5',
     target: '6',
-    label: 'foobar',
+    label: {
+      component: CustomLabel,
+      props: {
+        text: 'custom label text',
+      },
+    },
     labelStyle: { fill: 'red', fontWeight: 700 },
     arrowHeadType: ArrowHeadType.Arrow,
   },
diff --git a/src/components/Edges/Edge.vue b/src/components/Edges/Edge.vue
index 23bdab41..838132ad 100644
--- a/src/components/Edges/Edge.vue
+++ b/src/components/Edges/Edge.vue
@@ -123,7 +123,7 @@ const edgePos = computed(() =>
     v-if="!props.edge.isHidden && isVisible(edgePos)"
     :class="[
       'revue-flow__edge',
-      `revue-flow__edge-${props.type.name || 'default'}`,
+      `revue-flow__edge-${props.edge.type || 'default'}`,
       {
         selected: isSelected,
         animated: props.edge.animated,
diff --git a/src/components/Edges/EdgeText.vue b/src/components/Edges/EdgeText.vue
index 4992a3ad..4669bd90 100644
--- a/src/components/Edges/EdgeText.vue
+++ b/src/components/Edges/EdgeText.vue
@@ -4,7 +4,12 @@ import { HTMLAttributes, VNode } from 'vue'
 interface EdgeTextProps extends HTMLAttributes {
   x: number
   y: number
-  label?: string | VNode
+  label?:
+    | string
+    | {
+        component: VNode
+        props?: any
+      }
   labelStyle?: any
   labelShowBg?: boolean
   labelBgStyle?: any
@@ -38,7 +43,11 @@ const { width = 0, height = 0, x = 0, y = 0 } = useElementBounding(edgeRef)
       :ry="props.labelBgBorderRadius"
     />
     <text ref="edge-text" class="revue-flow__edge-text" :y="height / 2" dy="0.3em" :style="props.labelStyle">
-      <component :is="props.label" v-if="typeof props.label !== 'string'" />
+      <component
+        :is="props.label.component"
+        v-if="typeof props.label.component !== 'undefined'"
+        v-bind="{ ...props, ...props.label.props, width, height, x, y }"
+      />
       <template v-else>
         {{ props.label }}
       </template>
diff --git a/src/components/Nodes/DefaultNode.vue b/src/components/Nodes/DefaultNode.vue
index 5d38aa30..b37d78af 100644
--- a/src/components/Nodes/DefaultNode.vue
+++ b/src/components/Nodes/DefaultNode.vue
@@ -17,12 +17,10 @@ const props = withDefaults(defineProps<DefaultNodeProps>(), {
 })
 </script>
 <template>
-  <div class="revue-flow__node-default">
-    <Handle type="target" :position="props.targetPosition" :is-connectable="props.connectable" />
-    <component :is="props.data?.label" v-if="typeof props.data?.label !== 'string'" />
-    <template v-else>
-      {{ props.data?.label }}
-    </template>
-    <Handle type="source" :position="props.sourcePosition" :is-connectable="props.connectable" />
-  </div>
+  <Handle type="target" :position="props.targetPosition" :is-connectable="props.connectable" />
+  <component :is="props.data?.label" v-if="typeof props.data?.label !== 'string'" />
+  <template v-else>
+    {{ props.data?.label }}
+  </template>
+  <Handle type="source" :position="props.sourcePosition" :is-connectable="props.connectable" />
 </template>
diff --git a/src/components/Nodes/InputNode.vue b/src/components/Nodes/InputNode.vue
index 80a1f255..307ce45f 100644
--- a/src/components/Nodes/InputNode.vue
+++ b/src/components/Nodes/InputNode.vue
@@ -15,11 +15,9 @@ const props = withDefaults(defineProps<InputNodeProps>(), {
 })
 </script>
 <template>
-  <div class="revue-flow__node-input">
-    <component :is="props.data?.label" v-if="typeof props.data?.label !== 'string'" />
-    <template v-else>
-      {{ props.data?.label }}
-    </template>
-    <Handle type="source" :position="props.sourcePosition" :connectable="props.connectable" />
-  </div>
+  <component :is="props.data?.label" v-if="typeof props.data?.label !== 'string'" />
+  <template v-else>
+    {{ props.data?.label }}
+  </template>
+  <Handle type="source" :position="props.sourcePosition" :connectable="props.connectable" />
 </template>
diff --git a/src/components/Nodes/OutputNode.vue b/src/components/Nodes/OutputNode.vue
index e707bd86..5f9434db 100644
--- a/src/components/Nodes/OutputNode.vue
+++ b/src/components/Nodes/OutputNode.vue
@@ -15,11 +15,9 @@ const props = withDefaults(defineProps<OutputNodeProps>(), {
 })
 </script>
 <template>
-  <div class="revue-flow__node-output">
-    <component :is="props.data?.label" v-if="typeof props.data?.label !== 'string'" />
-    <template v-else>
-      {{ props.data?.label }}
-    </template>
-    <Handle type="source" :position="props.targetPosition" :is-connectable="props.connectable" />
-  </div>
+  <component :is="props.data?.label" v-if="typeof props.data?.label !== 'string'" />
+  <template v-else>
+    {{ props.data?.label }}
+  </template>
+  <Handle type="source" :position="props.targetPosition" :is-connectable="props.connectable" />
 </template>
diff --git a/src/container/Flow/Flow.vue b/src/container/Flow/Flow.vue
index 8b66eaba..fd2a8daf 100644
--- a/src/container/Flow/Flow.vue
+++ b/src/container/Flow/Flow.vue
@@ -114,19 +114,19 @@ const defaultEdgeTypes: Record<string, EdgeType> = {
 const store = useStore(props)
 const hooks = useHooks(emit)
 
-const init = () => {
-  store.$state = { ...store.$state, ...props }
-  store.setElements(props.elements)
-  store.setMinZoom(props.minZoom)
-  store.setMaxZoom(props.maxZoom)
-  store.setTranslateExtent(props.translateExtent)
-  store.setNodeExtent(props.nodeExtent)
+const init = (opts: typeof props) => {
+  store.$state = { ...store.$state, ...opts }
+  store.setElements(opts.elements)
+  store.setMinZoom(opts.minZoom)
+  store.setMaxZoom(opts.maxZoom)
+  store.setTranslateExtent(opts.translateExtent)
+  store.setNodeExtent(opts.nodeExtent)
 }
 
 onBeforeUnmount(() => store?.$dispose())
 
-onUpdated(() => init())
-init()
+watch(props, (val) => init(val))
+init(props)
 
 const nodeTypes = createNodeTypes({ ...defaultNodeTypes, ...props.nodeTypes })
 const edgeTypes = createEdgeTypes({ ...defaultEdgeTypes, ...props.edgeTypes })
diff --git a/src/container/NodeRenderer/NodeRenderer.vue b/src/container/NodeRenderer/NodeRenderer.vue
index 16b4cf72..ce7de637 100644
--- a/src/container/NodeRenderer/NodeRenderer.vue
+++ b/src/container/NodeRenderer/NodeRenderer.vue
@@ -37,8 +37,6 @@ const type = (node: TNode) => {
   }
   return type
 }
-
-const selected = (nodeId: string) => store.selectedElements?.some(({ id }) => id === nodeId)
 </script>
 <template>
   <div
@@ -52,7 +50,7 @@ const selected = (nodeId: string) => store.selectedElements?.some(({ id }) => id
         :type="type(node)"
         :scale="store.transform[2]"
         :snap-grid="store.snapToGrid ? store.snapGrid : undefined"
-        :selected="selected(node.id)"
+        :selected="store.selectedElements?.some(({ id }) => id === node.id)"
         :selectable="node.selectable || store.elementsSelectable"
         :connectable="node.connectable || store.nodesConnectable"
         :draggable="node.draggable || store.nodesDraggable"