From 352122968f096669a4b39f032ee7753c59c4f8ad Mon Sep 17 00:00:00 2001
From: peterkogo <peter@xyflow.com>
Date: Tue, 12 Nov 2024 13:03:28 +0100
Subject: [PATCH] migrate examples

---
 .../src/components/Header/Header.svelte       |  2 +-
 .../components/ToolbarNode.svelte             |  6 ++-
 .../nodes/components/DragHandleNode.svelte    |  2 +-
 .../svelte/src/routes/examples/+layout.svelte |  7 ++-
 .../examples/add-node-on-drop/Flow.svelte     |  4 +-
 .../routes/examples/color-mode/+page.svelte   |  2 +-
 .../custom-connection-line/+page.svelte       |  4 +-
 .../ConnectionLine.svelte                     | 30 +++++++------
 .../custom-connection-line/CustomNode.svelte  |  9 +++-
 .../examples/customnode/CustomNode.svelte     | 11 +++--
 .../src/routes/examples/dagre/+page.svelte    |  4 +-
 .../routes/examples/drag-n-drop/Flow.svelte   |  4 +-
 .../examples/drag-n-drop/Sidebar.svelte       |  6 +--
 .../src/routes/examples/edges/+page.svelte    | 17 +++----
 .../routes/examples/edges/ButtonEdge.svelte   | 42 +++++++++++------
 .../examples/edges/CustomBezierEdge.svelte    | 45 +++++++++++++------
 .../handle-connect/MultiHandleNode.svelte     | 10 +----
 .../handle-connect/SingleHandleNode.svelte    |  9 +++-
 .../routes/examples/interaction/+page.svelte  | 26 +++++------
 .../routes/examples/node-resizer/+page.svelte |  4 +-
 .../node-resizer/CustomResizer.svelte         |  6 ++-
 .../node-resizer/DefaultResizer.svelte        |  8 +++-
 .../node-resizer/HorizontalResizer.svelte     |  6 ++-
 .../node-resizer/VerticalResizer.svelte       |  6 ++-
 .../examples/node-toolbar/CustomNode.svelte   |  9 +++-
 .../node-toolbar/SelectedNodesToolbar.svelte  |  4 +-
 .../src/routes/examples/overview/+page.svelte | 14 +++---
 .../examples/overview/CustomEdge.svelte       | 27 ++++++-----
 .../examples/overview/CustomNode.svelte       | 13 ++++--
 .../overview/CustomNodeDragHandle.svelte      | 11 +++--
 .../examples/overview/InitTracker.svelte      |  8 ++--
 .../src/routes/examples/reset/+page.svelte    |  2 +-
 .../src/routes/examples/subflows/+page.svelte |  4 +-
 .../routes/examples/subflows/DebugNode.svelte | 21 ++++++---
 .../examples/two-way-viewport/Flow.svelte     |  4 +-
 .../routes/examples/usenodesdata/+page.svelte |  2 +-
 .../examples/usenodesdata/ResultNode.svelte   | 13 ++++--
 .../examples/usenodesdata/TextNode.svelte     | 13 ++++--
 .../usenodesdata/UppercaseNode.svelte         | 17 +++----
 .../examples/usesvelteflow/Sidebar.svelte     | 24 +++++-----
 .../useupdatenodeinternals/CustomNode.svelte  | 14 ++++--
 .../useupdatenodeinternals/Flow.svelte        |  2 +-
 .../generic/[topic]/[example]/+page.svelte    |  6 ++-
 .../generic/[topic]/[example]/Flow.svelte     |  6 ++-
 examples/svelte/svelte.config.js              |  4 +-
 packages/svelte/src/lib/types/edges.ts        | 18 ++++----
 packages/svelte/src/lib/types/nodes.ts        | 18 ++++----
 47 files changed, 322 insertions(+), 202 deletions(-)

diff --git a/examples/svelte/src/components/Header/Header.svelte b/examples/svelte/src/components/Header/Header.svelte
index 007d8ded..1c251c67 100644
--- a/examples/svelte/src/components/Header/Header.svelte
+++ b/examples/svelte/src/components/Header/Header.svelte
@@ -35,7 +35,7 @@
 
 <header>
 	<div class="logo">Svelte Flow</div>
-	<select on:change={onChange} value={$page.route.id}>
+	<select onchange={onChange} value={$page.route.id}>
 		{#each routes as route}
 			<option value={`/examples/${route}`}>{route}</option>
 		{/each}
diff --git a/examples/svelte/src/generic-tests/node-toolbar/components/ToolbarNode.svelte b/examples/svelte/src/generic-tests/node-toolbar/components/ToolbarNode.svelte
index 0a998217..6b11ddb9 100644
--- a/examples/svelte/src/generic-tests/node-toolbar/components/ToolbarNode.svelte
+++ b/examples/svelte/src/generic-tests/node-toolbar/components/ToolbarNode.svelte
@@ -3,7 +3,11 @@
 
 	type $$Props = NodeProps;
 
-	export let data: $$Props['data'];
+	interface Props {
+		data: $$Props['data'];
+	}
+
+	let { data }: Props = $props();
 </script>
 
 <NodeToolbar
diff --git a/examples/svelte/src/generic-tests/nodes/components/DragHandleNode.svelte b/examples/svelte/src/generic-tests/nodes/components/DragHandleNode.svelte
index da5fa4c4..74c0379c 100644
--- a/examples/svelte/src/generic-tests/nodes/components/DragHandleNode.svelte
+++ b/examples/svelte/src/generic-tests/nodes/components/DragHandleNode.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <div class="container">
-	<div class="drag-handle custom-drag-handle" />
+	<div class="drag-handle custom-drag-handle"></div>
 </div>
 
 <style>
diff --git a/examples/svelte/src/routes/examples/+layout.svelte b/examples/svelte/src/routes/examples/+layout.svelte
index cf9f655f..00c1deea 100644
--- a/examples/svelte/src/routes/examples/+layout.svelte
+++ b/examples/svelte/src/routes/examples/+layout.svelte
@@ -1,11 +1,16 @@
 <script lang="ts">
 	import { Header } from '$components/Header';
+	interface Props {
+		children?: import('svelte').Snippet;
+	}
+
+	let { children }: Props = $props();
 </script>
 
 <div class="app">
 	<Header />
 	<div class="flow">
-		<slot />
+		{@render children?.()}
 	</div>
 </div>
 
diff --git a/examples/svelte/src/routes/examples/add-node-on-drop/Flow.svelte b/examples/svelte/src/routes/examples/add-node-on-drop/Flow.svelte
index e767e4ac..53d7aa82 100644
--- a/examples/svelte/src/routes/examples/add-node-on-drop/Flow.svelte
+++ b/examples/svelte/src/routes/examples/add-node-on-drop/Flow.svelte
@@ -22,8 +22,8 @@
 	const nodes = writable<Node[]>(initialNodes);
 	const edges = writable<Edge[]>([]);
 
-	let connectingNodeId: string | null = '0';
-	let rect: DOMRectReadOnly;
+	let connectingNodeId: string | null = $state('0');
+	let rect: DOMRectReadOnly = $state();
 	let id = 1;
 	const getId = () => `${id++}`;
 
diff --git a/examples/svelte/src/routes/examples/color-mode/+page.svelte b/examples/svelte/src/routes/examples/color-mode/+page.svelte
index 59ddfdfd..13f201f5 100644
--- a/examples/svelte/src/routes/examples/color-mode/+page.svelte
+++ b/examples/svelte/src/routes/examples/color-mode/+page.svelte
@@ -36,7 +36,7 @@
 		{ id: 'A-D', source: 'A', target: 'D' }
 	]);
 
