@tscircuit/core 0.0.27 → 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;
     /**

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()
@@ -296,10 +310,6 @@ var PrimitiveComponent = class extends Renderable {
     return null;
   }
   getGlobalPcbPosition() {
-    const manualPlacement = this.getSubcircuit()._getManualPlacementForComponent(this);
-    if (manualPlacement) {
-      return manualPlacement;
-    }
     return applyToPoint(this.computePcbGlobalTransform(), { x: 0, y: 0 });
   }
   getGlobalSchematicPosition() {

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

@@ -126,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(),
@@ -198,11 +220,6 @@ export abstract class PrimitiveComponent<
   }
 
   getGlobalPcbPosition(): { x: number; y: number } {
-    const manualPlacement =
-      this.getSubcircuit()._getManualPlacementForComponent(this)
-    if (manualPlacement) {
-      return manualPlacement
-    }
     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.27",
+  "version": "0.0.28",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [