diff --git a/examples/react/src/examples/UpdatableEdge/index.tsx b/examples/react/src/examples/UpdatableEdge/index.tsx
index 754efa56..5dacdc9c 100644
--- a/examples/react/src/examples/UpdatableEdge/index.tsx
+++ b/examples/react/src/examples/UpdatableEdge/index.tsx
@@ -6,7 +6,6 @@ import {
   addEdge,
   applyNodeChanges,
   applyEdgeChanges,
-  ReactFlowInstance,
   Connection,
   Edge,
   Node,
@@ -97,7 +96,6 @@ const initialEdges: Edge[] = [
   { id: 'e5-6', source: '5', target: '6', label: 'This edge can be updated from both sides' },
 ];
 
-const onInit = (reactFlowInstance: ReactFlowInstance) => reactFlowInstance.fitView();
 const onEdgeUpdateStart = (_: ReactMouseEvent, edge: Edge, handleType: HandleType) =>
   console.log(`start update ${handleType} handle`, edge);
 const onEdgeUpdateEnd = (_: MouseEvent | TouchEvent, edge: Edge, handleType: HandleType) =>
@@ -111,7 +109,6 @@ const UpdatableEdge = () => {
   const onConnect = (connection: Connection) => setEdges((els) => addEdge(connection, els));
 
   const onNodesChange = useCallback((changes: NodeChange[]) => {
-    console.log(changes);
     setNodes((ns) => applyNodeChanges(changes, ns));
   }, []);
 
@@ -125,12 +122,12 @@ const UpdatableEdge = () => {
       edges={edges}
       onNodesChange={onNodesChange}
       onEdgesChange={onEdgesChange}
-      onInit={onInit}
       snapToGrid={true}
       onEdgeUpdate={onEdgeUpdate}
       onConnect={onConnect}
       onEdgeUpdateStart={onEdgeUpdateStart}
       onEdgeUpdateEnd={onEdgeUpdateEnd}
+      fitView
     >
       <Controls />
     </ReactFlow>
diff --git a/packages/react/src/components/EdgeWrapper/EdgeUpdateAnchors.tsx b/packages/react/src/components/EdgeWrapper/EdgeUpdateAnchors.tsx
new file mode 100644
index 00000000..02576559
--- /dev/null
+++ b/packages/react/src/components/EdgeWrapper/EdgeUpdateAnchors.tsx
@@ -0,0 +1,133 @@
+// Updatable edges have a anchors around their handles to update the edge.
+import { XYHandle, type Connection, getEdgePosition } from '@xyflow/system';
+
+import { EdgeAnchor } from '../Edges/EdgeAnchor';
+import type { EdgeWrapperProps, Edge } from '../../types/edges';
+import { useStoreApi } from '../../hooks/useStore';
+
+type EdgeUpdateAnchorsProps = {
+  edgePosition: NonNullable<ReturnType<typeof getEdgePosition>>;
+  edge: Edge;
+  isUpdatable: boolean | 'source' | 'target';
+  edgeUpdaterRadius: EdgeWrapperProps['edgeUpdaterRadius'];
+  sourceHandleId: EdgeWrapperProps['sourceHandleId'];
+  targetHandleId: EdgeWrapperProps['targetHandleId'];
+  onEdgeUpdate: EdgeWrapperProps['onEdgeUpdate'];
+  onEdgeUpdateStart: EdgeWrapperProps['onEdgeUpdateStart'];
+  onEdgeUpdateEnd: EdgeWrapperProps['onEdgeUpdateEnd'];
+  setUpdateHover: (hover: boolean) => void;
+  setUpdating: (updating: boolean) => void;
+};
+
+function EdgeUpdateAnchors({
+  isUpdatable,
+  edgeUpdaterRadius,
+  onEdgeUpdate,
+  onEdgeUpdateStart,
+  onEdgeUpdateEnd,
+  setUpdating,
+  setUpdateHover,
+  edgePosition,
+  edge,
+  targetHandleId,
+  sourceHandleId,
+}: EdgeUpdateAnchorsProps) {
+  const store = useStoreApi();
+
+  const handleEdgeUpdater = (event: React.MouseEvent<SVGGElement, MouseEvent>, isSourceHandle: boolean) => {
+    // avoid triggering edge updater if mouse btn is not left
+    if (event.button !== 0) {
+      return;
+    }
+
+    const {
+      autoPanOnConnect,
+      domNode,
+      isValidConnection,
+      connectionMode,
+      connectionRadius,
+      lib,
+      onConnectStart,
+      onConnectEnd,
+      cancelConnection,
+      nodes,
+      panBy,
+      updateConnection,
+    } = store.getState();
+    const nodeId = isSourceHandle ? edge.target : edge.source;
+    const handleId = (isSourceHandle ? targetHandleId : sourceHandleId) || null;
+    const handleType = isSourceHandle ? 'target' : 'source';
+
+    const isTarget = isSourceHandle;
+
+    setUpdating(true);
+    onEdgeUpdateStart?.(event, edge, handleType);
+
+    const _onEdgeUpdateEnd = (evt: MouseEvent | TouchEvent) => {
+      setUpdating(false);
+      onEdgeUpdateEnd?.(evt, edge, handleType);
+    };
+
+    const onConnectEdge = (connection: Connection) => onEdgeUpdate?.(edge, connection);
+
+    XYHandle.onPointerDown(event.nativeEvent, {
+      autoPanOnConnect,
+      connectionMode,
+      connectionRadius,
+      domNode,
+      handleId,
+      nodeId,
+      nodes,
+      isTarget,
+      edgeUpdaterType: handleType,
+      lib,
+      cancelConnection,
+      panBy,
+      isValidConnection,
+      onConnect: onConnectEdge,
+      onConnectStart,
+      onConnectEnd,
+      onEdgeUpdateEnd: _onEdgeUpdateEnd,
+      updateConnection,
+      getTransform: () => store.getState().transform,
+    });
+  };
+
+  const onEdgeUpdaterSourceMouseDown = (event: React.MouseEvent<SVGGElement, MouseEvent>): void =>
+    handleEdgeUpdater(event, true);
+  const onEdgeUpdaterTargetMouseDown = (event: React.MouseEvent<SVGGElement, MouseEvent>): void =>
+    handleEdgeUpdater(event, false);
+  const onEdgeUpdaterMouseEnter = () => setUpdateHover(true);
+  const onEdgeUpdaterMouseOut = () => setUpdateHover(false);
+
+  return (
+    <>
+      {(isUpdatable === 'source' || isUpdatable === true) && (
+        <EdgeAnchor
+          position={edgePosition.sourcePosition}
+          centerX={edgePosition.sourceX}
+          centerY={edgePosition.sourceY}
+          radius={edgeUpdaterRadius}
+          onMouseDown={onEdgeUpdaterSourceMouseDown}
+          onMouseEnter={onEdgeUpdaterMouseEnter}
+          onMouseOut={onEdgeUpdaterMouseOut}
+          type="source"
+        />
+      )}
+      {(isUpdatable === 'target' || isUpdatable === true) && (
+        <EdgeAnchor
+          position={edgePosition.targetPosition}
+          centerX={edgePosition.targetX}
+          centerY={edgePosition.targetY}
+          radius={edgeUpdaterRadius}
+          onMouseDown={onEdgeUpdaterTargetMouseDown}
+          onMouseEnter={onEdgeUpdaterMouseEnter}
+          onMouseOut={onEdgeUpdaterMouseOut}
+          type="target"
+        />
+      )}
+    </>
+  );
+}
+
+export default EdgeUpdateAnchors;
diff --git a/packages/react/src/components/EdgeWrapper/index.tsx b/packages/react/src/components/EdgeWrapper/index.tsx
index 0b20af69..e82268ac 100644
--- a/packages/react/src/components/EdgeWrapper/index.tsx
+++ b/packages/react/src/components/EdgeWrapper/index.tsx
@@ -1,43 +1,21 @@
 import { memo, useState, useMemo, useRef, type KeyboardEvent, useCallback } from 'react';
 import cc from 'classcat';
 import { shallow } from 'zustand/shallow';
-import {
-  getMarkerId,
-  elementSelectionKeys,
-  XYHandle,
-  type Connection,
-  getEdgePosition,
-  errorMessages,
-  getEdgeZIndex,
-} from '@xyflow/system';
+import { getMarkerId, elementSelectionKeys, getEdgePosition, errorMessages, getEdgeZIndex } from '@xyflow/system';
 
 import { useStoreApi, useStore } from '../../hooks/useStore';
 import { ARIA_EDGE_DESC_KEY } from '../A11yDescriptions';
-import { EdgeAnchor } from '../Edges/EdgeAnchor';
-import { getMouseHandler } from '../Edges/utils';
 import type { EdgeWrapperProps, Node } from '../../types';
 import { builtinEdgeTypes } from './utils';
+import EdgeUpdateAnchors from './EdgeUpdateAnchors';
 
 function EdgeWrapper({
   id,
-  className,
-  type,
-  data,
+  edgesFocusable,
+  edgesUpdatable,
+  elementsSelectable,
   onClick,
-  onEdgeDoubleClick,
-  selected,
-  animated,
-  label,
-  labelStyle,
-  labelShowBg,
-  labelBgStyle,
-  labelBgPadding,
-  labelBgBorderRadius,
-  style,
-  source,
-  target,
-  isSelectable,
-  hidden,
+  onDoubleClick,
   sourceHandleId,
   targetHandleId,
   onContextMenu,
@@ -48,20 +26,15 @@ function EdgeWrapper({
   onEdgeUpdate,
   onEdgeUpdateStart,
   onEdgeUpdateEnd,
-  markerEnd,
-  markerStart,
   rfId,
-  ariaLabel,
-  isFocusable,
-  isUpdatable,
-  pathOptions,
-  interactionWidth,
   edgeTypes,
-  zIndex: edgeZIndex,
   elevateEdgesOnSelect,
+  noPanClassName,
   onError,
 }: EdgeWrapperProps): JSX.Element | null {
-  let edgeType = type || 'default';
+  const edge = useStore((s) => s.edgeLookup.get(id)!);
+
+  let edgeType = edge.type || 'default';
   let EdgeComponent = edgeTypes?.[edgeType] || builtinEdgeTypes[edgeType];
 
   if (EdgeComponent === undefined) {
@@ -70,23 +43,29 @@ function EdgeWrapper({
     EdgeComponent = builtinEdgeTypes.default;
   }
 
+  const isFocusable = !!(edge.focusable || (edgesFocusable && typeof edge.focusable === 'undefined'));
+  const isUpdatable =
+    typeof onEdgeUpdate !== 'undefined' &&
+    (edge.updatable || (edgesUpdatable && typeof edge.updatable === 'undefined'));
+  const isSelectable = !!(edge.selectable || (elementsSelectable && typeof edge.selectable === 'undefined'));
+
   const edgeRef = useRef<SVGGElement>(null);
   const [updateHover, setUpdateHover] = useState<boolean>(false);
   const [updating, setUpdating] = useState<boolean>(false);
   const store = useStoreApi();
   const prevSourceNode = useRef<Node | undefined>();
   const prevTargetNode = useRef<Node | undefined>();
-  const prevZIndex = useRef<number | undefined>(edgeZIndex);
+  const prevZIndex = useRef<number | undefined>(edge.zIndex);
   const prevEdgePosition = useRef<ReturnType<typeof getEdgePosition> | null>(null);
 
   const { edgePosition, zIndex } = useStore(
     useCallback(
       (state) => {
-        const sourceNode = state.nodeLookup.get(source);
-        const targetNode = state.nodeLookup.get(target);
+        const sourceNode = state.nodeLookup.get(edge.source);
+        const targetNode = state.nodeLookup.get(edge.target);
 
         if (!sourceNode || !targetNode) {
-          return { edgePosition: null, zIndex: edgeZIndex };
+          return { edgePosition: null, zIndex: edge.zIndex };
         }
 
         const nodesChanged = prevSourceNode.current !== sourceNode || prevTargetNode.current !== targetNode;
@@ -105,28 +84,33 @@ function EdgeWrapper({
               onError: state.onError,
             })
           : prevEdgePosition.current;
-        prevZIndex.current = getEdgeZIndex(selected, edgeZIndex, sourceNode, targetNode, elevateEdgesOnSelect);
+        prevZIndex.current = getEdgeZIndex(edge.selected, edge.zIndex, sourceNode, targetNode, elevateEdgesOnSelect);
 
         return {
           edgePosition: prevEdgePosition.current,
           zIndex: prevZIndex.current,
         };
       },
-      [source, target, selected, edgeZIndex]
+      [edge.source, edge.target, edge.selected, edge.zIndex]
     ),
     shallow
   );
 
-  const markerStartUrl = useMemo(() => `url(#${getMarkerId(markerStart, rfId)})`, [markerStart, rfId]);
-  const markerEndUrl = useMemo(() => `url(#${getMarkerId(markerEnd, rfId)})`, [markerEnd, rfId]);
+  const markerStartUrl = useMemo(
+    () => (edge.markerStart ? `url(#${getMarkerId(edge.markerStart, rfId)})` : undefined),
+    [edge.markerStart, rfId]
+  );
+  const markerEndUrl = useMemo(
+    () => (edge.markerEnd ? `url(#${getMarkerId(edge.markerEnd, rfId)})` : undefined),
+    [edge.markerEnd, rfId]
+  );
 
-  if (hidden || !edgePosition) {
+  if (edge.hidden || !edgePosition) {
     return null;
   }
 
   const onEdgeClick = (event: React.MouseEvent<SVGGElement, MouseEvent>): void => {
-    const { edges, addSelectedEdges, unselectNodesAndEdges, multiSelectionActive } = store.getState();
-    const edge = edges.find((e) => e.id === id);
+    const { addSelectedEdges, unselectNodesAndEdges, multiSelectionActive } = store.getState();
 
     if (!edge) {
       return;
@@ -148,82 +132,31 @@ function EdgeWrapper({
     }
   };
 
-  const onEdgeDoubleClickHandler = getMouseHandler(id, store.getState, onEdgeDoubleClick);
-  const onEdgeContextMenu = getMouseHandler(id, store.getState, onContextMenu);
-  const onEdgeMouseEnter = getMouseHandler(id, store.getState, onMouseEnter);
-  const onEdgeMouseMove = getMouseHandler(id, store.getState, onMouseMove);
-  const onEdgeMouseLeave = getMouseHandler(id, store.getState, onMouseLeave);
-
-  const handleEdgeUpdater = (event: React.MouseEvent<SVGGElement, MouseEvent>, isSourceHandle: boolean) => {
-    // avoid triggering edge updater if mouse btn is not left
-    if (event.button !== 0) {
-      return;
-    }
-
-    const {
-      autoPanOnConnect,
-      domNode,
-      edges,
-      isValidConnection,
-      connectionMode,
-      connectionRadius,
-      lib,
-      onConnectStart,
-      onConnectEnd,
-      cancelConnection,
-      nodes,
-      panBy,
-      updateConnection,
-    } = store.getState();
-    const nodeId = isSourceHandle ? target : source;
-    const handleId = (isSourceHandle ? targetHandleId : sourceHandleId) || null;
-    const handleType = isSourceHandle ? 'target' : 'source';
-
-    const isTarget = isSourceHandle;
-    const edge = edges.find((e) => e.id === id)!;
-
-    setUpdating(true);
-    onEdgeUpdateStart?.(event, edge, handleType);
-
-    const _onEdgeUpdateEnd = (evt: MouseEvent | TouchEvent) => {
-      setUpdating(false);
-      onEdgeUpdateEnd?.(evt, edge, handleType);
-    };
-
-    const onConnectEdge = (connection: Connection) => onEdgeUpdate?.(edge, connection);
-
-    XYHandle.onPointerDown(event.nativeEvent, {
-      autoPanOnConnect,
-      connectionMode,
-      connectionRadius,
-      domNode,
-      handleId,
-      nodeId,
-      nodes,
-      isTarget,
-      edgeUpdaterType: handleType,
-      lib,
-      cancelConnection,
-      panBy,
-      isValidConnection,
-      onConnect: onConnectEdge,
-      onConnectStart,
-      onConnectEnd,
-      onEdgeUpdateEnd: _onEdgeUpdateEnd,
-      updateConnection,
-      getTransform: () => store.getState().transform,
-    });
-  };
-
-  const onEdgeUpdaterSourceMouseDown = (event: React.MouseEvent<SVGGElement, MouseEvent>): void =>
-    handleEdgeUpdater(event, true);
-  const onEdgeUpdaterTargetMouseDown = (event: React.MouseEvent<SVGGElement, MouseEvent>): void =>
-    handleEdgeUpdater(event, false);
-
-  const onEdgeUpdaterMouseEnter = () => setUpdateHover(true);
-  const onEdgeUpdaterMouseOut = () => setUpdateHover(false);
-
-  const inactive = !isSelectable && !onClick;
+  const onEdgeDoubleClick = onDoubleClick
+    ? (event: React.MouseEvent) => {
+        onDoubleClick(event, { ...edge });
+      }
+    : undefined;
+  const onEdgeContextMenu = onContextMenu
+    ? (event: React.MouseEvent) => {
+        onContextMenu(event, { ...edge });
+      }
+    : undefined;
+  const onEdgeMouseEnter = onMouseEnter
+    ? (event: React.MouseEvent) => {
+        onMouseEnter(event, { ...edge });
+      }
+    : undefined;
+  const onEdgeMouseMove = onMouseMove
+    ? (event: React.MouseEvent) => {
+        onMouseMove(event, { ...edge });
+      }
+    : undefined;
+  const onEdgeMouseLeave = onMouseLeave
+    ? (event: React.MouseEvent) => {
+        onMouseLeave(event, { ...edge });
+      }
+    : undefined;
 
   const onKeyDown = (event: KeyboardEvent) => {
     if (elementSelectionKeys.includes(event.key) && isSelectable) {
@@ -244,12 +177,18 @@ function EdgeWrapper({
       <g
         className={cc([
           'react-flow__edge',
-          `react-flow__edge-${type}`,
-          className,
-          { selected, animated, inactive, updating: updateHover },
+          `react-flow__edge-${edgeType}`,
+          edge.className,
+          noPanClassName,
+          {
+            selected: edge.selected,
+            animated: edge.animated,
+            inactive: !isSelectable && !onClick,
+            updating: updateHover,
+          },
         ])}
         onClick={onEdgeClick}
-        onDoubleClick={onEdgeDoubleClickHandler}
+        onDoubleClick={onEdgeDoubleClick}
         onContextMenu={onEdgeContextMenu}
         onMouseEnter={onEdgeMouseEnter}
         onMouseMove={onEdgeMouseMove}
@@ -259,25 +198,27 @@ function EdgeWrapper({
         role={isFocusable ? 'button' : 'img'}
         data-id={id}
         data-testid={`rf__edge-${id}`}
-        aria-label={ariaLabel === null ? undefined : ariaLabel ? ariaLabel : `Edge from ${source} to ${target}`}
+        aria-label={
+          edge.ariaLabel === null ? undefined : edge.ariaLabel || `Edge from ${edge.source} to ${edge.target}`
+        }
         aria-describedby={isFocusable ? `${ARIA_EDGE_DESC_KEY}-${rfId}` : undefined}
         ref={edgeRef}
       >
         {!updating && (
           <EdgeComponent
             id={id}
-            source={source}
-            target={target}
-            selected={selected}
-            animated={animated}
-            label={label}
-            labelStyle={labelStyle}
-            labelShowBg={labelShowBg}
-            labelBgStyle={labelBgStyle}
-            labelBgPadding={labelBgPadding}
-            labelBgBorderRadius={labelBgBorderRadius}
-            data={data}
-            style={style}
+            source={edge.source}
+            target={edge.target}
+            selected={edge.selected}
+            animated={edge.animated}
+            label={edge.label}
+            labelStyle={edge.labelStyle}
+            labelShowBg={edge.labelShowBg}
+            labelBgStyle={edge.labelBgStyle}
+            labelBgPadding={edge.labelBgPadding}
+            labelBgBorderRadius={edge.labelBgBorderRadius}
+            data={edge.data}
+            style={edge.style}
             sourceX={edgePosition.sourceX}
             sourceY={edgePosition.sourceY}
             targetX={edgePosition.targetX}
@@ -288,37 +229,24 @@ function EdgeWrapper({
             targetHandleId={targetHandleId}
             markerStart={markerStartUrl}
             markerEnd={markerEndUrl}
-            pathOptions={pathOptions}
-            interactionWidth={interactionWidth}
+            pathOptions={'pathOptions' in edge ? edge.pathOptions : undefined}
+            interactionWidth={edge.interactionWidth}
           />
         )}
         {isUpdatable && (
-          <>
-            {(isUpdatable === 'source' || isUpdatable === true) && (
-              <EdgeAnchor
-                position={edgePosition.sourcePosition}
-                centerX={edgePosition.sourceX}
-                centerY={edgePosition.sourceY}
-                radius={edgeUpdaterRadius}
-                onMouseDown={onEdgeUpdaterSourceMouseDown}
-                onMouseEnter={onEdgeUpdaterMouseEnter}
-                onMouseOut={onEdgeUpdaterMouseOut}
-                type="source"
-              />
-            )}
-            {(isUpdatable === 'target' || isUpdatable === true) && (
-              <EdgeAnchor
-                position={edgePosition.targetPosition}
-                centerX={edgePosition.targetX}
-                centerY={edgePosition.targetY}
-                radius={edgeUpdaterRadius}
-                onMouseDown={onEdgeUpdaterTargetMouseDown}
-                onMouseEnter={onEdgeUpdaterMouseEnter}
-                onMouseOut={onEdgeUpdaterMouseOut}
-                type="target"
-              />
-            )}
-          </>
+          <EdgeUpdateAnchors
+            edge={edge}
+            isUpdatable={isUpdatable}
+            edgeUpdaterRadius={edgeUpdaterRadius}
+            onEdgeUpdate={onEdgeUpdate}
+            onEdgeUpdateStart={onEdgeUpdateStart}
+            onEdgeUpdateEnd={onEdgeUpdateEnd}
+            edgePosition={edgePosition}
+            setUpdateHover={setUpdateHover}
+            setUpdating={setUpdating}
+            sourceHandleId={sourceHandleId}
+            targetHandleId={targetHandleId}
+          />
         )}
       </g>
     </svg>
diff --git a/packages/react/src/components/Edges/utils.ts b/packages/react/src/components/Edges/utils.ts
deleted file mode 100644
index a51b7613..00000000
--- a/packages/react/src/components/Edges/utils.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { MouseEvent as ReactMouseEvent } from 'react';
-import type { StoreApi } from 'zustand';
-
-import type { Edge, ReactFlowState } from '../../types';
-
-export function getMouseHandler(
-  id: string,
-  getState: StoreApi<ReactFlowState>['getState'],
-  handler?: (event: ReactMouseEvent<SVGGElement, MouseEvent>, edge: Edge) => void
-) {
-  return handler === undefined
-    ? handler
-    : (event: ReactMouseEvent<SVGGElement, MouseEvent>) => {
-        const edge = getState().edges.find((e) => e.id === id);
-
-        if (edge) {
-          handler(event, { ...edge });
-        }
-      };
-}
diff --git a/packages/react/src/container/EdgeRenderer/index.tsx b/packages/react/src/container/EdgeRenderer/index.tsx
index e1ae6a20..550bb487 100644
--- a/packages/react/src/container/EdgeRenderer/index.tsx
+++ b/packages/react/src/container/EdgeRenderer/index.tsx
@@ -1,9 +1,8 @@
 import { memo, ReactNode } from 'react';
 import { shallow } from 'zustand/shallow';
-import cc from 'classcat';
 
 import { useStore } from '../../hooks/useStore';
-import useVisibleEdges from '../../hooks/useVisibleEdges';
+import useVisibleEdgeIds from '../../hooks/useVisibleEdges';
 import MarkerDefinitions from './MarkerDefinitions';
 import { GraphViewProps } from '../GraphView';
 import type { ReactFlowState } from '../../types';
@@ -63,7 +62,7 @@ const EdgeRenderer = ({
   children,
 }: EdgeRendererProps) => {
   const { edgesFocusable, edgesUpdatable, elementsSelectable, onError } = useStore(selector, shallow);
-  const edges = useVisibleEdges(onlyRenderVisibleElements);
+  const edgeIds = useVisibleEdgeIds(onlyRenderVisibleElements);
 
   return (
     <div className="react-flow__edges">
@@ -71,38 +70,15 @@ const EdgeRenderer = ({
         <MarkerDefinitions defaultColor={defaultMarkerColor} rfId={rfId} />
       </svg>
 
-      {edges.map((edge) => {
-        const isFocusable = !!(edge.focusable || (edgesFocusable && typeof edge.focusable === 'undefined'));
-        const isUpdatable =
-          typeof onEdgeUpdate !== 'undefined' &&
-          (edge.updatable || (edgesUpdatable && typeof edge.updatable === 'undefined'));
-        const isSelectable = !!(edge.selectable || (elementsSelectable && typeof edge.selectable === 'undefined'));
-
+      {edgeIds.map((id) => {
         return (
           <EdgeWrapper
-            key={edge.id}
-            id={edge.id}
-            className={cc([edge.className, noPanClassName])}
-            type={edge.type}
-            data={edge.data}
-            selected={!!edge.selected}
-            animated={!!edge.animated}
-            hidden={!!edge.hidden}
-            zIndex={edge.zIndex}
-            label={edge.label}
-            labelStyle={edge.labelStyle}
-            labelShowBg={edge.labelShowBg}
-            labelBgStyle={edge.labelBgStyle}
-            labelBgPadding={edge.labelBgPadding}
-            labelBgBorderRadius={edge.labelBgBorderRadius}
-            style={edge.style}
-            source={edge.source}
-            target={edge.target}
-            sourceHandleId={edge.sourceHandle}
-            targetHandleId={edge.targetHandle}
-            markerEnd={edge.markerEnd}
-            markerStart={edge.markerStart}
-            isSelectable={isSelectable}
+            key={id}
+            id={id}
+            edgesFocusable={edgesFocusable}
+            edgesUpdatable={edgesUpdatable}
+            elementsSelectable={elementsSelectable}
+            noPanClassName={noPanClassName}
             onEdgeUpdate={onEdgeUpdate}
             onContextMenu={onEdgeContextMenu}
             onMouseEnter={onEdgeMouseEnter}
@@ -110,15 +86,10 @@ const EdgeRenderer = ({
             onMouseLeave={onEdgeMouseLeave}
             onClick={onEdgeClick}
             edgeUpdaterRadius={edgeUpdaterRadius}
-            onEdgeDoubleClick={onEdgeDoubleClick}
+            onDoubleClick={onEdgeDoubleClick}
             onEdgeUpdateStart={onEdgeUpdateStart}
             onEdgeUpdateEnd={onEdgeUpdateEnd}
             rfId={rfId}
-            ariaLabel={edge.ariaLabel}
-            isFocusable={isFocusable}
-            isUpdatable={isUpdatable}
-            pathOptions={'pathOptions' in edge ? edge.pathOptions : undefined}
-            interactionWidth={edge.interactionWidth}
             onError={onError}
             edgeTypes={edgeTypes}
             elevateEdgesOnSelect={elevateEdgesOnSelect}
diff --git a/packages/react/src/hooks/useVisibleEdges.ts b/packages/react/src/hooks/useVisibleEdges.ts
index f7ebe606..9280c27e 100644
--- a/packages/react/src/hooks/useVisibleEdges.ts
+++ b/packages/react/src/hooks/useVisibleEdges.ts
@@ -3,10 +3,10 @@ import { shallow } from 'zustand/shallow';
 import { isEdgeVisible } from '@xyflow/system';
 
 import { useStore } from '../hooks/useStore';
-import { type Edge, type ReactFlowState } from '../types';
+import { type ReactFlowState } from '../types';
 
-function useVisibleEdges(onlyRenderVisible: boolean): Edge[] {
-  const edges = useStore(
+function useVisibleEdgeIds(onlyRenderVisible: boolean): string[] {
+  const edgeIds = useStore(
     useCallback(
       (s: ReactFlowState) => {
         const visibleEdges =
@@ -29,14 +29,14 @@ function useVisibleEdges(onlyRenderVisible: boolean): Edge[] {
               })
             : s.edges;
 
-        return visibleEdges;
+        return visibleEdges.map((edge) => edge.id);
       },
       [onlyRenderVisible]
     ),
     shallow
   );
 
-  return edges;
+  return edgeIds;
 }
 
-export default useVisibleEdges;
+export default useVisibleEdgeIds;
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
index ae82e78b..fdf20c9f 100644
--- a/packages/react/src/index.ts
+++ b/packages/react/src/index.ts
@@ -77,6 +77,7 @@ export {
   type CoordinateExtent,
   type ColorMode,
   type ColorModeClass,
+  type HandleType,
 } from '@xyflow/system';
 
 // system utils
diff --git a/packages/react/src/store/index.ts b/packages/react/src/store/index.ts
index 166e9eed..9b163f4e 100644
--- a/packages/react/src/store/index.ts
+++ b/packages/react/src/store/index.ts
@@ -55,10 +55,10 @@ const createRFStore = ({
         set({ nodes: nodesWithInternalData });
       },
       setEdges: (edges: Edge[]) => {
-        const { defaultEdgeOptions = {}, connectionLookup } = get();
+        const { defaultEdgeOptions = {}, connectionLookup, edgeLookup } = get();
         const nextEdges = edges.map((e) => ({ ...defaultEdgeOptions, ...e }));
 
-        updateConnectionLookup(connectionLookup, nextEdges);
+        updateConnectionLookup(connectionLookup, edgeLookup, nextEdges);
 
         set({ edges: nextEdges });
       },
@@ -79,13 +79,16 @@ const createRFStore = ({
         };
 
         if (hasDefaultNodes) {
-          const { nodeLookup } = get();
+          const { nodeLookup, nodeOrigin, elevateNodesOnSelect } = get();
           nextState.nodes = adoptUserProvidedNodes(nodes, nodeLookup, {
-            nodeOrigin: get().nodeOrigin,
-            elevateNodesOnSelect: get().elevateNodesOnSelect,
+            nodeOrigin,
+            elevateNodesOnSelect,
           });
         }
         if (hasDefaultEdges) {
+          const { connectionLookup, edgeLookup } = get();
+          updateConnectionLookup(connectionLookup, edgeLookup, edges);
+
           nextState.edges = edges;
         }
 
diff --git a/packages/react/src/store/initialState.ts b/packages/react/src/store/initialState.ts
index d9b44567..e70d8598 100644
--- a/packages/react/src/store/initialState.ts
+++ b/packages/react/src/store/initialState.ts
@@ -24,7 +24,10 @@ const getInitialState = ({
   fitView?: boolean;
 } = {}): ReactFlowStore => {
   const nodeLookup = new Map();
-  const connectionLookup = updateConnectionLookup(new Map(), edges);
+  const connectionLookup = new Map();
+  const edgeLookup = new Map();
+
+  updateConnectionLookup(connectionLookup, edgeLookup, edges);
   const nextNodes = adoptUserProvidedNodes(nodes, nodeLookup, {
     nodeOrigin: [0, 0],
     elevateNodesOnSelect: false,
@@ -47,6 +50,7 @@ const getInitialState = ({
     nodes: nextNodes,
     nodeLookup,
     edges: edges,
+    edgeLookup,
     connectionLookup,
     onNodesChange: null,
     onEdgesChange: null,
diff --git a/packages/react/src/types/edges.ts b/packages/react/src/types/edges.ts
index 2c0d3742..e3e2809a 100644
--- a/packages/react/src/types/edges.ts
+++ b/packages/react/src/types/edges.ts
@@ -58,9 +58,14 @@ export type Edge<T = any> = DefaultEdge<T> | SmoothStepEdgeType<T> | BezierEdgeT
 
 export type EdgeMouseHandler = (event: ReactMouseEvent, edge: Edge) => void;
 
-export type EdgeWrapperProps<T = any> = Omit<Edge<T>, 'sourceHandle' | 'targetHandle'> & {
+export type EdgeWrapperProps = {
+  id: string;
+  edgesFocusable: boolean;
+  edgesUpdatable: boolean;
+  elementsSelectable: boolean;
+  noPanClassName: string;
   onClick?: EdgeMouseHandler;
-  onEdgeDoubleClick?: EdgeMouseHandler;
+  onDoubleClick?: EdgeMouseHandler;
   sourceHandleId?: string | null;
   targetHandleId?: string | null;
   onEdgeUpdate?: OnEdgeUpdateFunc;
@@ -72,10 +77,6 @@ export type EdgeWrapperProps<T = any> = Omit<Edge<T>, 'sourceHandle' | 'targetHa
   onEdgeUpdateStart?: (event: ReactMouseEvent, edge: Edge, handleType: HandleType) => void;
   onEdgeUpdateEnd?: (event: MouseEvent | TouchEvent, edge: Edge, handleType: HandleType) => void;
   rfId?: string;
-  isFocusable: boolean;
-  isUpdatable: EdgeUpdatable;
-  isSelectable: boolean;
-  pathOptions?: BezierPathOptions | SmoothStepPathOptions;
   edgeTypes?: EdgeTypes;
   onError?: OnError;
   elevateEdgesOnSelect?: boolean;
@@ -94,13 +95,14 @@ export type EdgeProps<T = any> = Pick<
   Edge<T>,
   'id' | 'animated' | 'data' | 'style' | 'selected' | 'source' | 'target'
 > &
-  Pick<EdgeWrapperProps, 'sourceHandleId' | 'targetHandleId' | 'interactionWidth'> &
+  Pick<EdgeWrapperProps, 'sourceHandleId' | 'targetHandleId'> &
   EdgePosition &
   EdgeLabelOptions & {
     markerStart?: string;
     markerEnd?: string;
     // @TODO: how can we get better types for pathOptions?
     pathOptions?: any;
+    interactionWidth?: number;
   };
 
 export type BaseEdgeProps = Pick<EdgeProps, 'style' | 'markerStart' | 'markerEnd' | 'interactionWidth'> &
diff --git a/packages/react/src/types/store.ts b/packages/react/src/types/store.ts
index 5aebb99d..50bf9618 100644
--- a/packages/react/src/types/store.ts
+++ b/packages/react/src/types/store.ts
@@ -24,7 +24,8 @@ import {
   type OnMoveEnd,
   type IsValidConnection,
   type UpdateConnection,
-  Connection,
+  EdgeLookup,
+  ConnectionLookup,
 } from '@xyflow/system';
 
 import type {
@@ -50,7 +51,8 @@ export type ReactFlowStore = {
   nodes: Node[];
   nodeLookup: Map<string, Node>;
   edges: Edge[];
-  connectionLookup: Map<string, Map<string, Connection>>;
+  edgeLookup: EdgeLookup<Edge>;
+  connectionLookup: ConnectionLookup;
 
   onNodesChange: OnNodesChange | null;
   onEdgesChange: OnEdgesChange | null;
diff --git a/packages/svelte/src/lib/store/initial-store.ts b/packages/svelte/src/lib/store/initial-store.ts
index 8e138c77..addaa0ab 100644
--- a/packages/svelte/src/lib/store/initial-store.ts
+++ b/packages/svelte/src/lib/store/initial-store.ts
@@ -81,7 +81,9 @@ export const getInitialStore = ({
     nodeOrigin: [0, 0],
     elevateNodesOnSelect: false
   });
-  const connectionLookup = updateConnectionLookup(new Map(), edges);
+  const connectionLookup = new Map();
+  const edgeLookup = new Map();
+  updateConnectionLookup(connectionLookup, edgeLookup, edges);
 
   let viewport: Viewport = { x: 0, y: 0, zoom: 1 };
 
@@ -96,7 +98,7 @@ export const getInitialStore = ({
     nodes: createNodesStore(nextNodes, nodeLookup),
     nodeLookup: readable<Map<string, Node>>(nodeLookup),
     visibleNodes: readable<Node[]>([]),
-    edges: createEdgesStore(edges, connectionLookup),
+    edges: createEdgesStore(edges, connectionLookup, edgeLookup),
     visibleEdges: readable<EdgeLayouted[]>([]),
     connectionLookup: readable<ConnectionLookup>(connectionLookup),
     height: writable<number>(500),
diff --git a/packages/svelte/src/lib/store/utils.ts b/packages/svelte/src/lib/store/utils.ts
index f8c1aef0..1fb96e7c 100644
--- a/packages/svelte/src/lib/store/utils.ts
+++ b/packages/svelte/src/lib/store/utils.ts
@@ -11,7 +11,8 @@ import {
   updateConnectionLookup,
   type Viewport,
   type PanZoomInstance,
-  type ConnectionLookup
+  type ConnectionLookup,
+  type EdgeLookup
 } from '@xyflow/system';
 
 import type { DefaultEdgeOptions, DefaultNodeOptions, Edge, Node } from '$lib/types';
@@ -175,6 +176,7 @@ export const createNodesStore = (
 export const createEdgesStore = (
   edges: Edge[],
   connectionLookup: ConnectionLookup,
+  edgeLookup: EdgeLookup,
   defaultOptions?: DefaultEdgeOptions
 ): Writable<Edge[]> & { setDefaultOptions: (opts: DefaultEdgeOptions) => void } => {
   const { subscribe, set, update } = writable<Edge[]>([]);
@@ -184,7 +186,7 @@ export const createEdgesStore = (
   const _set: typeof set = (eds: Edge[]) => {
     const nextEdges = defaults ? eds.map((edge) => ({ ...defaults, ...edge })) : eds;
 
-    updateConnectionLookup(connectionLookup, nextEdges);
+    updateConnectionLookup(connectionLookup, edgeLookup, nextEdges);
 
     value = nextEdges;
     set(value);
diff --git a/packages/system/src/types/edges.ts b/packages/system/src/types/edges.ts
index 65c8e641..131cab62 100644
--- a/packages/system/src/types/edges.ts
+++ b/packages/system/src/types/edges.ts
@@ -77,3 +77,5 @@ export type EdgePosition = {
   sourcePosition: Position;
   targetPosition: Position;
 };
+
+export type EdgeLookup = Map<string, EdgeBase>;
diff --git a/packages/system/src/utils/store.ts b/packages/system/src/utils/store.ts
index 96950710..68051aaa 100644
--- a/packages/system/src/utils/store.ts
+++ b/packages/system/src/utils/store.ts
@@ -11,6 +11,7 @@ import {
   XYZPosition,
   ConnectionLookup,
   EdgeBase,
+  EdgeLookup,
 } from '../types';
 import { getDimensions, getHandleBounds } from './dom';
 import { isNumeric } from './general';
@@ -244,22 +245,25 @@ export function panBy({
   return transformChanged;
 }
 
-export function updateConnectionLookup(lookup: ConnectionLookup, edges: EdgeBase[]) {
+export function updateConnectionLookup(lookup: ConnectionLookup, edgeLookup: EdgeLookup, edges: EdgeBase[]) {
   lookup.clear();
+  edgeLookup.clear();
 
-  edges.forEach(({ source, target, sourceHandle = null, targetHandle = null }) => {
-    if (source && target) {
-      const sourceKey = `${source}-source-${sourceHandle}`;
-      const targetKey = `${target}-target-${targetHandle}`;
+  for (const edge of edges) {
+    edgeLookup.set(edge.id, edge);
 
-      const prevSource = lookup.get(sourceKey) || new Map();
-      const prevTarget = lookup.get(targetKey) || new Map();
-      const connection = { source, target, sourceHandle, targetHandle };
+    const { source, target, sourceHandle = null, targetHandle = null } = edge;
 
-      lookup.set(sourceKey, prevSource.set(`${target}-${targetHandle}`, connection));
-      lookup.set(targetKey, prevTarget.set(`${source}-${sourceHandle}`, connection));
-    }
-  });
+    const sourceKey = `${source}-source-${sourceHandle}`;
+    const targetKey = `${target}-target-${targetHandle}`;
+
+    const prevSource = lookup.get(sourceKey) || new Map();
+    const prevTarget = lookup.get(targetKey) || new Map();
+    const connection = { source, target, sourceHandle, targetHandle };
+
+    lookup.set(sourceKey, prevSource.set(`${target}-${targetHandle}`, connection));
+    lookup.set(targetKey, prevTarget.set(`${source}-${sourceHandle}`, connection));
+  }
 
   return lookup;
 }