@revideo/2d 0.2.1-alpha.891 → 0.2.2

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.
Files changed (198) hide show
  1. package/lib/code/CodeCursor.d.ts +74 -74
  2. package/lib/code/CodeCursor.js +286 -352
  3. package/lib/code/CodeDiffer.d.ts +16 -21
  4. package/lib/code/CodeDiffer.js +41 -39
  5. package/lib/code/CodeFragment.d.ts +8 -16
  6. package/lib/code/CodeFragment.js +36 -36
  7. package/lib/code/CodeHighlighter.d.ts +59 -59
  8. package/lib/code/CodeHighlighter.js +1 -1
  9. package/lib/code/CodeMetrics.d.ts +8 -12
  10. package/lib/code/CodeMetrics.js +24 -26
  11. package/lib/code/CodeRange.d.ts +5 -21
  12. package/lib/code/CodeRange.js +124 -131
  13. package/lib/code/CodeScope.d.ts +8 -18
  14. package/lib/code/CodeScope.js +61 -59
  15. package/lib/code/CodeSelection.d.ts +4 -9
  16. package/lib/code/CodeSelection.js +8 -8
  17. package/lib/code/CodeSignal.d.ts +47 -74
  18. package/lib/code/CodeSignal.js +189 -206
  19. package/lib/code/CodeTokenizer.d.ts +1 -1
  20. package/lib/code/CodeTokenizer.js +41 -41
  21. package/lib/code/DefaultHighlightStyle.d.ts +2 -2
  22. package/lib/code/DefaultHighlightStyle.js +96 -96
  23. package/lib/code/LezerHighlighter.d.ts +19 -21
  24. package/lib/code/LezerHighlighter.js +101 -101
  25. package/lib/code/diff.d.ts +9 -12
  26. package/lib/code/diff.js +205 -218
  27. package/lib/code/extractRange.d.ts +4 -7
  28. package/lib/code/extractRange.js +71 -79
  29. package/lib/code/index.d.ts +1 -1
  30. package/lib/code/index.js +1 -1
  31. package/lib/components/Audio.d.ts +11 -11
  32. package/lib/components/Audio.js +109 -115
  33. package/lib/components/Bezier.d.ts +18 -18
  34. package/lib/components/Bezier.js +75 -86
  35. package/lib/components/Circle.d.ts +90 -95
  36. package/lib/components/Circle.js +74 -85
  37. package/lib/components/Code.d.ts +211 -244
  38. package/lib/components/Code.js +269 -317
  39. package/lib/components/CodeBlock.d.ts +67 -109
  40. package/lib/components/CodeBlock.js +373 -414
  41. package/lib/components/CubicBezier.d.ts +36 -36
  42. package/lib/components/CubicBezier.js +49 -52
  43. package/lib/components/Curve.d.ts +198 -208
  44. package/lib/components/Curve.js +269 -270
  45. package/lib/components/Grid.d.ts +42 -47
  46. package/lib/components/Grid.js +56 -63
  47. package/lib/components/Icon.d.ts +50 -55
  48. package/lib/components/Icon.js +50 -58
  49. package/lib/components/Img.d.ts +79 -86
  50. package/lib/components/Img.js +181 -193
  51. package/lib/components/Knot.d.ts +78 -97
  52. package/lib/components/Knot.js +60 -81
  53. package/lib/components/Latex.d.ts +12 -12
  54. package/lib/components/Latex.js +65 -77
  55. package/lib/components/Layout.d.ts +413 -455
  56. package/lib/components/Layout.js +681 -666
  57. package/lib/components/Line.d.ts +49 -61
  58. package/lib/components/Line.js +193 -216
  59. package/lib/components/Media.d.ts +35 -35
  60. package/lib/components/Media.js +134 -135
  61. package/lib/components/Node.d.ts +830 -875
  62. package/lib/components/Node.js +1314 -1383
  63. package/lib/components/Path.d.ts +14 -35
  64. package/lib/components/Path.js +89 -100
  65. package/lib/components/Polygon.d.ts +55 -60
  66. package/lib/components/Polygon.js +66 -71
  67. package/lib/components/QuadBezier.d.ts +29 -29
  68. package/lib/components/QuadBezier.js +45 -50
  69. package/lib/components/Ray.d.ts +28 -28
  70. package/lib/components/Ray.js +64 -71
  71. package/lib/components/Rect.d.ts +108 -115
  72. package/lib/components/Rect.js +72 -78
  73. package/lib/components/SVG.d.ts +139 -165
  74. package/lib/components/SVG.js +541 -609
  75. package/lib/components/Shape.d.ts +35 -44
  76. package/lib/components/Shape.js +127 -112
  77. package/lib/components/Spline.d.ts +40 -46
  78. package/lib/components/Spline.js +175 -190
  79. package/lib/components/Txt.d.ts +44 -55
  80. package/lib/components/Txt.js +155 -156
  81. package/lib/components/TxtLeaf.d.ts +16 -20
  82. package/lib/components/TxtLeaf.js +158 -177
  83. package/lib/components/Video.d.ts +41 -41
  84. package/lib/components/Video.js +135 -138
  85. package/lib/components/View2D.d.ts +21 -21
  86. package/lib/components/View2D.js +85 -98
  87. package/lib/components/index.d.ts +1 -1
  88. package/lib/components/index.js +1 -1
  89. package/lib/components/types.d.ts +9 -22
  90. package/lib/components/types.js +1 -1
  91. package/lib/curves/ArcSegment.d.ts +24 -36
  92. package/lib/curves/ArcSegment.js +94 -145
  93. package/lib/curves/CircleSegment.d.ts +16 -26
  94. package/lib/curves/CircleSegment.js +49 -56
  95. package/lib/curves/CubicBezierSegment.d.ts +13 -18
  96. package/lib/curves/CubicBezierSegment.js +46 -79
  97. package/lib/curves/CurveDrawingInfo.d.ts +9 -9
  98. package/lib/curves/CurveDrawingInfo.js +1 -1
  99. package/lib/curves/CurvePoint.d.ts +13 -13
  100. package/lib/curves/CurvePoint.js +1 -1
  101. package/lib/curves/CurveProfile.d.ts +5 -5
  102. package/lib/curves/CurveProfile.js +1 -1
  103. package/lib/curves/KnotInfo.d.ts +8 -8
  104. package/lib/curves/KnotInfo.js +1 -1
  105. package/lib/curves/LineSegment.d.ts +14 -19
  106. package/lib/curves/LineSegment.js +42 -42
  107. package/lib/curves/Polynomial.d.ts +110 -110
  108. package/lib/curves/Polynomial.js +239 -249
  109. package/lib/curves/Polynomial2D.d.ts +20 -20
  110. package/lib/curves/Polynomial2D.js +42 -46
  111. package/lib/curves/PolynomialSegment.d.ts +37 -42
  112. package/lib/curves/PolynomialSegment.js +81 -83
  113. package/lib/curves/QuadBezierSegment.d.ts +12 -12
  114. package/lib/curves/QuadBezierSegment.js +41 -71
  115. package/lib/curves/Segment.d.ts +7 -12
  116. package/lib/curves/Segment.js +3 -2
  117. package/lib/curves/UniformPolynomialCurveSampler.d.ts +34 -34
  118. package/lib/curves/UniformPolynomialCurveSampler.js +62 -68
  119. package/lib/curves/createCurveProfileLerp.d.ts +6 -17
  120. package/lib/curves/createCurveProfileLerp.js +208 -211
  121. package/lib/curves/getBezierSplineProfile.d.ts +4 -8
  122. package/lib/curves/getBezierSplineProfile.js +101 -145
  123. package/lib/curves/getCircleProfile.d.ts +4 -10
  124. package/lib/curves/getCircleProfile.js +40 -72
  125. package/lib/curves/getPathProfile.d.ts +2 -2
  126. package/lib/curves/getPathProfile.js +112 -135
  127. package/lib/curves/getPointAtDistance.d.ts +4 -7
  128. package/lib/curves/getPointAtDistance.js +12 -12
  129. package/lib/curves/getPolylineProfile.d.ts +4 -8
  130. package/lib/curves/getPolylineProfile.js +54 -67
  131. package/lib/curves/getRectProfile.d.ts +4 -9
  132. package/lib/curves/getRectProfile.js +52 -117
  133. package/lib/curves/index.d.ts +1 -1
  134. package/lib/curves/index.js +1 -1
  135. package/lib/decorators/canvasStyleSignal.d.ts +3 -3
  136. package/lib/decorators/canvasStyleSignal.js +10 -10
  137. package/lib/decorators/colorSignal.d.ts +1 -1
  138. package/lib/decorators/colorSignal.js +7 -7
  139. package/lib/decorators/compound.d.ts +2 -4
  140. package/lib/decorators/compound.js +23 -43
  141. package/lib/decorators/computed.d.ts +1 -1
  142. package/lib/decorators/computed.js +9 -9
  143. package/lib/decorators/defaultStyle.d.ts +2 -5
  144. package/lib/decorators/defaultStyle.js +11 -11
  145. package/lib/decorators/filtersSignal.d.ts +8 -28
  146. package/lib/decorators/filtersSignal.js +64 -87
  147. package/lib/decorators/index.d.ts +1 -1
  148. package/lib/decorators/index.js +1 -1
  149. package/lib/decorators/initializers.d.ts +2 -5
  150. package/lib/decorators/initializers.js +19 -18
  151. package/lib/decorators/nodeName.d.ts +1 -1
  152. package/lib/decorators/nodeName.js +4 -4
  153. package/lib/decorators/signal.d.ts +20 -40
  154. package/lib/decorators/signal.js +104 -113
  155. package/lib/decorators/spacingSignal.d.ts +1 -1
  156. package/lib/decorators/spacingSignal.js +13 -13
  157. package/lib/decorators/vector2Signal.d.ts +7 -13
  158. package/lib/decorators/vector2Signal.js +13 -15
  159. package/lib/index.d.ts +1 -1
  160. package/lib/index.js +1 -1
  161. package/lib/jsx-dev-runtime.d.ts +3 -3
  162. package/lib/jsx-dev-runtime.js +3 -3
  163. package/lib/jsx-runtime.d.ts +9 -19
  164. package/lib/jsx-runtime.js +18 -18
  165. package/lib/partials/Filter.d.ts +16 -24
  166. package/lib/partials/Filter.js +69 -69
  167. package/lib/partials/Gradient.d.ts +24 -30
  168. package/lib/partials/Gradient.js +58 -69
  169. package/lib/partials/Pattern.d.ts +9 -14
  170. package/lib/partials/Pattern.js +24 -30
  171. package/lib/partials/ShaderConfig.d.ts +74 -81
  172. package/lib/partials/ShaderConfig.js +23 -22
  173. package/lib/partials/index.d.ts +1 -1
  174. package/lib/partials/index.js +1 -1
  175. package/lib/partials/types.d.ts +6 -19
  176. package/lib/partials/types.js +1 -1
  177. package/lib/scenes/Scene2D.d.ts +23 -42
  178. package/lib/scenes/Scene2D.js +151 -161
  179. package/lib/scenes/index.d.ts +1 -1
  180. package/lib/scenes/index.js +1 -1
  181. package/lib/scenes/makeScene2D.d.ts +5 -7
  182. package/lib/scenes/makeScene2D.js +10 -10
  183. package/lib/scenes/useScene2D.d.ts +2 -2
  184. package/lib/scenes/useScene2D.js +3 -3
  185. package/lib/utils/CanvasUtils.d.ts +21 -93
  186. package/lib/utils/CanvasUtils.js +105 -186
  187. package/lib/utils/diff.d.ts +18 -25
  188. package/lib/utils/diff.js +87 -84
  189. package/lib/utils/index.d.ts +1 -1
  190. package/lib/utils/index.js +1 -1
  191. package/lib/utils/is.d.ts +2 -4
  192. package/lib/utils/is.js +2 -2
  193. package/lib/utils/makeSignalExtensions.d.ts +4 -11
  194. package/lib/utils/makeSignalExtensions.js +17 -17
  195. package/package.json +5 -5
  196. package/lib/components/AudioTest.d.ts +0 -99
  197. package/lib/components/AudioTest.d.ts.map +0 -1
  198. package/lib/components/AudioTest.js +0 -281
