@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.
Files changed (69) hide show
  1. package/lib/components/Audio.d.ts +11 -11
  2. package/lib/components/Audio.d.ts.map +1 -1
  3. package/lib/components/Audio.js +109 -115
  4. package/lib/components/Code.d.ts +211 -244
  5. package/lib/components/Code.d.ts.map +1 -1
  6. package/lib/components/Code.js +269 -317
  7. package/lib/components/CodeBlock.d.ts +67 -109
  8. package/lib/components/CodeBlock.d.ts.map +1 -1
  9. package/lib/components/CodeBlock.js +373 -414
  10. package/lib/components/Curve.js +269 -270
  11. package/lib/components/Grid.js +56 -63
  12. package/lib/components/Icon.js +50 -58
  13. package/lib/components/Img.d.ts +79 -86
  14. package/lib/components/Img.d.ts.map +1 -1
  15. package/lib/components/Img.js +181 -193
  16. package/lib/components/Knot.js +60 -81
  17. package/lib/components/Latex.js +65 -77
  18. package/lib/components/Layout.d.ts +413 -455
  19. package/lib/components/Layout.d.ts.map +1 -1
  20. package/lib/components/Layout.js +681 -666
  21. package/lib/components/Line.js +193 -216
  22. package/lib/components/Media.d.ts +35 -35
  23. package/lib/components/Media.d.ts.map +1 -1
  24. package/lib/components/Media.js +134 -135
  25. package/lib/components/Node.d.ts +830 -875
  26. package/lib/components/Node.d.ts.map +1 -1
  27. package/lib/components/Node.js +1314 -1383
  28. package/lib/components/SVG.js +541 -609
  29. package/lib/components/Shape.d.ts +35 -44
  30. package/lib/components/Shape.d.ts.map +1 -1
  31. package/lib/components/Shape.js +127 -112
  32. package/lib/components/Spline.js +175 -190
  33. package/lib/components/Txt.d.ts +44 -55
  34. package/lib/components/Txt.d.ts.map +1 -1
  35. package/lib/components/Txt.js +155 -156
  36. package/lib/components/TxtLeaf.d.ts +16 -20
  37. package/lib/components/TxtLeaf.d.ts.map +1 -1
  38. package/lib/components/TxtLeaf.js +2 -2
  39. package/lib/components/Video.d.ts +45 -41
  40. package/lib/components/Video.d.ts.map +1 -1
  41. package/lib/components/Video.js +202 -138
  42. package/lib/components/View2D.d.ts +22 -21
  43. package/lib/components/View2D.d.ts.map +1 -1
  44. package/lib/components/View2D.js +89 -98
  45. package/lib/components/index.js +1 -1
  46. package/lib/components/types.js +1 -1
  47. package/lib/curves/ArcSegment.js +94 -145
  48. package/lib/scenes/Scene2D.d.ts +23 -42
  49. package/lib/scenes/Scene2D.d.ts.map +1 -1
  50. package/lib/scenes/Scene2D.js +152 -161
  51. package/lib/scenes/index.js +1 -1
  52. package/lib/scenes/makeScene2D.js +10 -10
  53. package/lib/scenes/useScene2D.js +3 -3
  54. package/lib/tsconfig.build.tsbuildinfo +1 -1
  55. package/lib/utils/CanvasUtils.d.ts +21 -93
  56. package/package.json +5 -5
  57. package/src/lib/components/Audio.ts +2 -2
  58. package/src/lib/components/Code.ts +4 -2
  59. package/src/lib/components/CodeBlock.ts +1 -1
  60. package/src/lib/components/Img.ts +2 -2
  61. package/src/lib/components/Layout.ts +2 -2
  62. package/src/lib/components/Media.ts +3 -1
  63. package/src/lib/components/Node.ts +9 -9
  64. package/src/lib/components/Shape.ts +2 -2
  65. package/src/lib/components/Txt.ts +2 -2
  66. package/src/lib/components/TxtLeaf.ts +1 -1
  67. package/src/lib/components/Video.ts +114 -8
  68. package/src/lib/components/View2D.ts +6 -2
  69. package/src/lib/scenes/Scene2D.ts +4 -3
