Merge branch 'main' into v11

packages/core/src/container/ReactFlow/index.tsx

@@ -1,5 +1,6 @@
-import cc from 'classcat';
 import React, { forwardRef } from 'react';
+import cc from 'classcat';
+
 import Attribution from '../../components/Attribution';
 import { BezierEdge, SmoothStepEdge, StepEdge, StraightEdge, SimpleBezierEdge } from '../../components/Edges';
 import DefaultNode from '../../components/Nodes/DefaultNode';
@@ -148,10 +149,9 @@ const ReactFlow = forwardRef<ReactFlowRefType, ReactFlowProps>(
   ) => {
     const nodeTypesWrapped = useNodeOrEdgeTypes(nodeTypes, createNodeTypes) as NodeTypesWrapped;
     const edgeTypesWrapped = useNodeOrEdgeTypes(edgeTypes, createEdgeTypes) as EdgeTypesWrapped;
-    const reactFlowClasses = cc(['react-flow', className]);
 
     return (
-      <div {...rest} ref={ref} className={reactFlowClasses}>
+      <div {...rest} ref={ref} className={cc(['react-flow', className])}>
         <Wrapper>
           <GraphView
             onInit={onInit}

packages/core/src/container/ZoomPane/index.tsx

@@ -81,6 +81,7 @@ const ZoomPane = ({
         d3ZoomHandler: selection.on('wheel.zoom'),
         // we need to pass transform because zoom handler is not registered when we set the initial transform
         transform: [clampedX, clampedY, clampedZoom],
+        domNode: selection.node()?.closest('.react-flow') as HTMLElement,
       });
     }
   }, []);