package/lib/utils/is.js CHANGED
@@ -5,6 +5,6 @@
5
5
  * @param klass - The class to check against.
6
6
  */
7
7
  export function is(klass) {
8
- return object => object instanceof klass;
8
+ return (object) => object instanceof klass;
9
9
  }
10
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzL2lzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLEVBQUUsQ0FDaEIsS0FBZ0M7SUFFaEMsT0FBTyxDQUFDLE1BQU0sRUFBZSxFQUFFLENBQUMsTUFBTSxZQUFZLEtBQUssQ0FBQztBQUMxRCxDQUFDIn0=
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzL2lzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLEVBQUUsQ0FDaEIsS0FBZ0M7SUFFaEMsT0FBTyxDQUFDLE1BQU0sRUFBZSxFQUFFLENBQUMsTUFBTSxZQUFZLEtBQUssQ0FBQztBQUMxRCxDQUFDIn0=
@@ -1,11 +1,4 @@
1
- import {SignalExtensions} from '@revideo/core';
2
- import {PropertyMetadata} from '../decorators';
3
- export declare function makeSignalExtensions<
4
- TSetterValue,
5
- TValue extends TSetterValue,
6
- >(
7
- meta?: Partial<PropertyMetadata<TValue>>,
8
- owner?: any,
9
- name?: string,
10
- ): Partial<SignalExtensions<TSetterValue, TValue>>;
11
- //# sourceMappingURL=makeSignalExtensions.d.ts.map
1
+ import { SignalExtensions } from '@revideo/core';
2
+ import { PropertyMetadata } from '../decorators';
3
+ export declare function makeSignalExtensions<TSetterValue, TValue extends TSetterValue>(meta?: Partial<PropertyMetadata<TValue>>, owner?: any, name?: string): Partial<SignalExtensions<TSetterValue, TValue>>;
4
+ //# sourceMappingURL=makeSignalExtensions.d.ts.map
@@ -1,20 +1,20 @@
1
- import {capitalize} from '@revideo/core';
1
+ import { capitalize } from '@revideo/core';
2
2
  export function makeSignalExtensions(meta = {}, owner, name) {
3
- const extensions = {};
4
- if (name && owner) {
5
- const setter = meta.setter ?? owner?.[`set${capitalize(name)}`];
6
- if (setter) {
7
- extensions.setter = setter.bind(owner);
3
+ const extensions = {};
4
+ if (name && owner) {
5
+ const setter = meta.setter ?? owner?.[`set${capitalize(name)}`];
6
+ if (setter) {
7
+ extensions.setter = setter.bind(owner);
8
+ }
9
+ const getter = meta.getter ?? owner?.[`get${capitalize(name)}`];
10
+ if (getter) {
11
+ extensions.getter = getter.bind(owner);
12
+ }
13
+ const tweener = meta.tweener ?? owner?.[`tween${capitalize(name)}`];
14
+ if (tweener) {
15
+ extensions.tweener = tweener.bind(owner);
16
+ }
8
17
  }
9
- const getter = meta.getter ?? owner?.[`get${capitalize(name)}`];
10
- if (getter) {
11
- extensions.getter = getter.bind(owner);
12
- }
13
- const tweener = meta.tweener ?? owner?.[`tween${capitalize(name)}`];
14
- if (tweener) {
15
- extensions.tweener = tweener.bind(owner);
16
- }
17
- }
18
- return extensions;
18
+ return extensions;
19
19
  }
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZVNpZ25hbEV4dGVuc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzL21ha2VTaWduYWxFeHRlbnNpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBbUIsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBRzNELE1BQU0sVUFBVSxvQkFBb0IsQ0FDbEMsT0FBMEMsRUFBRSxFQUM1QyxLQUFXLEVBQ1gsSUFBYTtJQUViLE1BQU0sVUFBVSxHQUFvRCxFQUFFLENBQUM7SUFFdkUsSUFBSSxJQUFJLElBQUksS0FBSyxFQUFFLENBQUM7UUFDbEIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDaEUsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLFVBQVUsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6QyxDQUFDO1FBRUQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDaEUsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLFVBQVUsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6QyxDQUFDO1FBRUQsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxLQUFLLEVBQUUsQ0FBQyxRQUFRLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDcEUsSUFBSSxPQUFPLEVBQUUsQ0FBQztZQUNaLFVBQVUsQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQyxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMifQ==
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZVNpZ25hbEV4dGVuc2lvbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzL21ha2VTaWduYWxFeHRlbnNpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBbUIsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBRzNELE1BQU0sVUFBVSxvQkFBb0IsQ0FDbEMsT0FBMEMsRUFBRSxFQUM1QyxLQUFXLEVBQ1gsSUFBYTtJQUViLE1BQU0sVUFBVSxHQUFvRCxFQUFFLENBQUM7SUFFdkUsSUFBSSxJQUFJLElBQUksS0FBSyxFQUFFLENBQUM7UUFDbEIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDaEUsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLFVBQVUsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6QyxDQUFDO1FBRUQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDaEUsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLFVBQVUsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6QyxDQUFDO1FBRUQsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxLQUFLLEVBQUUsQ0FBQyxRQUFRLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDcEUsSUFBSSxPQUFPLEVBQUUsQ0FBQztZQUNaLFVBQVUsQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQyxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@revideo/2d",
3
- "version": "0.2.1-alpha.891+b6a0386",
3
+ "version": "0.2.2",
4
4
  "description": "A 2D renderer for revideo",
5
5
  "author": "revideo",
6
6
  "homepage": "https://re.video/",
@@ -29,8 +29,8 @@
29
29
  ],