-	let colorMode: ColorMode = 'light';
+	let colorMode: ColorMode = $state('light');
 </script>
 
 <SvelteFlow {nodes} {edges} {colorMode} fitView>
diff --git a/examples/svelte/src/routes/examples/custom-connection-line/+page.svelte b/examples/svelte/src/routes/examples/custom-connection-line/+page.svelte
index 58552225..c2b1951f 100644
--- a/examples/svelte/src/routes/examples/custom-connection-line/+page.svelte
+++ b/examples/svelte/src/routes/examples/custom-connection-line/+page.svelte
@@ -26,7 +26,9 @@
 
 <div style="height:100vh;">
 	<SvelteFlow {nodeTypes} {nodes} {edges} fitView>
-		<ConnectionLine slot="connectionLine" />
+		{#snippet connectionLine()}
+				<ConnectionLine  />
+			{/snippet}
 		<Background variant={BackgroundVariant.Lines} />
 	</SvelteFlow>
 </div>
diff --git a/examples/svelte/src/routes/examples/custom-connection-line/ConnectionLine.svelte b/examples/svelte/src/routes/examples/custom-connection-line/ConnectionLine.svelte
index d315f572..f670fbc5 100644
--- a/examples/svelte/src/routes/examples/custom-connection-line/ConnectionLine.svelte
+++ b/examples/svelte/src/routes/examples/custom-connection-line/ConnectionLine.svelte
@@ -3,20 +3,22 @@
 
 	const connection = useConnection();
 
-	let path: string | null = null;
-
-	$: if ($connection.inProgress) {
-		const { from, to, fromPosition, toPosition } = $connection;
-		const pathParams = {
-			sourceX: from.x,
-			sourceY: from.y,
-			sourcePosition: fromPosition,
-			targetX: to.x,
-			targetY: to.y,
-			targetPosition: toPosition
-		};
-		[path] = getBezierPath(pathParams);
-	}
+	let path: string | null = $derived.by(() => {
+		if ($connection.inProgress) {
+			const { from, to, fromPosition, toPosition } = $connection;
+			const pathParams = {
+				sourceX: from.x,
+				sourceY: from.y,
+				sourcePosition: fromPosition,
+				targetX: to.x,
+				targetY: to.y,
+				targetPosition: toPosition
+			};
+			const [path] = getBezierPath(pathParams);
+			return path;
+		}
+		return null;
+	});
 </script>
 
 {#if $connection.inProgress}
diff --git a/examples/svelte/src/routes/examples/custom-connection-line/CustomNode.svelte b/examples/svelte/src/routes/examples/custom-connection-line/CustomNode.svelte
index 6507ce51..7cca42c0 100644
--- a/examples/svelte/src/routes/examples/custom-connection-line/CustomNode.svelte
+++ b/examples/svelte/src/routes/examples/custom-connection-line/CustomNode.svelte
@@ -3,8 +3,13 @@
 
 	type $$Props = NodeProps;
 
-	export let isConnectable: $$Props['isConnectable'];
-	$$restProps;
+	interface Props {
+		isConnectable: $$Props['isConnectable'];
+		[key: string]: any
+	}
+
+	let { isConnectable, ...rest }: Props = $props();
+	rest;
 
 	const handleStyle = 'width: 10px; height: 10px; bottom: -5px;';
 </script>
diff --git a/examples/svelte/src/routes/examples/customnode/CustomNode.svelte b/examples/svelte/src/routes/examples/customnode/CustomNode.svelte
index 47a33534..eb26b88d 100644
--- a/examples/svelte/src/routes/examples/customnode/CustomNode.svelte
+++ b/examples/svelte/src/routes/examples/customnode/CustomNode.svelte
@@ -4,9 +4,14 @@
 
 	type $$Props = NodeProps<Node<{ colorStore: Writable<string> }>>;
 
-	export let data: $$Props['data'];
+	interface Props {
+		data: $$Props['data'];
+		[key: string]: any
+	}
 
-	$$restProps;
+	let { data, ...rest }: Props = $props();
+
+	rest;
 
 	const { colorStore } = data;
 </script>
@@ -19,7 +24,7 @@
 	<input
 		class="nodrag"
 		type="color"
-		on:input={(evt) => colorStore.set(evt.currentTarget.value)}
+		oninput={(evt) => colorStore.set(evt.currentTarget.value)}
 		value={$colorStore}
 	/>
 	<Handle type="source" position={Position.Right} id="a" style="top: 20px;" />
diff --git a/examples/svelte/src/routes/examples/dagre/+page.svelte b/examples/svelte/src/routes/examples/dagre/+page.svelte
index 02b417a9..b5e1e897 100644
--- a/examples/svelte/src/routes/examples/dagre/+page.svelte
+++ b/examples/svelte/src/routes/examples/dagre/+page.svelte
@@ -71,8 +71,8 @@
     defaultEdgeOptions={{ type: 'smoothstep', animated: true }}
   >
     <Panel position="top-right">
-      <button on:click={() => onLayout('TB')}>vertical layout</button>
-      <button on:click={() => onLayout('LR')}>horizontal layout</button>
+      <button onclick={() => onLayout('TB')}>vertical layout</button>
+      <button onclick={() => onLayout('LR')}>horizontal layout</button>
     </Panel>
     <Background />
   </SvelteFlow>
diff --git a/examples/svelte/src/routes/examples/drag-n-drop/Flow.svelte b/examples/svelte/src/routes/examples/drag-n-drop/Flow.svelte
index b72a4b17..cb9eea2b 100644
--- a/examples/svelte/src/routes/examples/drag-n-drop/Flow.svelte
+++ b/examples/svelte/src/routes/examples/drag-n-drop/Flow.svelte
@@ -83,9 +83,7 @@
 		$nodes = $nodes;
 	};
 
-	$: {
-		console.log($nodes);
-	}
+	$inspect($nodes);
 </script>
 
 <main>
diff --git a/examples/svelte/src/routes/examples/drag-n-drop/Sidebar.svelte b/examples/svelte/src/routes/examples/drag-n-drop/Sidebar.svelte
index 98fb2b03..a143a94d 100644
--- a/examples/svelte/src/routes/examples/drag-n-drop/Sidebar.svelte
+++ b/examples/svelte/src/routes/examples/drag-n-drop/Sidebar.svelte
@@ -17,21 +17,21 @@
 	<div class="label">You can drag these nodes to the pane on the left.</div>
 	<div
 		class="input-node node"
-		on:dragstart={(event) => onDragStart(event, 'input')}
+		ondragstart={(event) => onDragStart(event, 'input')}
 		draggable={true}
 	>
 		Input Node
 	</div>
 	<div
 		class="default-node node"
-		on:dragstart={(event) => onDragStart(event, 'default')}
+		ondragstart={(event) => onDragStart(event, 'default')}
 		draggable={true}
 	>
 		Default Node
 	</div>
 	<div
 		class="output-node node"
-		on:dragstart={(event) => onDragStart(event, 'output')}
+		ondragstart={(event) => onDragStart(event, 'output')}
 		draggable={true}
 	>
 		Output Node
diff --git a/examples/svelte/src/routes/examples/edges/+page.svelte b/examples/svelte/src/routes/examples/edges/+page.svelte
index 9bcda443..c51e2dbf 100644
--- a/examples/svelte/src/routes/examples/edges/+page.svelte
+++ b/examples/svelte/src/routes/examples/edges/+page.svelte
@@ -7,7 +7,8 @@
 		BackgroundVariant,
 		MiniMap,
 		MarkerType,
-		type Connection
+		type Connection,
+		type EdgeTypes
 	} from '@xyflow/svelte';
 
 	import '@xyflow/svelte/dist/style.css';
