@tscircuit/core 0.0.633 → 0.0.634

package/dist/index.js

@@ -8894,6 +8894,7 @@ import {
   getPrimaryId
 } from "@tscircuit/circuit-json-util";
 import { length as length3 } from "circuit-json";
+import { CssGrid } from "minicssgrid";
 function Group_doInitialPcbLayoutGrid(group) {
   const { db } = group.root;
   const props = group._parsedProps;
@@ -8901,8 +8902,8 @@ function Group_doInitialPcbLayoutGrid(group) {
     (child) => child.pcb_component_id
   );
   if (pcbChildren.length === 0) return;
-  let maxCellWidth = 0;
-  let maxCellHeight = 0;
+  let childWidth = 0;
+  let childHeight = 0;
   for (const child of pcbChildren) {
     const pcbComp = db.pcb_component.get(child.pcb_component_id);
     let width = pcbComp?.width ?? 0;
@@ -8912,11 +8913,11 @@ function Group_doInitialPcbLayoutGrid(group) {
       width = Math.max(width, bounds.width);
       height = Math.max(height, bounds.height);
     }
-    maxCellWidth = Math.max(maxCellWidth, width);
-    maxCellHeight = Math.max(maxCellHeight, height);
+    childWidth = Math.max(childWidth, width);
+    childHeight = Math.max(childHeight, height);
   }
-  if (maxCellWidth === 0 && pcbChildren.length > 0) maxCellWidth = 1;
-  if (maxCellHeight === 0 && pcbChildren.length > 0) maxCellHeight = 1;
+  if (childWidth === 0 && pcbChildren.length > 0) childWidth = 1;
+  if (childHeight === 0 && pcbChildren.length > 0) childHeight = 1;
   let gridColsOption = props.pcbGridCols ?? props.gridCols;
   let gridRowsOption = props.pcbGridRows;
   let gridGapOption = props.pcbGridGap ?? props.gridGap;
@@ -8929,29 +8930,12 @@ function Group_doInitialPcbLayoutGrid(group) {
     gridRowGapOption = props.pcbLayout.gridRowGap ?? gridRowGapOption;
     gridColumnGapOption = props.pcbLayout.gridColumnGap ?? gridColumnGapOption;
   }
-  let numCols;
-  let numRows;
-  if (gridColsOption !== void 0 && gridRowsOption !== void 0) {
-    numCols = gridColsOption;
-    numRows = gridRowsOption;
-  } else if (gridColsOption !== void 0) {
-    numCols = gridColsOption;
-    numRows = Math.ceil(pcbChildren.length / numCols);
-  } else if (gridRowsOption !== void 0) {
-    numRows = gridRowsOption;
-    numCols = Math.ceil(pcbChildren.length / numRows);
-  } else {
-    numCols = Math.ceil(Math.sqrt(pcbChildren.length));
-    numRows = Math.ceil(pcbChildren.length / numCols);
-  }
-  if (numCols === 0 && pcbChildren.length > 0) numCols = 1;
-  if (numRows === 0 && pcbChildren.length > 0) numRows = pcbChildren.length;
-  let gridGapX;
-  let gridGapY;
   const parseGap = (val) => {
     if (val === void 0) return void 0;
     return typeof val === "number" ? val : length3.parse(val);
   };
+  let gridGapX = props.pcbGridColumnGap ?? props.gridColumnGap;
+  let gridGapY = props.pcbGridRowGap ?? props.gridRowGap;
   if (gridRowGapOption !== void 0 || gridColumnGapOption !== void 0) {
     const fallbackX = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.x : gridGapOption;
     const fallbackY = typeof gridGapOption === "object" && gridGapOption !== null ? gridGapOption.y : gridGapOption;
@@ -8973,24 +8957,56 @@ function Group_doInitialPcbLayoutGrid(group) {
     gridGapX = 1;
     gridGapY = 1;
   }
-  const totalGridWidth = numCols * maxCellWidth + Math.max(0, numCols - 1) * gridGapX;
-  const totalGridHeight = numRows * maxCellHeight + Math.max(0, numRows - 1) * gridGapY;
+  let numCols = gridColsOption ?? 0;
+  let numRows = gridRowsOption ?? 0;
+  if (gridColsOption !== void 0 && gridRowsOption !== void 0) {
+    numCols = gridColsOption;
+    numRows = gridRowsOption;
+  } else if (gridColsOption !== void 0) {
+    numCols = gridColsOption;
+    numRows = Math.ceil(pcbChildren.length / numCols);
+  } else if (gridRowsOption !== void 0) {
+    numRows = gridRowsOption;
+    numCols = Math.ceil(pcbChildren.length / numRows);
+  } else {
+    numCols = Math.ceil(Math.sqrt(pcbChildren.length));
+    numRows = Math.ceil(pcbChildren.length / numCols);
+  }
+  if (numCols === 0 && pcbChildren.length > 0) numCols = 1;
+  if (numRows === 0 && pcbChildren.length > 0) numRows = pcbChildren.length;
+  const totalGridWidth = numCols * childWidth + Math.max(0, numCols - 1) * gridGapX;
+  const totalGridHeight = numRows * childHeight + Math.max(0, numRows - 1) * gridGapY;
+  const gridTemplateColumns = props.pcbGridTemplateColumns ?? `repeat(${numCols}, ${childWidth}px)`;
+  const gridTemplateRows = props.pcbGridTemplateRows ?? `repeat(${numRows}, ${childHeight}px)`;
+  const gridChildren = pcbChildren.map((child, index) => ({
+    key: child.getString() || `child-${index}`,
+    contentWidth: childWidth,
+    contentHeight: childHeight
+  }));
+  const cssGrid = new CssGrid({
+    containerWidth: totalGridWidth,
+    containerHeight: totalGridHeight,
+    gridTemplateColumns,
+    gridTemplateRows,
+    gap: [gridGapY, gridGapX],
+    // [rowGap, columnGap]
+    children: gridChildren
+  });
+  const { itemCoordinates } = cssGrid.layout();
   const groupCenter = group._getGlobalPcbPositionBeforeLayout();
-  const firstCellCenterX = groupCenter.x - totalGridWidth / 2 + maxCellWidth / 2;
-  const firstCellCenterY = groupCenter.y + totalGridHeight / 2 - maxCellHeight / 2;
   for (let i = 0; i < pcbChildren.length; i++) {
     const child = pcbChildren[i];
     if (!child.pcb_component_id) continue;
-    const row = Math.floor(i / numCols);
-    const col = i % numCols;
-    if (row >= numRows || col >= numCols) {
+    const childKey = child.getString() || `child-${i}`;
+    const coordinates = itemCoordinates[childKey];
+    if (!coordinates) {
       console.warn(
-        `PCB grid layout: Child ${child.getString()} at index ${i} (row ${row}, col ${col}) exceeds grid dimensions (${numRows}x${numCols}). Skipping placement.`
+        `PCB grid layout: No coordinates found for child ${childKey}`
       );
       continue;
     }
-    const targetCellCenterX = firstCellCenterX + col * (maxCellWidth + gridGapX);
-    const targetCellCenterY = firstCellCenterY - row * (maxCellHeight + gridGapY);
+    const targetCellCenterX = groupCenter.x - totalGridWidth / 2 + coordinates.x + coordinates.width / 2;
+    const targetCellCenterY = groupCenter.y + totalGridHeight / 2 - coordinates.y - coordinates.height / 2;
     const pcbComp = db.pcb_component.get(child.pcb_component_id);
     if (pcbComp) {
       const oldCenter = pcbComp.center;
@@ -12532,7 +12548,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.632",
+  version: "0.0.633",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -12562,6 +12578,7 @@ var package_default = {
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/log-soup": "^1.0.2",
+    "@tscircuit/matchpack": "^0.0.4",
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/props": "^0.0.286",
@@ -12589,13 +12606,13 @@ var package_default = {
     howfat: "^0.3.8",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
+    minicssgrid: "^0.0.5",
     "pkg-pr-new": "^0.0.37",
     react: "^19.1.0",
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.180",
     "ts-expect": "^1.3.0",
-    tsup: "^8.2.4",
-    "@tscircuit/matchpack": "^0.0.4"
+    tsup: "^8.2.4"
   },
   peerDependencies: {
     "@tscircuit/capacity-autorouter": "*",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.633",
+  "version": "0.0.634",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -31,6 +31,7 @@
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/log-soup": "^1.0.2",
+    "@tscircuit/matchpack": "^0.0.4",
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/props": "^0.0.286",
@@ -58,13 +59,13 @@
     "howfat": "^0.3.8",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
+    "minicssgrid": "^0.0.5",
     "pkg-pr-new": "^0.0.37",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.180",
     "ts-expect": "^1.3.0",
-    "tsup": "^8.2.4",
-    "@tscircuit/matchpack": "^0.0.4"
+    "tsup": "^8.2.4"
   },
   "peerDependencies": {
     "@tscircuit/capacity-autorouter": "*",