From e6b0d12f6fb441d64a931493d6564586851804f6 Mon Sep 17 00:00:00 2001
From: moklick <info@moritzklack.com>
Date: Tue, 21 Oct 2025 12:16:54 +0200
Subject: [PATCH] chore(edge-toolbar): cleanup

---
 .../react/src/additional-components/EdgeToolbar/types.ts  | 4 ++++
 .../svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte  | 8 +++-----
 .../svelte/src/lib/plugins/EdgeToolbar/EdgeToolbar.svelte | 7 ++++---
 packages/system/src/types/edges.ts                        | 4 ----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/react/src/additional-components/EdgeToolbar/types.ts b/packages/react/src/additional-components/EdgeToolbar/types.ts
index fb7bdfae..9b9ec286 100644
--- a/packages/react/src/additional-components/EdgeToolbar/types.ts
+++ b/packages/react/src/additional-components/EdgeToolbar/types.ts
@@ -6,5 +6,9 @@ import type { EdgeToolbarBaseProps } from '@xyflow/system';
  */
 export type EdgeToolbarProps = EdgeToolbarBaseProps &
   HTMLAttributes<HTMLDivElement> & {
+    /**
+     * An edge toolbar must be attached to an edge.
+     */
+    edgeId: string;
     children?: ReactNode;
   };
diff --git a/packages/svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte b/packages/svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte
index 109fd8ee..b01ce307 100644
--- a/packages/svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte
+++ b/packages/svelte/src/lib/components/EdgeLabel/EdgeLabel.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { getContext } from 'svelte';
-  import { hideOnSSR, portal } from '$lib/actions/portal';
 
+  import { hideOnSSR, portal } from '$lib/actions/portal';
   import { useStore } from '$lib/store';
   import type { EdgeLabelProps } from './types';
   import { toPxString } from '$lib/utils';
@@ -19,15 +19,13 @@
   }: EdgeLabelProps = $props();
 
   const store = useStore();
-
   const edgeId = getContext<string>('svelteflow__edge_id');
+
   if (!edgeId) {
     throw new Error('EdgeLabel must be used within an edge');
   }
 
-  let z = $derived.by(() => {
-    return store.visible.edges.get(edgeId)?.zIndex;
-  });
+  let z = $derived(store.visible.edges.get(edgeId)?.zIndex);
 </script>
 
 <div
diff --git a/packages/svelte/src/lib/plugins/EdgeToolbar/EdgeToolbar.svelte b/packages/svelte/src/lib/plugins/EdgeToolbar/EdgeToolbar.svelte
index 39668df9..6a063acb 100644
--- a/packages/svelte/src/lib/plugins/EdgeToolbar/EdgeToolbar.svelte
+++ b/packages/svelte/src/lib/plugins/EdgeToolbar/EdgeToolbar.svelte
@@ -19,14 +19,15 @@
   }: EdgeToolbarProps = $props();
 
   const store = useStore();
-
   const edgeId = getContext<string>('svelteflow__edge_id');
+
   if (!edgeId) {
     throw new Error('EdgeToolbar must be used within an edge');
   }
 
-  const edge = $derived(store.edgeLookup.get(edgeId));
-  const isActive = $derived(typeof isVisible === 'boolean' ? isVisible : edge?.selected);
+  const isActive = $derived(
+    typeof isVisible === 'boolean' ? isVisible : store.edgeLookup.get(edgeId)?.selected
+  );
   const transform = $derived(getEdgeToolbarTransform(x, y, store.viewport.zoom, alignX, alignY));
 </script>
 
diff --git a/packages/system/src/types/edges.ts b/packages/system/src/types/edges.ts
index 20e43eda..e446f613 100644
--- a/packages/system/src/types/edges.ts
+++ b/packages/system/src/types/edges.ts
@@ -131,10 +131,6 @@ export type EdgePosition = {
 export type EdgeLookup<EdgeType extends EdgeBase = EdgeBase> = Map<string, EdgeType>;
 
 export type EdgeToolbarBaseProps = {
-  /**
-   * An edge toolbar must be attached to an edge.
-   */
-  edgeId: string;
   /**
    * The `x` position of the edge label.
    */