@@ -1,48 +1,39 @@
1
- import {BBox, SignalValue, SimpleSignal} from '@revideo/core';
2
- import {CanvasStyleSignal} from '../decorators/canvasStyleSignal';
3
- import {PossibleCanvasStyle} from '../partials';
4
- import {Layout, LayoutProps} from './Layout';
1
+ import { BBox, SignalValue, SimpleSignal } from '@revideo/core';
2
+ import { CanvasStyleSignal } from '../decorators/canvasStyleSignal';
3
+ import { PossibleCanvasStyle } from '../partials';
4
+ import { Layout, LayoutProps } from './Layout';
5
5
  export interface ShapeProps extends LayoutProps {
6
- fill?: SignalValue<PossibleCanvasStyle>;
7
- stroke?: SignalValue<PossibleCanvasStyle>;
8
- strokeFirst?: SignalValue<boolean>;
9
- lineWidth?: SignalValue<number>;
10
- lineJoin?: SignalValue<CanvasLineJoin>;
11
- lineCap?: SignalValue<CanvasLineCap>;
12
- lineDash?: SignalValue<number[]>;
13
- lineDashOffset?: SignalValue<number>;
14
- antialiased?: SignalValue<boolean>;
6
+ fill?: SignalValue<PossibleCanvasStyle>;
7
+ stroke?: SignalValue<PossibleCanvasStyle>;
8
+ strokeFirst?: SignalValue<boolean>;
9
+ lineWidth?: SignalValue<number>;
10
+ lineJoin?: SignalValue<CanvasLineJoin>;
11
+ lineCap?: SignalValue<CanvasLineCap>;
12
+ lineDash?: SignalValue<number[]>;
13
+ lineDashOffset?: SignalValue<number>;
14
+ antialiased?: SignalValue<boolean>;
15
15
  }
16
16
  export declare abstract class Shape extends Layout {
17
- readonly fill: CanvasStyleSignal<this>;
18
- readonly stroke: CanvasStyleSignal<this>;
19
- readonly strokeFirst: SimpleSignal<boolean, this>;
20
- readonly lineWidth: SimpleSignal<number, this>;
21
- readonly lineJoin: SimpleSignal<CanvasLineJoin, this>;
22
- readonly lineCap: SimpleSignal<CanvasLineCap, this>;
23
- readonly lineDash: SimpleSignal<number[], this>;
24
- readonly lineDashOffset: SimpleSignal<number, this>;
25
- readonly antialiased: SimpleSignal<boolean, this>;
26
- protected readonly rippleStrength: SimpleSignal<number, this>;
27
- protected rippleSize(): number;
28
- constructor(props: ShapeProps);
29
- protected applyText(context: CanvasRenderingContext2D): void;
30
- protected applyStyle(context: CanvasRenderingContext2D): void;
31
- protected draw(context: CanvasRenderingContext2D): void;
32
- protected drawShape(context: CanvasRenderingContext2D): void;
33
- protected getCacheBBox(): BBox;
34
- protected getPath(): Path2D;
35
- protected getRipplePath(): Path2D;
36
- protected drawRipple(context: CanvasRenderingContext2D): void;
37
- ripple(
38
- duration?: number,
39
- ): Generator<
40
- | void
41
- | import('@revideo/core').ThreadGenerator
42
- | Promise<any>
43
- | import('@revideo/core').Promisable<any>,
44
- void,
45
- any
46
- >;
17
+ readonly fill: CanvasStyleSignal<this>;
18
+ readonly stroke: CanvasStyleSignal<this>;
19
+ readonly strokeFirst: SimpleSignal<boolean, this>;
20
+ readonly lineWidth: SimpleSignal<number, this>;
21
+ readonly lineJoin: SimpleSignal<CanvasLineJoin, this>;
22
+ readonly lineCap: SimpleSignal<CanvasLineCap, this>;
23
+ readonly lineDash: SimpleSignal<number[], this>;
24
+ readonly lineDashOffset: SimpleSignal<number, this>;
25
+ readonly antialiased: SimpleSignal<boolean, this>;
26
+ protected readonly rippleStrength: SimpleSignal<number, this>;
27
+ protected rippleSize(): number;
28
+ constructor(props: ShapeProps);
29
+ protected applyText(context: CanvasRenderingContext2D): void;
30
+ protected applyStyle(context: CanvasRenderingContext2D): void;
31
+ protected draw(context: CanvasRenderingContext2D): Promise<void>;
32
+ protected drawShape(context: CanvasRenderingContext2D): void;
33
+ protected getCacheBBox(): BBox;
34
+ protected getPath(): Path2D;
35
+ protected getRipplePath(): Path2D;
36
+ protected drawRipple(context: CanvasRenderingContext2D): void;
37
+ ripple(duration?: number): Generator<void | import("@revideo/core").ThreadGenerator | Promise<any> | import("@revideo/core").Promisable<any>, void, any>;
47
38
  }