@@ -147,23 +148,23 @@
 			}
 		}
 	]);
-  
-	const edgeTypes = {
+
+	const edgeTypes: EdgeTypes = {
 		button: ButtonEdge,
 		customBezier: CustomBezierEdge
 	};
-  
-  function getEdgeId(connection: Connection) {
+
+	function getEdgeId(connection: Connection) {
 		return `edge-${connection.source}-${connection.target}}`;
 	}
-  
-  $: console.log('edges', $edges);
+
+	$inspect($edges);
 </script>
 
 <SvelteFlow
 	{nodes}
 	{edges}
-  {edgeTypes}
+	{edgeTypes}
 	fitView
 	nodeDragThreshold={2}
 	onedgecreate={(connection) => {
diff --git a/examples/svelte/src/routes/examples/edges/ButtonEdge.svelte b/examples/svelte/src/routes/examples/edges/ButtonEdge.svelte
index ee582226..93a14a46 100644
--- a/examples/svelte/src/routes/examples/edges/ButtonEdge.svelte
+++ b/examples/svelte/src/routes/examples/edges/ButtonEdge.svelte
@@ -3,28 +3,44 @@
 
 	type $$Props = EdgeProps;
 
-	export let id: $$Props['id'] = '';
-	export let style: $$Props['style'] = undefined;
-	export let markerEnd: $$Props['markerEnd'] = undefined;
 
-	export let sourceX: $$Props['sourceX'];
-	export let sourceY: $$Props['sourceY'];
-	export let sourcePosition: $$Props['sourcePosition'];
 
-	export let targetX: $$Props['targetX'];
-	export let targetY: $$Props['targetY'];
-	export let targetPosition: $$Props['targetPosition'];
+	interface Props {
+		id?: $$Props['id'];
+		style?: $$Props['style'];
+		markerEnd?: $$Props['markerEnd'];
+		sourceX: $$Props['sourceX'];
+		sourceY: $$Props['sourceY'];
+		sourcePosition: $$Props['sourcePosition'];
+		targetX: $$Props['targetX'];
+		targetY: $$Props['targetY'];
+		targetPosition: $$Props['targetPosition'];
+		[key: string]: any
+	}
 
-	$$restProps;
+	let {
+		id = '',
+		style = undefined,
+		markerEnd = undefined,
+		sourceX,
+		sourceY,
+		sourcePosition,
+		targetX,
+		targetY,
+		targetPosition,
+		...rest
+	}: Props = $props();
 
-	$: [edgePath, labelX, labelY] = getBezierPath({
+	rest;
+
+	let [edgePath, labelX, labelY] = $derived(getBezierPath({
 		sourceX,
 		sourceY,
 		sourcePosition,
 		targetX,
 		targetY,
 		targetPosition
-	});
+	}));
 </script>
 
 <BaseEdge path={edgePath} {markerEnd} {style} />
@@ -35,7 +51,7 @@
 	>
 		<button
 			class="edgeButton"
-			on:click={(event) => {
+			onclick={(event) => {
 				event.stopPropagation();
 				alert(`remove ${id}`);
 			}}
diff --git a/examples/svelte/src/routes/examples/edges/CustomBezierEdge.svelte b/examples/svelte/src/routes/examples/edges/CustomBezierEdge.svelte
index 960d3e6e..212deb21 100644
--- a/examples/svelte/src/routes/examples/edges/CustomBezierEdge.svelte
+++ b/examples/svelte/src/routes/examples/edges/CustomBezierEdge.svelte
@@ -3,22 +3,41 @@
 
 	type $$Props = EdgeProps;
 
-	export let label: $$Props['label'] = undefined;
-	export let labelStyle: $$Props['labelStyle'] = undefined;
-	export let style: $$Props['style'] = undefined;
-	export let markerStart: $$Props['markerStart'] = undefined;
-	export let markerEnd: $$Props['markerEnd'] = undefined;
-	export let interactionWidth: $$Props['interactionWidth'] = undefined;
 
-	export let sourceX: $$Props['sourceX'];
-	export let sourceY: $$Props['sourceY'];
-	export let sourcePosition: $$Props['sourcePosition'];
 
-	export let targetX: $$Props['targetX'];
-	export let targetY: $$Props['targetY'];
-	export let targetPosition: $$Props['targetPosition'];
+	interface Props {
+		label?: $$Props['label'];
+		labelStyle?: $$Props['labelStyle'];
+		style?: $$Props['style'];
+		markerStart?: $$Props['markerStart'];
+		markerEnd?: $$Props['markerEnd'];
+		interactionWidth?: $$Props['interactionWidth'];
+		sourceX: $$Props['sourceX'];
+		sourceY: $$Props['sourceY'];
+		sourcePosition: $$Props['sourcePosition'];
+		targetX: $$Props['targetX'];
+		targetY: $$Props['targetY'];
+		targetPosition: $$Props['targetPosition'];
+		[key: string]: any
+	}
 
-	$$restProps;
+	let {
+		label = undefined,
+		labelStyle = undefined,
+		style = undefined,
+		markerStart = undefined,
+		markerEnd = undefined,
+		interactionWidth = undefined,
+		sourceX,
+		sourceY,
+		sourcePosition,
+		targetX,
+		targetY,
+		targetPosition,
+		...rest
+	}: Props = $props();
+
+	rest;
 </script>
 
 <BezierEdge
diff --git a/examples/svelte/src/routes/examples/handle-connect/MultiHandleNode.svelte b/examples/svelte/src/routes/examples/handle-connect/MultiHandleNode.svelte
index 51243944..aa4842ee 100644
--- a/examples/svelte/src/routes/examples/handle-connect/MultiHandleNode.svelte
+++ b/examples/svelte/src/routes/examples/handle-connect/MultiHandleNode.svelte
@@ -7,9 +7,7 @@
 		useHandleConnections
 	} from '@xyflow/svelte';
 
-	type $$Props = NodeProps;
-
-	export let id: $$Props['id'];
+	let { id }: NodeProps = $props();
 
 	function onConnectTarget(connection: Connection[]) {
 		console.log('connect target', connection);
@@ -29,11 +27,7 @@
 
 	const connections = useHandleConnections({ nodeId: id, type: 'target' });
 
-	$: {
-		console.log('connections', id, $connections);
-	}
-
-	$$restProps;
+	$inspect('connections', $connections);
 </script>
 
 <div class="custom">
diff --git a/examples/svelte/src/routes/examples/handle-connect/SingleHandleNode.svelte b/examples/svelte/src/routes/examples/handle-connect/SingleHandleNode.svelte
index d2958969..d6be0c52 100644
--- a/examples/svelte/src/routes/examples/handle-connect/SingleHandleNode.svelte
+++ b/examples/svelte/src/routes/examples/handle-connect/SingleHandleNode.svelte
@@ -3,7 +3,12 @@
 
 	type $$Props = NodeProps;
 
-	export let id: $$Props['id'];
+	interface Props {
+		id: $$Props['id'];
+		[key: string]: any
+	}
+
+	let { id, ...rest }: Props = $props();
 
 	function onConnectTarget(connection: Connection[]) {
 		console.log('connect target', connection);
@@ -21,7 +26,7 @@
 		console.log('disconnect source', connection);
 	}
 
-	$$restProps;
+	rest;
 </script>
 
 <div class="custom">
diff --git a/examples/svelte/src/routes/examples/interaction/+page.svelte b/examples/svelte/src/routes/examples/interaction/+page.svelte
index 05a0a75a..dd7def36 100644
--- a/examples/svelte/src/routes/examples/interaction/+page.svelte
+++ b/examples/svelte/src/routes/examples/interaction/+page.svelte
@@ -39,18 +39,18 @@
 	const onPaneContextMenu = (event: MouseEvent) => console.log('onPaneContextMenu', event);
 	const onMoveEnd: OnMoveEnd = (_, viewport) => console.log('onMoveEnd', viewport);
 
-	let isSelectable = false;
-	let isDraggable = false;
-	let isConnectable = false;
-	let zoomOnScroll = false;
-	let zoomOnPinch = false;
-	let panOnScroll = false;
-	let panOnScrollMode = PanOnScrollMode.Free;
-	let zoomOnDoubleClick = false;
-	let panOnDrag = true;
-	let captureZoomClick = false;
-	let captureZoomScroll = false;
-	let captureElementClick = false;
+	let isSelectable = $state(false);
+	let isDraggable = $state(false);
+	let isConnectable = $state(false);
+	let zoomOnScroll = $state(false);
+	let zoomOnPinch = $state(false);
+	let panOnScroll = $state(false);
+	let panOnScrollMode = $state(PanOnScrollMode.Free);
+	let zoomOnDoubleClick = $state(false);
+	let panOnDrag = $state(true);
+	let captureZoomClick = $state(false);
+	let captureZoomScroll = $state(false);
+	let captureElementClick = $state(false);
 </script>
 
 <SvelteFlow
@@ -143,7 +143,7 @@
 				<select
 					id="panonscrollmode"
 					bind:value={panOnScrollMode}
-					on:change={(event) => {
+					onchange={(event) => {
 						panOnScrollMode = PanOnScrollMode.Free;
 					}}
 					class="svelte-flow__panonscrollmode"
diff --git a/examples/svelte/src/routes/examples/node-resizer/+page.svelte b/examples/svelte/src/routes/examples/node-resizer/+page.svelte
index e03acf34..51432ad4 100644
--- a/examples/svelte/src/routes/examples/node-resizer/+page.svelte
+++ b/examples/svelte/src/routes/examples/node-resizer/+page.svelte
@@ -128,7 +128,7 @@
 		}
 	]);
 
-	let snapToGrid = false;
+	let snapToGrid = $state(false);
 </script>
 
 <SvelteFlow
@@ -144,7 +144,7 @@
 	<Controls />
 	<Panel position="bottom-right">
 		<button
-			on:click={() => {
+			onclick={() => {
 				snapToGrid = !snapToGrid;
 			}}
 		>
diff --git a/examples/svelte/src/routes/examples/node-resizer/CustomResizer.svelte b/examples/svelte/src/routes/examples/node-resizer/CustomResizer.svelte
index e765c7c8..9b57b930 100644
--- a/examples/svelte/src/routes/examples/node-resizer/CustomResizer.svelte
+++ b/examples/svelte/src/routes/examples/node-resizer/CustomResizer.svelte
@@ -4,7 +4,11 @@
 
 	type $$Props = NodeProps<ResizeNode>;
 
-	export let data: $$Props['data'];
+	interface Props {
+		data: $$Props['data'];
+	}
+
+	let { data }: Props = $props();
 </script>
 
 <NodeResizeControl
diff --git a/examples/svelte/src/routes/examples/node-resizer/DefaultResizer.svelte b/examples/svelte/src/routes/examples/node-resizer/DefaultResizer.svelte
index 81964784..b214c761 100644
--- a/examples/svelte/src/routes/examples/node-resizer/DefaultResizer.svelte
+++ b/examples/svelte/src/routes/examples/node-resizer/DefaultResizer.svelte
@@ -4,8 +4,12 @@
 
 	type $$Props = NodeProps<ResizeNode>;
 
-	export let data: $$Props['data'];
-	export let selected: $$Props['selected'] = undefined;
+	interface Props {
+		data: $$Props['data'];
+		selected?: $$Props['selected'];
+	}
+
+	let { data, selected = undefined }: Props = $props();
 </script>
 
 <NodeResizer
diff --git a/examples/svelte/src/routes/examples/node-resizer/HorizontalResizer.svelte b/examples/svelte/src/routes/examples/node-resizer/HorizontalResizer.svelte
index 5caea508..2c014600 100644
--- a/examples/svelte/src/routes/examples/node-resizer/HorizontalResizer.svelte
+++ b/examples/svelte/src/routes/examples/node-resizer/HorizontalResizer.svelte
@@ -4,7 +4,11 @@
 
 	type $$Props = NodeProps<ResizeNode>;
 
-	export let data: $$Props['data'];
+	interface Props {
+		data: $$Props['data'];
+	}
+
+	let { data }: Props = $props();
 </script>
 
 <NodeResizeControl
diff --git a/examples/svelte/src/routes/examples/node-resizer/VerticalResizer.svelte b/examples/svelte/src/routes/examples/node-resizer/VerticalResizer.svelte
index 5e173508..92dcc5f4 100644
--- a/examples/svelte/src/routes/examples/node-resizer/VerticalResizer.svelte
+++ b/examples/svelte/src/routes/examples/node-resizer/VerticalResizer.svelte
@@ -4,7 +4,11 @@
 
 	type $$Props = NodeProps<ResizeNode>;
 
-	export let data: $$Props['data'];
+	interface Props {
+		data: $$Props['data'];
+	}
+
+	let { data }: Props = $props();
 </script>
 
 <NodeResizeControl
diff --git a/examples/svelte/src/routes/examples/node-toolbar/CustomNode.svelte b/examples/svelte/src/routes/examples/node-toolbar/CustomNode.svelte
index 99b00f7c..1f8c2a78 100644
--- a/examples/svelte/src/routes/examples/node-toolbar/CustomNode.svelte
+++ b/examples/svelte/src/routes/examples/node-toolbar/CustomNode.svelte
@@ -2,9 +2,14 @@
 	import { NodeToolbar, type NodeProps, Handle, Position } from '@xyflow/svelte';
 
 	type $$Props = NodeProps;
-	$$restProps;
+	rest;
 
-	export let data: $$Props['data'];
+	interface Props {
+		data: $$Props['data'];
+		[key: string]: any
+	}
+
+	let { data, ...rest }: Props = $props();
 </script>
 
 <NodeToolbar
diff --git a/examples/svelte/src/routes/examples/node-toolbar/SelectedNodesToolbar.svelte b/examples/svelte/src/routes/examples/node-toolbar/SelectedNodesToolbar.svelte
index df62b856..069348b2 100644
--- a/examples/svelte/src/routes/examples/node-toolbar/SelectedNodesToolbar.svelte
+++ b/examples/svelte/src/routes/examples/node-toolbar/SelectedNodesToolbar.svelte
@@ -3,8 +3,8 @@
 
 	const nodes = useNodes();
 
-	$: selectedNodeIds = $nodes.filter((node) => node.selected).map((node) => node.id);
-	$: isVisible = selectedNodeIds.length > 1;
+	let selectedNodeIds = $derived($nodes.filter((node) => node.selected).map((node) => node.id));
+	let isVisible = $derived(selectedNodeIds.length > 1);
 </script>
 
 <NodeToolbar nodeId={selectedNodeIds} {isVisible}>
diff --git a/examples/svelte/src/routes/examples/overview/+page.svelte b/examples/svelte/src/routes/examples/overview/+page.svelte
index 2dd57734..efdeb35c 100644
--- a/examples/svelte/src/routes/examples/overview/+page.svelte
+++ b/examples/svelte/src/routes/examples/overview/+page.svelte
@@ -134,9 +134,7 @@
 		$edges = $edges;
 	}
 
-	$: {
-		console.log('nodes changed', $nodes);
-	}
+	$inspect($nodes);
 </script>
 
 <SvelteFlow
@@ -199,7 +197,9 @@
 	deleteKey={['Backspace', 'd']}
 >
 	<Controls orientation="horizontal" {fitViewOptions}>
-		<ControlButton slot="before">xy</ControlButton>
+		{#snippet before()}
+			<ControlButton>xy</ControlButton>
+		{/snippet}
 		<ControlButton aria-label="log" on:click={() => console.log('control button')}
 			>log</ControlButton
 		>
@@ -207,10 +207,10 @@
 	<Background variant={BackgroundVariant.Dots} />
 	<MiniMap />
 	<Panel position="top-right">
-		<button on:click={updateNode}>update node pos</button>
-		<button on:click={updateEdge}>update edge type</button>
+		<button onclick={updateNode}>update node pos</button>
+		<button onclick={updateEdge}>update edge type</button>
 		<button
-			on:click={() => {
+			onclick={() => {
 				console.log($nodes, $nodes.length);
 				$nodes[$nodes.length - 1].hidden = !$nodes[$nodes.length - 1].hidden;
 				$nodes = $nodes;
diff --git a/examples/svelte/src/routes/examples/overview/CustomEdge.svelte b/examples/svelte/src/routes/examples/overview/CustomEdge.svelte
index 5f22a826..9c00449f 100644
--- a/examples/svelte/src/routes/examples/overview/CustomEdge.svelte
+++ b/examples/svelte/src/routes/examples/overview/CustomEdge.svelte
@@ -6,32 +6,37 @@
 		type EdgeProps,
 		getBezierPath
 	} from '@xyflow/svelte';
+	interface Props {
+		[key: string]: any
+	}
+
+	let { ...props }: Props = $props();
 
 	type $$Props = EdgeProps;
 
-	$: [path, labelX, labelY] = getBezierPath({
-		sourceX: $$props.sourceX,
-		sourceY: $$props.sourceY,
-		targetX: $$props.targetX,
-		targetY: $$props.targetY,
-		sourcePosition: $$props.sourcePosition,
-		targetPosition: $$props.targetPosition
-	});
+	let [path, labelX, labelY] = $derived(getBezierPath({
+		sourceX: props.sourceX,
+		sourceY: props.sourceY,
+		targetX: props.targetX,
+		targetY: props.targetY,
+		sourcePosition: props.sourcePosition,
+		targetPosition: props.targetPosition
+	}));
 
 	const edges = useEdges();
 
 	function onClick() {
-		edges.update((eds) => eds.filter((e) => e.id !== $$props.id));
+		edges.update((eds) => eds.filter((e) => e.id !== props.id));
 	}
 </script>
 
-<BaseEdge {path} {labelX} {labelY} {...$$props} />
+<BaseEdge {path} {labelX} {labelY} {...props} />
 
 <EdgeLabelRenderer>
 	<button
 		style:transform={`translate(-50%,-50%) translate(${labelX}px,${labelY}px)`}
 		class="edge-button"
-		on:click={onClick}
+		onclick={onClick}
 	>
 		✕
 	</button>
diff --git a/examples/svelte/src/routes/examples/overview/CustomNode.svelte b/examples/svelte/src/routes/examples/overview/CustomNode.svelte
index 0e991ac2..e7e88120 100644
--- a/examples/svelte/src/routes/examples/overview/CustomNode.svelte
+++ b/examples/svelte/src/routes/examples/overview/CustomNode.svelte
@@ -2,11 +2,16 @@
 	import { Handle, Position, type BuiltInNode, type NodeProps } from '@xyflow/svelte';
 
 	type $$Props = NodeProps<BuiltInNode>;
-	$$restProps;
+	rest;
 
-	export let data: { label: string } = { label: 'Node' };
-	export let positionAbsoluteX: number = 0;
-	export let positionAbsoluteY: number = 0;
+	interface Props {
+		data?: { label: string };
+		positionAbsoluteX?: number;
+		positionAbsoluteY?: number;
+		[key: string]: any
+	}
+
+	let { data = { label: 'Node' }, positionAbsoluteX = 0, positionAbsoluteY = 0, ...rest }: Props = $props();
 </script>
 
 <div class="custom">
diff --git a/examples/svelte/src/routes/examples/overview/CustomNodeDragHandle.svelte b/examples/svelte/src/routes/examples/overview/CustomNodeDragHandle.svelte
index c087f7de..41d59778 100644
--- a/examples/svelte/src/routes/examples/overview/CustomNodeDragHandle.svelte
+++ b/examples/svelte/src/routes/examples/overview/CustomNodeDragHandle.svelte
@@ -2,14 +2,19 @@
 	import type { BuiltInNode, NodeProps } from '@xyflow/svelte';
 
 	type $$Props = NodeProps<BuiltInNode>;
-	$$restProps;
+	rest;
 
-	export let data: { label: string } = { label: 'Node' };
+	interface Props {
+		data?: { label: string };
+		[key: string]: any
+	}
+
+	let { data = { label: 'Node' }, ...rest }: Props = $props();
 </script>
 
 <div class="custom">
 	<div>{data.label}</div>
-	<div class="custom-drag-handle" style="width:15px;height:15px;background:#222;" />
+	<div class="custom-drag-handle" style="width:15px;height:15px;background:#222;"></div>
 </div>
 
 <style>
diff --git a/examples/svelte/src/routes/examples/overview/InitTracker.svelte b/examples/svelte/src/routes/examples/overview/InitTracker.svelte
index 8b486f8c..3d3ff181 100644
--- a/examples/svelte/src/routes/examples/overview/InitTracker.svelte
+++ b/examples/svelte/src/routes/examples/overview/InitTracker.svelte
@@ -4,15 +4,15 @@
 	const nodesInitialized = useNodesInitialized();
 	const initialized = useInitialized();
 
-	$: {
+	$effect(() => {
 		if (nodesInitialized) {
 			console.log('nodes initialized');
 		}
-	}
+	});
 
-	$: {
+	$effect(() => {
 		if (initialized) {
 			console.log('initialized');
 		}
-	}
+	});
 </script>
diff --git a/examples/svelte/src/routes/examples/reset/+page.svelte b/examples/svelte/src/routes/examples/reset/+page.svelte
index e7857d70..0c67256c 100644
--- a/examples/svelte/src/routes/examples/reset/+page.svelte
+++ b/examples/svelte/src/routes/examples/reset/+page.svelte
@@ -24,7 +24,7 @@
 	};
 </script>
 
-<button on:click={resetNodesArray}> Reset </button>
+<button onclick={resetNodesArray}> Reset </button>
 
 <div style:height="100vh">
 	<SvelteFlow {nodes} {edges} fitView>
diff --git a/examples/svelte/src/routes/examples/subflows/+page.svelte b/examples/svelte/src/routes/examples/subflows/+page.svelte
index a4574a6e..0eda4df1 100644
--- a/examples/svelte/src/routes/examples/subflows/+page.svelte
+++ b/examples/svelte/src/routes/examples/subflows/+page.svelte
@@ -116,9 +116,7 @@
 		{ id: 'e4b1-4b2', source: '4b1', target: '4b2' }
 	]);
 
-	$: {
-		console.log($nodes);
-	}
+	$inspect($nodes);
 </script>
 
 <SvelteFlow {nodes} {edges} {nodeTypes} fitView minZoom={0.1} maxZoom={2.5}>
diff --git a/examples/svelte/src/routes/examples/subflows/DebugNode.svelte b/examples/svelte/src/routes/examples/subflows/DebugNode.svelte
index ecacb06b..c207659c 100644
--- a/examples/svelte/src/routes/examples/subflows/DebugNode.svelte
+++ b/examples/svelte/src/routes/examples/subflows/DebugNode.svelte
@@ -3,12 +3,23 @@
 
 	type $$Props = NodeProps;
 
-	export let id: string;
-	export let positionAbsoluteX: number = 0;
-	export let positionAbsoluteY: number = 0;
-	export let zIndex: number = 0;
+	interface Props {
+		id: string;
+		positionAbsoluteX?: number;
+		positionAbsoluteY?: number;
+		zIndex?: number;
+		[key: string]: any
+	}
 
-	$$restProps;
+	let {
+		id,
+		positionAbsoluteX = 0,
+		positionAbsoluteY = 0,
+		zIndex = 0,
+		...rest
+	}: Props = $props();
+
+	rest;
 </script>
 
 <Handle type="target" position={Position.Top} />
diff --git a/examples/svelte/src/routes/examples/two-way-viewport/Flow.svelte b/examples/svelte/src/routes/examples/two-way-viewport/Flow.svelte
index 73d3a073..2d9d562d 100644
--- a/examples/svelte/src/routes/examples/two-way-viewport/Flow.svelte
+++ b/examples/svelte/src/routes/examples/two-way-viewport/Flow.svelte
@@ -40,7 +40,7 @@
 	<Background variant={BackgroundVariant.Dots} />
 
 	<Panel>
-		<button on:click={updateViewport}>update viewport</button>
-		<button on:click={() => fitView()}>fitView</button>
+		<button onclick={updateViewport}>update viewport</button>
+		<button onclick={() => fitView()}>fitView</button>
 	</Panel>
 </SvelteFlow>
diff --git a/examples/svelte/src/routes/examples/usenodesdata/+page.svelte b/examples/svelte/src/routes/examples/usenodesdata/+page.svelte
index 8f041b0a..fc67ae98 100644
--- a/examples/svelte/src/routes/examples/usenodesdata/+page.svelte
+++ b/examples/svelte/src/routes/examples/usenodesdata/+page.svelte
@@ -1,4 +1,4 @@
-<script context="module" lang="ts">
+<script module lang="ts">
 	import type { Node } from '@xyflow/svelte';
 
 	type TextNodeType = Node<{ text: string }, 'text'>;
diff --git a/examples/svelte/src/routes/examples/usenodesdata/ResultNode.svelte b/examples/svelte/src/routes/examples/usenodesdata/ResultNode.svelte
index 436d2109..8d5f0724 100644
--- a/examples/svelte/src/routes/examples/usenodesdata/ResultNode.svelte
+++ b/examples/svelte/src/routes/examples/usenodesdata/ResultNode.svelte
@@ -10,16 +10,21 @@
 
 	type $$Props = NodeProps;
 
-	export let id: $$Props['id'];
-	$$restProps;
+	interface Props {
+		id: $$Props['id'];
+		[key: string]: any
+	}
+
+	let { id, ...rest }: Props = $props();
+	rest;
 
 	const connections = useHandleConnections({
 		nodeId: id,
 		type: 'target'
 	});
 
-	$: nodeData = useNodesData<MyNode>($connections.map((connection) => connection.source));
-	$: textNodes = $nodeData.filter(isTextNode);
+	let nodeData = $derived(useNodesData<MyNode>($connections.map((connection) => connection.source)));
+	let textNodes = $derived($nodeData.filter(isTextNode));
 </script>
 
 <div class="custom">
diff --git a/examples/svelte/src/routes/examples/usenodesdata/TextNode.svelte b/examples/svelte/src/routes/examples/usenodesdata/TextNode.svelte
index 1fe5ff70..cb2a0335 100644
--- a/examples/svelte/src/routes/examples/usenodesdata/TextNode.svelte
+++ b/examples/svelte/src/routes/examples/usenodesdata/TextNode.svelte
@@ -3,11 +3,16 @@
 
 	type $$Props = NodeProps;
 
-	export let id: $$Props['id'];
-	export let data: $$Props['data'];
+	interface Props {
+		id: $$Props['id'];
+		data: $$Props['data'];
+		[key: string]: any
+	}
+
+	let { id, data, ...rest }: Props = $props();
 
 	const { updateNodeData } = useSvelteFlow();
-	$$restProps;
+	rest;
 </script>
 
 <div class="custom">
@@ -15,7 +20,7 @@
 	<div>
 		<input
 			value={data.text}
-			on:input={(evt) => updateNodeData(id, { text: evt.currentTarget.value })}
+			oninput={(evt) => updateNodeData(id, { text: evt.currentTarget.value })}
 		/>
 	</div>
 	<Handle type="source" position={Position.Right} />
diff --git a/examples/svelte/src/routes/examples/usenodesdata/UppercaseNode.svelte b/examples/svelte/src/routes/examples/usenodesdata/UppercaseNode.svelte
index 55960cb5..141f7d05 100644
--- a/examples/svelte/src/routes/examples/usenodesdata/UppercaseNode.svelte
+++ b/examples/svelte/src/routes/examples/usenodesdata/UppercaseNode.svelte
@@ -5,15 +5,12 @@
 		useHandleConnections,
 		useNodesData,
 		useSvelteFlow,
+		type Node,
 		type NodeProps
 	} from '@xyflow/svelte';
 	import { isTextNode, type MyNode } from './+page.svelte';
 
-	type $$Props = NodeProps;
-
-	export let id: $$Props['id'];
-	export let data: $$Props['data'];
-	$$restProps;
+	let { id, data }: NodeProps<Node<{ text: string }>> = $props();
 
 	const { updateNodeData } = useSvelteFlow();
 	const connections = useHandleConnections({
@@ -21,16 +18,16 @@
 		type: 'target'
 	});
 
-	$: nodeData = useNodesData<MyNode>($connections[0]?.source);
-	$: textNode = isTextNode($nodeData) ? $nodeData : null;
+	let nodeData = $derived(useNodesData<MyNode>($connections[0]?.source));
+	let textNode = $derived(isTextNode($nodeData) ? $nodeData : null);
 
-	$: console.log(textNode?.data, data);
+	$inspect(textNode?.data, data);
 
-	$: {
+	$effect.pre(() => {
 		const input = textNode?.data.text.toUpperCase() ?? '';
 		updateNodeData(id, { text: input });
 		console.log('updatedNodeData with', input);
-	}
+	});
 </script>
 
 <div class="custom">
diff --git a/examples/svelte/src/routes/examples/usesvelteflow/Sidebar.svelte b/examples/svelte/src/routes/examples/usesvelteflow/Sidebar.svelte
index 0a27afd9..ca5c3ef2 100644
--- a/examples/svelte/src/routes/examples/usesvelteflow/Sidebar.svelte
+++ b/examples/svelte/src/routes/examples/usesvelteflow/Sidebar.svelte
@@ -25,24 +25,24 @@
 
 <aside>
 	<div class="label">Functions:</div>
-	<button on:click={() => zoomIn()}>zoom in</button>
-	<button on:click={() => zoomOut({ duration: 1000 })}>zoom out transition</button>
-	<button on:click={() => setZoom(2)}>set zoom</button>
-	<button on:click={() => fitView()}>fitView</button>
-	<button on:click={() => setCenter(0, 0)}>setCenter 0, 0</button>
-	<button on:click={() => setViewport({ x: 100, y: 100, zoom: 2 })}>setViewport</button>
-	<button on:click={() => console.log(getViewport())}>getViewport</button>
+	<button onclick={() => zoomIn()}>zoom in</button>
+	<button onclick={() => zoomOut({ duration: 1000 })}>zoom out transition</button>
+	<button onclick={() => setZoom(2)}>set zoom</button>
+	<button onclick={() => fitView()}>fitView</button>
+	<button onclick={() => setCenter(0, 0)}>setCenter 0, 0</button>
+	<button onclick={() => setViewport({ x: 100, y: 100, zoom: 2 })}>setViewport</button>
+	<button onclick={() => console.log(getViewport())}>getViewport</button>
 
-	<button on:click={() => deleteElements({ edges: $edges.map((edge) => ({ id: edge.id })) })}
+	<button onclick={() => deleteElements({ edges: $edges.map((edge) => ({ id: edge.id })) })}
 		>delete edges</button
 	>
-	<button on:click={() => deleteElements({ nodes: [{ id: $nodes[0].id }] })}>delete node</button>
-	<button on:click={() => deleteElements({ nodes: $nodes.map((node) => ({ id: node.id })) })}
+	<button onclick={() => deleteElements({ nodes: [{ id: $nodes[0].id }] })}>delete node</button>
+	<button onclick={() => deleteElements({ nodes: $nodes.map((node) => ({ id: node.id })) })}
 		>deleteElements</button
 	>
-	<button on:click={() => deleteNode()}>delete via store</button>
+	<button onclick={() => deleteNode()}>delete via store</button>
 	<button
-		on:click={() => {
+		onclick={() => {
 			const { nodes, edges, viewport } = toObject();
 			console.log(nodes, edges, viewport);
 		}}>toObject</button
diff --git a/examples/svelte/src/routes/examples/useupdatenodeinternals/CustomNode.svelte b/examples/svelte/src/routes/examples/useupdatenodeinternals/CustomNode.svelte
index 89a73e1c..a041de86 100644
--- a/examples/svelte/src/routes/examples/useupdatenodeinternals/CustomNode.svelte
+++ b/examples/svelte/src/routes/examples/useupdatenodeinternals/CustomNode.svelte
@@ -3,12 +3,18 @@
 
 	type $$Props = NodeProps;
 
-	export let id: $$Props['id'];
-	$$restProps;
+	interface Props {
+		id: $$Props['id'];
+		[key: string]: any
+	}
+
+	let { id, ...rest }: Props = $props();
+	rest;
 
 	const updateNodeInternals = useUpdateNodeInternals();
 
-	$: handleCount = 1;
+	let handleCount = $state(1);
+	
 
 	const onClick = () => {
 		handleCount += 1;
@@ -17,7 +23,7 @@
 </script>
 
 <Handle type="target" position={Position.Top} />
-<button on:click={onClick}>add handle</button>
+<button onclick={onClick}>add handle</button>
 
 {#each Array.from({ length: handleCount }) as handle, i}
 	<Handle type="source" position={Position.Bottom} id={`${i}`} style={`left: ${i * 10}px;`} />
diff --git a/examples/svelte/src/routes/examples/useupdatenodeinternals/Flow.svelte b/examples/svelte/src/routes/examples/useupdatenodeinternals/Flow.svelte
index 42c76cd0..e8275d72 100644
--- a/examples/svelte/src/routes/examples/useupdatenodeinternals/Flow.svelte
+++ b/examples/svelte/src/routes/examples/useupdatenodeinternals/Flow.svelte
@@ -66,7 +66,7 @@
 		<Background variant={BackgroundVariant.Dots} />
 		<MiniMap />
 
-		<Panel><button on:click={updateNodePosition}>update node</button></Panel>
+		<Panel><button onclick={updateNodePosition}>update node</button></Panel>
 	</SvelteFlow>
 </main>
 
diff --git a/examples/svelte/src/routes/tests/generic/[topic]/[example]/+page.svelte b/examples/svelte/src/routes/tests/generic/[topic]/[example]/+page.svelte
index 8d75afb8..d8a79ff6 100644
--- a/examples/svelte/src/routes/tests/generic/[topic]/[example]/+page.svelte
+++ b/examples/svelte/src/routes/tests/generic/[topic]/[example]/+page.svelte
@@ -3,7 +3,11 @@
 
 	import Flow from './Flow.svelte';
 
-	export let data: { flowConfig: FlowConfig };
+	interface Props {
+		data: { flowConfig: FlowConfig };
+	}
+
+	let { data }: Props = $props();
 </script>
 
 <SvelteFlowProvider>
diff --git a/examples/svelte/src/routes/tests/generic/[topic]/[example]/Flow.svelte b/examples/svelte/src/routes/tests/generic/[topic]/[example]/Flow.svelte
index bb04fcb8..4ca02ef9 100644
--- a/examples/svelte/src/routes/tests/generic/[topic]/[example]/Flow.svelte
+++ b/examples/svelte/src/routes/tests/generic/[topic]/[example]/Flow.svelte
@@ -4,7 +4,11 @@
 
 	import '@xyflow/svelte/dist/style.css';
 
-	export let flowConfig: FlowConfig;
+	interface Props {
+		flowConfig: FlowConfig;
+	}
+
+	let { flowConfig }: Props = $props();
 
 	// Create writables here so it is easier to create test cases
 	const nodes = writable(flowConfig.flowProps?.nodes);
diff --git a/examples/svelte/svelte.config.js b/examples/svelte/svelte.config.js
index 56ed51a8..42e34179 100644
--- a/examples/svelte/svelte.config.js
+++ b/examples/svelte/svelte.config.js
@@ -6,7 +6,9 @@ const config = {
 	// Consult https://kit.svelte.dev/docs/integrations#preprocessors
 	// for more information about preprocessors
 	preprocess: vitePreprocess(),
-
+	// compilerOptions: {
+	// 	runes: true
+	// },
 	kit: {
 		// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
 		// If your environment is not supported or you settled on a specific environment, switch out the adapter.
diff --git a/packages/svelte/src/lib/types/edges.ts b/packages/svelte/src/lib/types/edges.ts
index de1def91..0f3153e4 100644
--- a/packages/svelte/src/lib/types/edges.ts
+++ b/packages/svelte/src/lib/types/edges.ts
@@ -1,4 +1,4 @@
-import type { SvelteComponent, ComponentType } from 'svelte';
+import type { Component } from 'svelte';
 import type {
   EdgeBase,
   BezierPathOptions,
@@ -113,15 +113,13 @@ export type StraightEdgeProps = Omit<EdgeComponentProps, 'sourcePosition' | 'tar
 
 export type EdgeTypes = Record<
   string,
-  ComponentType<
-    SvelteComponent<
-      EdgeProps & {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        data?: any;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        type: any;
-      }
-    >
+  Component<
+    EdgeProps & {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      data?: any;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      type: any;
+    }
   >
 >;
 
diff --git a/packages/svelte/src/lib/types/nodes.ts b/packages/svelte/src/lib/types/nodes.ts
index 0e741c00..321f49e2 100644
--- a/packages/svelte/src/lib/types/nodes.ts
+++ b/packages/svelte/src/lib/types/nodes.ts
@@ -1,4 +1,4 @@
-import type { ComponentType, SvelteComponent } from 'svelte';
+import type { Component } from 'svelte';
 import type { InternalNodeBase, NodeBase, NodeProps as NodePropsBase } from '@xyflow/system';
 
 /**
@@ -30,15 +30,13 @@ export type NodeProps<NodeType extends Node = Node> = NodePropsBase<NodeType> &
 
 export type NodeTypes = Record<
   string,
-  ComponentType<
-    SvelteComponent<
-      NodeProps & {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        data: any;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        type: any;
-      }
-    >
+  Component<
+    NodeProps & {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      data: any;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      type: any;
+    }
   >
 >;