Skip to content

Visualize Your Ideas With Code

fix(2d): fix Gradient and Pattern signals (#376)

Jacob6e0dc8af8d19
diff --git a/packages/2d/src/components/Node.ts b/packages/2d/src/components/Node.ts
index e741a0d1..fe56a91c 100644
--- a/packages/2d/src/components/Node.ts
+++ b/packages/2d/src/components/Node.ts
@@ -4,7 +4,7 @@ import {
computed,
getPropertiesOf,
initial,
- initialize,
+ initializeSignals,
inspectable,
signal,
vector2Signal,
@@ -391,20 +391,7 @@ export class Node implements Promisable<Node> {
this.key = scene.registerNode(this, key);
this.view2D = scene.getView();
this.creationStack = new Error().stack;
- initialize(this, {defaults: rest});
- for (const {key, signal, meta} of this) {
- signal.reset();
- if ((<any>rest)[key] !== undefined) {
- signal((<any>rest)[key]);
- }
- if (meta.compoundEntries !== undefined) {
- for (const [key, property] of meta.compoundEntries) {
- if (property in rest) {
- (<any>signal)[key]((<any>rest)[property]);
- }
- }
- }
- }
+ initializeSignals(this, rest);
this.add(children);
if (spawner) {
this.children(spawner);
diff --git a/packages/2d/src/decorators/filtersSignal.ts b/packages/2d/src/decorators/filtersSignal.ts
index 9191b660..633dc8d4 100644
--- a/packages/2d/src/decorators/filtersSignal.ts
+++ b/packages/2d/src/decorators/filtersSignal.ts
@@ -109,12 +109,12 @@ export class FiltersSignalContext<TOwner> extends SignalContext<
}
}
-export function filtersSignal<T>(): PropertyDecorator {
+export function filtersSignal(): PropertyDecorator {
return (target: any, key) => {
- const meta = getPropertyMetaOrCreate<T>(target, key);
- addInitializer(target, (instance: any, context: any) => {
+ const meta = getPropertyMetaOrCreate<Filter[]>(target, key);
+ addInitializer(target, (instance: any) => {
instance[key] = new FiltersSignalContext(
- context.defaults[key] ?? meta.default ?? [],
+ meta.default ?? [],
instance,
).toSignal();
});
diff --git a/packages/2d/src/decorators/initializers.ts b/packages/2d/src/decorators/initializers.ts
index 5523f5c5..c5114dbe 100644
--- a/packages/2d/src/decorators/initializers.ts
+++ b/packages/2d/src/decorators/initializers.ts
@@ -1,6 +1,6 @@
const INITIALIZERS = Symbol.for('@motion-canvas/2d/decorators/initializers');
-export type Initializer<T> = (instance: T, context: any) => void;
+export type Initializer<T> = (instance: T, context?: any) => void;
export function addInitializer<T>(target: any, initializer: Initializer<T>) {
if (!target[INITIALIZERS]) {
@@ -18,7 +18,7 @@ export function addInitializer<T>(target: any, initializer: Initializer<T>) {
target[INITIALIZERS].push(initializer);
}
-export function initialize(target: any, context: any) {
+export function initialize(target: any, context?: any) {
if (target[INITIALIZERS]) {
try {
target[INITIALIZERS].forEach((initializer: Initializer<any>) =>
diff --git a/packages/2d/src/decorators/signal.ts b/packages/2d/src/decorators/signal.ts
index ce8e3757..f2538930 100644
--- a/packages/2d/src/decorators/signal.ts
+++ b/packages/2d/src/decorators/signal.ts
@@ -2,7 +2,7 @@ import {
deepLerp,
InterpolationFunction,
} from '@motion-canvas/core/lib/tweening';
-import {addInitializer} from './initializers';
+import {addInitializer, initialize} from './initializers';
import {capitalize, useLogger} from '@motion-canvas/core/lib/utils';
import {patchSignal} from '../utils/patchSignal';
import {SignalContext} from '@motion-canvas/core/lib/signals';
@@ -65,6 +65,23 @@ export function getPropertiesOf(
return {};
}
+export function initializeSignals(instance: any, props: Record<string, any>) {
+ initialize(instance);
+ for (const [key, meta] of Object.entries(getPropertiesOf(instance))) {
+ const signal = instance[key];
+ if (props[key] !== undefined) {
+ signal(props[key]);
+ }
+ if (meta.compoundEntries !== undefined) {
+ for (const [key, property] of meta.compoundEntries) {
+ if (property in props) {
+ signal[key](props[property]);
+ }
+ }
+ }
+ }
+}
+
/**
* Create a signal decorator.
*
diff --git a/packages/2d/src/partials/Gradient.ts b/packages/2d/src/partials/Gradient.ts
index c66f7488..90ce3d6b 100644
--- a/packages/2d/src/partials/Gradient.ts
+++ b/packages/2d/src/partials/Gradient.ts
@@ -1,7 +1,6 @@
-import {initial, signal} from '../decorators/signal';
+import {initial, initializeSignals, signal} from '../decorators/signal';
import {vector2Signal} from '../decorators/vector2Signal';
import {computed} from '../decorators/computed';
-import {initialize} from '../decorators/initializers';
import {
Color,
PossibleColor,
@@ -60,7 +59,7 @@ export class Gradient {
public declare readonly stops: SimpleSignal<GradientStop[], this>;
public constructor(props: GradientProps) {
- initialize(this, {defaults: props});
+ initializeSignals(this, props);
}
@computed()
diff --git a/packages/2d/src/partials/Pattern.ts b/packages/2d/src/partials/Pattern.ts
index 103834f0..b5c247d1 100644
--- a/packages/2d/src/partials/Pattern.ts
+++ b/packages/2d/src/partials/Pattern.ts
@@ -1,6 +1,5 @@
-import {initial, signal} from '../decorators/signal';
+import {initial, initializeSignals, signal} from '../decorators/signal';
import {computed} from '../decorators/computed';
-import {initialize} from '../decorators/initializers';
import {SimpleSignal} from '@motion-canvas/core/lib/signals';
export type CanvasRepetition =
@@ -24,7 +23,7 @@ export class Pattern {
public declare readonly repetition: SimpleSignal<CanvasRepetition, this>;
public constructor(props: PatternProps) {
- initialize(this, {defaults: props});
+ initializeSignals(this, props);
}
@computed()