@tscircuit/core 0.0.26 → 0.0.28

package/dist/index.d.ts

@@ -119,7 +119,10 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     computePcbPropsTransform(): Matrix;
     /**
      * Compute a transformation matrix combining all parent transforms for PCB
-     * components
+     * components, including this component's translation and rotation.
+     *
+     * This is used to compute this component's position as well as all children
+     * components positions
      */
     computePcbGlobalTransform(): Matrix;
     /**
@@ -133,6 +136,14 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
      */
     computeSchematicGlobalTransform(): Matrix;
     getSchematicSymbol(variant?: "horz" | "vert" | null): SchSymbol | null;
+    /**
+     * Subcircuit groups have a prop called "layout" that can include manual
+     * placements for pcb components. These are typically added from an IDE
+     */
+    _getManualPlacementForComponent(component: PrimitiveComponent): {
+        x: number;
+        y: number;
+    } | null;
     getGlobalPcbPosition(): {
         x: number;
         y: number;

package/dist/index.js

@@ -239,9 +239,23 @@ var PrimitiveComponent = class extends Renderable {
   }
   /**
    * Compute a transformation matrix combining all parent transforms for PCB
-   * components
+   * components, including this component's translation and rotation.
+   *
+   * This is used to compute this component's position as well as all children
+   * components positions
    */
   computePcbGlobalTransform() {
+    const { _parsedProps: props } = this;
+    const manualPlacement = this.getSubcircuit()._getManualPlacementForComponent(this);
+    if (manualPlacement && this.props.pcbX === void 0 && this.props.pcbY === void 0) {
+      return compose(
+        this.parent?.computePcbGlobalTransform() ?? identity(),
+        compose(
+          translate(manualPlacement.x, manualPlacement.y),
+          rotate((props.pcbRotation ?? 0) * Math.PI / 180)
+        )
+      );
+    }
     return compose(
       this.parent?.computePcbGlobalTransform() ?? identity(),
       this.computePcbPropsTransform()
@@ -274,6 +288,27 @@ var PrimitiveComponent = class extends Renderable {
     if (!config.schematicSymbolName) return null;
     return symbols[`${config.schematicSymbolName}_${variant}`] ?? null;
   }
+  /**
+   * Subcircuit groups have a prop called "layout" that can include manual
+   * placements for pcb components. These are typically added from an IDE
+   */
+  _getManualPlacementForComponent(component) {
+    if (!this.isSubcircuit) return null;
+    const layout = this.props.layout;
+    if (!layout) return null;
+    const placementConfig = layout.manual_pcb_placement_config;
+    if (!placementConfig) return null;
+    for (const position of placementConfig.positions) {
+      if (isMatchingSelector(component, position.selector)) {
+        const center = applyToPoint(
+          this.computePcbGlobalTransform(),
+          position.center
+        );
+        return center;
+      }
+    }
+    return null;
+  }
   getGlobalPcbPosition() {
     return applyToPoint(this.computePcbGlobalTransform(), { x: 0, y: 0 });
   }

package/lib/components/base-components/PrimitiveComponent.ts

@@ -15,6 +15,7 @@ import {
   type Matrix,
 } from "transformation-matrix"
 import { isMatchingSelector } from "lib/utils/selector-matching"
+import type { LayoutBuilder } from "@tscircuit/layout"
 
 export interface BaseComponentConfig {
   schematicSymbolName?: BaseSymbolName | null
@@ -125,9 +126,31 @@ export abstract class PrimitiveComponent<
 
   /**
    * Compute a transformation matrix combining all parent transforms for PCB
-   * components
+   * components, including this component's translation and rotation.
+   *
+   * This is used to compute this component's position as well as all children
+   * components positions
    */
   computePcbGlobalTransform(): Matrix {
+    const { _parsedProps: props } = this
+    const manualPlacement =
+      this.getSubcircuit()._getManualPlacementForComponent(this)
+
+    // pcbX or pcbY will override the manual placement
+    if (
+      manualPlacement &&
+      this.props.pcbX === undefined &&
+      this.props.pcbY === undefined
+    ) {
+      return compose(
+        this.parent?.computePcbGlobalTransform() ?? identity(),
+        compose(
+          translate(manualPlacement.x, manualPlacement.y),
+          rotate(((props.pcbRotation ?? 0) * Math.PI) / 180),
+        ),
+      )
+    }
+
     return compose(
       this.parent?.computePcbGlobalTransform() ?? identity(),
       this.computePcbPropsTransform(),
@@ -168,6 +191,34 @@ export abstract class PrimitiveComponent<
     )
   }
 
+  /**
+   * Subcircuit groups have a prop called "layout" that can include manual
+   * placements for pcb components. These are typically added from an IDE
+   */
+  _getManualPlacementForComponent(
+    component: PrimitiveComponent,
+  ): { x: number; y: number } | null {
+    if (!this.isSubcircuit) return null
+
+    const layout: LayoutBuilder = this.props.layout
+    if (!layout) return null
+
+    const placementConfig = layout.manual_pcb_placement_config
+    if (!placementConfig) return null
+
+    for (const position of placementConfig.positions) {
+      if (isMatchingSelector(component, position.selector)) {
+        const center = applyToPoint(
+          this.computePcbGlobalTransform(),
+          position.center,
+        )
+        return center
+      }
+    }
+
+    return null
+  }
+
   getGlobalPcbPosition(): { x: number; y: number } {
     return applyToPoint(this.computePcbGlobalTransform(), { x: 0, y: 0 })
   }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
-    "@tscircuit/layout": "^0.0.27",
+    "@tscircuit/layout": "^0.0.28",
     "@tscircuit/log-soup": "^1.0.2",
     "@types/bun": "latest",
     "@types/react": "^18.3.3",