@revideo/2d 0.2.5 → 0.2.6-alpha.904
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/lib/components/Audio.d.ts +11 -11
- package/lib/components/Audio.d.ts.map +1 -1
- package/lib/components/Audio.js +109 -115
- package/lib/components/Code.d.ts +211 -244
- package/lib/components/Code.d.ts.map +1 -1
- package/lib/components/Code.js +269 -317
- package/lib/components/CodeBlock.d.ts +67 -109
- package/lib/components/CodeBlock.d.ts.map +1 -1
- package/lib/components/CodeBlock.js +373 -414
- package/lib/components/Curve.js +269 -270
- package/lib/components/Grid.js +56 -63
- package/lib/components/Icon.js +50 -58
- package/lib/components/Img.d.ts +79 -86
- package/lib/components/Img.d.ts.map +1 -1
- package/lib/components/Img.js +181 -193
- package/lib/components/Knot.js +60 -81
- package/lib/components/Latex.js +65 -77
- package/lib/components/Layout.d.ts +413 -455
- package/lib/components/Layout.d.ts.map +1 -1
- package/lib/components/Layout.js +681 -666
- package/lib/components/Line.js +193 -216
- package/lib/components/Media.d.ts +35 -35
- package/lib/components/Media.d.ts.map +1 -1
- package/lib/components/Media.js +134 -135
- package/lib/components/Node.d.ts +830 -875
- package/lib/components/Node.d.ts.map +1 -1
- package/lib/components/Node.js +1314 -1383
- package/lib/components/SVG.js +541 -609
- package/lib/components/Shape.d.ts +35 -44
- package/lib/components/Shape.d.ts.map +1 -1
- package/lib/components/Shape.js +127 -112
- package/lib/components/Spline.js +175 -190
- package/lib/components/Txt.d.ts +44 -55
- package/lib/components/Txt.d.ts.map +1 -1
- package/lib/components/Txt.js +155 -156
- package/lib/components/TxtLeaf.d.ts +16 -20
- package/lib/components/TxtLeaf.d.ts.map +1 -1
- package/lib/components/TxtLeaf.js +2 -2
- package/lib/components/Video.d.ts +45 -41
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +202 -138
- package/lib/components/View2D.d.ts +22 -21
- package/lib/components/View2D.d.ts.map +1 -1
- package/lib/components/View2D.js +89 -98
- package/lib/components/index.js +1 -1
- package/lib/components/types.js +1 -1
- package/lib/curves/ArcSegment.js +94 -145
- package/lib/scenes/Scene2D.d.ts +23 -42
- package/lib/scenes/Scene2D.d.ts.map +1 -1
- package/lib/scenes/Scene2D.js +152 -161
- package/lib/scenes/index.js +1 -1
- package/lib/scenes/makeScene2D.js +10 -10
- package/lib/scenes/useScene2D.js +3 -3
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/CanvasUtils.d.ts +21 -93
- package/package.json +5 -5
- package/src/lib/components/Audio.ts +2 -2
- package/src/lib/components/Code.ts +4 -2
- package/src/lib/components/CodeBlock.ts +1 -1
- package/src/lib/components/Img.ts +2 -2
- package/src/lib/components/Layout.ts +2 -2
- package/src/lib/components/Media.ts +3 -1
- package/src/lib/components/Node.ts +9 -9
- package/src/lib/components/Shape.ts +2 -2
- package/src/lib/components/Txt.ts +2 -2
- package/src/lib/components/TxtLeaf.ts +1 -1
- package/src/lib/components/Video.ts +114 -8
- package/src/lib/components/View2D.ts +6 -2
- package/src/lib/scenes/Scene2D.ts +4 -3
package/lib/components/Media.js
CHANGED
|
@@ -1,149 +1,148 @@
|
|
|
1
|
-
var __decorate =
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var
|
|
5
|
-
r =
|
|
6
|
-
c < 3
|
|
7
|
-
? target
|
|
8
|
-
: desc === null
|
|
9
|
-
? (desc = Object.getOwnPropertyDescriptor(target, key))
|
|
10
|
-
: desc,
|
|
11
|
-
d;
|
|
12
|
-
if (typeof Reflect === 'object' && typeof Reflect.decorate === 'function')
|
|
13
|
-
r = Reflect.decorate(decorators, target, key, desc);
|
|
14
|
-
else
|
|
15
|
-
for (var i = decorators.length - 1; i >= 0; i--)
|
|
16
|
-
if ((d = decorators[i]))
|
|
17
|
-
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
18
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
-
|
|
20
|
-
import {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
isReactive,
|
|
24
|
-
useLogger,
|
|
25
|
-
useThread,
|
|
26
|
-
} from '@revideo/core';
|
|
27
|
-
import {computed, initial, signal} from '../decorators';
|
|
28
|
-
import {Rect} from './Rect';
|
|
6
|
+
};
|
|
7
|
+
import { DependencyContext, clamp, isReactive, useLogger, useThread, } from '@revideo/core';
|
|
8
|
+
import { computed, initial, signal } from '../decorators';
|
|
9
|
+
import { Rect } from './Rect';
|
|
29
10
|
export class Media extends Rect {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
11
|
+
constructor(props) {
|
|
12
|
+
super(props);
|
|
13
|
+
this.lastTime = -1;
|
|
14
|
+
if (props.play) {
|
|
15
|
+
this.play();
|
|
16
|
+
}
|
|
35
17
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
return this.playing();
|
|
39
|
-
}
|
|
40
|
-
getCurrentTime() {
|
|
41
|
-
return this.clampTime(this.time());
|
|
42
|
-
}
|
|
43
|
-
getDuration() {
|
|
44
|
-
return this.mediaElement().duration;
|
|
45
|
-
}
|
|
46
|
-
getVolume() {
|
|
47
|
-
return this.mediaElement().volume;
|
|
48
|
-
}
|
|
49
|
-
dispose() {
|
|
50
|
-
this.pause();
|
|
51
|
-
this.remove();
|
|
52
|
-
super.dispose();
|
|
53
|
-
}
|
|
54
|
-
completion() {
|
|
55
|
-
return this.clampTime(this.time()) / this.getDuration();
|
|
56
|
-
}
|
|
57
|
-
setCurrentTime(value) {
|
|
58
|
-
const media = this.mediaElement();
|
|
59
|
-
if (media.readyState < 2) return;
|
|
60
|
-
media.currentTime = value;
|
|
61
|
-
this.lastTime = value;
|
|
62
|
-
if (media.seeking) {
|
|
63
|
-
DependencyContext.collectPromise(
|
|
64
|
-
new Promise(resolve => {
|
|
65
|
-
const listener = () => {
|
|
66
|
-
resolve();
|
|
67
|
-
media.removeEventListener('seeked', listener);
|
|
68
|
-
};
|
|
69
|
-
media.addEventListener('seeked', listener);
|
|
70
|
-
}),
|
|
71
|
-
);
|
|
18
|
+
isPlaying() {
|
|
19
|
+
return this.playing();
|
|
72
20
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
if (volume < 0 || volume > 1) {
|
|
76
|
-
console.warn(
|
|
77
|
-
`${volume} is an incorrect value for volume, has to be in range [0,1]. We're clamping to the nearest value`,
|
|
78
|
-
);
|
|
21
|
+
getCurrentTime() {
|
|
22
|
+
return this.clampTime(this.time());
|
|
79
23
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
setPlaybackRate(playbackRate) {
|
|
83
|
-
let value;
|
|
84
|
-
if (isReactive(playbackRate)) {
|
|
85
|
-
value = playbackRate();
|
|
86
|
-
useLogger().warn({
|
|
87
|
-
message: 'Invalid value set as the playback rate',
|
|
88
|
-
remarks:
|
|
89
|
-
'<p>The <code>playbackRate</code> of a <code>Video</code> cannot be reactive.</p>\n<p>Make sure to use a concrete value and not a function:</p>\n<pre class="wrong"><code class="language-ts">video.<span class="hljs-title function_">playbackRate</span>(<span class="hljs-function">() =></span> <span class="hljs-number">7</span>);</code></pre><pre class="correct"><code class="language-ts">video.<span class="hljs-title function_">playbackRate</span>(<span class="hljs-number">7</span>);</code></pre><p>If you're using a signal, extract its value before passing it to the property:</p>\n<pre class="wrong"><code class="language-ts">video.<span class="hljs-title function_">playbackRate</span>(mySignal);</code></pre><pre class="correct"><code class="language-ts">video.<span class="hljs-title function_">playbackRate</span>(<span class="hljs-title function_">mySignal</span>());</code></pre>',
|
|
90
|
-
inspect: this.key,
|
|
91
|
-
stack: new Error().stack,
|
|
92
|
-
});
|
|
93
|
-
} else {
|
|
94
|
-
value = playbackRate;
|
|
24
|
+
getDuration() {
|
|
25
|
+
return this.mediaElement().duration;
|
|
95
26
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
27
|
+
getVolume() {
|
|
28
|
+
return this.mediaElement().volume;
|
|
29
|
+
}
|
|
30
|
+
dispose() {
|
|
99
31
|
this.pause();
|
|
100
|
-
|
|
32
|
+
this.remove();
|
|
33
|
+
super.dispose();
|
|
34
|
+
}
|
|
35
|
+
completion() {
|
|
36
|
+
return this.clampTime(this.time()) / this.getDuration();
|
|
37
|
+
}
|
|
38
|
+
setCurrentTime(value) {
|
|
39
|
+
const media = this.mediaElement();
|
|
40
|
+
if (media.readyState < 2)
|
|
41
|
+
return;
|
|
42
|
+
media.currentTime = value;
|
|
43
|
+
this.lastTime = value;
|
|
44
|
+
if (media.seeking) {
|
|
45
|
+
DependencyContext.collectPromise(new Promise(resolve => {
|
|
46
|
+
const listener = () => {
|
|
47
|
+
resolve();
|
|
48
|
+
media.removeEventListener('seeked', listener);
|
|
49
|
+
};
|
|
50
|
+
media.addEventListener('seeked', listener);
|
|
51
|
+
}));
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
setVolume(volume) {
|
|
55
|
+
if (volume < 0 || volume > 1) {
|
|
56
|
+
console.warn(`${volume} is an incorrect value for volume, has to be in range [0,1]. We're clamping to the nearest value`);
|
|
57
|
+
}
|
|
58
|
+
this.mediaElement().volume = Math.min(Math.max(volume, 0), 1);
|
|
59
|
+
}
|
|
60
|
+
setPlaybackRate(playbackRate) {
|
|
61
|
+
let value;
|
|
62
|
+
if (isReactive(playbackRate)) {
|
|
63
|
+
value = playbackRate();
|
|
64
|
+
useLogger().warn({
|
|
65
|
+
message: 'Invalid value set as the playback rate',
|
|
66
|
+
remarks: "<p>The <code>playbackRate</code> of a <code>Video</code> cannot be reactive.</p>\n<p>Make sure to use a concrete value and not a function:</p>\n<pre class=\"wrong\"><code class=\"language-ts\">video.<span class=\"hljs-title function_\">playbackRate</span>(<span class=\"hljs-function\">() =></span> <span class=\"hljs-number\">7</span>);</code></pre><pre class=\"correct\"><code class=\"language-ts\">video.<span class=\"hljs-title function_\">playbackRate</span>(<span class=\"hljs-number\">7</span>);</code></pre><p>If you're using a signal, extract its value before passing it to the property:</p>\n<pre class=\"wrong\"><code class=\"language-ts\">video.<span class=\"hljs-title function_\">playbackRate</span>(mySignal);</code></pre><pre class=\"correct\"><code class=\"language-ts\">video.<span class=\"hljs-title function_\">playbackRate</span>(<span class=\"hljs-title function_\">mySignal</span>());</code></pre>",
|
|
67
|
+
inspect: this.key,
|
|
68
|
+
stack: new Error().stack,
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
value = playbackRate;
|
|
73
|
+
}
|
|
74
|
+
this.playbackRate.context.setter(value);
|
|
75
|
+
if (this.playing()) {
|
|
76
|
+
if (value === 0) {
|
|
77
|
+
this.pause();
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
const time = useThread().time;
|
|
81
|
+
const start = time();
|
|
82
|
+
const offset = this.time();
|
|
83
|
+
this.time(() => this.clampTime(offset + (time() - start) * value));
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
play() {
|
|
101
88
|
const time = useThread().time;
|
|
102
89
|
const start = time();
|
|
103
90
|
const offset = this.time();
|
|
104
|
-
|
|
105
|
-
|
|
91
|
+
const playbackRate = this.playbackRate();
|
|
92
|
+
this.playing(true);
|
|
93
|
+
this.time(() => this.clampTime(offset + (time() - start) * playbackRate));
|
|
94
|
+
}
|
|
95
|
+
pause() {
|
|
96
|
+
this.playing(false);
|
|
97
|
+
this.time.save();
|
|
98
|
+
this.mediaElement().pause();
|
|
99
|
+
}
|
|
100
|
+
seek(time) {
|
|
101
|
+
const playing = this.playing();
|
|
102
|
+
this.time(this.clampTime(time));
|
|
103
|
+
if (playing) {
|
|
104
|
+
this.play();
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
this.pause();
|
|
108
|
+
}
|
|
106
109
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
this.playing(true);
|
|
114
|
-
this.time(() => this.clampTime(offset + (time() - start) * playbackRate));
|
|
115
|
-
}
|
|
116
|
-
pause() {
|
|
117
|
-
this.playing(false);
|
|
118
|
-
this.time.save();
|
|
119
|
-
this.mediaElement().pause();
|
|
120
|
-
}
|
|
121
|
-
seek(time) {
|
|
122
|
-
const playing = this.playing();
|
|
123
|
-
this.time(this.clampTime(time));
|
|
124
|
-
if (playing) {
|
|
125
|
-
this.play();
|
|
126
|
-
} else {
|
|
127
|
-
this.pause();
|
|
110
|
+
clampTime(time) {
|
|
111
|
+
const duration = this.getDuration();
|
|
112
|
+
if (this.loop()) {
|
|
113
|
+
time %= duration;
|
|
114
|
+
}
|
|
115
|
+
return clamp(0, duration, time);
|
|
128
116
|
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
if (this.loop()) {
|
|
133
|
-
time %= duration;
|
|
117
|
+
collectAsyncResources() {
|
|
118
|
+
super.collectAsyncResources();
|
|
119
|
+
this.seekedMedia();
|
|
134
120
|
}
|
|
135
|
-
return clamp(0, duration, time);
|
|
136
|
-
}
|
|
137
|
-
collectAsyncResources() {
|
|
138
|
-
super.collectAsyncResources();
|
|
139
|
-
this.seekedMedia();
|
|
140
|
-
}
|
|
141
121
|
}
|
|
142
|
-
__decorate([
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
__decorate([
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
122
|
+
__decorate([
|
|
123
|
+
signal()
|
|
124
|
+
], Media.prototype, "src", void 0);
|
|
125
|
+
__decorate([
|
|
126
|
+
initial(false),
|
|
127
|
+
signal()
|
|
128
|
+
], Media.prototype, "loop", void 0);
|
|
129
|
+
__decorate([
|
|
130
|
+
initial(1),
|
|
131
|
+
signal()
|
|
132
|
+
], Media.prototype, "playbackRate", void 0);
|
|
133
|
+
__decorate([
|
|
134
|
+
initial(0),
|
|
135
|
+
signal()
|
|
136
|
+
], Media.prototype, "time", void 0);
|
|
137
|
+
__decorate([
|
|
138
|
+
initial(false),
|
|
139
|
+
signal()
|
|
140
|
+
], Media.prototype, "playing", void 0);
|
|
141
|
+
__decorate([
|
|
142
|
+
initial(1),
|
|
143
|
+
signal()
|
|
144
|
+
], Media.prototype, "volume", void 0);
|
|
145
|
+
__decorate([
|
|
146
|
+
computed()
|
|
147
|
+
], Media.prototype, "completion", null);
|
|
148
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWVkaWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvTWVkaWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUNMLGlCQUFpQixFQUdqQixLQUFLLEVBQ0wsVUFBVSxFQUNWLFNBQVMsRUFDVCxTQUFTLEdBQ1YsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQ3hELE9BQU8sRUFBQyxJQUFJLEVBQVksTUFBTSxRQUFRLENBQUM7QUFZdkMsTUFBTSxPQUFnQixLQUFNLFNBQVEsSUFBSTtJQTBCdEMsWUFBbUIsS0FBaUI7UUFDbEMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBSEwsYUFBUSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBSXRCLElBQUksS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2YsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2QsQ0FBQztJQUNILENBQUM7SUFFTSxTQUFTO1FBQ2QsT0FBTyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDeEIsQ0FBQztJQUVNLGNBQWM7UUFDbkIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFTSxXQUFXO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDLFFBQVEsQ0FBQztJQUN0QyxDQUFDO0lBRU0sU0FBUztRQUNkLE9BQU8sSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDLE1BQU0sQ0FBQztJQUNwQyxDQUFDO0lBRWUsT0FBTztRQUNyQixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDYixJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDZCxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbEIsQ0FBQztJQUdlLFVBQVU7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
|