30
30
  "devDependencies": {
31
31
  "@preact/signals": "^1.2.1",
32
- "@revideo/internal": "^0.0.0",
33
- "@revideo/ui": "^0.2.1-alpha.891+b6a0386",
32
+ "@revideo/internal": "0.0.0",
33
+ "@revideo/ui": "^0.2.2",
34
34
  "clsx": "^2.0.0",
35
35
  "jsdom": "^22.1.0",
36
36
  "preact": "^10.19.2",
@@ -40,10 +40,10 @@
40
40
  "@codemirror/language": "^6.10.1",
41
41
  "@lezer/common": "^1.2.1",
42
42
  "@lezer/highlight": "^1.2.0",
43
- "@revideo/core": "^0.2.1-alpha.891+b6a0386",
43
+ "@revideo/core": "^0.2.2",
44
44
  "code-fns": "^0.8.2",
45
45
  "mathjax-full": "^3.2.2",
46
46
  "parse-svg-path": "^0.1.2"
47
47
  },
48
- "gitHead": "b6a03863cd5ee2f9bde38d1b199e8b7a03ab7bdc"
48
+ "gitHead": "aed6717a2c1364b37c99315a099bab56d8017e99"
49
49
  }
@@ -1,99 +0,0 @@
1
- import {SerializedVector2, SignalValue, SimpleSignal} from '@revideo/core';
2
- import {DesiredLength} from '../partials';
3
- import {Rect, RectProps} from './Rect';
4
- export interface AudioTestProps extends RectProps {
5
- /**
6
- * {@inheritDoc Video.src}
7
- */
8
- src?: SignalValue<string>;
9
- /**
10
- * {@inheritDoc Video.alpha}
11
- */
12
- alpha?: SignalValue<number>;
13
- /**
14
- * {@inheritDoc Video.smoothing}
15
- */
16
- smoothing?: SignalValue<boolean>;
17
- /**
18
- * {@inheritDoc Video.loop}
19
- */
20
- loop?: SignalValue<boolean>;
21
- /**
22
- * {@inheritDoc Video.playbackRate}
23
- */
24
- playbackRate?: number;
25
- /**
26
- * The starting time for this video in seconds.
27
- */
28
- time?: SignalValue<number>;
29
- play?: boolean;
30
- }
31
- export declare class AudioTest extends Rect {
32
- private static readonly pool;
33
- /**
34
- * The source of this video.
35
- *
36
- * @example
37
- * Using a local video:
38
- * ```tsx
39
- * import video from './example.mp4';
40
- * // ...
41
- * view.add(<Video src={video} />)
42
- * ```
43
- * Loading an image from the internet:
44
- * ```tsx
45
- * view.add(<Video src="https://example.com/video.mp4" />)
46
- * ```
47
- */
48
- readonly src: SimpleSignal<string, this>;
49
- /**
50
- * The alpha value of this video.
51
- *
52
- * @remarks
53
- * Unlike opacity, the alpha value affects only the video itself, leaving the
54
- * fill, stroke, and children intact.
55
- */
56
- readonly alpha: SimpleSignal<number, this>;
57
- /**
58
- * Whether the video should be smoothed.
59
- *
60
- * @remarks
61
- * When disabled, the video will be scaled using the nearest neighbor
62
- * interpolation with no smoothing. The resulting video will appear pixelated.
63
- *
64
- * @defaultValue true
65
- */
66
- readonly smoothing: SimpleSignal<boolean, this>;
67
- /**
68
- * Whether this video should loop upon reaching the end.
69
- */
70
- readonly loop: SimpleSignal<boolean, this>;
71
- /**
72
- * The rate at which the video plays, as multiples of the normal speed.
73
- *
74
- * @defaultValue 1
75
- */
76
- readonly playbackRate: SimpleSignal<number, this>;
77
- protected readonly time: SimpleSignal<number, this>;
78
- protected readonly playing: SimpleSignal<boolean, this>;
79
- private lastTime;
80
- constructor({play, ...props}: AudioTestProps);
81
- isPlaying(): boolean;
82
- getCurrentTime(): number;
83
- getDuration(): number;
84
- protected desiredSize(): SerializedVector2<DesiredLength>;
85
- completion(): number;
86
- protected video(): HTMLAudioElement;
87
- protected seekedVideo(): HTMLAudioElement;
88
- protected fastSeekedVideo(): HTMLAudioElement;
89
- protected draw(context: CanvasRenderingContext2D): void;
90
- protected applyFlex(): void;
91
- protected setCurrentTime(value: number): void;
92
- protected setPlaybackRate(playbackRate: number): void;
93
- play(): void;
94
- pause(): void;
95
- seek(time: number): void;
96
- clampTime(time: number): number;
97
- protected collectAsyncResources(): void;
98
- }
99
- //# sourceMappingURL=AudioTest.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"AudioTest.d.ts","sourceRoot":"","sources":["../../src/lib/components/AudioTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,iBAAiB,EACjB,WAAW,EACX,YAAY,EAKb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAC,IAAI,EAAE,SAAS,EAAC,MAAM,QAAQ,CAAC;AAGvC,MAAM,WAAW,cAAe,SAAQ,SAAS;IAC/C;;OAEG;IACH,GAAG,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1B;;OAEG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5B;;OAEG;IACH,SAAS,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACjC;;OAEG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,qBACa,SAAU,SAAQ,IAAI;IACjC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAwC;IAEpE;;;;;;;;;;;;;;OAcG;IACH,SACwB,GAAG,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAExD;;;;;;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;;OAEG;IACH,SAEwB,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAE1D;;;;OAIG;IACH,SAEwB,YAAY,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAEjE,mBAE2B,IAAI,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE5D,mBAE2B,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEhE,OAAO,CAAC,QAAQ,CAAM;gBAEH,EAAC,IAAI,EAAE,GAAG,KAAK,EAAC,EAAE,cAAc;IAO5C,SAAS,IAAI,OAAO;IAIpB,cAAc,IAAI,MAAM;IAIxB,WAAW,IAAI,MAAM;cAIT,WAAW,IAAI,iBAAiB,CAAC,aAAa,CAAC;IAclD,UAAU,IAAI,MAAM;IAMpC,SAAS,CAAC,KAAK,IAAI,gBAAgB;IAqCnC,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAqBzC,SAAS,CAAC,eAAe,IAAI,gBAAgB;cAyC1B,IAAI,CAAC,OAAO,EAAE,wBAAwB;cAoCtC,SAAS;IAQ5B,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM;IA2BtC,SAAS,CAAC,eAAe,CAAC,YAAY,EAAE,MAAM;IA2BvC,IAAI;IASJ,KAAK;IAML,IAAI,CAAC,IAAI,EAAE,MAAM;IAWjB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;cASnB,qBAAqB;CAIzC"}
@@ -1,281 +0,0 @@
1
- var __decorate =
2
- (this && this.__decorate) ||
3
- function (decorators, target, key, desc) {
4
- var c = arguments.length,
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;
18
- return c > 3 && r && Object.defineProperty(target, key, r), r;
19
- };
20
- var AudioTest_1;
21
- import {
22
- BBox,
23
- DependencyContext,
24
- PlaybackState,
25
- clamp,
26
- isReactive,
27
- useLogger,
28
- useThread,
29
- } from '@revideo/core';
30
- import {computed, initial, nodeName, signal} from '../decorators';
31
- import {Rect} from './Rect';
32
- let AudioTest = (AudioTest_1 = class AudioTest extends Rect {
33
- constructor({play, ...props}) {
34
- super(props);
35
- this.lastTime = -1;
36
- if (play) {
37
- this.play();
38
- }
39
- }
40
- isPlaying() {
41
- return this.playing();
42
- }
43
- getCurrentTime() {
44
- return this.clampTime(this.time());
45
- }
46
- getDuration() {
47
- return this.video().duration;
48
- }
49
- desiredSize() {
50
- const custom = super.desiredSize();
51
- if (custom.x === null && custom.y === null) {
52
- const image = this.video();
53
- return {
54
- x: 300,
55
- y: 300,
56
- };
57
- }
58
- return custom;
59
- }
60
- completion() {
61
- console.log('completion of video');
62
- return this.clampTime(this.time()) / this.video().duration;
63
- }
64
- video() {
65
- const src = this.src();
66
- console.log('src video', src);
67
- const key = `${this.key}/${src}`;
68
- let video = AudioTest_1.pool[key];
69
- if (!video) {
70
- console.log('before creating video element');
71
- video = document.createElement('video');
72
- document.body.appendChild(video);
73
- video.addEventListener('ended', () => {
74
- console.log('Video ended, triggered by event listener haha');
75
- this.playing(false); // Update the playing state
76
- // Additional logic for when audio ends
77
- });
78
- console.log('after creating video element');
79
- video.src = src;
80
- AudioTest_1.pool[key] = video;
81
- }
82
- if (video.readyState < 2) {
83
- DependencyContext.collectPromise(
84
- new Promise(resolve => {
85
- const listener = () => {
86
- resolve();
87
- video.removeEventListener('canplay', listener);
88
- };
89
- video.addEventListener('canplay', listener);
90
- }),
91
- );
92
- }
93
- return video;
94
- }
95
- seekedVideo() {
96
- console.log('in seekedVideo');
97
- const video = this.video();
98
- const time = this.clampTime(this.time());
99
- video.playbackRate = this.playbackRate();
100
- if (!video.paused) {
101
- video.pause();
102
- }
103
- if (this.lastTime === time) {
104
- return video;
105
- }
106
- this.setCurrentTime(time);
107
- return video;
108
- }
109
- fastSeekedVideo() {
110
- const video = this.video();
111
- const time = this.clampTime(this.time());
112
- video.playbackRate = this.playbackRate();
113
- if (this.lastTime === time) {
114
- return video;
115
- }
116
- console.log(
117
- 'calculating if playing:',
118
- this.playing(),
119
- time < video.duration,
120
- video.playbackRate,
121
- );
122
- console.log('time', time);
123
- console.log('this.duration', video.duration);
124
- if (time < video.duration) {
125
- console.log("oh shit, we're over tiem!");
126
- this.pause();
127
- this.remove();
128
- }
129
- const playing =
130
- this.playing() && time < video.duration && video.playbackRate > 0;
131
- if (playing) {
132
- if (video.paused) {
133
- DependencyContext.collectPromise(video.play());
134
- }
135
- } else {
136
- if (!video.paused) {
137
- video.pause();
138
- }
139
- }
140
- console.log('video difference', Math.abs(video.currentTime - time) > 0.3);
141
- if (Math.abs(video.currentTime - time) > 0.3) {
142
- this.setCurrentTime(time);
143
- } else if (!playing) {
144
- video.currentTime = time;
145
- }
146
- return video;
147
- }
148
- draw(context) {
149
- console.log('drawing video');
150
- this.drawShape(context);
151
- const alpha = this.alpha();
152
- if (alpha > 0) {
153
- const playbackState = this.view().playbackState();
154
- console.log('in video playbackState', playbackState);
155
- const video =
156
- playbackState === PlaybackState.Playing ||
157
- playbackState === PlaybackState.Presenting
158
- ? this.fastSeekedVideo()
159
- : this.seekedVideo();
160
- console.log('in video video', video);
161
- const box = BBox.fromSizeCentered(this.computedSize());
162
- context.save();
163
- context.clip(this.getPath());
164
- if (alpha < 1) {
165
- context.globalAlpha *= alpha;
166
- }
167
- context.imageSmoothingEnabled = this.smoothing();
168
- //drawImage(context, video, box);
169
- context.restore();
170
- }
171
- console.log('this.clip() video', this.clip());
172
- if (this.clip()) {
173
- context.clip(this.getPath());
174
- }
175
- this.drawChildren(context);
176
- }
177
- applyFlex() {
178
- super.applyFlex();
179
- const video = this.video();
180
- this.element.style.aspectRatio = (this.ratio() ?? 300 / 300).toString();
181
- }
182
- setCurrentTime(value) {
183
- console.log('setcurrenttime called on video with value', value);
184
- const video = this.video();
185
- console.log('setcurrenttime this.video', video);
186
- console.log('setcurrenttime this.video.readyState', video.readyState);
187
- if (video.readyState < 2) {
188
- console.log('some fucking failure haha bruder');
189
- return;
190
- }
191
- video.currentTime = value;
192
- this.lastTime = value;
193
- if (video.seeking) {
194
- DependencyContext.collectPromise(
195
- new Promise(resolve => {
196
- const listener = () => {
197
- resolve();
198
- video.removeEventListener('seeked', listener);
199
- };
200
- video.addEventListener('seeked', listener);
201
- }),
202
- );
203
- }
204
- }
205
- setPlaybackRate(playbackRate) {
206
- let value;
207
- if (isReactive(playbackRate)) {
208
- value = playbackRate();
209
- useLogger().warn({
210
- message: 'Invalid value set as the playback rate',
211
- remarks:
212
- '<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">() =&gt;</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&#39;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>',
213
- inspect: this.key,
214
- stack: new Error().stack,
215
- });
216
- } else {
217
- value = playbackRate;
218
- }
219
- this.playbackRate.context.setter(value);
220
- if (this.playing()) {
221
- if (value === 0) {
222
- this.pause();
223
- } else {
224
- const time = useThread().time;
225
- const start = time();
226
- const offset = this.time();
227
- this.time(() => this.clampTime(offset + (time() - start) * value));
228
- }
229
- }
230
- }
231
- play() {
232
- const time = useThread().time;
233
- const start = time();
234
- const offset = this.time();
235
- const playbackRate = this.playbackRate();
236
- this.playing(true);
237
- this.time(() => this.clampTime(offset + (time() - start) * playbackRate));
238
- }
239
- pause() {
240
- this.playing(false);
241
- this.time.save();
242
- this.video().pause();
243
- }
244
- seek(time) {
245
- console.log('seek called on video');
246
- const playing = this.playing();
247
- this.time(this.clampTime(time));
248
- if (playing) {
249
- this.play();
250
- } else {
251
- this.pause();
252
- }
253
- }
254
- clampTime(time) {
255
- const duration = this.video().duration;
256
- if (this.loop()) {
257
- time %= duration;
258
- }
259
- console.log(`in clamptime (VIDEO), calling clamp(0, ${duration}, ${time}`);
260
- return clamp(0, duration, time);
261
- }
262
- collectAsyncResources() {
263
- super.collectAsyncResources();
264
- this.seekedVideo();
265
- }
266
- });
267
- AudioTest.pool = {};
268
- __decorate([signal()], AudioTest.prototype, 'src', void 0);
269
- __decorate([initial(1), signal()], AudioTest.prototype, 'alpha', void 0);
270
- __decorate([initial(true), signal()], AudioTest.prototype, 'smoothing', void 0);
271
- __decorate([initial(false), signal()], AudioTest.prototype, 'loop', void 0);
272
- __decorate([initial(1), signal()], AudioTest.prototype, 'playbackRate', void 0);
273
- __decorate([initial(0), signal()], AudioTest.prototype, 'time', void 0);
274
- __decorate([initial(false), signal()], AudioTest.prototype, 'playing', void 0);
275
- __decorate([computed()], AudioTest.prototype, 'completion', null);
276
- __decorate([computed()], AudioTest.prototype, 'video', null);
277
- __decorate([computed()], AudioTest.prototype, 'seekedVideo', null);
278
- __decorate([computed()], AudioTest.prototype, 'fastSeekedVideo', null);
279
- AudioTest = AudioTest_1 = __decorate([nodeName('AudioTest')], AudioTest);
280
- export {AudioTest};
281
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AudioTest.js","sourceRoot":"","sources":["../../src/lib/components/AudioTest.ts"],"names":[],"mappings":"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"}