48
- //# sourceMappingURL=Shape.d.ts.map
39
+ //# sourceMappingURL=Shape.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Shape.d.ts","sourceRoot":"","sources":["../../src/lib/components/Shape.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,WAAW,EACX,YAAY,EAMb,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,iBAAiB,EAElB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AAE7C,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,IAAI,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAC1C,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,SAAS,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACvC,OAAO,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACjC,cAAc,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CACpC;AAED,8BACsB,KAAM,SAAQ,MAAM;IACxC,SACwB,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACtD,SACwB,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxD,SAEwB,WAAW,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjE,SAEwB,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9D,SAEwB,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACrE,SAEwB,OAAO,EAAE,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACnE,SAEwB,QAAQ,EAAE,YAAY,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IAC/D,SAEwB,cAAc,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnE,SAEwB,WAAW,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEjE,SAAS,CAAC,QAAQ,CAAC,cAAc,6BAAiC;IAGlE,SAAS,CAAC,UAAU;gBAID,KAAK,EAAE,UAAU;IAIpC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,wBAAwB;IAKrD,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,wBAAwB;cAenC,IAAI,CAAC,OAAO,EAAE,wBAAwB;IAQzD,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,wBAAwB;cAiBlC,YAAY,IAAI,IAAI;IAKvC,SAAS,CAAC,OAAO,IAAI,MAAM;IAI3B,SAAS,CAAC,aAAa,IAAI,MAAM;IAIjC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,wBAAwB;IAY9C,MAAM,CAAC,QAAQ,SAAI;CAK5B"}
1
+ {"version":3,"file":"Shape.d.ts","sourceRoot":"","sources":["../../src/lib/components/Shape.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,WAAW,EACX,YAAY,EAMb,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,iBAAiB,EAElB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AAE7C,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,IAAI,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAC1C,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,SAAS,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACvC,OAAO,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACjC,cAAc,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CACpC;AAED,8BACsB,KAAM,SAAQ,MAAM;IACxC,SACwB,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACtD,SACwB,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxD,SAEwB,WAAW,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjE,SAEwB,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9D,SAEwB,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACrE,SAEwB,OAAO,EAAE,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACnE,SAEwB,QAAQ,EAAE,YAAY,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IAC/D,SAEwB,cAAc,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnE,SAEwB,WAAW,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEjE,SAAS,CAAC,QAAQ,CAAC,cAAc,6BAAiC;IAGlE,SAAS,CAAC,UAAU;gBAID,KAAK,EAAE,UAAU;IAIpC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,wBAAwB;IAKrD,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,wBAAwB;cAe7B,IAAI,CAAC,OAAO,EAAE,wBAAwB;IAQ/D,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,wBAAwB;cAiBlC,YAAY,IAAI,IAAI;IAKvC,SAAS,CAAC,OAAO,IAAI,MAAM;IAI3B,SAAS,CAAC,aAAa,IAAI,MAAM;IAIjC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,wBAAwB;IAY9C,MAAM,CAAC,QAAQ,SAAI;CAK5B"}
@@ -1,119 +1,134 @@
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;
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
- createSignal,
22
- easeOutExpo,
23
- linear,
24
- map,
25
- threadable,
26
- } from '@revideo/core';
27
- import {computed, initial, nodeName, signal} from '../decorators';
28
- import {canvasStyleSignal} from '../decorators/canvasStyleSignal';
29
- import {resolveCanvasStyle} from '../utils';
30
- import {Layout} from './Layout';
6
+ };
7
+ import { createSignal, easeOutExpo, linear, map, threadable, } from '@revideo/core';
8
+ import { computed, initial, nodeName, signal } from '../decorators';
9
+ import { canvasStyleSignal, } from '../decorators/canvasStyleSignal';
10
+ import { resolveCanvasStyle } from '../utils';
11
+ import { Layout } from './Layout';
31
12
  let Shape = class Shape extends Layout {
32
- rippleSize() {
33
- return easeOutExpo(this.rippleStrength(), 0, 50);
34
- }
35
- constructor(props) {
36
- super(props);
37
- this.rippleStrength = createSignal(0);
38
- }
39
- applyText(context) {
40
- context.direction = this.textDirection();
41
- this.element.dir = this.textDirection();
42
- }
43
- applyStyle(context) {
44
- context.fillStyle = resolveCanvasStyle(this.fill(), context);
45
- context.strokeStyle = resolveCanvasStyle(this.stroke(), context);
46
- context.lineWidth = this.lineWidth();
47
- context.lineJoin = this.lineJoin();
48
- context.lineCap = this.lineCap();
49
- context.setLineDash(this.lineDash());
50
- context.lineDashOffset = this.lineDashOffset();
51
- if (!this.antialiased()) {
52
- // from https://stackoverflow.com/a/68372384
53
- context.filter =
54
- 'url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxmaWx0ZXIgaWQ9ImZpbHRlciIgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj48ZmVDb21wb25lbnRUcmFuc2Zlcj48ZmVGdW5jUiB0eXBlPSJpZGVudGl0eSIvPjxmZUZ1bmNHIHR5cGU9ImlkZW50aXR5Ii8+PGZlRnVuY0IgdHlwZT0iaWRlbnRpdHkiLz48ZmVGdW5jQSB0eXBlPSJkaXNjcmV0ZSIgdGFibGVWYWx1ZXM9IjAgMSIvPjwvZmVDb21wb25lbnRUcmFuc2Zlcj48L2ZpbHRlcj48L3N2Zz4=#filter)';
13
+ rippleSize() {
14
+ return easeOutExpo(this.rippleStrength(), 0, 50);
15
+ }
16
+ constructor(props) {
17
+ super(props);
18
+ this.rippleStrength = createSignal(0);
19
+ }
20
+ applyText(context) {
21
+ context.direction = this.textDirection();
22
+ this.element.dir = this.textDirection();
23
+ }
24
+ applyStyle(context) {
25
+ context.fillStyle = resolveCanvasStyle(this.fill(), context);
26
+ context.strokeStyle = resolveCanvasStyle(this.stroke(), context);
27
+ context.lineWidth = this.lineWidth();
28
+ context.lineJoin = this.lineJoin();
29
+ context.lineCap = this.lineCap();
30
+ context.setLineDash(this.lineDash());
31
+ context.lineDashOffset = this.lineDashOffset();
32
+ if (!this.antialiased()) {
33
+ // from https://stackoverflow.com/a/68372384
34
+ context.filter =
35
+ 'url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxmaWx0ZXIgaWQ9ImZpbHRlciIgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj48ZmVDb21wb25lbnRUcmFuc2Zlcj48ZmVGdW5jUiB0eXBlPSJpZGVudGl0eSIvPjxmZUZ1bmNHIHR5cGU9ImlkZW50aXR5Ii8+PGZlRnVuY0IgdHlwZT0iaWRlbnRpdHkiLz48ZmVGdW5jQSB0eXBlPSJkaXNjcmV0ZSIgdGFibGVWYWx1ZXM9IjAgMSIvPjwvZmVDb21wb25lbnRUcmFuc2Zlcj48L2ZpbHRlcj48L3N2Zz4=#filter)';
36
+ }
37
+ }
38
+ async draw(context) {
39
+ this.drawShape(context);
40
+ if (this.clip()) {
41
+ context.clip(this.getPath());
42
+ }
43
+ await this.drawChildren(context);
44
+ }
45
+ drawShape(context) {
46
+ const path = this.getPath();
47
+ const hasStroke = this.lineWidth() > 0 && this.stroke() !== null;
48
+ const hasFill = this.fill() !== null;
49
+ context.save();
50
+ this.applyStyle(context);
51
+ this.drawRipple(context);
52
+ if (this.strokeFirst()) {
53
+ hasStroke && context.stroke(path);
54
+ hasFill && context.fill(path);
55
+ }
56
+ else {
57
+ hasFill && context.fill(path);
58
+ hasStroke && context.stroke(path);
59
+ }
60
+ context.restore();
61
+ }
62
+ getCacheBBox() {
63
+ return super.getCacheBBox().expand(this.lineWidth() / 2);
64
+ }
65
+ getPath() {
66
+ return new Path2D();
55
67
  }
56
- }
57
- draw(context) {
58
- this.drawShape(context);
59
- if (this.clip()) {
60
- context.clip(this.getPath());
68
+ getRipplePath() {
69
+ return new Path2D();
61
70
  }
62
- this.drawChildren(context);
63
- }
64
- drawShape(context) {
65
- const path = this.getPath();
66
- const hasStroke = this.lineWidth() > 0 && this.stroke() !== null;
67
- const hasFill = this.fill() !== null;
68
- context.save();
69
- this.applyStyle(context);
70
- this.drawRipple(context);
71
- if (this.strokeFirst()) {
72
- hasStroke && context.stroke(path);
73
- hasFill && context.fill(path);
74
- } else {
75
- hasFill && context.fill(path);
76
- hasStroke && context.stroke(path);
71
+ drawRipple(context) {
72
+ const rippleStrength = this.rippleStrength();
73
+ if (rippleStrength > 0) {
74
+ const ripplePath = this.getRipplePath();
75
+ context.save();
76
+ context.globalAlpha *= map(0.54, 0, rippleStrength);
77
+ context.fill(ripplePath);
78
+ context.restore();
79
+ }
77
80
  }
78
- context.restore();
79
- }
80
- getCacheBBox() {
81
- return super.getCacheBBox().expand(this.lineWidth() / 2);
82
- }
83
- getPath() {
84
- return new Path2D();
85
- }
86
- getRipplePath() {
87
- return new Path2D();
88
- }
89
- drawRipple(context) {
90
- const rippleStrength = this.rippleStrength();
91
- if (rippleStrength > 0) {
92
- const ripplePath = this.getRipplePath();
93
- context.save();
94
- context.globalAlpha *= map(0.54, 0, rippleStrength);
95
- context.fill(ripplePath);
96
- context.restore();
81
+ *ripple(duration = 1) {
82
+ this.rippleStrength(0);
83
+ yield* this.rippleStrength(1, duration, linear);
84
+ this.rippleStrength(0);
97
85
  }
98
- }
99
- *ripple(duration = 1) {
100
- this.rippleStrength(0);
101
- yield* this.rippleStrength(1, duration, linear);
102
- this.rippleStrength(0);
103
- }
104
86
  };
105
- __decorate([canvasStyleSignal()], Shape.prototype, 'fill', void 0);
106
- __decorate([canvasStyleSignal()], Shape.prototype, 'stroke', void 0);
107
- __decorate([initial(false), signal()], Shape.prototype, 'strokeFirst', void 0);
108
- __decorate([initial(0), signal()], Shape.prototype, 'lineWidth', void 0);
109
- __decorate([initial('miter'), signal()], Shape.prototype, 'lineJoin', void 0);
110
- __decorate([initial('butt'), signal()], Shape.prototype, 'lineCap', void 0);
111
- __decorate([initial([]), signal()], Shape.prototype, 'lineDash', void 0);
112
- __decorate([initial(0), signal()], Shape.prototype, 'lineDashOffset', void 0);
113
- __decorate([initial(true), signal()], Shape.prototype, 'antialiased', void 0);
114
- __decorate([computed()], Shape.prototype, 'rippleSize', null);
115
- __decorate([computed()], Shape.prototype, 'getPath', null);
116
- __decorate([threadable()], Shape.prototype, 'ripple', null);
117
- Shape = __decorate([nodeName('Shape')], Shape);
118
- export {Shape};
119
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhcGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvU2hhcGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUlMLFlBQVksRUFDWixXQUFXLEVBQ1gsTUFBTSxFQUNOLEdBQUcsRUFDSCxVQUFVLEdBQ1gsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUNsRSxPQUFPLEVBRUwsaUJBQWlCLEdBQ2xCLE1BQU0saUNBQWlDLENBQUM7QUFFekMsT0FBTyxFQUFDLGtCQUFrQixFQUFDLE1BQU0sVUFBVSxDQUFDO0FBQzVDLE9BQU8sRUFBQyxNQUFNLEVBQWMsTUFBTSxVQUFVLENBQUM7QUFldEMsSUFBZSxLQUFLLEdBQXBCLE1BQWUsS0FBTSxTQUFRLE1BQU07SUE4QjlCLFVBQVU7UUFDbEIsT0FBTyxXQUFXLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsWUFBbUIsS0FBaUI7UUFDbEMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBUkksbUJBQWMsR0FBRyxZQUFZLENBQWUsQ0FBQyxDQUFDLENBQUM7SUFTbEUsQ0FBQztJQUVTLFNBQVMsQ0FBQyxPQUFpQztRQUNuRCxPQUFPLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDMUMsQ0FBQztJQUVTLFVBQVUsQ0FBQyxPQUFpQztRQUNwRCxPQUFPLENBQUMsU0FBUyxHQUFHLGtCQUFrQixDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUM3RCxPQUFPLENBQUMs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
87
+ __decorate([
88
+ canvasStyleSignal()
89
+ ], Shape.prototype, "fill", void 0);
90
+ __decorate([
91
+ canvasStyleSignal()
92
+ ], Shape.prototype, "stroke", void 0);
93
+ __decorate([
94
+ initial(false),
95
+ signal()
96
+ ], Shape.prototype, "strokeFirst", void 0);
97
+ __decorate([
98
+ initial(0),
99
+ signal()
100
+ ], Shape.prototype, "lineWidth", void 0);
101
+ __decorate([
102
+ initial('miter'),
103
+ signal()
104
+ ], Shape.prototype, "lineJoin", void 0);
105
+ __decorate([
106
+ initial('butt'),
107
+ signal()
108
+ ], Shape.prototype, "lineCap", void 0);
109
+ __decorate([
110
+ initial([]),
111
+ signal()
112
+ ], Shape.prototype, "lineDash", void 0);
113
+ __decorate([
114
+ initial(0),
115
+ signal()
116
+ ], Shape.prototype, "lineDashOffset", void 0);
117
+ __decorate([
118
+ initial(true),
119
+ signal()
120
+ ], Shape.prototype, "antialiased", void 0);
121
+ __decorate([
122
+ computed()
123
+ ], Shape.prototype, "rippleSize", null);
124
+ __decorate([
125
+ computed()
126
+ ], Shape.prototype, "getPath", null);
127
+ __decorate([
128
+ threadable()
129
+ ], Shape.prototype, "ripple", null);
130
+ Shape = __decorate([
131
+ nodeName('Shape')
132
+ ], Shape);
133
+ export { Shape };
134
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hhcGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvU2hhcGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUlMLFlBQVksRUFDWixXQUFXLEVBQ1gsTUFBTSxFQUNOLEdBQUcsRUFDSCxVQUFVLEdBQ1gsTUFBTSxlQUFlLENBQUM7QUFDdkIsT0FBTyxFQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUNsRSxPQUFPLEVBRUwsaUJBQWlCLEdBQ2xCLE1BQU0saUNBQWlDLENBQUM7QUFFekMsT0FBTyxFQUFDLGtCQUFrQixFQUFDLE1BQU0sVUFBVSxDQUFDO0FBQzVDLE9BQU8sRUFBQyxNQUFNLEVBQWMsTUFBTSxVQUFVLENBQUM7QUFldEMsSUFBZSxLQUFLLEdBQXBCLE1BQWUsS0FBTSxTQUFRLE1BQU07SUE4QjlCLFVBQVU7UUFDbEIsT0FBTyxXQUFXLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsWUFBbUIsS0FBaUI7UUFDbEMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBUkksbUJBQWMsR0FBRyxZQUFZLENBQWUsQ0FBQyxDQUFDLENBQUM7SUFTbEUsQ0FBQztJQUVTLFNBQVMsQ0FBQyxPQUFpQztRQUNuRCxPQUFPLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDMUMsQ0FBQztJQUVTLFVBQVUsQ0FBQyxPQUFpQztRQUNwRCxPQUFPLENBQUMsU0FBUyxHQUFHLGtCQUFrQixDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUM3RCxPQUFPLENBQUMs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