@tscircuit/core 0.0.1003 → 0.0.1004

package/dist/index.js

@@ -16964,6 +16964,49 @@ var getBoardDimensionsFromProps = (board) => {
 };
 
 // lib/utils/panels/pack-boards-into-grid.ts
+function calculateOptimalGrid({
+  boardsWithDims,
+  availableWidth,
+  availableHeight,
+  boardGap,
+  minCellWidth,
+  minCellHeight
+}) {
+  const boardCount = boardsWithDims.length;
+  if (boardCount === 0) {
+    return { rows: 0, cols: 0 };
+  }
+  const maxBoardWidth = Math.max(
+    ...boardsWithDims.map((b) => b.width),
+    minCellWidth
+  );
+  const maxBoardHeight = Math.max(
+    ...boardsWithDims.map((b) => b.height),
+    minCellHeight
+  );
+  const maxCols = Math.max(
+    1,
+    Math.floor((availableWidth + boardGap) / (maxBoardWidth + boardGap))
+  );
+  const maxRows = Math.max(
+    1,
+    Math.floor((availableHeight + boardGap) / (maxBoardHeight + boardGap))
+  );
+  let bestCols = maxCols;
+  let bestRows = Math.ceil(boardCount / bestCols);
+  if (bestRows > maxRows) {
+    bestRows = maxRows;
+    bestCols = Math.ceil(boardCount / bestRows);
+    if (bestCols > maxCols) {
+      bestCols = maxCols;
+      bestRows = Math.ceil(boardCount / bestCols);
+    }
+  }
+  return {
+    rows: Math.max(1, bestRows),
+    cols: Math.max(1, bestCols)
+  };
+}
 var packBoardsIntoGrid = ({
   boards,
   db,
@@ -16971,7 +17014,9 @@ var packBoardsIntoGrid = ({
   col,
   cellWidth,
   cellHeight,
-  boardGap
+  boardGap,
+  availablePanelWidth,
+  availablePanelHeight
 }) => {
   const boardsWithDims = boards.map((board) => {
     let width;
@@ -17002,8 +17047,29 @@ var packBoardsIntoGrid = ({
   }
   const explicitRow = row;
   const explicitCol = col;
-  const cols = explicitCol ?? (explicitRow ? Math.ceil(boardsWithDims.length / explicitRow) : Math.ceil(Math.sqrt(boardsWithDims.length)));
-  const rows = explicitRow ?? Math.ceil(boardsWithDims.length / cols);
+  let cols;
+  let rows;
+  if (explicitCol !== void 0) {
+    cols = explicitCol;
+    rows = explicitRow ?? Math.ceil(boardsWithDims.length / cols);
+  } else if (explicitRow !== void 0) {
+    rows = explicitRow;
+    cols = Math.ceil(boardsWithDims.length / rows);
+  } else if (availablePanelWidth !== void 0 && availablePanelHeight !== void 0) {
+    const result = calculateOptimalGrid({
+      boardsWithDims,
+      availableWidth: availablePanelWidth,
+      availableHeight: availablePanelHeight,
+      boardGap,
+      minCellWidth: cellWidth ? distance10.parse(cellWidth) : 0,
+      minCellHeight: cellHeight ? distance10.parse(cellHeight) : 0
+    });
+    cols = result.cols;
+    rows = result.rows;
+  } else {
+    cols = Math.ceil(Math.sqrt(boardsWithDims.length));
+    rows = Math.ceil(boardsWithDims.length / cols);
+  }
   const colWidths = Array(cols).fill(0);
   const rowHeights = Array(rows).fill(0);
   boardsWithDims.forEach((b, i) => {
@@ -17158,13 +17224,42 @@ var Subpanel = class _Subpanel extends Group6 {
     if (layoutMode !== "grid") return;
     const tabWidth = this._parsedProps.tabWidth ?? DEFAULT_TAB_WIDTH;
     const boardGap = this._parsedProps.boardGap ?? tabWidth;
+    let availablePanelWidth;
+    let availablePanelHeight;
+    const hasExplicitRowOrCol = this._parsedProps.row !== void 0 || this._parsedProps.col !== void 0;
+    const hasExplicitWidth = this._parsedProps.width !== void 0;
+    const hasExplicitHeight = this._parsedProps.height !== void 0;
+    if (!hasExplicitRowOrCol && hasExplicitWidth && hasExplicitHeight) {
+      const {
+        edgePadding: edgePaddingProp,
+        edgePaddingLeft: edgePaddingLeftProp,
+        edgePaddingRight: edgePaddingRightProp,
+        edgePaddingTop: edgePaddingTopProp,
+        edgePaddingBottom: edgePaddingBottomProp
+      } = this._parsedProps;
+      const edgePadding = distance11.parse(edgePaddingProp ?? 5);
+      const edgePaddingLeft = distance11.parse(edgePaddingLeftProp ?? edgePadding);
+      const edgePaddingRight = distance11.parse(
+        edgePaddingRightProp ?? edgePadding
+      );
+      const edgePaddingTop = distance11.parse(edgePaddingTopProp ?? edgePadding);
+      const edgePaddingBottom = distance11.parse(
+        edgePaddingBottomProp ?? edgePadding
+      );
+      const panelWidth = distance11.parse(this._parsedProps.width);
+      const panelHeight = distance11.parse(this._parsedProps.height);
+      availablePanelWidth = panelWidth - edgePaddingLeft - edgePaddingRight;
+      availablePanelHeight = panelHeight - edgePaddingTop - edgePaddingBottom;
+    }
     const { positions, gridWidth, gridHeight } = packBoardsIntoGrid({
       boards: childBoardInstances,
       row: this._parsedProps.row,
       col: this._parsedProps.col,
       cellWidth: this._parsedProps.cellWidth,
       cellHeight: this._parsedProps.cellHeight,
-      boardGap
+      boardGap,
+      availablePanelHeight,
+      availablePanelWidth
     });
     this._cachedGridWidth = gridWidth;
     this._cachedGridHeight = gridHeight;
@@ -21605,7 +21700,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1002",
+  version: "0.0.1003",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1003",
+  "version": "0.0.1004",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",