chore(edge-toolbar): cleanup

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;
   };

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(() => {
+  let z = $derived(store.visible.edges.get(edgeId)?.zIndex);
-    return store.visible.edges.get(edgeId)?.zIndex;
-  });
 </script>
 
 <div

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(
-  const isActive = $derived(typeof isVisible === 'boolean' ? isVisible : edge?.selected);
+    typeof isVisible === 'boolean' ? isVisible : store.edgeLookup.get(edgeId)?.selected
+  );
   const transform = $derived(getEdgeToolbarTransform(x, y, store.viewport.zoom, alignX, alignY));
 </script>
 

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.
    */