Merge branch 'main' into refactor/d3-drag

src/components/Attribution/index.tsx

@@ -10,7 +10,8 @@ type AttributionProps = {
 
 function Attribution({ proOptions, position = 'bottom-right' }: AttributionProps) {
   if (
-    (proOptions?.account === 'paid-sponsor' ||
+    (proOptions?.account === 'paid-pro' ||
+      proOptions?.account === 'paid-sponsor' ||
       proOptions?.account === 'paid-enterprise' ||
       proOptions?.account === 'paid-custom') &&
     proOptions?.hideAttribution

src/components/Edges/EdgeText.tsx

@@ -1,9 +1,9 @@
-import React, { memo, useRef, useState, useEffect, FC } from 'react';
+import React, { memo, useRef, useState, useEffect, FC, PropsWithChildren } from 'react';
 import cc from 'classcat';
 
 import { EdgeTextProps, Rect } from '../../types';
 
-const EdgeText: FC<EdgeTextProps> = ({
+const EdgeText: FC<PropsWithChildren<EdgeTextProps>> = ({
   x,
   y,
   label,

src/components/Edges/wrapEdge.tsx

@@ -140,7 +140,7 @@ export default (EdgeComponent: ComponentType<EdgeProps>) => {
     const handleEdgeUpdater = useCallback(
       (event: React.MouseEvent<SVGGElement, MouseEvent>, isSourceHandle: boolean) => {
         const nodeId = isSourceHandle ? target : source;
-        const handleId = isSourceHandle ? targetHandleId : sourceHandleId;
+        const handleId = (isSourceHandle ? targetHandleId : sourceHandleId) || null;
         const handleType = isSourceHandle ? 'target' : 'source';
         const isValidConnection = () => true;
         const isTarget = isSourceHandle;

src/components/NodesSelection/index.tsx

@@ -24,9 +24,7 @@ const selector = (s: ReactFlowState) => ({
   transform: s.transform,
   selectedNodesBbox: s.selectedNodesBbox,
   userSelectionActive: s.userSelectionActive,
-  selectedNodes: Array.from(s.nodeInternals)
-    .filter(([_, n]) => n.selected)
-    .map(([_, n]) => n),
+  selectedNodes: Array.from(s.nodeInternals.values()).filter((n) => n.selected),
   updateNodePosition: s.updateNodePosition,
 });