reafactor(react/svelte): rename some util functions #3528

packages/system/src/utils/general.ts

@@ -8,6 +8,7 @@ import type {
   NodeOrigin,
   SnapGrid,
   Transform,
+  Viewport,
 } from '../types';
 import { getNodePositionWithOrigin } from './graph';
 
@@ -154,14 +155,14 @@ export const rendererPointToPoint = ({ x, y }: XYPosition, [tx, ty, tScale]: Tra
   };
 };
 
-export const getTransformForBounds = (
+export const getViewportForBounds = (
   bounds: Rect,
   width: number,
   height: number,
   minZoom: number,
   maxZoom: number,
   padding: number
-): Transform => {
+): Viewport => {
   const xZoom = width / (bounds.width * (1 + padding));
   const yZoom = height / (bounds.height * (1 + padding));
   const zoom = Math.min(xZoom, yZoom);
@@ -171,7 +172,7 @@ export const getTransformForBounds = (
   const x = width / 2 - boundsCenterX * clampedZoom;
   const y = height / 2 - boundsCenterY * clampedZoom;
 
-  return [x, y, clampedZoom];
+  return { x, y, zoom: clampedZoom };
 };
 
 export const isMacOs = () => typeof navigator !== 'undefined' && navigator?.userAgent?.indexOf('Mac') >= 0;

packages/system/src/utils/graph.ts

@@ -8,7 +8,7 @@ import {
   rectToBox,
   nodeToRect,
   pointToRendererPoint,
-  getTransformForBounds,
+  getViewportForBounds,
 } from './general';
 import {
   type Connection,
@@ -105,7 +105,7 @@ export const getNodePositionWithOrigin = (
   };
 };
 
-export const getRectOfNodes = (nodes: NodeBase[], nodeOrigin: NodeOrigin = [0, 0]): Rect => {
+export const getNodesBounds = (nodes: NodeBase[], nodeOrigin: NodeOrigin = [0, 0]): Rect => {
   if (nodes.length === 0) {
     return { x: 0, y: 0, width: 0, height: 0 };
   }
@@ -195,9 +195,9 @@ export function fitView<Params extends FitViewParamsBase<NodeBase>, Options exte
   });
 
   if (filteredNodes.length > 0) {
-    const bounds = getRectOfNodes(filteredNodes, nodeOrigin);
+    const bounds = getNodesBounds(filteredNodes, nodeOrigin);
 
-    const [x, y, zoom] = getTransformForBounds(
+    const viewport = getViewportForBounds(
       bounds,
       width,
       height,
@@ -206,7 +206,7 @@ export function fitView<Params extends FitViewParamsBase<NodeBase>, Options exte
       options?.padding ?? 0.1
     );
 
-    panZoom.setViewport({ x, y, zoom }, { duration: options?.duration });
+    panZoom.setViewport(viewport, { duration: options?.duration });
 
     return true;
   }