@twick/2d 0.13.0 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/editor/editor/tsconfig.build.tsbuildinfo +1 -1
- package/lib/components/Audio.d.ts.map +1 -1
- package/lib/components/Audio.js +3 -33
- package/lib/components/CodeBlock.d.ts +1 -1
- package/lib/components/Media.d.ts +0 -6
- package/lib/components/Media.d.ts.map +1 -1
- package/lib/components/Media.js +39 -255
- package/lib/components/Node.d.ts +1 -1
- package/lib/components/Path.d.ts +1 -1
- package/lib/components/SVG.d.ts +1 -1
- package/lib/components/Shape.d.ts +1 -1
- package/lib/components/Video.d.ts +1 -0
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +65 -70
- package/lib/components/utils/waitUntil.d.ts +7 -0
- package/lib/components/utils/waitUntil.d.ts.map +1 -0
- package/lib/components/utils/waitUntil.js +15 -0
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/waitUntil.d.ts +7 -0
- package/lib/utils/waitUntil.d.ts.map +1 -0
- package/lib/utils/waitUntil.js +15 -0
- package/package.json +5 -4
- package/src/lib/components/Audio.ts +2 -39
- package/src/lib/components/Media.ts +45 -275
- package/src/lib/components/Video.ts +78 -77
- package/src/lib/utils/waitUntil.ts +18 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Audio.d.ts","sourceRoot":"","sources":["../../src/lib/components/Audio.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACxC,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAE9B,qBACa,KAAM,SAAQ,KAAK;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAwC;gBAEjD,KAAK,EAAE,UAAU;IAIpC,SAAS,CAAC,YAAY,IAAI,gBAAgB;IAI1C,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC,SAAS,CAAC,eAAe,IAAI,gBAAgB;IAK7C,SAAS,CAAC,KAAK,IAAI,gBAAgB;
|
|
1
|
+
{"version":3,"file":"Audio.d.ts","sourceRoot":"","sources":["../../src/lib/components/Audio.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACxC,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAE9B,qBACa,KAAM,SAAQ,KAAK;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAwC;gBAEjD,KAAK,EAAE,UAAU;IAIpC,SAAS,CAAC,YAAY,IAAI,gBAAgB;IAI1C,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC,SAAS,CAAC,eAAe,IAAI,gBAAgB;IAK7C,SAAS,CAAC,KAAK,IAAI,gBAAgB;IA0BnC,SAAS,CAAC,WAAW,IAAI,gBAAgB;IA6BzC,SAAS,CAAC,eAAe,IAAI,gBAAgB;cAoCpB,IAAI,CAAC,OAAO,EAAE,wBAAwB;CAahE"}
|
package/lib/components/Audio.js
CHANGED
|
@@ -23,41 +23,13 @@ let Audio = Audio_1 = class Audio extends Media {
|
|
|
23
23
|
}
|
|
24
24
|
audio() {
|
|
25
25
|
const src = this.src();
|
|
26
|
-
|
|
27
|
-
const key = `${this.key}/${src || 'pending'}`;
|
|
26
|
+
const key = `${this.key}/${src}`;
|
|
28
27
|
let audio = Audio_1.pool[key];
|
|
29
28
|
if (!audio) {
|
|
30
29
|
audio = document.createElement('audio');
|
|
31
30
|
audio.crossOrigin = 'anonymous';
|
|
32
|
-
// Only set src if it's valid, otherwise leave it empty
|
|
33
|
-
if (src && src !== 'undefined') {
|
|
34
|
-
audio.src = src;
|
|
35
|
-
}
|
|
36
|
-
Audio_1.pool[key] = audio;
|
|
37
|
-
}
|
|
38
|
-
else if (src && src !== 'undefined' && audio.src !== src) {
|
|
39
|
-
// Update existing audio element if src has changed and is now valid
|
|
40
31
|
audio.src = src;
|
|
41
|
-
|
|
42
|
-
delete Audio_1.pool[key];
|
|
43
|
-
const newKey = `${this.key}/${src}`;
|
|
44
|
-
Audio_1.pool[newKey] = audio;
|
|
45
|
-
}
|
|
46
|
-
// If src is still undefined, wait for it to become available
|
|
47
|
-
if (!src || src === 'undefined') {
|
|
48
|
-
DependencyContext.collectPromise(new Promise(resolve => {
|
|
49
|
-
// Check periodically for valid src
|
|
50
|
-
const checkSrc = () => {
|
|
51
|
-
const currentSrc = this.src();
|
|
52
|
-
if (currentSrc && currentSrc !== 'undefined') {
|
|
53
|
-
resolve();
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
setTimeout(checkSrc, 10);
|
|
57
|
-
}
|
|
58
|
-
};
|
|
59
|
-
checkSrc();
|
|
60
|
-
}));
|
|
32
|
+
Audio_1.pool[key] = audio;
|
|
61
33
|
}
|
|
62
34
|
const weNeedToWait = this.waitForCanPlayNecessary(audio);
|
|
63
35
|
if (!weNeedToWait) {
|
|
@@ -119,8 +91,6 @@ let Audio = Audio_1 = class Audio extends Media {
|
|
|
119
91
|
return audio;
|
|
120
92
|
}
|
|
121
93
|
async draw(context) {
|
|
122
|
-
// Auto-start playback if Revideo is playing but media isn't
|
|
123
|
-
this.autoPlayBasedOnRevideo();
|
|
124
94
|
const playbackState = this.view().playbackState();
|
|
125
95
|
playbackState === PlaybackState.Playing ||
|
|
126
96
|
playbackState === PlaybackState.Presenting
|
|
@@ -145,4 +115,4 @@ Audio = Audio_1 = __decorate([
|
|
|
145
115
|
nodeName('Audio')
|
|
146
116
|
], Audio);
|
|
147
117
|
export { Audio };
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXVkaW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvQXVkaW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBLE9BQU8sRUFBQyxpQkFBaUIsRUFBRSxhQUFhLEVBQUMsTUFBTSxhQUFhLENBQUM7QUFDN0QsT0FBTyxFQUFDLFFBQVEsRUFBRSxRQUFRLEVBQUMsTUFBTSxlQUFlLENBQUM7QUFFakQsT0FBTyxFQUFDLEtBQUssRUFBQyxNQUFNLFNBQVMsQ0FBQztBQUd2QixJQUFNLEtBQUssYUFBWCxNQUFNLEtBQU0sU0FBUSxLQUFLO0lBRzlCLFlBQW1CLEtBQWlCO1FBQ2xDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNmLENBQUM7SUFFUyxZQUFZO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFUyxXQUFXO1FBQ25CLE9BQU8sSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQzVCLENBQUM7SUFFUyxlQUFlO1FBQ3ZCLE9BQU8sSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFHUyxLQUFLO1FBQ2IsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ3ZCLE1BQU0sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNqQyxJQUFJLEtBQUssR0FBRyxPQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzVCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNYLEtBQUssR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3hDLEtBQUssQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO1lBQ2hDLEtBQUssQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1lBQ2hCLE9BQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFD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
|
|
@@ -70,7 +70,7 @@ export declare class CodeBlock extends Shape {
|
|
|
70
70
|
* it instead.
|
|
71
71
|
*/
|
|
72
72
|
edit(duration?: number, changeSelection?: CodeRange[] | boolean): (strings: TemplateStringsArray, ...rest: (Code | CodeModification)[]) => ThreadGenerator;
|
|
73
|
-
tweenCode(code: CodeTree, time: number, timingFunction: TimingFunction): Generator<void |
|
|
73
|
+
tweenCode(code: CodeTree, time: number, timingFunction: TimingFunction): Generator<void | Promise<any> | ThreadGenerator | import("@twick/core").Promisable<any>, void, any>;
|
|
74
74
|
protected draw(context: CanvasRenderingContext2D): Promise<void>;
|
|
75
75
|
protected selectionStrength(x: number, y: number): number;
|
|
76
76
|
protected static selectionStrength(selection: CodeRange[], x: number, y: number): number;
|
|
@@ -26,7 +26,6 @@ export declare abstract class Media extends Rect {
|
|
|
26
26
|
gainNode: GainNode;
|
|
27
27
|
}>;
|
|
28
28
|
protected lastTime: number;
|
|
29
|
-
private isSchedulingPlay;
|
|
30
29
|
constructor(props: MediaProps);
|
|
31
30
|
isPlaying(): boolean;
|
|
32
31
|
getCurrentTime(): number;
|
|
@@ -57,14 +56,9 @@ export declare abstract class Media extends Rect {
|
|
|
57
56
|
*/
|
|
58
57
|
protected waitForCanPlayNecessary(media: HTMLMediaElement): boolean;
|
|
59
58
|
play(): void;
|
|
60
|
-
protected schedulePlay(): void;
|
|
61
|
-
private simplePlay;
|
|
62
|
-
private actuallyPlay;
|
|
63
59
|
pause(): void;
|
|
64
60
|
clampTime(time: number): number;
|
|
65
61
|
protected collectAsyncResources(): void;
|
|
66
|
-
protected autoPlayBasedOnRevideo(): void;
|
|
67
62
|
protected getErrorReason(errCode?: number): string;
|
|
68
|
-
protected isIOS(): boolean;
|
|
69
63
|
}
|
|
70
64
|
//# sourceMappingURL=Media.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Media.d.ts","sourceRoot":"","sources":["../../src/lib/components/Media.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAU3D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAE5B,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,GAAG,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1B,IAAI,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACpC,iCAAiC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CAC1D;AA0BD,8BACsB,KAAM,SAAQ,IAAI;IACtC,
|
|
1
|
+
{"version":3,"file":"Media.d.ts","sourceRoot":"","sources":["../../src/lib/components/Media.ts"],"names":[],"mappings":"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"}
|
package/lib/components/Media.js
CHANGED
|
@@ -35,7 +35,6 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
35
35
|
constructor(props) {
|
|
36
36
|
super(props);
|
|
37
37
|
this.lastTime = -1;
|
|
38
|
-
this.isSchedulingPlay = false;
|
|
39
38
|
if (!this.awaitCanPlay()) {
|
|
40
39
|
this.scheduleSeek(this.time());
|
|
41
40
|
}
|
|
@@ -43,10 +42,7 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
43
42
|
this.play();
|
|
44
43
|
}
|
|
45
44
|
this.volume = props.volume ?? 1;
|
|
46
|
-
|
|
47
|
-
if (!this.awaitCanPlay()) {
|
|
48
|
-
this.setVolume(this.volume);
|
|
49
|
-
}
|
|
45
|
+
this.setVolume(this.volume);
|
|
50
46
|
}
|
|
51
47
|
isPlaying() {
|
|
52
48
|
return this.playing();
|
|
@@ -55,33 +51,16 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
55
51
|
return this.clampTime(this.time());
|
|
56
52
|
}
|
|
57
53
|
getDuration() {
|
|
58
|
-
|
|
59
|
-
const mElement = this.mediaElement();
|
|
60
|
-
const isVideo = (mElement instanceof HTMLVideoElement);
|
|
61
|
-
const isAudio = (mElement instanceof HTMLAudioElement);
|
|
62
|
-
return (this.isIOS() && (isVideo || isAudio)) ? 2 /** dummy duration for iOS */ : mElement.duration;
|
|
63
|
-
}
|
|
64
|
-
catch (error) {
|
|
65
|
-
// If media element is not ready yet, return a default duration
|
|
66
|
-
return 0;
|
|
67
|
-
}
|
|
54
|
+
return this.mediaElement().duration;
|
|
68
55
|
}
|
|
69
56
|
getVolume() {
|
|
70
57
|
return this.volume;
|
|
71
58
|
}
|
|
72
59
|
getUrl() {
|
|
73
|
-
|
|
74
|
-
return this.mediaElement().src;
|
|
75
|
-
}
|
|
76
|
-
catch (error) {
|
|
77
|
-
// If media element is not ready yet, return the src signal value
|
|
78
|
-
return this.src();
|
|
79
|
-
}
|
|
60
|
+
return this.mediaElement().src;
|
|
80
61
|
}
|
|
81
62
|
dispose() {
|
|
82
|
-
|
|
83
|
-
this.playing(false);
|
|
84
|
-
this.time.save();
|
|
63
|
+
this.pause();
|
|
85
64
|
this.remove();
|
|
86
65
|
super.dispose();
|
|
87
66
|
}
|
|
@@ -89,47 +68,33 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
89
68
|
return this.clampTime(this.time()) / this.getDuration();
|
|
90
69
|
}
|
|
91
70
|
setCurrentTime(value) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
}));
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
catch (error) {
|
|
109
|
-
// If media element is not ready yet, just update the lastTime
|
|
110
|
-
this.lastTime = value;
|
|
71
|
+
const media = this.mediaElement();
|
|
72
|
+
if (media.readyState < 2)
|
|
73
|
+
return;
|
|
74
|
+
media.currentTime = value;
|
|
75
|
+
this.lastTime = value;
|
|
76
|
+
if (media.seeking) {
|
|
77
|
+
DependencyContext.collectPromise(new Promise(resolve => {
|
|
78
|
+
const listener = () => {
|
|
79
|
+
resolve();
|
|
80
|
+
media.removeEventListener('seeked', listener);
|
|
81
|
+
};
|
|
82
|
+
media.addEventListener('seeked', listener);
|
|
83
|
+
}));
|
|
111
84
|
}
|
|
112
85
|
}
|
|
113
86
|
setVolume(volume) {
|
|
114
87
|
if (volume < 0) {
|
|
115
88
|
console.warn(`volumes cannot be negative - the value will be clamped to 0.`);
|
|
116
89
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
if (this.allowVolumeAmplificationInPreview()) {
|
|
124
|
-
this.amplify(media, volume);
|
|
125
|
-
return;
|
|
126
|
-
}
|
|
127
|
-
console.warn(`you have set the volume of node ${this.key} to ${volume} - your video will be exported with the correct volume, but the browser does not support volumes higher than 1 by default. To enable volume amplification in the preview, set the "allowVolumeAmplificationInPreview" of your <Video/> or <Audio/> tag to true. Note that amplification for previews will not work if you use autoplay within the player due to browser autoplay policies: https://developer.chrome.com/blog/autoplay/#webaudio.`);
|
|
90
|
+
const media = this.mediaElement();
|
|
91
|
+
media.volume = Math.min(Math.max(volume, 0), 1);
|
|
92
|
+
if (volume > 1) {
|
|
93
|
+
if (this.allowVolumeAmplificationInPreview()) {
|
|
94
|
+
this.amplify(media, volume);
|
|
95
|
+
return;
|
|
128
96
|
}
|
|
129
|
-
|
|
130
|
-
catch (error) {
|
|
131
|
-
// If media element is not ready yet, just store the volume
|
|
132
|
-
// It will be applied when the media becomes available via collectAsyncResources
|
|
97
|
+
console.warn(`you have set the volume of node ${this.key} to ${volume} - your video will be exported with the correct volume, but the browser does not support volumes higher than 1 by default. To enable volume amplification in the preview, set the "allowVolumeAmplificationInPreview" of your <Video/> or <Audio/> tag to true. Note that amplification for previews will not work if you use autoplay within the player due to browser autoplay policies: https://developer.chrome.com/blog/autoplay/#webaudio.`);
|
|
133
98
|
}
|
|
134
99
|
}
|
|
135
100
|
amplify(node, volume) {
|
|
@@ -183,22 +148,12 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
183
148
|
}
|
|
184
149
|
}
|
|
185
150
|
scheduleSeek(time) {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
// Wait until the media is ready to seek again as
|
|
193
|
-
// setting the time before the video doesn't work reliably.
|
|
194
|
-
media.currentTime = time;
|
|
195
|
-
});
|
|
196
|
-
}
|
|
197
|
-
catch (error) {
|
|
198
|
-
// If media element is not ready yet, retry after a longer delay
|
|
199
|
-
setTimeout(() => this.scheduleSeek(time), 50);
|
|
200
|
-
}
|
|
201
|
-
}, 0);
|
|
151
|
+
this.waitForCanPlay(this.mediaElement(), () => {
|
|
152
|
+
const media = this.mediaElement();
|
|
153
|
+
// Wait until the media is ready to seek again as
|
|
154
|
+
// setting the time before the video doesn't work reliably.
|
|
155
|
+
media.currentTime = time;
|
|
156
|
+
});
|
|
202
157
|
}
|
|
203
158
|
/**
|
|
204
159
|
* Waits for the canplay event to be fired before calling onCanPlay.
|
|
@@ -208,28 +163,20 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
208
163
|
* @returns
|
|
209
164
|
*/
|
|
210
165
|
waitForCanPlay(media, onCanPlay) {
|
|
211
|
-
|
|
212
|
-
if (media.readyState >= 3) {
|
|
166
|
+
if (media.readyState >= 2) {
|
|
213
167
|
onCanPlay();
|
|
214
168
|
return;
|
|
215
169
|
}
|
|
216
170
|
const onCanPlayWrapper = () => {
|
|
217
171
|
onCanPlay();
|
|
218
172
|
media.removeEventListener('canplay', onCanPlayWrapper);
|
|
219
|
-
media.removeEventListener('canplaythrough', onCanPlayWrapper);
|
|
220
173
|
};
|
|
221
174
|
const onError = () => {
|
|
222
175
|
const reason = this.getErrorReason(media.error?.code);
|
|
223
|
-
|
|
224
|
-
console.log(`ERROR: Error loading video: src="${srcValue}", ${reason}`);
|
|
225
|
-
console.log(`Media element src: "${media.src}"`);
|
|
176
|
+
console.log(`ERROR: Error loading video: ${this.src()}, ${reason}`);
|
|
226
177
|
media.removeEventListener('error', onError);
|
|
227
|
-
media.removeEventListener('canplay', onCanPlayWrapper);
|
|
228
|
-
media.removeEventListener('canplaythrough', onCanPlayWrapper);
|
|
229
178
|
};
|
|
230
|
-
// Listen for both canplay and canplaythrough events
|
|
231
179
|
media.addEventListener('canplay', onCanPlayWrapper);
|
|
232
|
-
media.addEventListener('canplaythrough', onCanPlayWrapper);
|
|
233
180
|
media.addEventListener('error', onError);
|
|
234
181
|
}
|
|
235
182
|
/**
|
|
@@ -243,151 +190,17 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
243
190
|
this.view().playbackState() === PlaybackState.Rendering);
|
|
244
191
|
}
|
|
245
192
|
play() {
|
|
246
|
-
|
|
247
|
-
|
|
193
|
+
const time = useThread().time;
|
|
194
|
+
const start = time();
|
|
195
|
+
const offset = this.time();
|
|
196
|
+
const playbackRate = this.playbackRate();
|
|
248
197
|
this.playing(true);
|
|
249
|
-
|
|
250
|
-
this.schedulePlay();
|
|
251
|
-
}
|
|
252
|
-
schedulePlay() {
|
|
253
|
-
// Prevent recursive calls
|
|
254
|
-
if (this.isSchedulingPlay) {
|
|
255
|
-
return;
|
|
256
|
-
}
|
|
257
|
-
this.isSchedulingPlay = true;
|
|
258
|
-
// Check if thread context is available before accessing it
|
|
259
|
-
let timeFunction = null;
|
|
260
|
-
try {
|
|
261
|
-
const time = useThread().time;
|
|
262
|
-
timeFunction = time;
|
|
263
|
-
}
|
|
264
|
-
catch (error) {
|
|
265
|
-
// Reset flag and use simple play without thread time
|
|
266
|
-
this.isSchedulingPlay = false;
|
|
267
|
-
this.simplePlay();
|
|
268
|
-
return;
|
|
269
|
-
}
|
|
270
|
-
// We need to wait for the media to be ready before we can play it
|
|
271
|
-
// Use a setTimeout to defer the operation and avoid immediate async property access
|
|
272
|
-
setTimeout(() => {
|
|
273
|
-
// Check if we're still supposed to be playing (avoid race conditions)
|
|
274
|
-
const isPlaying = this.playing();
|
|
275
|
-
if (!isPlaying) {
|
|
276
|
-
this.isSchedulingPlay = false;
|
|
277
|
-
return;
|
|
278
|
-
}
|
|
279
|
-
// Add another timeout to further defer media element access
|
|
280
|
-
setTimeout(() => {
|
|
281
|
-
try {
|
|
282
|
-
const media = this.mediaElement();
|
|
283
|
-
// Always use waitForCanPlay to ensure media is ready
|
|
284
|
-
this.waitForCanPlay(media, () => {
|
|
285
|
-
// Double-check we're still playing before calling actuallyPlay
|
|
286
|
-
if (this.playing() && timeFunction) {
|
|
287
|
-
this.actuallyPlay(media, timeFunction);
|
|
288
|
-
}
|
|
289
|
-
// Reset the flag when done
|
|
290
|
-
this.isSchedulingPlay = false;
|
|
291
|
-
});
|
|
292
|
-
}
|
|
293
|
-
catch (error) {
|
|
294
|
-
// Reset flag before retry
|
|
295
|
-
this.isSchedulingPlay = false;
|
|
296
|
-
// If media is not ready yet, retry after a longer delay
|
|
297
|
-
setTimeout(() => this.schedulePlay(), 100);
|
|
298
|
-
}
|
|
299
|
-
}, 10);
|
|
300
|
-
}, 0);
|
|
301
|
-
}
|
|
302
|
-
simplePlay() {
|
|
303
|
-
setTimeout(() => {
|
|
304
|
-
try {
|
|
305
|
-
const media = this.mediaElement();
|
|
306
|
-
// Guard against undefined src
|
|
307
|
-
if (!media.src || media.src.includes('undefined')) {
|
|
308
|
-
return;
|
|
309
|
-
}
|
|
310
|
-
if (media.paused && this.playing()) {
|
|
311
|
-
media.playbackRate = this.playbackRate();
|
|
312
|
-
const playPromise = media.play();
|
|
313
|
-
if (playPromise !== undefined) {
|
|
314
|
-
playPromise.then(() => {
|
|
315
|
-
console.log('Simple play started successfully');
|
|
316
|
-
}).catch(error => {
|
|
317
|
-
if (error.name !== 'AbortError') {
|
|
318
|
-
console.warn('Error in simple play:', error);
|
|
319
|
-
}
|
|
320
|
-
this.playing(false);
|
|
321
|
-
});
|
|
322
|
-
}
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
catch (error) {
|
|
326
|
-
// Stop retries for errors
|
|
327
|
-
return;
|
|
328
|
-
}
|
|
329
|
-
}, 10);
|
|
330
|
-
}
|
|
331
|
-
actuallyPlay(media, timeFunction) {
|
|
332
|
-
console.log('=== actuallyPlay called ===');
|
|
333
|
-
console.log('Media element:', media);
|
|
334
|
-
console.log('Media src:', media.src);
|
|
335
|
-
console.log('Media paused:', media.paused);
|
|
336
|
-
console.log('Media readyState:', media.readyState);
|
|
337
|
-
// Make sure we're still supposed to be playing
|
|
338
|
-
if (!this.playing()) {
|
|
339
|
-
console.log('Playing state is false, aborting actuallyPlay');
|
|
340
|
-
return;
|
|
341
|
-
}
|
|
342
|
-
// Set playback rate on media element
|
|
343
|
-
media.playbackRate = this.playbackRate();
|
|
344
|
-
// Ensure the media is ready to play
|
|
345
|
-
if (media.paused) {
|
|
346
|
-
console.log('Media is paused, calling play()');
|
|
347
|
-
// Start playing the media element
|
|
348
|
-
const playPromise = media.play();
|
|
349
|
-
if (playPromise !== undefined) {
|
|
350
|
-
playPromise.then(() => {
|
|
351
|
-
console.log('Media play() promise resolved - should be playing now');
|
|
352
|
-
console.log('Post-play media paused:', media.paused);
|
|
353
|
-
console.log('Post-play media currentTime:', media.currentTime);
|
|
354
|
-
}).catch(error => {
|
|
355
|
-
// Don't warn about AbortError - it's normal when play() is interrupted by pause()
|
|
356
|
-
if (error.name !== 'AbortError') {
|
|
357
|
-
console.warn('Error playing media:', error);
|
|
358
|
-
}
|
|
359
|
-
this.playing(false);
|
|
360
|
-
});
|
|
361
|
-
}
|
|
362
|
-
}
|
|
363
|
-
else {
|
|
364
|
-
console.log('Media is already playing');
|
|
365
|
-
}
|
|
366
|
-
// Set up time synchronization
|
|
367
|
-
const start = timeFunction();
|
|
368
|
-
const offset = media.currentTime;
|
|
369
|
-
// Update time signal
|
|
370
|
-
this.time(() => {
|
|
371
|
-
const newTime = this.clampTime(offset + (timeFunction() - start) * this.playbackRate());
|
|
372
|
-
return newTime;
|
|
373
|
-
});
|
|
198
|
+
this.time(() => this.clampTime(offset + (time() - start) * playbackRate));
|
|
374
199
|
}
|
|
375
200
|
pause() {
|
|
376
|
-
// Set the playing state first
|
|
377
201
|
this.playing(false);
|
|
378
202
|
this.time.save();
|
|
379
|
-
|
|
380
|
-
// Use setTimeout to defer access and avoid async property issues
|
|
381
|
-
setTimeout(() => {
|
|
382
|
-
try {
|
|
383
|
-
const media = this.mediaElement();
|
|
384
|
-
media.pause();
|
|
385
|
-
}
|
|
386
|
-
catch (error) {
|
|
387
|
-
// If media element is not ready yet, just update the state
|
|
388
|
-
// The media won't be playing anyway if it's not ready
|
|
389
|
-
}
|
|
390
|
-
}, 0);
|
|
203
|
+
this.mediaElement().pause();
|
|
391
204
|
}
|
|
392
205
|
clampTime(time) {
|
|
393
206
|
const duration = this.getDuration();
|
|
@@ -399,26 +212,6 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
399
212
|
collectAsyncResources() {
|
|
400
213
|
super.collectAsyncResources();
|
|
401
214
|
this.seekedMedia();
|
|
402
|
-
// Ensure volume is set when media becomes available
|
|
403
|
-
this.setVolume(this.volume);
|
|
404
|
-
}
|
|
405
|
-
autoPlayBasedOnRevideo() {
|
|
406
|
-
// Auto-start/stop playback based on Revideo's playback state
|
|
407
|
-
const playbackState = this.view().playbackState();
|
|
408
|
-
// console.log('autoPlayBasedOnRevideo called:', {
|
|
409
|
-
// playbackState,
|
|
410
|
-
// currentlyPlaying: this.playing(),
|
|
411
|
-
// shouldAutoPlay: (playbackState === PlaybackState.Playing || playbackState === PlaybackState.Presenting) && !this.playing(),
|
|
412
|
-
// shouldAutoPause: playbackState === PlaybackState.Paused && this.playing()
|
|
413
|
-
// });
|
|
414
|
-
if ((playbackState === PlaybackState.Playing || playbackState === PlaybackState.Presenting) && !this.playing()) {
|
|
415
|
-
console.log('Auto-starting media playback via play() method');
|
|
416
|
-
this.play(); // Call the full play() method instead of just setting playing(true)
|
|
417
|
-
}
|
|
418
|
-
else if (playbackState === PlaybackState.Paused && this.playing()) {
|
|
419
|
-
console.log('Auto-pausing media playback via pause() method');
|
|
420
|
-
this.pause(); // Call the full pause() method
|
|
421
|
-
}
|
|
422
215
|
}
|
|
423
216
|
getErrorReason(errCode) {
|
|
424
217
|
let reason;
|
|
@@ -442,18 +235,9 @@ let Media = Media_1 = class Media extends Rect {
|
|
|
442
235
|
}
|
|
443
236
|
return reason;
|
|
444
237
|
}
|
|
445
|
-
// Helper method to check if running on iOS
|
|
446
|
-
isIOS() {
|
|
447
|
-
if (typeof navigator === 'undefined')
|
|
448
|
-
return false;
|
|
449
|
-
const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) ||
|
|
450
|
-
(navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1);
|
|
451
|
-
return isIos;
|
|
452
|
-
}
|
|
453
238
|
};
|
|
454
239
|
Media.amplificationPool = {};
|
|
455
240
|
__decorate([
|
|
456
|
-
initial(''),
|
|
457
241
|
signal()
|
|
458
242
|
], Media.prototype, "src", void 0);
|
|
459
243
|
__decorate([
|
|
@@ -490,4 +274,4 @@ Media = Media_1 = __decorate([
|
|
|
490
274
|
nodeName('Media')
|
|
491
275
|
], Media);
|
|
492
276
|
export { Media };
|
|
493
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Media.js","sourceRoot":"","sources":["../../src/lib/components/Media.ts"],"names":[],"mappings":"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"}
|
|
277
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Media.js","sourceRoot":"","sources":["../../src/lib/components/Media.ts"],"names":[],"mappings":";;;;;;;AACA,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,KAAK,EACL,UAAU,EACV,SAAS,EACT,SAAS,GACV,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAElE,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAa5B,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;;;;;;CAsB5B,CAAC;AAGK,IAAe,KAAK,aAApB,MAAe,KAAM,SAAQ,IAAI;IA2CtC,YAAmB,KAAiB;QAClC,KAAK,CAAC,KAAK,CAAC,CAAC;QAHL,aAAQ,GAAG,CAAC,CAAC,CAAC;QAItB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC;IACtC,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEM,MAAM;QACX,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC;IACjC,CAAC;IAEe,OAAO;QACrB,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAGe,UAAU;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1D,CAAC;IAYS,cAAc,CAAC,KAAa;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,UAAU,GAAG,CAAC;YAAE,OAAO;QAEjC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAClB,iBAAiB,CAAC,cAAc,CAC9B,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBAC1B,MAAM,QAAQ,GAAG,GAAG,EAAE;oBACpB,OAAO,EAAE,CAAC;oBACV,KAAK,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAChD,CAAC,CAAC;gBACF,KAAK,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CACV,8DAA8D,CAC/D,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAClC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEhD,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,iCAAiC,EAAE,EAAE,CAAC;gBAC7C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC5B,OAAO;YACT,CAAC;YACD,OAAO,CAAC,IAAI,CACV,mCAAmC,IAAI,CAAC,GAAG,OAAO,MAAM,kbAAkb,CAC3e,CAAC;QACJ,CAAC;IACH,CAAC;IAGS,OAAO,CAAC,IAAsB,EAAE,MAAc;QACtD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QAExC,IAAI,OAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,OAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;QACxC,MAAM,UAAU,GAAG,YAAY,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAE3C,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;QAC7B,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7B,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE3C,OAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAC,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAC,CAAC;QAEpE,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,YAAY,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;YACxE,OAAO;QACT,CAAC;QAED,yFAAyF;QACzF,MAAM,iBAAiB,GAAG,GAAG,EAAE;YAC7B,OAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YACnD,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACzD,CAAC,CAAC;QACF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IACtD,CAAC;IAES,eAAe,CAAC,YAAoB;QAC5C,IAAI,KAAa,CAAC;QAClB,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,KAAK,GAAG,YAAY,EAAE,CAAC;YACvB,SAAS,EAAE,CAAC,IAAI,CAAC;gBACf,OAAO,EAAE,wCAAwC;gBACjD,OAAO,EAAE,oBAAoB;gBAC7B,OAAO,EAAE,IAAI,CAAC,GAAG;gBACjB,KAAK,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK;aACzB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,YAAY,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YACnB,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAChB,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC,IAAI,CAAC;gBAC9B,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;IACH,CAAC;IAES,YAAY,CAAC,IAAY;QACjC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAClC,iDAAiD;YACjD,2DAA2D;YAC3D,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACO,cAAc,CAAC,KAAuB,EAAE,SAAqB;QACrE,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;YAC1B,SAAS,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,GAAG,EAAE;YAC5B,SAAS,EAAE,CAAC;YACZ,KAAK,CAAC,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACzD,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,CAAC,GAAG,EAAE,KAAK,MAAM,EAAE,CAAC,CAAC;YACpE,KAAK,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC,CAAC;QAEF,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACpD,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACO,uBAAuB,CAAC,KAAuB;QACvD,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,CACL,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,IAAI,EAAE,CAAC,aAAa,EAAE,KAAK,aAAa,CAAC,SAAS,CACxD,CAAC;IACJ,CAAC;IAEM,IAAI;QACT,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC,IAAI,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACjB,IAAI,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAEM,SAAS,CAAC,IAAY;QAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAChB,IAAI,IAAI,QAAQ,CAAC;QACnB,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAEkB,qBAAqB;QACtC,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAC9B,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAES,cAAc,CAAC,OAAgB;QACvC,IAAI,MAAM,CAAC;QACX,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,CAAC;gBACJ,MAAM,GAAG,mBAAmB,CAAC;gBAC7B,MAAM;YACR,KAAK,CAAC;gBACJ,MAAM,GAAG,+CAA+C,CAAC;gBACzD,MAAM;YACR,KAAK,CAAC;gBACJ,MAAM;oBACJ,gEAAgE,CAAC;gBACnE,MAAM;YACR,KAAK,CAAC;gBACJ,MAAM;oBACJ,iHAAiH,CAAC;gBACpH,MAAM;YACR;gBACE,MAAM,GAAG,SAAS,CAAC;QACvB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;;AAtQyB,uBAAiB,GAOvC,EAAE,AAPqC,CAOpC;AAtCiB;IADvB,MAAM,EAAE;kCAC+C;AAIhC;IAFvB,OAAO,CAAC,KAAK,CAAC;IACd,MAAM,EAAE;mCACiD;AAIlC;IAFvB,OAAO,CAAC,CAAC,CAAC;IACV,MAAM,EAAE;2CACwD;AAItC;IAF1B,OAAO,CAAC,CAAC,CAAC;IACV,MAAM,EAAE;mCACmD;AAIjC;IAF1B,OAAO,CAAC,KAAK,CAAC;IACd,MAAM,EAAE;sCACuD;AAIrC;IAF1B,OAAO,CAAC,IAAI,CAAC;IACb,MAAM,EAAE;2CAC4D;AAI1C;IAF1B,OAAO,CAAC,KAAK,CAAC;IACd,MAAM,EAAE;gEAIP;AAsDc;IADf,QAAQ,EAAE;uCAGV;AAoDS;IADT,QAAQ,EAAE;oCA6BV;AArKmB,KAAK;IAD1B,QAAQ,CAAC,OAAO,CAAC;GACI,KAAK,CAwS1B"}
|
package/lib/components/Node.d.ts
CHANGED
|
@@ -232,7 +232,7 @@ export declare class Node implements Promisable<Node> {
|
|
|
232
232
|
readonly composite: SimpleSignal<boolean, this>;
|
|
233
233
|
readonly compositeOperation: SimpleSignal<GlobalCompositeOperation, this>;
|
|
234
234
|
private readonly compositeOverride;
|
|
235
|
-
protected tweenCompositeOperation(value: SignalValue<GlobalCompositeOperation>, time: number, timingFunction: TimingFunction): Generator<void |
|
|
235
|
+
protected tweenCompositeOperation(value: SignalValue<GlobalCompositeOperation>, time: number, timingFunction: TimingFunction): Generator<void | Promise<any> | ThreadGenerator | Promisable<any>, void, any>;
|
|
236
236
|
/**
|
|
237
237
|
* Represents the opacity of this node in the range 0-1.
|
|
238
238
|
*
|
package/lib/components/Path.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export declare class Path extends Curve {
|
|
|
14
14
|
protected childrenBBox(): BBox;
|
|
15
15
|
protected lineWidthCoefficient(): number;
|
|
16
16
|
protected processSubpath(path: Path2D, startPoint: Vector2 | null, endPoint: Vector2 | null): void;
|
|
17
|
-
protected tweenData(newPath: SignalValue<string>, time: number, timingFunction: TimingFunction): Generator<void | import("@twick/core").ThreadGenerator |
|
|
17
|
+
protected tweenData(newPath: SignalValue<string>, time: number, timingFunction: TimingFunction): Generator<void | Promise<any> | import("@twick/core").ThreadGenerator | import("@twick/core").Promisable<any>, void, any>;
|
|
18
18
|
drawOverlay(context: CanvasRenderingContext2D, matrix: DOMMatrix): void;
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=Path.d.ts.map
|
package/lib/components/SVG.d.ts
CHANGED
|
@@ -98,7 +98,7 @@ export declare class SVG extends Shape {
|
|
|
98
98
|
* @param timing - The timing function.
|
|
99
99
|
*/
|
|
100
100
|
protected generateTransformer(from: Node, to: Node, duration: number, timing: TimingFunction): Generator<ThreadGenerator>;
|
|
101
|
-
protected tweenSvg(value: SignalValue<string>, time: number, timingFunction: TimingFunction): Generator<void |
|
|
101
|
+
protected tweenSvg(value: SignalValue<string>, time: number, timingFunction: TimingFunction): Generator<void | Promise<any> | ThreadGenerator | import("@twick/core").Promisable<any>, void, any>;
|
|
102
102
|
private wrapperScale;
|
|
103
103
|
/**
|
|
104
104
|
* Get the current `SVGDocument`.
|
|
@@ -35,6 +35,6 @@ export declare abstract class Shape extends Layout {
|
|
|
35
35
|
protected getPath(): Path2D;
|
|
36
36
|
protected getRipplePath(): Path2D;
|
|
37
37
|
protected drawRipple(context: CanvasRenderingContext2D): void;
|
|
38
|
-
ripple(duration?: number): Generator<void | import("@twick/core").ThreadGenerator |
|
|
38
|
+
ripple(duration?: number): Generator<void | Promise<any> | import("@twick/core").ThreadGenerator | import("@twick/core").Promisable<any>, void, any>;
|
|
39
39
|
}
|
|
40
40
|
//# sourceMappingURL=Shape.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Video.d.ts","sourceRoot":"","sources":["../../src/lib/components/Video.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAI9E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAI/C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACxC,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"Video.d.ts","sourceRoot":"","sources":["../../src/lib/components/Video.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAI9E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAI/C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACxC,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAG9B,MAAM,WAAW,UAAW,SAAQ,UAAU;IAC5C;;OAEG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5B;;OAEG;IACH,SAAS,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACjC;;OAEG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;CACzD;AAED,qBACa,KAAM,SAAQ,KAAK;IAC9B;;;;;;OAMG;IACH,SAEwB,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE1D;;;;;;;;OAQG;IACH,SAEwB,SAAS,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE/D;;;;;;;OAOG;IACH,SAEwB,OAAO,EAAE,YAAY,CAC3C,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI,EAChC,IAAI,CACL,CAAC;IAEK,gBAAgB,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,CACvD;IACZ,OAAO,CAAC,mBAAmB,CAAkB;IAE7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAwC;IAEpE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAEb;gBAEV,KAAK,EAAE,UAAU;cAIjB,WAAW,IAAI,iBAAiB,CAAC,aAAa,CAAC;IAalE,SAAS,CAAC,YAAY,IAAI,gBAAgB;IAI1C,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC,SAAS,CAAC,eAAe,IAAI,gBAAgB;IAK7C,OAAO,CAAC,KAAK;IAoFb,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAoBzC,SAAS,CAAC,eAAe,IAAI,gBAAgB;IAgC7C,SAAS,CAAC,SAAS,EAAE,WAAW,GAAG,IAAI,CAAQ;cAE/B,mBAAmB,IAAI,OAAO,CAAC,iBAAiB,CAAC;cAcjD,iBAAiB,IAAI,OAAO,CAAC,WAAW,CAAC;cA8BzC,YAAY;cA4CH,IAAI,CAAC,OAAO,EAAE,wBAAwB;cAwB5C,SAAS;IAQZ,MAAM;IAMtB,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,cAAc;IAmEd,eAAe;CAcxB"}
|