Visualize Your Ideas With Code
fix(2d): remove circular dependencies (#780)
Jacobcdf3af500a58
diff --git a/packages/2d/src/components/Curve.ts b/packages/2d/src/components/Curve.tsindex 174b0dce..7c9f4a24 100644--- a/packages/2d/src/components/Curve.ts+++ b/packages/2d/src/components/Curve.ts@@ -1,12 +1,10 @@import {SignalValue, SimpleSignal} from '@motion-canvas/core/lib/signals';import {clamp} from '@motion-canvas/core/lib/tweening';import {BBox, SerializedVector2, Vector2} from '@motion-canvas/core/lib/types';-import {- CurveDrawingInfo,- CurvePoint,- CurveProfile,- getPointAtDistance,-} from '../curves';+import {CurveDrawingInfo} from '../curves/CurveDrawingInfo';+import {CurvePoint} from '../curves/CurvePoint';+import {CurveProfile} from '../curves/CurveProfile';+import {getPointAtDistance} from '../curves/getPointAtDistance';import {computed, initial, signal} from '../decorators';import {DesiredLength} from '../partials';import {lineTo, moveTo, resolveCanvasStyle} from '../utils';diff --git a/packages/2d/src/components/Rect.ts b/packages/2d/src/components/Rect.tsindex 7f41f814..2758d287 100644--- a/packages/2d/src/components/Rect.ts+++ b/packages/2d/src/components/Rect.ts@@ -8,7 +8,7 @@ import {computed, initial, signal} from '../decorators';import {spacingSignal} from '../decorators/spacingSignal';import {SignalValue, SimpleSignal} from '@motion-canvas/core/lib/signals';import {Curve, CurveProps} from './Curve';-import {CurveProfile, getRectProfile} from '../curves';+import {getRectProfile} from '../curves/getRectProfile';import {drawRoundRect} from '../utils';import {DesiredLength} from '../partials';@@ -127,7 +127,7 @@ export class Rect extends Curve {}@computed()- public profile(): CurveProfile {+ public profile() {return getRectProfile(this.childrenBBox(),this.radius(),diff --git a/packages/2d/src/curves/ArcSegment.ts b/packages/2d/src/curves/ArcSegment.tsindex 75e0eb43..6cede35c 100644--- a/packages/2d/src/curves/ArcSegment.ts+++ b/packages/2d/src/curves/ArcSegment.ts@@ -1,9 +1,9 @@-import {lazy} from '@motion-canvas/core/lib/decorators';+import {lazy} from '@motion-canvas/core/lib/decorators/lazy';import {BBox, Matrix2D, Vector2} from '@motion-canvas/core/lib/types';import {CurvePoint} from './CurvePoint';import {Segment} from './Segment';import {DEG2RAD} from '@motion-canvas/core/lib/utils';-import {View2D} from '../components';+import {View2D} from '../components/View2D';export class ArcSegment extends Segment {@lazy(() => {