refactor(minimap): cleanup

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "react-flow-renderer",
-  "version": "10.2.3-next.2",
+  "version": "10.2.3-next.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "react-flow-renderer",
-      "version": "10.2.3-next.2",
+      "version": "10.2.3-next.3",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.17.9",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-flow-renderer",
-  "version": "10.2.3-next.2",
+  "version": "10.2.3-next.3",
   "engines": {
     "node": ">=14"
   },

src/additional-components/MiniMap/index.tsx

@@ -3,7 +3,6 @@ import cc from 'classcat';
 import shallow from 'zustand/shallow';
 
 import MiniMapNode from './MiniMapNode';
-
 import { useStore } from '../../store';
 import { getRectOfNodes } from '../../utils/graph';
 import { getBoundsofRects } from '../../utils';
@@ -19,9 +18,11 @@ const selector = (s: ReactFlowState) => ({
   width: s.width,
   height: s.height,
   transform: s.transform,
-  nodeInternals: s.nodeInternals,
+  nodes: Array.from(s.nodeInternals.values()),
 });
 
+const getAttrFunction = (func: any): GetMiniMapNodeAttribute => (func instanceof Function ? func : () => func);
+
 const MiniMap = ({
   style,
   className,
@@ -32,30 +33,19 @@ const MiniMap = ({
   nodeStrokeWidth = 2,
   maskColor = 'rgb(240, 242, 243, 0.7)',
 }: MiniMapProps) => {
-  const { width: containerWidth, height: containerHeight, transform, nodeInternals } = useStore(selector, shallow);
+  const { width: containerWidth, height: containerHeight, transform, nodes } = useStore(selector, shallow);
-  const [tX, tY, tScale] = transform;
+  const elementWidth = (style?.width as number) ?? defaultWidth;
-
+  const elementHeight = (style?.height as number) ?? defaultHeight;
-  const mapClasses = cc(['react-flow__minimap', className]);
+  const nodeColorFunc = getAttrFunction(nodeColor);
-  const elementWidth = (style?.width || defaultWidth)! as number;
+  const nodeStrokeColorFunc = getAttrFunction(nodeStrokeColor);
-  const elementHeight = (style?.height || defaultHeight)! as number;
+  const nodeClassNameFunc = getAttrFunction(nodeClassName);
-  const nodeColorFunc = (nodeColor instanceof Function ? nodeColor : () => nodeColor) as GetMiniMapNodeAttribute;
-  const nodeStrokeColorFunc = (
-    nodeStrokeColor instanceof Function ? nodeStrokeColor : () => nodeStrokeColor
-  ) as GetMiniMapNodeAttribute;
-  const nodeClassNameFunc = (
-    nodeClassName instanceof Function ? nodeClassName : () => nodeClassName
-  ) as GetMiniMapNodeAttribute;
-  const hasNodes = nodeInternals && nodeInternals.size > 0;
-  // @TODO: work with nodeInternals instead of converting it to an array
-  const nodes = Array.from(nodeInternals).map(([_, node]) => node);
-  const bb = getRectOfNodes(nodes);
   const viewBB: Rect = {
-    x: -tX / tScale,
+    x: -transform[0] / transform[2],
-    y: -tY / tScale,
+    y: -transform[1] / transform[2],
-    width: containerWidth / tScale,
+    width: containerWidth / transform[2],
-    height: containerHeight / tScale,
+    height: containerHeight / transform[2],
   };
-  const boundingRect = hasNodes ? getBoundsofRects(bb, viewBB) : viewBB;
+  const boundingRect = nodes.length > 0 ? getBoundsofRects(getRectOfNodes(nodes), viewBB) : viewBB;
   const scaledWidth = boundingRect.width / elementWidth;
   const scaledHeight = boundingRect.height / elementHeight;
   const viewScale = Math.max(scaledWidth, scaledHeight);
@@ -74,18 +64,16 @@ const MiniMap = ({
       height={elementHeight}
       viewBox={`${x} ${y} ${width} ${height}`}
       style={style}
-      className={mapClasses}
+      className={cc(['react-flow__minimap', className])}
     >
-      {Array.from(nodeInternals)
+      {nodes
-        .filter(([_, node]) => !node.hidden && node.width && node.height)
+        .filter((node) => !node.hidden && node.width && node.height)
-        .map(([_, node]) => {
+        .map((node) => {
-          const positionAbsolute = nodeInternals.get(node.id)?.positionAbsolute;
-
           return (
             <MiniMapNode
               key={node.id}
-              x={positionAbsolute?.x || 0}
+              x={node.positionAbsolute?.x ?? 0}
-              y={positionAbsolute?.y || 0}
+              y={node.positionAbsolute?.y ?? 0}
               width={node.width!}
               height={node.height!}
               style={node.style}