feature/COMPASS-9655 add getCoordinatesForNewNode

Author: paula-stacho

src/index.ts

@@ -1,6 +1,7 @@
 export * from '@/components/diagram';
 export * from '@/utilities/apply-layout';
 export * from '@/utilities/add-nodes-within-bounds';
+export { getCoordinatesForNewNode } from '@/utilities/get-coordinates-for-new-node';
 export * from '@/utilities/get-nodes-bounds';
 export * from '@/types';
 export { useDiagram, type DiagramInstance } from '@/hooks/use-diagram';

src/utilities/add-nodes-within-bounds.ts

@@ -1,5 +1,7 @@
-import { DEFAULT_NODE_HEIGHT, DEFAULT_NODE_SPACING, DEFAULT_NODE_WIDTH } from '@/utilities/constants';
-import { BaseNode } from '@/types/layout';
+import type { BaseNode } from '@/types/layout';
+
+import { getNodeWidth, getNodeHeight } from './node-dimensions';
+import { getCoordinatesForNewNodeFromMaxDimensions } from './get-coordinates-for-new-node';
 
 /**
  * Adds new nodes to an existing array of nodes, positioning them in a grid pattern.
@@ -14,28 +16,14 @@ import { BaseNode } from '@/types/layout';
  * @param newNodes A list of new nodes to add within the bounds of the diagram.
  */
 export const addNodesWithinBounds = <N extends BaseNode>(nodes: N[], newNodes: N[]) => {
-  const maxWidth = Math.max(0, ...nodes.map(n => n.position.x + (n.measured?.width || DEFAULT_NODE_WIDTH)));
-  const maxHeight = Math.max(0, ...nodes.map(n => n.position.y + (n.measured?.height || DEFAULT_NODE_HEIGHT)));
-
-  let x = 0;
-  let y = maxHeight + DEFAULT_NODE_SPACING;
-  let rowHeight = 0;
+  const maxWidth = Math.max(0, ...nodes.map(n => n.position.x + getNodeWidth(n)));
+  const maxHeight = Math.max(0, ...nodes.map(n => n.position.y + getNodeHeight(n)));
 
   return [
     ...nodes,
-    ...newNodes.map(n => {
-      if (!n.measured || !n.measured.height || !n.measured.width) return n;
-
-      if (x + n.measured.width + DEFAULT_NODE_SPACING > maxWidth) {
-        x = 0;
-        y += rowHeight + DEFAULT_NODE_SPACING;
-        rowHeight = 0;
-      }
-
-      x += n.measured.width + DEFAULT_NODE_SPACING;
-      rowHeight = Math.max(rowHeight, n.measured.height);
-
-      return { ...n, position: { x, y } };
-    }),
+    ...newNodes.map(n => ({
+      ...n,
+      position: getCoordinatesForNewNodeFromMaxDimensions({ maxWidth, maxHeight, newNode: n }),
+    })),
   ];
 };

src/utilities/get-coordinates-for-new-node.ts

@@ -0,0 +1,71 @@
+import { DEFAULT_NODE_SPACING } from '@/utilities/constants';
+import type { BaseNode } from '@/types/layout';
+
+import { getNodeHeight, getNodeWidth } from './node-dimensions';
+
+/**
+ * Get coordinates for a new node, positioning it in a grid pattern.
+ *
+ * This function takes maximum width and height of the existing nodes
+ * and then finds place for a new one.
+ *
+ * The node is positioned such that it fits within the maximum width of the existing nodes,
+ * and when the width is exceeded, it wraps to the next row.
+ *
+ * @param nodes A list of existing nodes, used to calculate the bounds of the diagram.
+ * @param newNode A new node to add within the bounds of the diagram.
+ */
+export const getCoordinatesForNewNodeFromMaxDimensions = <N extends BaseNode>({
+  maxWidth,
+  maxHeight,
+  newNode,
+}: {
+  newNode: N;
+  maxWidth: number;
+  maxHeight: number;
+}) => {
+  const newNodeWidth = getNodeWidth(newNode);
+  const newNodeHeight = getNodeHeight(newNode);
+
+  let x = 0;
+  let y = maxHeight + DEFAULT_NODE_SPACING;
+  let rowHeight = 0;
+
+  if (x + newNodeWidth + DEFAULT_NODE_SPACING > maxWidth) {
+    x = 0;
+    y += rowHeight + DEFAULT_NODE_SPACING;
+    rowHeight = 0;
+  }
+
+  x += newNodeWidth + DEFAULT_NODE_SPACING;
+  rowHeight = Math.max(rowHeight, newNodeHeight);
+
+  return { x, y };
+};
+
+/**
+ * Get coordinates for a new node, positioning it in a grid pattern.
+ *
+ * This function calculates the maximum width and height of the existing nodes
+ * and then finds a place for the new node.
+ *
+ * The node is positioned such that it fits within the maximum width of the existing nodes,
+ * and when the width is exceeded, it wraps to the next row.
+ *
+ * @param nodes A list of existing nodes, used to calculate the bounds of the diagram.
+ * @param newNode A new node to add within the bounds of the diagram.
+ */
+export const getCoordinatesForNewNode = <N extends BaseNode>(nodes: N[], newNode: N): { x: number; y: number } => {
+  if (nodes.length === 0) {
+    return { x: DEFAULT_NODE_SPACING, y: DEFAULT_NODE_SPACING };
+  }
+
+  const maxWidth = Math.max(...nodes.map(node => getNodeWidth(node))) + DEFAULT_NODE_SPACING;
+  const maxHeight = Math.max(...nodes.map(node => getNodeHeight(node))) + DEFAULT_NODE_SPACING;
+
+  return getCoordinatesForNewNodeFromMaxDimensions({
+    newNode,
+    maxWidth,
+    maxHeight,
+  });
+};