@revideo/2d 0.2.2 → 0.2.4-alpha.894
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/editor/index.css +1 -1
- package/editor/index.js +529 -245
- package/lib/code/CodeCursor.d.ts +74 -74
- package/lib/code/CodeCursor.js +352 -286
- package/lib/code/CodeDiffer.d.ts +21 -16
- package/lib/code/CodeDiffer.js +39 -41
- package/lib/code/CodeFragment.d.ts +16 -8
- package/lib/code/CodeFragment.js +36 -36
- package/lib/code/CodeHighlighter.d.ts +59 -59
- package/lib/code/CodeHighlighter.js +1 -1
- package/lib/code/CodeMetrics.d.ts +12 -8
- package/lib/code/CodeMetrics.js +26 -24
- package/lib/code/CodeRange.d.ts +21 -5
- package/lib/code/CodeRange.js +131 -124
- package/lib/code/CodeScope.d.ts +18 -8
- package/lib/code/CodeScope.js +59 -61
- package/lib/code/CodeSelection.d.ts +9 -4
- package/lib/code/CodeSelection.js +8 -8
- package/lib/code/CodeSignal.d.ts +74 -47
- package/lib/code/CodeSignal.js +206 -189
- package/lib/code/CodeTokenizer.d.ts +1 -1
- package/lib/code/CodeTokenizer.js +41 -41
- package/lib/code/DefaultHighlightStyle.d.ts +2 -2
- package/lib/code/DefaultHighlightStyle.js +96 -96
- package/lib/code/LezerHighlighter.d.ts +21 -19
- package/lib/code/LezerHighlighter.js +101 -101
- package/lib/code/diff.d.ts +12 -9
- package/lib/code/diff.js +218 -205
- package/lib/code/extractRange.d.ts +7 -4
- package/lib/code/extractRange.js +79 -71
- package/lib/code/index.d.ts +1 -1
- package/lib/code/index.js +1 -1
- package/lib/components/Audio.d.ts +11 -11
- package/lib/components/Audio.js +115 -109
- package/lib/components/Bezier.d.ts +18 -18
- package/lib/components/Bezier.js +86 -75
- package/lib/components/Circle.d.ts +95 -90
- package/lib/components/Circle.js +85 -74
- package/lib/components/Code.d.ts +244 -211
- package/lib/components/Code.js +317 -269
- package/lib/components/CodeBlock.d.ts +109 -67
- package/lib/components/CodeBlock.js +414 -373
- package/lib/components/CubicBezier.d.ts +36 -36
- package/lib/components/CubicBezier.js +52 -49
- package/lib/components/Curve.d.ts +208 -198
- package/lib/components/Curve.js +270 -269
- package/lib/components/Grid.d.ts +47 -42
- package/lib/components/Grid.js +63 -56
- package/lib/components/Icon.d.ts +55 -50
- package/lib/components/Icon.js +58 -50
- package/lib/components/Img.d.ts +86 -79
- package/lib/components/Img.js +193 -181
- package/lib/components/Knot.d.ts +97 -78
- package/lib/components/Knot.js +81 -60
- package/lib/components/Latex.d.ts +12 -12
- package/lib/components/Latex.js +77 -65
- package/lib/components/Layout.d.ts +455 -413
- package/lib/components/Layout.js +666 -681
- package/lib/components/Line.d.ts +61 -49
- package/lib/components/Line.js +216 -193
- package/lib/components/Media.d.ts +35 -35
- package/lib/components/Media.js +135 -134
- package/lib/components/Node.d.ts +875 -830
- package/lib/components/Node.js +1383 -1314
- package/lib/components/Path.d.ts +35 -14
- package/lib/components/Path.js +100 -89
- package/lib/components/Polygon.d.ts +60 -55
- package/lib/components/Polygon.js +71 -66
- package/lib/components/QuadBezier.d.ts +29 -29
- package/lib/components/QuadBezier.js +50 -45
- package/lib/components/Ray.d.ts +28 -28
- package/lib/components/Ray.js +71 -64
- package/lib/components/Rect.d.ts +115 -108
- package/lib/components/Rect.js +78 -72
- package/lib/components/SVG.d.ts +165 -139
- package/lib/components/SVG.js +609 -541
- package/lib/components/Shape.d.ts +44 -35
- package/lib/components/Shape.js +112 -127
- package/lib/components/Spline.d.ts +46 -40
- package/lib/components/Spline.js +190 -175
- package/lib/components/Txt.d.ts +55 -44
- package/lib/components/Txt.js +156 -155
- package/lib/components/TxtLeaf.d.ts +20 -16
- package/lib/components/TxtLeaf.js +177 -158
- package/lib/components/Video.d.ts +41 -41
- package/lib/components/Video.js +138 -135
- package/lib/components/View2D.d.ts +21 -21
- package/lib/components/View2D.js +98 -85
- package/lib/components/index.d.ts +1 -1
- package/lib/components/index.js +1 -1
- package/lib/components/types.d.ts +22 -9
- package/lib/components/types.js +1 -1
- package/lib/curves/ArcSegment.d.ts +36 -24
- package/lib/curves/ArcSegment.js +145 -94
- package/lib/curves/CircleSegment.d.ts +26 -16
- package/lib/curves/CircleSegment.js +56 -49
- package/lib/curves/CubicBezierSegment.d.ts +18 -13
- package/lib/curves/CubicBezierSegment.js +79 -46
- package/lib/curves/CurveDrawingInfo.d.ts +9 -9
- package/lib/curves/CurveDrawingInfo.js +1 -1
- package/lib/curves/CurvePoint.d.ts +13 -13
- package/lib/curves/CurvePoint.js +1 -1
- package/lib/curves/CurveProfile.d.ts +5 -5
- package/lib/curves/CurveProfile.js +1 -1
- package/lib/curves/KnotInfo.d.ts +8 -8
- package/lib/curves/KnotInfo.js +1 -1
- package/lib/curves/LineSegment.d.ts +19 -14
- package/lib/curves/LineSegment.js +42 -42
- package/lib/curves/Polynomial.d.ts +110 -110
- package/lib/curves/Polynomial.js +249 -239
- package/lib/curves/Polynomial2D.d.ts +20 -20
- package/lib/curves/Polynomial2D.js +46 -42
- package/lib/curves/PolynomialSegment.d.ts +42 -37
- package/lib/curves/PolynomialSegment.js +83 -81
- package/lib/curves/QuadBezierSegment.d.ts +12 -12
- package/lib/curves/QuadBezierSegment.js +71 -41
- package/lib/curves/Segment.d.ts +12 -7
- package/lib/curves/Segment.js +2 -3
- package/lib/curves/UniformPolynomialCurveSampler.d.ts +34 -34
- package/lib/curves/UniformPolynomialCurveSampler.js +68 -62
- package/lib/curves/createCurveProfileLerp.d.ts +17 -6
- package/lib/curves/createCurveProfileLerp.js +211 -208
- package/lib/curves/getBezierSplineProfile.d.ts +8 -4
- package/lib/curves/getBezierSplineProfile.js +145 -101
- package/lib/curves/getCircleProfile.d.ts +10 -4
- package/lib/curves/getCircleProfile.js +72 -40
- package/lib/curves/getPathProfile.d.ts +2 -2
- package/lib/curves/getPathProfile.js +135 -112
- package/lib/curves/getPointAtDistance.d.ts +7 -4
- package/lib/curves/getPointAtDistance.js +12 -12
- package/lib/curves/getPolylineProfile.d.ts +8 -4
- package/lib/curves/getPolylineProfile.js +67 -54
- package/lib/curves/getRectProfile.d.ts +9 -4
- package/lib/curves/getRectProfile.js +117 -52
- package/lib/curves/index.d.ts +1 -1
- package/lib/curves/index.js +1 -1
- package/lib/decorators/canvasStyleSignal.d.ts +3 -3
- package/lib/decorators/canvasStyleSignal.js +10 -10
- package/lib/decorators/colorSignal.d.ts +1 -1
- package/lib/decorators/colorSignal.js +7 -7
- package/lib/decorators/compound.d.ts +4 -2
- package/lib/decorators/compound.js +43 -23
- package/lib/decorators/computed.d.ts +1 -1
- package/lib/decorators/computed.js +9 -9
- package/lib/decorators/defaultStyle.d.ts +5 -2
- package/lib/decorators/defaultStyle.js +11 -11
- package/lib/decorators/filtersSignal.d.ts +28 -8
- package/lib/decorators/filtersSignal.js +87 -64
- package/lib/decorators/index.d.ts +1 -1
- package/lib/decorators/index.js +1 -1
- package/lib/decorators/initializers.d.ts +5 -2
- package/lib/decorators/initializers.js +18 -19
- package/lib/decorators/nodeName.d.ts +1 -1
- package/lib/decorators/nodeName.js +4 -4
- package/lib/decorators/signal.d.ts +40 -20
- package/lib/decorators/signal.js +113 -104
- package/lib/decorators/spacingSignal.d.ts +1 -1
- package/lib/decorators/spacingSignal.js +13 -13
- package/lib/decorators/vector2Signal.d.ts +13 -7
- package/lib/decorators/vector2Signal.js +15 -13
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/jsx-dev-runtime.d.ts +3 -3
- package/lib/jsx-dev-runtime.js +3 -3
- package/lib/jsx-runtime.d.ts +19 -9
- package/lib/jsx-runtime.js +18 -18
- package/lib/partials/Filter.d.ts +24 -16
- package/lib/partials/Filter.js +69 -69
- package/lib/partials/Gradient.d.ts +30 -24
- package/lib/partials/Gradient.js +69 -58
- package/lib/partials/Pattern.d.ts +14 -9
- package/lib/partials/Pattern.js +30 -24
- package/lib/partials/ShaderConfig.d.ts +81 -74
- package/lib/partials/ShaderConfig.js +22 -23
- package/lib/partials/index.d.ts +1 -1
- package/lib/partials/index.js +1 -1
- package/lib/partials/types.d.ts +19 -6
- package/lib/partials/types.js +1 -1
- package/lib/scenes/Scene2D.d.ts +42 -23
- package/lib/scenes/Scene2D.js +161 -151
- package/lib/scenes/index.d.ts +1 -1
- package/lib/scenes/index.js +1 -1
- package/lib/scenes/makeScene2D.d.ts +7 -5
- package/lib/scenes/makeScene2D.js +10 -10
- package/lib/scenes/useScene2D.d.ts +2 -2
- package/lib/scenes/useScene2D.js +3 -3
- package/lib/utils/CanvasUtils.d.ts +93 -21
- package/lib/utils/CanvasUtils.js +186 -105
- package/lib/utils/diff.d.ts +25 -18
- package/lib/utils/diff.js +84 -87
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/is.d.ts +4 -2
- package/lib/utils/is.js +2 -2
- package/lib/utils/makeSignalExtensions.d.ts +11 -4
- package/lib/utils/makeSignalExtensions.js +17 -17
- package/package.json +5 -5
package/lib/components/Knot.js
CHANGED
|
@@ -1,68 +1,89 @@
|
|
|
1
|
-
var __decorate =
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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;
|
|
5
18
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
-
};
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
|
|
19
|
+
};
|
|
20
|
+
import {Vector2} from '@revideo/core';
|
|
21
|
+
import {
|
|
22
|
+
cloneable,
|
|
23
|
+
compound,
|
|
24
|
+
computed,
|
|
25
|
+
initial,
|
|
26
|
+
parser,
|
|
27
|
+
signal,
|
|
28
|
+
wrapper,
|
|
29
|
+
} from '../decorators';
|
|
30
|
+
import {Node} from './Node';
|
|
10
31
|
/**
|
|
11
32
|
* A node representing a knot of a {@link Spline}.
|
|
12
33
|
*/
|
|
13
34
|
export class Knot extends Node {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
35
|
+
get startHandleAuto() {
|
|
36
|
+
return this.auto.startHandle;
|
|
37
|
+
}
|
|
38
|
+
get endHandleAuto() {
|
|
39
|
+
return this.auto.endHandle;
|
|
40
|
+
}
|
|
41
|
+
constructor(props) {
|
|
42
|
+
super(
|
|
43
|
+
props.startHandle === undefined && props.endHandle === undefined
|
|
44
|
+
? {auto: 1, ...props}
|
|
45
|
+
: props,
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
points() {
|
|
49
|
+
const hasExplicitHandles =
|
|
50
|
+
!this.startHandle.isInitial() || !this.endHandle.isInitial();
|
|
51
|
+
const startHandle = hasExplicitHandles ? this.startHandle() : Vector2.zero;
|
|
52
|
+
const endHandle = hasExplicitHandles ? this.endHandle() : Vector2.zero;
|
|
53
|
+
return {
|
|
54
|
+
position: this.position(),
|
|
55
|
+
startHandle: startHandle.transformAsPoint(this.localToParent()),
|
|
56
|
+
endHandle: endHandle.transformAsPoint(this.localToParent()),
|
|
57
|
+
auto: {start: this.startHandleAuto(), end: this.endHandleAuto()},
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
getDefaultEndHandle() {
|
|
61
|
+
return this.startHandle().flipped;
|
|
62
|
+
}
|
|
63
|
+
getDefaultStartHandle() {
|
|
64
|
+
return this.endHandle().flipped;
|
|
65
|
+
}
|
|
42
66
|
}
|
|
43
|
-
__decorate([
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
__decorate([
|
|
48
|
-
wrapper(Vector2),
|
|
49
|
-
signal()
|
|
50
|
-
], Knot.prototype, "endHandle", void 0);
|
|
51
|
-
__decorate([
|
|
67
|
+
__decorate([wrapper(Vector2), signal()], Knot.prototype, 'startHandle', void 0);
|
|
68
|
+
__decorate([wrapper(Vector2), signal()], Knot.prototype, 'endHandle', void 0);
|
|
69
|
+
__decorate(
|
|
70
|
+
[
|
|
52
71
|
cloneable(false),
|
|
53
|
-
initial(() => ({
|
|
54
|
-
parser(
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
72
|
+
initial(() => ({startHandle: 0, endHandle: 0})),
|
|
73
|
+
parser(value => {
|
|
74
|
+
if (typeof value === 'object' && !Array.isArray(value)) {
|
|
75
|
+
return value;
|
|
76
|
+
}
|
|
77
|
+
if (typeof value === 'number') {
|
|
78
|
+
value = [value, value];
|
|
79
|
+
}
|
|
80
|
+
return {startHandle: value[0], endHandle: value[1]};
|
|
62
81
|
}),
|
|
63
|
-
compound({
|
|
64
|
-
],
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
82
|
+
compound({startHandle: 'startHandleAuto', endHandle: 'endHandleAuto'}),
|
|
83
|
+
],
|
|
84
|
+
Knot.prototype,
|
|
85
|
+
'auto',
|
|
86
|
+
void 0,
|
|
87
|
+
);
|
|
88
|
+
__decorate([computed()], Knot.prototype, 'points', null);
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiS25vdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvY29tcG9uZW50cy9Lbm90LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLE9BQU8sRUFJTCxPQUFPLEdBRVIsTUFBTSxlQUFlLENBQUM7QUFFdkIsT0FBTyxFQUNMLFNBQVMsRUFDVCxRQUFRLEVBQ1IsUUFBUSxFQUNSLE9BQU8sRUFDUCxNQUFNLEVBQ04sTUFBTSxFQUNOLE9BQU8sR0FDUixNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBQUMsSUFBSSxFQUFZLE1BQU0sUUFBUSxDQUFDO0FBOEJ2Qzs7R0FFRztBQUNILE1BQU0sT0FBTyxJQUFLLFNBQVEsSUFBSTtJQW9FNUIsSUFBVyxlQUFlO1FBQ3hCLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDL0IsQ0FBQztJQUNELElBQVcsYUFBYTtRQUN0QixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQzdCLENBQUM7SUFFRCxZQUFtQixLQUFnQjtRQUNqQyxLQUFLLENBQ0gsS0FBSyxDQUFDLFdBQVcsS0FBSyxTQUFTLElBQUksS0FBSyxDQUFDLFNBQVMsS0FBSyxTQUFTO1lBQzlELENBQUMsQ0FBQyxFQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsR0FBRyxLQUFLLEVBQUM7WUFDckIsQ0FBQyxDQUFDLEtBQUssQ0FDVixDQUFDO0lBQ0osQ0FBQztJQUdNLE1BQU07UUFDWCxNQUFNLGtCQUFrQixHQUN0QixDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQy9ELE1BQU0sV0FBVyxHQUFHLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUM7UUFDM0UsTUFBTSxTQUFTLEdBQUcsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQztRQUV2RSxPQUFPO1lBQ0wsUUFBUSxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDekIsV0FBVyxFQUFFLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDL0QsU0FBUyxFQUFFLFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDM0QsSUFBSSxFQUFFLEVBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxlQUFlLEVBQUUsRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLGFBQWEsRUFBRSxFQUFDO1NBQ2pFLENBQUM7SUFDSixDQUFDO0lBRU8sbUJBQW1CO1FBQ3pCLE9BQU8sSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLE9BQU8sQ0FBQztJQUNwQyxDQUFDO0lBRU8scUJBQXFCO1FBQzNCLE9BQU8sSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLE9BQU8sQ0FBQztJQUNsQyxDQUFDO0NBQ0Y7QUFwRnlCO0lBRnZCLE9BQU8sQ0FBQyxPQUFPLENBQUM7SUFDaEIsTUFBTSxFQUFFO3lDQUNnRDtBQXNCakM7SUFGdkIsT0FBTyxDQUFDLE9BQU8sQ0FBQztJQUNoQixNQUFNLEVBQUU7dUNBQzhDO0FBd0IvQjtJQVp2QixTQUFTLENBQUMsS0FBSyxDQUFDO0lBQ2hCLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUMsV0FBVyxFQUFFLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFDLENBQUMsQ0FBQztJQUMvQyxNQUFNLENBQUMsQ0FBQyxLQUF1QixFQUFFLEVBQUU7UUFDbEMsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDdkQsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDO1FBQ0QsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUM5QixLQUFLLEdBQUcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDekIsQ0FBQztRQUNELE9BQU8sRUFBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLFNBQVMsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUMsQ0FBQztJQUN0RCxDQUFDLENBQUM7SUFDRCxRQUFRLENBQUMsRUFBQyxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsU0FBUyxFQUFFLGVBQWUsRUFBQyxDQUFDO2tDQUNwQjtBQWlCNUM7SUFETixRQUFRLEVBQUU7a0NBYVYifQ==
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import {SignalValue, SimpleSignal} from '@revideo/core';
|
|
2
|
+
import {OptionList} from 'mathjax-full/js/util/Options';
|
|
3
|
+
import {Img, ImgProps} from './Img';
|
|
4
4
|
export interface LatexProps extends ImgProps {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
tex?: SignalValue<string>;
|
|
6
|
+
renderProps?: SignalValue<OptionList>;
|
|
7
7
|
}
|
|
8
8
|
/**
|
|
9
9
|
* A node for rendering equations with LaTeX.
|
|
@@ -24,11 +24,11 @@ export interface LatexProps extends ImgProps {
|
|
|
24
24
|
* ```
|
|
25
25
|
*/
|
|
26
26
|
export declare class Latex extends Img {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
27
|
+
private static svgContentsPool;
|
|
28
|
+
private readonly imageElement;
|
|
29
|
+
readonly options: SimpleSignal<OptionList, this>;
|
|
30
|
+
readonly tex: SimpleSignal<string, this>;
|
|
31
|
+
constructor(props: LatexProps);
|
|
32
|
+
protected image(): HTMLImageElement;
|
|
33
33
|
}
|
|
34
|
-
//# sourceMappingURL=Latex.d.ts.map
|
|
34
|
+
//# sourceMappingURL=Latex.d.ts.map
|
package/lib/components/Latex.js
CHANGED
|
@@ -1,25 +1,38 @@
|
|
|
1
|
-
var __decorate =
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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;
|
|
5
18
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
-
};
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
19
|
+
};
|
|
20
|
+
import {DependencyContext, useLogger} from '@revideo/core';
|
|
21
|
+
import {liteAdaptor} from 'mathjax-full/js/adaptors/liteAdaptor';
|
|
22
|
+
import {RegisterHTMLHandler} from 'mathjax-full/js/handlers/html';
|
|
23
|
+
import {TeX} from 'mathjax-full/js/input/tex';
|
|
24
|
+
import {AllPackages} from 'mathjax-full/js/input/tex/AllPackages';
|
|
25
|
+
import {mathjax} from 'mathjax-full/js/mathjax';
|
|
26
|
+
import {SVG} from 'mathjax-full/js/output/svg';
|
|
27
|
+
import {initial, signal} from '../decorators';
|
|
28
|
+
import {Img} from './Img';
|
|
16
29
|
const Adaptor = liteAdaptor();
|
|
17
30
|
RegisterHTMLHandler(Adaptor);
|
|
18
31
|
const JaxDocument = mathjax.document('', {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
33
|
+
InputJax: new TeX({packages: AllPackages}),
|
|
34
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
35
|
+
OutputJax: new SVG({fontCache: 'local'}),
|
|
23
36
|
});
|
|
24
37
|
/**
|
|
25
38
|
* A node for rendering equations with LaTeX.
|
|
@@ -40,54 +53,53 @@ const JaxDocument = mathjax.document('', {
|
|
|
40
53
|
* ```
|
|
41
54
|
*/
|
|
42
55
|
export class Latex extends Img {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
56
|
+
constructor(props) {
|
|
57
|
+
super({...props, src: null});
|
|
58
|
+
this.imageElement = document.createElement('img');
|
|
59
|
+
}
|
|
60
|
+
image() {
|
|
61
|
+
// Render props may change the look of the TeX, so we need to cache both
|
|
62
|
+
// source and render props together.
|
|
63
|
+
const src = `${this.tex()}::${JSON.stringify(this.options())}`;
|
|
64
|
+
if (Latex.svgContentsPool[src]) {
|
|
65
|
+
this.imageElement.src = Latex.svgContentsPool[src];
|
|
66
|
+
if (!this.imageElement.complete) {
|
|
67
|
+
DependencyContext.collectPromise(
|
|
68
|
+
new Promise((resolve, reject) => {
|
|
69
|
+
this.imageElement.addEventListener('load', resolve);
|
|
70
|
+
this.imageElement.addEventListener('error', reject);
|
|
71
|
+
}),
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
return this.imageElement;
|
|
46
75
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
this.imageElement.addEventListener('load', resolve);
|
|
56
|
-
this.imageElement.addEventListener('error', reject);
|
|
57
|
-
}));
|
|
58
|
-
}
|
|
59
|
-
return this.imageElement;
|
|
60
|
-
}
|
|
61
|
-
// Convert to TeX, look for any errors
|
|
62
|
-
const tex = this.tex();
|
|
63
|
-
const svg = Adaptor.innerHTML(JaxDocument.convert(tex, this.options()));
|
|
64
|
-
if (svg.includes('data-mjx-error')) {
|
|
65
|
-
const errors = svg.match(/data-mjx-error="(.*?)"/);
|
|
66
|
-
if (errors && errors.length > 0) {
|
|
67
|
-
useLogger().error(`Invalid MathJax: ${errors[1]}`);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
// Encode to raw base64 image format
|
|
71
|
-
const text = `data:image/svg+xml;base64,${btoa(`<?xml version="1.0" encoding="UTF-8" standalone="no" ?>\n${svg}`)}`;
|
|
72
|
-
Latex.svgContentsPool[src] = text;
|
|
73
|
-
const image = document.createElement('img');
|
|
74
|
-
image.src = text;
|
|
75
|
-
image.src = text;
|
|
76
|
-
if (!image.complete) {
|
|
77
|
-
DependencyContext.collectPromise(new Promise((resolve, reject) => {
|
|
78
|
-
image.addEventListener('load', resolve);
|
|
79
|
-
image.addEventListener('error', reject);
|
|
80
|
-
}));
|
|
81
|
-
}
|
|
82
|
-
return image;
|
|
76
|
+
// Convert to TeX, look for any errors
|
|
77
|
+
const tex = this.tex();
|
|
78
|
+
const svg = Adaptor.innerHTML(JaxDocument.convert(tex, this.options()));
|
|
79
|
+
if (svg.includes('data-mjx-error')) {
|
|
80
|
+
const errors = svg.match(/data-mjx-error="(.*?)"/);
|
|
81
|
+
if (errors && errors.length > 0) {
|
|
82
|
+
useLogger().error(`Invalid MathJax: ${errors[1]}`);
|
|
83
|
+
}
|
|
83
84
|
}
|
|
85
|
+
// Encode to raw base64 image format
|
|
86
|
+
const text = `data:image/svg+xml;base64,${btoa(`<?xml version="1.0" encoding="UTF-8" standalone="no" ?>\n${svg}`)}`;
|
|
87
|
+
Latex.svgContentsPool[src] = text;
|
|
88
|
+
const image = document.createElement('img');
|
|
89
|
+
image.src = text;
|
|
90
|
+
image.src = text;
|
|
91
|
+
if (!image.complete) {
|
|
92
|
+
DependencyContext.collectPromise(
|
|
93
|
+
new Promise((resolve, reject) => {
|
|
94
|
+
image.addEventListener('load', resolve);
|
|
95
|
+
image.addEventListener('error', reject);
|
|
96
|
+
}),
|
|
97
|
+
);
|
|
98
|
+
}
|
|
99
|
+
return image;
|
|
100
|
+
}
|
|
84
101
|
}
|
|
85
102
|
Latex.svgContentsPool = {};
|
|
86
|
-
__decorate([
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
], Latex.prototype, "options", void 0);
|
|
90
|
-
__decorate([
|
|
91
|
-
signal()
|
|
92
|
-
], Latex.prototype, "tex", void 0);
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTGF0ZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvTGF0ZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUNMLGlCQUFpQixFQUdqQixTQUFTLEdBQ1YsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFDLFdBQVcsRUFBQyxNQUFNLHNDQUFzQyxDQUFDO0FBQ2pFLE9BQU8sRUFBQyxtQkFBbUIsRUFBQyxNQUFNLCtCQUErQixDQUFDO0FBQ2xFLE9BQU8sRUFBQyxHQUFHLEVBQUMsTUFBTSwyQkFBMkIsQ0FBQztBQUM5QyxPQUFPLEVBQUMsV0FBVyxFQUFDLE1BQU0sdUNBQXVDLENBQUM7QUFDbEUsT0FBTyxFQUFDLE9BQU8sRUFBQyxNQUFNLHlCQUF5QixDQUFDO0FBQ2hELE9BQU8sRUFBQyxHQUFHLEVBQUMsTUFBTSw0QkFBNEIsQ0FBQztBQUUvQyxPQUFPLEVBQUMsT0FBTyxFQUFFLE1BQU0sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUM5QyxPQUFPLEVBQUMsR0FBRyxFQUFXLE1BQU0sT0FBTyxDQUFDO0FBRXBDLE1BQU0sT0FBTyxHQUFHLFdBQVcsRUFBRSxDQUFDO0FBQzlCLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdCLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFO0lBQ3ZDLGdFQUFnRTtJQUNoRSxRQUFRLEVBQUUsSUFBSSxHQUFHLENBQUMsRUFBQyxRQUFRLEVBQUUsV0FBVyxFQUFDLENBQUM7SUFDMUMsZ0VBQWdFO0lBQ2hFLFNBQVMsRUFBRSxJQUFJLEdBQUcsQ0FBQyxFQUFDLFNBQVMsRUFBRSxPQUFPLEVBQUMsQ0FBQztDQUN6QyxDQUFDLENBQUM7QUFPSDs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpQkc7QUFDSCxNQUFNLE9BQU8sS0FBTSxTQUFRLEdBQUc7SUFZNUIsWUFBbUIsS0FBaUI7UUFDbEMsS0FBSyxDQUFDLEVBQUMsR0FBRyxLQUFLLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBQyxDQUFDLENBQUM7UUFWZCxpQkFBWSxHQUFHLFFBQVEsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7SUFXOUQsQ0FBQztJQUVrQixLQUFLO1FBQ3RCLHdFQUF3RTtRQUN4RSxvQ0FBb0M7UUFDcEMsTUFBTSxHQUFHLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLEtBQUssSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsRUFBRSxDQUFDO1FBQy9ELElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQy9CLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDbkQsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQ2hDLGlCQUFpQixDQUFDLGNBQWMsQ0FDOUIsSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7b0JBQzlCLElBQUksQ0FBQyxZQUFZLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO29CQUNwRCxJQUFJLENBQUMsWUFBWSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFDdEQsQ0FBQyxDQUFDLENBQ0gsQ0FBQztZQUNKLENBQUM7WUFDRCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7UUFDM0IsQ0FBQztRQUVELHNDQUFzQztRQUN0QyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDdkIsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3hFLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUM7WUFDbkMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1lBQ25ELElBQUksTUFBTSxJQUFJLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQ2hDLFNBQVMsRUFBRSxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNyRCxDQUFDO1FBQ0gsQ0FBQztRQUVELG9DQUFvQztRQUNwQyxNQUFNLElBQUksR0FBRyw2QkFBNkIsSUFBSSxDQUM1Qyw0REFBNEQsR0FBRyxFQUFFLENBQ2xFLEVBQUUsQ0FBQztRQUNKLEtBQUssQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQ2xDLE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDNUMsS0FBSyxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUM7UUFDakIsS0FBSyxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNwQixpQkFBaUIsQ0FBQyxjQUFjLENBQzlCLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO2dCQUM5QixLQUFLLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO2dCQUN4QyxLQUFLLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1lBQzFDLENBQUMsQ0FBQyxDQUNILENBQUM7UUFDSixDQUFDO1FBRUQsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDOztBQTVEYyxxQkFBZSxHQUEyQixFQUFFLEFBQTdCLENBQThCO0FBTXBDO0lBRnZCLE9BQU8sQ0FBQyxFQUFFLENBQUM7SUFDWCxNQUFNLEVBQUU7c0NBQ3VEO0FBR3hDO0lBRHZCLE1BQU0sRUFBRTtrQ0FDK0MifQ==
|
|
103
|
+
__decorate([initial({}), signal()], Latex.prototype, 'options', void 0);
|
|
104
|
+
__decorate([signal()], Latex.prototype, 'tex', void 0);
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTGF0ZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvTGF0ZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUNMLGlCQUFpQixFQUdqQixTQUFTLEdBQ1YsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFDLFdBQVcsRUFBQyxNQUFNLHNDQUFzQyxDQUFDO0FBQ2pFLE9BQU8sRUFBQyxtQkFBbUIsRUFBQyxNQUFNLCtCQUErQixDQUFDO0FBQ2xFLE9BQU8sRUFBQyxHQUFHLEVBQUMsTUFBTSwyQkFBMkIsQ0FBQztBQUM5QyxPQUFPLEVBQUMsV0FBVyxFQUFDLE1BQU0sdUNBQXVDLENBQUM7QUFDbEUsT0FBTyxFQUFDLE9BQU8sRUFBQyxNQUFNLHlCQUF5QixDQUFDO0FBQ2hELE9BQU8sRUFBQyxHQUFHLEVBQUMsTUFBTSw0QkFBNEIsQ0FBQztBQUUvQyxPQUFPLEVBQUMsT0FBTyxFQUFFLE1BQU0sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUM5QyxPQUFPLEVBQUMsR0FBRyxFQUFXLE1BQU0sT0FBTyxDQUFDO0FBRXBDLE1BQU0sT0FBTyxHQUFHLFdBQVcsRUFBRSxDQUFDO0FBQzlCLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdCLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFO0lBQ3ZDLGdFQUFnRTtJQUNoRSxRQUFRLEVBQUUsSUFBSSxHQUFHLENBQUMsRUFBQyxRQUFRLEVBQUUsV0FBVyxFQUFDLENBQUM7SUFDMUMsZ0VBQWdFO0lBQ2hFLFNBQVMsRUFBRSxJQUFJLEdBQUcsQ0FBQyxFQUFDLFNBQVMsRUFBRSxPQUFPLEVBQUMsQ0FBQztDQUN6QyxDQUFDLENBQUM7QUFPSDs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FpQkc7QUFDSCxNQUFNLE9BQU8sS0FBTSxTQUFRLEdBQUc7SUFZNUIsWUFBbUIsS0FBaUI7UUFDbEMsS0FBSyxD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
|