@shopify/react-native-skia 0.1.208 → 0.1.210

Sign up to get free protection for your applications and to get access to all the features.
Files changed (101) hide show
  1. package/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseView.java +19 -12
  2. package/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseViewManager.java +1 -1
  3. package/android/src/main/java/com/shopify/reactnative/skia/SkiaDomView.java +1 -1
  4. package/android/src/main/java/com/shopify/reactnative/skia/SkiaDrawView.java +1 -1
  5. package/android/src/main/java/com/shopify/reactnative/skia/SkiaPictureView.java +1 -1
  6. package/android/src/main/java/com/shopify/reactnative/skia/ViewScreenshotService.java +2 -0
  7. package/cpp/api/JsiSkFont.h +17 -0
  8. package/cpp/api/JsiSkPaint.h +7 -0
  9. package/cpp/api/JsiSkPath.h +10 -7
  10. package/cpp/rnskia/dom/base/JsiDomRenderNode.h +1 -1
  11. package/cpp/rnskia/dom/nodes/JsiPaintNode.h +4 -0
  12. package/cpp/rnskia/dom/props/FontProp.h +3 -1
  13. package/cpp/rnskia/dom/props/PaintProps.h +3 -0
  14. package/lib/commonjs/dom/nodes/PaintNode.js +6 -1
  15. package/lib/commonjs/dom/nodes/PaintNode.js.map +1 -1
  16. package/lib/commonjs/dom/nodes/RenderNode.js +1 -1
  17. package/lib/commonjs/dom/nodes/RenderNode.js.map +1 -1
  18. package/lib/commonjs/dom/nodes/drawings/Text.d.ts +3 -3
  19. package/lib/commonjs/dom/nodes/drawings/Text.js +26 -4
  20. package/lib/commonjs/dom/nodes/drawings/Text.js.map +1 -1
  21. package/lib/commonjs/dom/types/Common.d.ts +1 -0
  22. package/lib/commonjs/dom/types/Common.js.map +1 -1
  23. package/lib/commonjs/dom/types/DrawingContext.js +15 -0
  24. package/lib/commonjs/dom/types/DrawingContext.js.map +1 -1
  25. package/lib/commonjs/dom/types/Drawings.d.ts +1 -1
  26. package/lib/commonjs/dom/types/Drawings.js.map +1 -1
  27. package/lib/commonjs/skia/types/Font/Font.d.ts +9 -0
  28. package/lib/commonjs/skia/types/Font/Font.js.map +1 -1
  29. package/lib/commonjs/skia/types/Image/ImageFactory.d.ts +12 -11
  30. package/lib/commonjs/skia/types/Image/ImageFactory.js +12 -11
  31. package/lib/commonjs/skia/types/Image/ImageFactory.js.map +1 -1
  32. package/lib/commonjs/skia/types/Paint/Paint.d.ts +5 -0
  33. package/lib/commonjs/skia/types/Paint/Paint.js.map +1 -1
  34. package/lib/commonjs/skia/web/JsiSkFont.d.ts +2 -1
  35. package/lib/commonjs/skia/web/JsiSkFont.js +4 -0
  36. package/lib/commonjs/skia/web/JsiSkFont.js.map +1 -1
  37. package/lib/commonjs/skia/web/JsiSkPaint.d.ts +1 -0
  38. package/lib/commonjs/skia/web/JsiSkPaint.js +4 -0
  39. package/lib/commonjs/skia/web/JsiSkPaint.js.map +1 -1
  40. package/lib/commonjs/skia/web/JsiSkPath.d.ts +1 -1
  41. package/lib/commonjs/skia/web/JsiSkPath.js +10 -1
  42. package/lib/commonjs/skia/web/JsiSkPath.js.map +1 -1
  43. package/lib/module/dom/nodes/PaintNode.js +6 -1
  44. package/lib/module/dom/nodes/PaintNode.js.map +1 -1
  45. package/lib/module/dom/nodes/RenderNode.js +1 -1
  46. package/lib/module/dom/nodes/RenderNode.js.map +1 -1
  47. package/lib/module/dom/nodes/drawings/Text.d.ts +3 -3
  48. package/lib/module/dom/nodes/drawings/Text.js +26 -4
  49. package/lib/module/dom/nodes/drawings/Text.js.map +1 -1
  50. package/lib/module/dom/types/Common.d.ts +1 -0
  51. package/lib/module/dom/types/Common.js.map +1 -1
  52. package/lib/module/dom/types/DrawingContext.js +15 -0
  53. package/lib/module/dom/types/DrawingContext.js.map +1 -1
  54. package/lib/module/dom/types/Drawings.d.ts +1 -1
  55. package/lib/module/dom/types/Drawings.js.map +1 -1
  56. package/lib/module/skia/types/Font/Font.d.ts +9 -0
  57. package/lib/module/skia/types/Font/Font.js.map +1 -1
  58. package/lib/module/skia/types/Image/ImageFactory.d.ts +12 -11
  59. package/lib/module/skia/types/Image/ImageFactory.js +12 -11
  60. package/lib/module/skia/types/Image/ImageFactory.js.map +1 -1
  61. package/lib/module/skia/types/Paint/Paint.d.ts +5 -0
  62. package/lib/module/skia/types/Paint/Paint.js.map +1 -1
  63. package/lib/module/skia/web/JsiSkFont.d.ts +2 -1
  64. package/lib/module/skia/web/JsiSkFont.js +5 -1
  65. package/lib/module/skia/web/JsiSkFont.js.map +1 -1
  66. package/lib/module/skia/web/JsiSkPaint.d.ts +1 -0
  67. package/lib/module/skia/web/JsiSkPaint.js +4 -0
  68. package/lib/module/skia/web/JsiSkPaint.js.map +1 -1
  69. package/lib/module/skia/web/JsiSkPath.d.ts +1 -1
  70. package/lib/module/skia/web/JsiSkPath.js +11 -1
  71. package/lib/module/skia/web/JsiSkPath.js.map +1 -1
  72. package/lib/typescript/src/dom/nodes/drawings/Text.d.ts +3 -3
  73. package/lib/typescript/src/dom/types/Common.d.ts +1 -0
  74. package/lib/typescript/src/dom/types/Drawings.d.ts +1 -1
  75. package/lib/typescript/src/skia/types/Font/Font.d.ts +9 -0
  76. package/lib/typescript/src/skia/types/Image/ImageFactory.d.ts +12 -11
  77. package/lib/typescript/src/skia/types/Paint/Paint.d.ts +5 -0
  78. package/lib/typescript/src/skia/web/JsiSkFont.d.ts +2 -1
  79. package/lib/typescript/src/skia/web/JsiSkPaint.d.ts +1 -0
  80. package/lib/typescript/src/skia/web/JsiSkPath.d.ts +1 -1
  81. package/package.json +2 -2
  82. package/src/dom/nodes/PaintNode.ts +4 -0
  83. package/src/dom/nodes/RenderNode.ts +1 -0
  84. package/src/dom/nodes/drawings/Text.ts +31 -5
  85. package/src/dom/types/Common.ts +1 -0
  86. package/src/dom/types/DrawingContext.ts +13 -0
  87. package/src/dom/types/Drawings.ts +1 -1
  88. package/src/skia/types/Font/Font.ts +10 -0
  89. package/src/skia/types/Image/ImageFactory.ts +1 -0
  90. package/src/skia/types/Paint/Paint.ts +6 -0
  91. package/src/skia/web/JsiSkFont.ts +6 -1
  92. package/src/skia/web/JsiSkPaint.ts +4 -0
  93. package/src/skia/web/JsiSkPath.ts +8 -1
  94. package/lib/commonjs/dom/nodes/PaintContext.d.ts +0 -18
  95. package/lib/commonjs/dom/nodes/PaintContext.js +0 -6
  96. package/lib/commonjs/dom/nodes/PaintContext.js.map +0 -1
  97. package/lib/module/dom/nodes/PaintContext.d.ts +0 -18
  98. package/lib/module/dom/nodes/PaintContext.js +0 -2
  99. package/lib/module/dom/nodes/PaintContext.js.map +0 -1
  100. package/lib/typescript/src/dom/nodes/PaintContext.d.ts +0 -18
  101. package/src/dom/nodes/PaintContext.ts +0 -31
@@ -1 +1 @@
1
- {"version":3,"names":["HostObject","ckEnum","JsiSkPaint","JsiSkPoint","JsiSkRect","JsiSkTypeface","JsiSkFont","constructor","CanvasKit","ref","delete","getTextWidth","text","paint","ids","getGlyphIDs","widths","getGlyphWidths","reduce","a","b","getMetrics","result","ascent","descent","leading","bounds","undefined","str","numCodePoints","glyphs","fromValue","getGlyphIntercepts","positions","top","bottom","map","p","Array","from","flat","getScaleX","getSize","getSkewX","isEmbolden","getTypeface","tf","setEdging","edging","setEmbeddedBitmaps","embeddedBitmaps","setHinting","hinting","setLinearMetrics","linearMetrics","setScaleX","sx","setSize","points","setSkewX","setEmbolden","embolden","setSubpixel","subpixel","setTypeface","face"],"sources":["JsiSkFont.ts"],"sourcesContent":["import type { CanvasKit, Font } from \"canvaskit-wasm\";\n\nimport type {\n FontEdging,\n FontHinting,\n SkFont,\n SkPaint,\n SkPoint,\n SkTypeface,\n} from \"../types\";\n\nimport { HostObject, ckEnum } from \"./Host\";\nimport { JsiSkPaint } from \"./JsiSkPaint\";\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport class JsiSkFont extends HostObject<Font, \"Font\"> implements SkFont {\n constructor(CanvasKit: CanvasKit, ref: Font) {\n super(CanvasKit, ref, \"Font\");\n }\n\n dispose = () => {\n this.ref.delete();\n };\n\n getTextWidth(text: string, paint?: SkPaint | undefined) {\n const ids = this.getGlyphIDs(text);\n const widths = this.getGlyphWidths(ids, paint);\n return widths.reduce((a, b) => a + b, 0);\n }\n\n getMetrics() {\n const result = this.ref.getMetrics();\n return {\n ascent: result.ascent,\n descent: result.descent,\n leading: result.leading,\n bounds: result.bounds\n ? new JsiSkRect(this.CanvasKit, result.bounds)\n : undefined,\n };\n }\n\n getGlyphIDs(str: string, numCodePoints?: number) {\n // TODO: Fix return value in the C++ implementation\n return [...this.ref.getGlyphIDs(str, numCodePoints)];\n }\n\n // TODO: Fix return value in the C++ implementation, it return float32\n getGlyphWidths(glyphs: number[], paint?: SkPaint | null) {\n return [\n ...this.ref.getGlyphWidths(\n glyphs,\n paint ? JsiSkPaint.fromValue(paint) : null\n ),\n ];\n }\n\n getGlyphIntercepts(\n glyphs: number[],\n positions: SkPoint[],\n top: number,\n bottom: number\n ) {\n return [\n ...this.ref.getGlyphIntercepts(\n glyphs,\n positions.map((p) => Array.from(JsiSkPoint.fromValue(p))).flat(),\n top,\n bottom\n ),\n ];\n }\n\n getScaleX() {\n return this.ref.getScaleX();\n }\n\n getSize() {\n return this.ref.getSize();\n }\n\n getSkewX() {\n return this.ref.getSkewX();\n }\n\n isEmbolden() {\n return this.ref.isEmbolden();\n }\n\n getTypeface() {\n const tf = this.ref.getTypeface();\n return tf ? new JsiSkTypeface(this.CanvasKit, tf) : null;\n }\n\n setEdging(edging: FontEdging) {\n this.ref.setEdging(ckEnum(edging));\n }\n\n setEmbeddedBitmaps(embeddedBitmaps: boolean) {\n this.ref.setEmbeddedBitmaps(embeddedBitmaps);\n }\n\n setHinting(hinting: FontHinting) {\n this.ref.setHinting(ckEnum(hinting));\n }\n\n setLinearMetrics(linearMetrics: boolean) {\n this.ref.setLinearMetrics(linearMetrics);\n }\n\n setScaleX(sx: number) {\n this.ref.setScaleX(sx);\n }\n\n setSize(points: number) {\n this.ref.setSize(points);\n }\n\n setSkewX(sx: number) {\n this.ref.setSkewX(sx);\n }\n\n setEmbolden(embolden: boolean) {\n this.ref.setEmbolden(embolden);\n }\n\n setSubpixel(subpixel: boolean) {\n this.ref.setSubpixel(subpixel);\n }\n\n setTypeface(face: SkTypeface | null) {\n this.ref.setTypeface(face ? JsiSkTypeface.fromValue(face) : null);\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["HostObject","NotImplementedOnRNWeb","ckEnum","JsiSkPaint","JsiSkPoint","JsiSkRect","JsiSkTypeface","JsiSkFont","constructor","CanvasKit","ref","delete","measureText","_text","_paint","getTextWidth","text","paint","ids","getGlyphIDs","widths","getGlyphWidths","reduce","a","b","getMetrics","result","ascent","descent","leading","bounds","undefined","str","numCodePoints","glyphs","fromValue","getGlyphIntercepts","positions","top","bottom","map","p","Array","from","flat","getScaleX","getSize","getSkewX","isEmbolden","getTypeface","tf","setEdging","edging","setEmbeddedBitmaps","embeddedBitmaps","setHinting","hinting","setLinearMetrics","linearMetrics","setScaleX","sx","setSize","points","setSkewX","setEmbolden","embolden","setSubpixel","subpixel","setTypeface","face"],"sources":["JsiSkFont.ts"],"sourcesContent":["import type { CanvasKit, Font } from \"canvaskit-wasm\";\n\nimport type {\n FontEdging,\n FontHinting,\n SkFont,\n SkPaint,\n SkPoint,\n SkRect,\n SkTypeface,\n} from \"../types\";\n\nimport { HostObject, NotImplementedOnRNWeb, ckEnum } from \"./Host\";\nimport { JsiSkPaint } from \"./JsiSkPaint\";\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport class JsiSkFont extends HostObject<Font, \"Font\"> implements SkFont {\n constructor(CanvasKit: CanvasKit, ref: Font) {\n super(CanvasKit, ref, \"Font\");\n }\n\n measureText(_text: string, _paint?: SkPaint | undefined): SkRect {\n throw new NotImplementedOnRNWeb();\n }\n\n dispose = () => {\n this.ref.delete();\n };\n\n getTextWidth(text: string, paint?: SkPaint | undefined) {\n const ids = this.getGlyphIDs(text);\n const widths = this.getGlyphWidths(ids, paint);\n return widths.reduce((a, b) => a + b, 0);\n }\n\n getMetrics() {\n const result = this.ref.getMetrics();\n return {\n ascent: result.ascent,\n descent: result.descent,\n leading: result.leading,\n bounds: result.bounds\n ? new JsiSkRect(this.CanvasKit, result.bounds)\n : undefined,\n };\n }\n\n getGlyphIDs(str: string, numCodePoints?: number) {\n // TODO: Fix return value in the C++ implementation\n return [...this.ref.getGlyphIDs(str, numCodePoints)];\n }\n\n // TODO: Fix return value in the C++ implementation, it return float32\n getGlyphWidths(glyphs: number[], paint?: SkPaint | null) {\n return [\n ...this.ref.getGlyphWidths(\n glyphs,\n paint ? JsiSkPaint.fromValue(paint) : null\n ),\n ];\n }\n\n getGlyphIntercepts(\n glyphs: number[],\n positions: SkPoint[],\n top: number,\n bottom: number\n ) {\n return [\n ...this.ref.getGlyphIntercepts(\n glyphs,\n positions.map((p) => Array.from(JsiSkPoint.fromValue(p))).flat(),\n top,\n bottom\n ),\n ];\n }\n\n getScaleX() {\n return this.ref.getScaleX();\n }\n\n getSize() {\n return this.ref.getSize();\n }\n\n getSkewX() {\n return this.ref.getSkewX();\n }\n\n isEmbolden() {\n return this.ref.isEmbolden();\n }\n\n getTypeface() {\n const tf = this.ref.getTypeface();\n return tf ? new JsiSkTypeface(this.CanvasKit, tf) : null;\n }\n\n setEdging(edging: FontEdging) {\n this.ref.setEdging(ckEnum(edging));\n }\n\n setEmbeddedBitmaps(embeddedBitmaps: boolean) {\n this.ref.setEmbeddedBitmaps(embeddedBitmaps);\n }\n\n setHinting(hinting: FontHinting) {\n this.ref.setHinting(ckEnum(hinting));\n }\n\n setLinearMetrics(linearMetrics: boolean) {\n this.ref.setLinearMetrics(linearMetrics);\n }\n\n setScaleX(sx: number) {\n this.ref.setScaleX(sx);\n }\n\n setSize(points: number) {\n this.ref.setSize(points);\n }\n\n setSkewX(sx: number) {\n this.ref.setSkewX(sx);\n }\n\n setEmbolden(embolden: boolean) {\n this.ref.setEmbolden(embolden);\n }\n\n setSubpixel(subpixel: boolean) {\n this.ref.setSubpixel(subpixel);\n }\n\n setTypeface(face: SkTypeface | null) {\n this.ref.setTypeface(face ? JsiSkTypeface.fromValue(face) : null);\n }\n}\n"],"mappings":"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"}
@@ -14,6 +14,7 @@ export declare class JsiSkPaint extends HostObject<Paint, "Paint"> implements Sk
14
14
  getStrokeWidth(): number;
15
15
  setAlphaf(alpha: number): void;
16
16
  setAntiAlias(aa: boolean): void;
17
+ setDither(dither: boolean): void;
17
18
  setBlendMode(blendMode: BlendMode): void;
18
19
  setColor(color: SkColor): void;
19
20
  setColorFilter(filter: SkColorFilter | null): void;
@@ -55,6 +55,10 @@ export class JsiSkPaint extends HostObject {
55
55
  this.ref.setAntiAlias(aa);
56
56
  }
57
57
 
58
+ setDither(dither) {
59
+ this.ref.setDither(dither);
60
+ }
61
+
58
62
  setBlendMode(blendMode) {
59
63
  this.ref.setBlendMode(ckEnum(blendMode));
60
64
  }
@@ -1 +1 @@
1
- {"version":3,"names":["HostObject","ckEnum","JsiSkColorFilter","JsiSkImageFilter","JsiSkMaskFilter","JsiSkPathEffect","JsiSkShader","JsiSkPaint","constructor","CanvasKit","ref","delete","copy","reset","Paint","getAlphaf","getColor","getStrokeCap","value","getStrokeJoin","getStrokeMiter","getStrokeWidth","setAlphaf","alpha","setAntiAlias","aa","setBlendMode","blendMode","setColor","color","setColorFilter","filter","fromValue","setImageFilter","setMaskFilter","setPathEffect","effect","setShader","shader","setStrokeCap","cap","setStrokeJoin","join","setStrokeMiter","limit","setStrokeWidth","width","setStyle","style"],"sources":["JsiSkPaint.ts"],"sourcesContent":["import type { CanvasKit, Paint } from \"canvaskit-wasm\";\n\nimport type {\n StrokeJoin,\n BlendMode,\n SkColor,\n SkColorFilter,\n SkImageFilter,\n SkPaint,\n SkShader,\n StrokeCap,\n PaintStyle,\n SkMaskFilter,\n SkPathEffect,\n} from \"../types\";\n\nimport { HostObject, ckEnum } from \"./Host\";\nimport { JsiSkColorFilter } from \"./JsiSkColorFilter\";\nimport { JsiSkImageFilter } from \"./JsiSkImageFilter\";\nimport { JsiSkMaskFilter } from \"./JsiSkMaskFilter\";\nimport { JsiSkPathEffect } from \"./JsiSkPathEffect\";\nimport { JsiSkShader } from \"./JsiSkShader\";\n\nexport class JsiSkPaint extends HostObject<Paint, \"Paint\"> implements SkPaint {\n constructor(CanvasKit: CanvasKit, ref: Paint) {\n super(CanvasKit, ref, \"Paint\");\n }\n\n dispose = () => {\n this.ref.delete();\n };\n\n copy() {\n return new JsiSkPaint(this.CanvasKit, this.ref.copy());\n }\n\n reset() {\n this.ref = new this.CanvasKit.Paint();\n }\n\n getAlphaf() {\n return this.getColor()[3];\n }\n\n getColor() {\n return this.ref.getColor();\n }\n\n getStrokeCap() {\n return this.ref.getStrokeCap().value;\n }\n\n getStrokeJoin() {\n return this.ref.getStrokeJoin().value;\n }\n\n getStrokeMiter() {\n return this.ref.getStrokeMiter();\n }\n\n getStrokeWidth() {\n return this.ref.getStrokeWidth();\n }\n\n setAlphaf(alpha: number) {\n this.ref.setAlphaf(alpha);\n }\n\n setAntiAlias(aa: boolean) {\n this.ref.setAntiAlias(aa);\n }\n\n setBlendMode(blendMode: BlendMode) {\n this.ref.setBlendMode(ckEnum(blendMode));\n }\n\n setColor(color: SkColor) {\n this.ref.setColor(color);\n }\n\n setColorFilter(filter: SkColorFilter | null) {\n this.ref.setColorFilter(filter ? JsiSkColorFilter.fromValue(filter) : null);\n }\n\n setImageFilter(filter: SkImageFilter | null) {\n this.ref.setImageFilter(filter ? JsiSkImageFilter.fromValue(filter) : null);\n }\n\n setMaskFilter(filter: SkMaskFilter | null) {\n this.ref.setMaskFilter(filter ? JsiSkMaskFilter.fromValue(filter) : null);\n }\n\n setPathEffect(effect: SkPathEffect | null) {\n this.ref.setPathEffect(effect ? JsiSkPathEffect.fromValue(effect) : null);\n }\n\n setShader(shader: SkShader | null) {\n this.ref.setShader(shader ? JsiSkShader.fromValue(shader) : null);\n }\n\n setStrokeCap(cap: StrokeCap) {\n this.ref.setStrokeCap(ckEnum(cap));\n }\n\n setStrokeJoin(join: StrokeJoin) {\n this.ref.setStrokeJoin(ckEnum(join));\n }\n\n setStrokeMiter(limit: number) {\n this.ref.setStrokeMiter(limit);\n }\n\n setStrokeWidth(width: number) {\n this.ref.setStrokeWidth(width);\n }\n\n setStyle(style: PaintStyle) {\n this.ref.setStyle({ value: style });\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["HostObject","ckEnum","JsiSkColorFilter","JsiSkImageFilter","JsiSkMaskFilter","JsiSkPathEffect","JsiSkShader","JsiSkPaint","constructor","CanvasKit","ref","delete","copy","reset","Paint","getAlphaf","getColor","getStrokeCap","value","getStrokeJoin","getStrokeMiter","getStrokeWidth","setAlphaf","alpha","setAntiAlias","aa","setDither","dither","setBlendMode","blendMode","setColor","color","setColorFilter","filter","fromValue","setImageFilter","setMaskFilter","setPathEffect","effect","setShader","shader","setStrokeCap","cap","setStrokeJoin","join","setStrokeMiter","limit","setStrokeWidth","width","setStyle","style"],"sources":["JsiSkPaint.ts"],"sourcesContent":["import type { CanvasKit, Paint } from \"canvaskit-wasm\";\n\nimport type {\n StrokeJoin,\n BlendMode,\n SkColor,\n SkColorFilter,\n SkImageFilter,\n SkPaint,\n SkShader,\n StrokeCap,\n PaintStyle,\n SkMaskFilter,\n SkPathEffect,\n} from \"../types\";\n\nimport { HostObject, ckEnum } from \"./Host\";\nimport { JsiSkColorFilter } from \"./JsiSkColorFilter\";\nimport { JsiSkImageFilter } from \"./JsiSkImageFilter\";\nimport { JsiSkMaskFilter } from \"./JsiSkMaskFilter\";\nimport { JsiSkPathEffect } from \"./JsiSkPathEffect\";\nimport { JsiSkShader } from \"./JsiSkShader\";\n\nexport class JsiSkPaint extends HostObject<Paint, \"Paint\"> implements SkPaint {\n constructor(CanvasKit: CanvasKit, ref: Paint) {\n super(CanvasKit, ref, \"Paint\");\n }\n\n dispose = () => {\n this.ref.delete();\n };\n\n copy() {\n return new JsiSkPaint(this.CanvasKit, this.ref.copy());\n }\n\n reset() {\n this.ref = new this.CanvasKit.Paint();\n }\n\n getAlphaf() {\n return this.getColor()[3];\n }\n\n getColor() {\n return this.ref.getColor();\n }\n\n getStrokeCap() {\n return this.ref.getStrokeCap().value;\n }\n\n getStrokeJoin() {\n return this.ref.getStrokeJoin().value;\n }\n\n getStrokeMiter() {\n return this.ref.getStrokeMiter();\n }\n\n getStrokeWidth() {\n return this.ref.getStrokeWidth();\n }\n\n setAlphaf(alpha: number) {\n this.ref.setAlphaf(alpha);\n }\n\n setAntiAlias(aa: boolean) {\n this.ref.setAntiAlias(aa);\n }\n\n setDither(dither: boolean) {\n this.ref.setDither(dither);\n }\n\n setBlendMode(blendMode: BlendMode) {\n this.ref.setBlendMode(ckEnum(blendMode));\n }\n\n setColor(color: SkColor) {\n this.ref.setColor(color);\n }\n\n setColorFilter(filter: SkColorFilter | null) {\n this.ref.setColorFilter(filter ? JsiSkColorFilter.fromValue(filter) : null);\n }\n\n setImageFilter(filter: SkImageFilter | null) {\n this.ref.setImageFilter(filter ? JsiSkImageFilter.fromValue(filter) : null);\n }\n\n setMaskFilter(filter: SkMaskFilter | null) {\n this.ref.setMaskFilter(filter ? JsiSkMaskFilter.fromValue(filter) : null);\n }\n\n setPathEffect(effect: SkPathEffect | null) {\n this.ref.setPathEffect(effect ? JsiSkPathEffect.fromValue(effect) : null);\n }\n\n setShader(shader: SkShader | null) {\n this.ref.setShader(shader ? JsiSkShader.fromValue(shader) : null);\n }\n\n setStrokeCap(cap: StrokeCap) {\n this.ref.setStrokeCap(ckEnum(cap));\n }\n\n setStrokeJoin(join: StrokeJoin) {\n this.ref.setStrokeJoin(ckEnum(join));\n }\n\n setStrokeMiter(limit: number) {\n this.ref.setStrokeMiter(limit);\n }\n\n setStrokeWidth(width: number) {\n this.ref.setStrokeWidth(width);\n }\n\n setStyle(style: PaintStyle) {\n this.ref.setStyle({ value: style });\n }\n}\n"],"mappings":"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"}
@@ -50,7 +50,7 @@ export declare class JsiSkPath extends HostObject<Path, "Path"> implements SkPat
50
50
  op(path: SkPath, op: PathOp): boolean;
51
51
  simplify(): boolean;
52
52
  toSVGString(): string;
53
- trim(startT: number, stopT: number, isComplement: boolean): this | null;
53
+ trim(start: number, stop: number, isComplement: boolean): this | null;
54
54
  transform(m3: SkMatrix): void;
55
55
  interpolate(end: SkPath, t: number): JsiSkPath | null;
56
56
  isInterpolatable(path2: SkPath): boolean;
@@ -14,6 +14,9 @@ const CommandCount = {
14
14
  [PathVerb.Cubic]: 7,
15
15
  [PathVerb.Close]: 1
16
16
  };
17
+
18
+ const pinT = t => Math.min(Math.max(t, 0), 1);
19
+
17
20
  export class JsiSkPath extends HostObject {
18
21
  constructor(CanvasKit, ref) {
19
22
  super(CanvasKit, ref, "Path");
@@ -230,7 +233,14 @@ export class JsiSkPath extends HostObject {
230
233
  return this.ref.toSVGString();
231
234
  }
232
235
 
233
- trim(startT, stopT, isComplement) {
236
+ trim(start, stop, isComplement) {
237
+ const startT = pinT(start);
238
+ const stopT = pinT(stop);
239
+
240
+ if (startT === 0 && stopT === 1) {
241
+ return this;
242
+ }
243
+
234
244
  const result = this.ref.trim(startT, stopT, isComplement);
235
245
  return result === null ? result : this;
236
246
  }
@@ -1 +1 @@
1
- {"version":3,"names":["PathVerb","ckEnum","HostObject","optEnum","JsiSkPoint","JsiSkRect","JsiSkRRect","JsiSkMatrix","CommandCount","Move","Line","Quad","Conic","Cubic","Close","JsiSkPath","constructor","CanvasKit","ref","delete","addPath","src","matrix","extend","args","fromValue","addArc","oval","startAngleInDegrees","sweepAngleInDegrees","addOval","isCCW","startIndex","countPoints","addPoly","points","close","map","p","Array","from","flat","moveTo","x","y","lineTo","makeAsWinding","result","offset","dx","dy","rArcTo","rx","ry","xAxisRotateInDegrees","useSmallArc","rConicTo","dx1","dy1","dx2","dy2","w","rCubicTo","cpx1","cpy1","cpx2","cpy2","rMoveTo","rLineTo","rQuadTo","x1","y1","x2","y2","setFillType","fill","setIsVolatile","volatile","stroke","opts","undefined","width","miter_limit","precision","join","cap","reset","rewind","computeTightBounds","arcToOval","forceMoveTo","arcToRotated","arcToTangent","radius","conicTo","contains","copy","cubicTo","dash","on","off","phase","equals","other","getBounds","getFillType","value","quadTo","addRect","rect","addRRect","rrect","getPoint","index","isEmpty","isVolatile","addCircle","r","getLastPt","op","path","simplify","toSVGString","trim","startT","stopT","isComplement","transform","m3","interpolate","end","t","Path","MakeFromPathInterpolation","isInterpolatable","path2","CanInterpolate","toCmds","cmds","reduce","acc","cmd","i","push","current","length"],"sources":["JsiSkPath.ts"],"sourcesContent":["import type { CanvasKit, Path } from \"canvaskit-wasm\";\n\nimport { PathVerb } from \"../types\";\nimport type {\n FillType,\n PathCommand,\n PathOp,\n SkMatrix,\n SkPath,\n SkPoint,\n SkRect,\n SkRRect,\n StrokeOpts,\n} from \"../types\";\n\nimport { ckEnum, HostObject, optEnum } from \"./Host\";\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { JsiSkRRect } from \"./JsiSkRRect\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\n\nconst CommandCount = {\n [PathVerb.Move]: 3,\n [PathVerb.Line]: 3,\n [PathVerb.Quad]: 5,\n [PathVerb.Conic]: 6,\n [PathVerb.Cubic]: 7,\n [PathVerb.Close]: 1,\n};\n\nexport class JsiSkPath extends HostObject<Path, \"Path\"> implements SkPath {\n constructor(CanvasKit: CanvasKit, ref: Path) {\n super(CanvasKit, ref, \"Path\");\n }\n\n dispose = () => {\n this.ref.delete();\n };\n\n addPath(src: SkPath, matrix?: SkMatrix, extend = false) {\n const args = [\n JsiSkPath.fromValue(src),\n ...(matrix ? JsiSkMatrix.fromValue<Float32Array>(matrix) : []),\n extend,\n ];\n this.ref.addPath(...args);\n return this;\n }\n\n addArc(\n oval: SkRect,\n startAngleInDegrees: number,\n sweepAngleInDegrees: number\n ) {\n this.ref.addArc(\n JsiSkRect.fromValue(this.CanvasKit, oval),\n startAngleInDegrees,\n sweepAngleInDegrees\n );\n return this;\n }\n\n addOval(oval: SkRect, isCCW?: boolean, startIndex?: number) {\n this.ref.addOval(\n JsiSkRect.fromValue(this.CanvasKit, oval),\n isCCW,\n startIndex\n );\n return this;\n }\n\n countPoints() {\n return this.ref.countPoints();\n }\n\n addPoly(points: SkPoint[], close: boolean) {\n this.ref.addPoly(\n points.map((p) => Array.from(JsiSkPoint.fromValue(p))).flat(),\n close\n );\n return this;\n }\n\n moveTo(x: number, y: number) {\n this.ref.moveTo(x, y);\n return this;\n }\n\n lineTo(x: number, y: number) {\n this.ref.lineTo(x, y);\n return this;\n }\n\n makeAsWinding() {\n const result = this.ref.makeAsWinding();\n return result === null ? result : this;\n }\n\n offset(dx: number, dy: number) {\n this.ref.offset(dx, dy);\n return this;\n }\n\n rArcTo(\n rx: number,\n ry: number,\n xAxisRotateInDegrees: number,\n useSmallArc: boolean,\n isCCW: boolean,\n dx: number,\n dy: number\n ) {\n this.ref.rArcTo(rx, ry, xAxisRotateInDegrees, useSmallArc, isCCW, dx, dy);\n return this;\n }\n\n rConicTo(dx1: number, dy1: number, dx2: number, dy2: number, w: number) {\n this.ref.rConicTo(dx1, dy1, dx2, dy2, w);\n return this;\n }\n\n rCubicTo(\n cpx1: number,\n cpy1: number,\n cpx2: number,\n cpy2: number,\n x: number,\n y: number\n ) {\n this.ref.rCubicTo(cpx1, cpy1, cpx2, cpy2, x, y);\n return this;\n }\n\n rMoveTo(x: number, y: number) {\n this.ref.rMoveTo(x, y);\n return this;\n }\n\n rLineTo(x: number, y: number) {\n this.ref.rLineTo(x, y);\n return this;\n }\n\n rQuadTo(x1: number, y1: number, x2: number, y2: number) {\n this.ref.rQuadTo(x1, y1, x2, y2);\n return this;\n }\n\n setFillType(fill: FillType) {\n this.ref.setFillType(ckEnum(fill));\n }\n\n setIsVolatile(volatile: boolean) {\n this.ref.setIsVolatile(volatile);\n }\n\n stroke(opts?: StrokeOpts) {\n const result = this.ref.stroke(\n opts === undefined\n ? undefined\n : {\n width: opts.width,\n // eslint-disable-next-line camelcase\n miter_limit: opts.width,\n precision: opts.width,\n join: optEnum(opts.join),\n cap: optEnum(opts.cap),\n }\n );\n return result === null ? result : this;\n }\n\n close() {\n this.ref.close();\n }\n\n reset() {\n this.ref.reset();\n }\n\n rewind() {\n this.ref.rewind();\n }\n\n computeTightBounds(): SkRect {\n return new JsiSkRect(this.CanvasKit, this.ref.computeTightBounds());\n }\n\n arcToOval(\n oval: SkRect,\n startAngleInDegrees: number,\n sweepAngleInDegrees: number,\n forceMoveTo: boolean\n ) {\n this.ref.arcToOval(\n JsiSkRect.fromValue(this.CanvasKit, oval),\n startAngleInDegrees,\n sweepAngleInDegrees,\n forceMoveTo\n );\n return this;\n }\n\n arcToRotated(\n rx: number,\n ry: number,\n xAxisRotateInDegrees: number,\n useSmallArc: boolean,\n isCCW: boolean,\n x: number,\n y: number\n ) {\n this.ref.arcToRotated(\n rx,\n ry,\n xAxisRotateInDegrees,\n useSmallArc,\n isCCW,\n x,\n y\n );\n return this;\n }\n\n arcToTangent(x1: number, y1: number, x2: number, y2: number, radius: number) {\n this.ref.arcToTangent(x1, y1, x2, y2, radius);\n return this;\n }\n\n conicTo(x1: number, y1: number, x2: number, y2: number, w: number) {\n this.ref.conicTo(x1, y1, x2, y2, w);\n return this;\n }\n\n contains(x: number, y: number) {\n return this.ref.contains(x, y);\n }\n\n copy() {\n return new JsiSkPath(this.CanvasKit, this.ref.copy());\n }\n\n cubicTo(\n cpx1: number,\n cpy1: number,\n cpx2: number,\n cpy2: number,\n x: number,\n y: number\n ) {\n this.ref.cubicTo(cpx1, cpy1, cpx2, cpy2, x, y);\n return this;\n }\n\n dash(on: number, off: number, phase: number) {\n return this.ref.dash(on, off, phase);\n }\n\n equals(other: SkPath) {\n return this.ref.equals(JsiSkPath.fromValue(other));\n }\n\n getBounds() {\n return new JsiSkRect(this.CanvasKit, this.ref.getBounds());\n }\n\n getFillType() {\n return this.ref.getFillType().value;\n }\n\n quadTo(x1: number, y1: number, x2: number, y2: number) {\n this.ref.quadTo(x1, y1, x2, y2);\n }\n\n addRect(rect: SkRect, isCCW?: boolean) {\n this.ref.addRect(JsiSkRect.fromValue(this.CanvasKit, rect), isCCW);\n }\n\n addRRect(rrect: SkRRect, isCCW?: boolean) {\n this.ref.addRRect(JsiSkRRect.fromValue(this.CanvasKit, rrect), isCCW);\n return this;\n }\n\n getPoint(index: number) {\n return new JsiSkPoint(this.CanvasKit, this.ref.getPoint(index));\n }\n\n isEmpty() {\n return this.ref.isEmpty();\n }\n\n isVolatile() {\n return this.ref.isVolatile();\n }\n\n addCircle(x: number, y: number, r: number) {\n this.ref.addCircle(x, y, r);\n return this;\n }\n\n getLastPt() {\n return new JsiSkPoint(\n this.CanvasKit,\n this.ref.getPoint(this.ref.countPoints() - 1)\n );\n }\n\n op(path: SkPath, op: PathOp) {\n return this.ref.op(JsiSkPath.fromValue(path), ckEnum(op));\n }\n\n simplify() {\n return this.ref.simplify();\n }\n\n toSVGString() {\n return this.ref.toSVGString();\n }\n\n trim(startT: number, stopT: number, isComplement: boolean) {\n const result = this.ref.trim(startT, stopT, isComplement);\n return result === null ? result : this;\n }\n\n transform(m3: SkMatrix) {\n this.ref.transform(JsiSkMatrix.fromValue(m3));\n }\n\n interpolate(end: SkPath, t: number) {\n const path = this.CanvasKit.Path.MakeFromPathInterpolation(\n this.ref,\n JsiSkPath.fromValue(end),\n t\n );\n if (path === null) {\n return null;\n }\n return new JsiSkPath(this.CanvasKit, path);\n }\n\n isInterpolatable(path2: SkPath): boolean {\n return this.CanvasKit.Path.CanInterpolate(\n this.ref,\n JsiSkPath.fromValue(path2)\n );\n }\n\n toCmds() {\n const cmds = this.ref.toCmds();\n const result = cmds.reduce<PathCommand[]>((acc, cmd, i) => {\n if (i === 0) {\n acc.push([]);\n }\n const current = acc[acc.length - 1];\n if (current.length === 0) {\n current.push(cmd);\n const length = CommandCount[current[0] as PathVerb];\n if (current.length === length && i !== cmds.length - 1) {\n acc.push([]);\n }\n } else {\n const length = CommandCount[current[0] as PathVerb];\n if (current.length < length) {\n current.push(cmd);\n }\n if (current.length === length && i !== cmds.length - 1) {\n acc.push([]);\n }\n }\n return acc;\n }, []);\n return result;\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["PathVerb","ckEnum","HostObject","optEnum","JsiSkPoint","JsiSkRect","JsiSkRRect","JsiSkMatrix","CommandCount","Move","Line","Quad","Conic","Cubic","Close","pinT","t","Math","min","max","JsiSkPath","constructor","CanvasKit","ref","delete","addPath","src","matrix","extend","args","fromValue","addArc","oval","startAngleInDegrees","sweepAngleInDegrees","addOval","isCCW","startIndex","countPoints","addPoly","points","close","map","p","Array","from","flat","moveTo","x","y","lineTo","makeAsWinding","result","offset","dx","dy","rArcTo","rx","ry","xAxisRotateInDegrees","useSmallArc","rConicTo","dx1","dy1","dx2","dy2","w","rCubicTo","cpx1","cpy1","cpx2","cpy2","rMoveTo","rLineTo","rQuadTo","x1","y1","x2","y2","setFillType","fill","setIsVolatile","volatile","stroke","opts","undefined","width","miter_limit","precision","join","cap","reset","rewind","computeTightBounds","arcToOval","forceMoveTo","arcToRotated","arcToTangent","radius","conicTo","contains","copy","cubicTo","dash","on","off","phase","equals","other","getBounds","getFillType","value","quadTo","addRect","rect","addRRect","rrect","getPoint","index","isEmpty","isVolatile","addCircle","r","getLastPt","op","path","simplify","toSVGString","trim","start","stop","isComplement","startT","stopT","transform","m3","interpolate","end","Path","MakeFromPathInterpolation","isInterpolatable","path2","CanInterpolate","toCmds","cmds","reduce","acc","cmd","i","push","current","length"],"sources":["JsiSkPath.ts"],"sourcesContent":["import type { CanvasKit, Path } from \"canvaskit-wasm\";\n\nimport { PathVerb } from \"../types\";\nimport type {\n FillType,\n PathCommand,\n PathOp,\n SkMatrix,\n SkPath,\n SkPoint,\n SkRect,\n SkRRect,\n StrokeOpts,\n} from \"../types\";\n\nimport { ckEnum, HostObject, optEnum } from \"./Host\";\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { JsiSkRRect } from \"./JsiSkRRect\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\n\nconst CommandCount = {\n [PathVerb.Move]: 3,\n [PathVerb.Line]: 3,\n [PathVerb.Quad]: 5,\n [PathVerb.Conic]: 6,\n [PathVerb.Cubic]: 7,\n [PathVerb.Close]: 1,\n};\n\nconst pinT = (t: number) => Math.min(Math.max(t, 0), 1);\n\nexport class JsiSkPath extends HostObject<Path, \"Path\"> implements SkPath {\n constructor(CanvasKit: CanvasKit, ref: Path) {\n super(CanvasKit, ref, \"Path\");\n }\n\n dispose = () => {\n this.ref.delete();\n };\n\n addPath(src: SkPath, matrix?: SkMatrix, extend = false) {\n const args = [\n JsiSkPath.fromValue(src),\n ...(matrix ? JsiSkMatrix.fromValue<Float32Array>(matrix) : []),\n extend,\n ];\n this.ref.addPath(...args);\n return this;\n }\n\n addArc(\n oval: SkRect,\n startAngleInDegrees: number,\n sweepAngleInDegrees: number\n ) {\n this.ref.addArc(\n JsiSkRect.fromValue(this.CanvasKit, oval),\n startAngleInDegrees,\n sweepAngleInDegrees\n );\n return this;\n }\n\n addOval(oval: SkRect, isCCW?: boolean, startIndex?: number) {\n this.ref.addOval(\n JsiSkRect.fromValue(this.CanvasKit, oval),\n isCCW,\n startIndex\n );\n return this;\n }\n\n countPoints() {\n return this.ref.countPoints();\n }\n\n addPoly(points: SkPoint[], close: boolean) {\n this.ref.addPoly(\n points.map((p) => Array.from(JsiSkPoint.fromValue(p))).flat(),\n close\n );\n return this;\n }\n\n moveTo(x: number, y: number) {\n this.ref.moveTo(x, y);\n return this;\n }\n\n lineTo(x: number, y: number) {\n this.ref.lineTo(x, y);\n return this;\n }\n\n makeAsWinding() {\n const result = this.ref.makeAsWinding();\n return result === null ? result : this;\n }\n\n offset(dx: number, dy: number) {\n this.ref.offset(dx, dy);\n return this;\n }\n\n rArcTo(\n rx: number,\n ry: number,\n xAxisRotateInDegrees: number,\n useSmallArc: boolean,\n isCCW: boolean,\n dx: number,\n dy: number\n ) {\n this.ref.rArcTo(rx, ry, xAxisRotateInDegrees, useSmallArc, isCCW, dx, dy);\n return this;\n }\n\n rConicTo(dx1: number, dy1: number, dx2: number, dy2: number, w: number) {\n this.ref.rConicTo(dx1, dy1, dx2, dy2, w);\n return this;\n }\n\n rCubicTo(\n cpx1: number,\n cpy1: number,\n cpx2: number,\n cpy2: number,\n x: number,\n y: number\n ) {\n this.ref.rCubicTo(cpx1, cpy1, cpx2, cpy2, x, y);\n return this;\n }\n\n rMoveTo(x: number, y: number) {\n this.ref.rMoveTo(x, y);\n return this;\n }\n\n rLineTo(x: number, y: number) {\n this.ref.rLineTo(x, y);\n return this;\n }\n\n rQuadTo(x1: number, y1: number, x2: number, y2: number) {\n this.ref.rQuadTo(x1, y1, x2, y2);\n return this;\n }\n\n setFillType(fill: FillType) {\n this.ref.setFillType(ckEnum(fill));\n }\n\n setIsVolatile(volatile: boolean) {\n this.ref.setIsVolatile(volatile);\n }\n\n stroke(opts?: StrokeOpts) {\n const result = this.ref.stroke(\n opts === undefined\n ? undefined\n : {\n width: opts.width,\n // eslint-disable-next-line camelcase\n miter_limit: opts.width,\n precision: opts.width,\n join: optEnum(opts.join),\n cap: optEnum(opts.cap),\n }\n );\n return result === null ? result : this;\n }\n\n close() {\n this.ref.close();\n }\n\n reset() {\n this.ref.reset();\n }\n\n rewind() {\n this.ref.rewind();\n }\n\n computeTightBounds(): SkRect {\n return new JsiSkRect(this.CanvasKit, this.ref.computeTightBounds());\n }\n\n arcToOval(\n oval: SkRect,\n startAngleInDegrees: number,\n sweepAngleInDegrees: number,\n forceMoveTo: boolean\n ) {\n this.ref.arcToOval(\n JsiSkRect.fromValue(this.CanvasKit, oval),\n startAngleInDegrees,\n sweepAngleInDegrees,\n forceMoveTo\n );\n return this;\n }\n\n arcToRotated(\n rx: number,\n ry: number,\n xAxisRotateInDegrees: number,\n useSmallArc: boolean,\n isCCW: boolean,\n x: number,\n y: number\n ) {\n this.ref.arcToRotated(\n rx,\n ry,\n xAxisRotateInDegrees,\n useSmallArc,\n isCCW,\n x,\n y\n );\n return this;\n }\n\n arcToTangent(x1: number, y1: number, x2: number, y2: number, radius: number) {\n this.ref.arcToTangent(x1, y1, x2, y2, radius);\n return this;\n }\n\n conicTo(x1: number, y1: number, x2: number, y2: number, w: number) {\n this.ref.conicTo(x1, y1, x2, y2, w);\n return this;\n }\n\n contains(x: number, y: number) {\n return this.ref.contains(x, y);\n }\n\n copy() {\n return new JsiSkPath(this.CanvasKit, this.ref.copy());\n }\n\n cubicTo(\n cpx1: number,\n cpy1: number,\n cpx2: number,\n cpy2: number,\n x: number,\n y: number\n ) {\n this.ref.cubicTo(cpx1, cpy1, cpx2, cpy2, x, y);\n return this;\n }\n\n dash(on: number, off: number, phase: number) {\n return this.ref.dash(on, off, phase);\n }\n\n equals(other: SkPath) {\n return this.ref.equals(JsiSkPath.fromValue(other));\n }\n\n getBounds() {\n return new JsiSkRect(this.CanvasKit, this.ref.getBounds());\n }\n\n getFillType() {\n return this.ref.getFillType().value;\n }\n\n quadTo(x1: number, y1: number, x2: number, y2: number) {\n this.ref.quadTo(x1, y1, x2, y2);\n }\n\n addRect(rect: SkRect, isCCW?: boolean) {\n this.ref.addRect(JsiSkRect.fromValue(this.CanvasKit, rect), isCCW);\n }\n\n addRRect(rrect: SkRRect, isCCW?: boolean) {\n this.ref.addRRect(JsiSkRRect.fromValue(this.CanvasKit, rrect), isCCW);\n return this;\n }\n\n getPoint(index: number) {\n return new JsiSkPoint(this.CanvasKit, this.ref.getPoint(index));\n }\n\n isEmpty() {\n return this.ref.isEmpty();\n }\n\n isVolatile() {\n return this.ref.isVolatile();\n }\n\n addCircle(x: number, y: number, r: number) {\n this.ref.addCircle(x, y, r);\n return this;\n }\n\n getLastPt() {\n return new JsiSkPoint(\n this.CanvasKit,\n this.ref.getPoint(this.ref.countPoints() - 1)\n );\n }\n\n op(path: SkPath, op: PathOp) {\n return this.ref.op(JsiSkPath.fromValue(path), ckEnum(op));\n }\n\n simplify() {\n return this.ref.simplify();\n }\n\n toSVGString() {\n return this.ref.toSVGString();\n }\n\n trim(start: number, stop: number, isComplement: boolean) {\n const startT = pinT(start);\n const stopT = pinT(stop);\n if (startT === 0 && stopT === 1) {\n return this;\n }\n const result = this.ref.trim(startT, stopT, isComplement);\n return result === null ? result : this;\n }\n\n transform(m3: SkMatrix) {\n this.ref.transform(JsiSkMatrix.fromValue(m3));\n }\n\n interpolate(end: SkPath, t: number) {\n const path = this.CanvasKit.Path.MakeFromPathInterpolation(\n this.ref,\n JsiSkPath.fromValue(end),\n t\n );\n if (path === null) {\n return null;\n }\n return new JsiSkPath(this.CanvasKit, path);\n }\n\n isInterpolatable(path2: SkPath): boolean {\n return this.CanvasKit.Path.CanInterpolate(\n this.ref,\n JsiSkPath.fromValue(path2)\n );\n }\n\n toCmds() {\n const cmds = this.ref.toCmds();\n const result = cmds.reduce<PathCommand[]>((acc, cmd, i) => {\n if (i === 0) {\n acc.push([]);\n }\n const current = acc[acc.length - 1];\n if (current.length === 0) {\n current.push(cmd);\n const length = CommandCount[current[0] as PathVerb];\n if (current.length === length && i !== cmds.length - 1) {\n acc.push([]);\n }\n } else {\n const length = CommandCount[current[0] as PathVerb];\n if (current.length < length) {\n current.push(cmd);\n }\n if (current.length === length && i !== cmds.length - 1) {\n acc.push([]);\n }\n }\n return acc;\n }, []);\n return result;\n }\n}\n"],"mappings":"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"}
@@ -1,11 +1,11 @@
1
- import type { SkTextBlob, SkPoint } from "../../../skia/types";
1
+ import type { SkTextBlob, SkPoint, SkFont } from "../../../skia/types";
2
2
  import type { DrawingContext, TextBlobProps, TextPathProps, TextProps } from "../../types";
3
3
  import type { GlyphsProps } from "../../types/Drawings";
4
4
  import { JsiDrawingNode } from "../DrawingNode";
5
5
  import type { NodeContext } from "../Node";
6
- export declare class TextNode extends JsiDrawingNode<TextProps, null> {
6
+ export declare class TextNode extends JsiDrawingNode<TextProps, SkFont | null> {
7
7
  constructor(ctx: NodeContext, props: TextProps);
8
- protected deriveProps(): null;
8
+ protected deriveProps(): SkFont | null;
9
9
  draw({ canvas, paint }: DrawingContext): void;
10
10
  }
11
11
  export declare class TextPathNode extends JsiDrawingNode<TextPathProps, SkTextBlob | null> {
@@ -48,6 +48,7 @@ export interface PaintProps extends ChildrenProps {
48
48
  strokeMiter?: number;
49
49
  opacity?: number;
50
50
  antiAlias?: boolean;
51
+ dither?: boolean;
51
52
  }
52
53
  export interface GroupProps extends PaintProps, TransformProps {
53
54
  clip?: ClipDef;
@@ -70,7 +70,7 @@ export interface DiffRectProps extends DrawingNodeProps {
70
70
  outer: SkRRect;
71
71
  }
72
72
  export interface TextProps extends DrawingNodeProps {
73
- font: SkFont | null;
73
+ font?: SkFont | null;
74
74
  text: string;
75
75
  x: number;
76
76
  y: number;
@@ -10,10 +10,19 @@ export interface FontMetrics {
10
10
  bounds?: SkRect;
11
11
  }
12
12
  export interface SkFont extends SkJSIInstance<"Font"> {
13
+ /**
14
+ * Returns the advance width of text.
15
+ * The advance is the normal distance to move before drawing additional text.
16
+ * Returns the bounding box of text
17
+ * @param text
18
+ * @param paint
19
+ */
20
+ measureText(text: string, paint?: SkPaint): SkRect;
13
21
  /**
14
22
  * Retrieves the total width of the provided text
15
23
  * @param text
16
24
  * @param paint
25
+ * @deprecated Use measureText or getGlyphWidths instead
17
26
  */
18
27
  getTextWidth(text: string, paint?: SkPaint): number;
19
28
  /**
@@ -18,17 +18,18 @@ export declare enum ColorType {
18
18
  BGRA_1010102 = 8,
19
19
  RGB_101010x = 9,
20
20
  BGR_101010x = 10,
21
- Gray_8 = 11,
22
- RGBA_F16Norm = 12,
23
- RGBA_F16 = 13,
24
- RGBA_F32 = 14,
25
- R8G8_unorm = 15,
26
- A16_float = 16,
27
- R16G16_float = 17,
28
- A16_unorm = 18,
29
- R16G16_unorm = 19,
30
- R16G16B16A16_unorm = 20,
31
- SRGBA_8888 = 21
21
+ BGR_101010x_XR = 11,
22
+ Gray_8 = 12,
23
+ RGBA_F16Norm = 13,
24
+ RGBA_F16 = 14,
25
+ RGBA_F32 = 15,
26
+ R8G8_unorm = 16,
27
+ A16_float = 17,
28
+ R16G16_float = 18,
29
+ A16_unorm = 19,
30
+ R16G16_unorm = 20,
31
+ R16G16B16A16_unorm = 21,
32
+ SRGBA_8888 = 22
32
33
  }
33
34
  export interface ImageInfo {
34
35
  alphaType: AlphaType;
@@ -67,6 +67,11 @@ export interface SkPaint extends SkJSIInstance<"Paint"> {
67
67
  * @param aa
68
68
  */
69
69
  setAntiAlias: (aa: boolean) => void;
70
+ /**
71
+ * Requests, but does not require, to distribute color error.
72
+ * @param dither
73
+ */
74
+ setDither: (dither: boolean) => void;
70
75
  /**
71
76
  * Sets the blend mode that is, the mode used to combine source color
72
77
  * with destination color.
@@ -1,10 +1,11 @@
1
1
  import type { CanvasKit, Font } from "canvaskit-wasm";
2
- import type { FontEdging, FontHinting, SkFont, SkPaint, SkPoint, SkTypeface } from "../types";
2
+ import type { FontEdging, FontHinting, SkFont, SkPaint, SkPoint, SkRect, SkTypeface } from "../types";
3
3
  import { HostObject } from "./Host";
4
4
  import { JsiSkRect } from "./JsiSkRect";
5
5
  import { JsiSkTypeface } from "./JsiSkTypeface";
6
6
  export declare class JsiSkFont extends HostObject<Font, "Font"> implements SkFont {
7
7
  constructor(CanvasKit: CanvasKit, ref: Font);
8
+ measureText(_text: string, _paint?: SkPaint | undefined): SkRect;
8
9
  dispose: () => void;
9
10
  getTextWidth(text: string, paint?: SkPaint | undefined): number;
10
11
  getMetrics(): {
@@ -14,6 +14,7 @@ export declare class JsiSkPaint extends HostObject<Paint, "Paint"> implements Sk
14
14
  getStrokeWidth(): number;
15
15
  setAlphaf(alpha: number): void;
16
16
  setAntiAlias(aa: boolean): void;
17
+ setDither(dither: boolean): void;
17
18
  setBlendMode(blendMode: BlendMode): void;
18
19
  setColor(color: SkColor): void;
19
20
  setColorFilter(filter: SkColorFilter | null): void;
@@ -50,7 +50,7 @@ export declare class JsiSkPath extends HostObject<Path, "Path"> implements SkPat
50
50
  op(path: SkPath, op: PathOp): boolean;
51
51
  simplify(): boolean;
52
52
  toSVGString(): string;
53
- trim(startT: number, stopT: number, isComplement: boolean): this | null;
53
+ trim(start: number, stop: number, isComplement: boolean): this | null;
54
54
  transform(m3: SkMatrix): void;
55
55
  interpolate(end: SkPath, t: number): JsiSkPath | null;
56
56
  isInterpolatable(path2: SkPath): boolean;
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "setup-skia-web": "./scripts/setup-canvaskit.js"
8
8
  },
9
9
  "title": "React Native Skia",
10
- "version": "0.1.208",
10
+ "version": "0.1.210",
11
11
  "description": "High-performance React Native Graphics using Skia",
12
12
  "main": "lib/module/index.js",
13
13
  "files": [
@@ -104,7 +104,7 @@
104
104
  "ws": "^8.11.0"
105
105
  },
106
106
  "dependencies": {
107
- "canvaskit-wasm": "0.38.0",
107
+ "canvaskit-wasm": "0.38.2",
108
108
  "react-reconciler": "^0.27.0"
109
109
  },
110
110
  "eslintIgnore": [
@@ -26,6 +26,7 @@ export class PaintNode
26
26
  strokeMiter,
27
27
  opacity,
28
28
  antiAlias,
29
+ dither,
29
30
  } = this.props;
30
31
  const paint = this.Skia.Paint();
31
32
  if (color !== undefined) {
@@ -55,6 +56,9 @@ export class PaintNode
55
56
  if (antiAlias !== undefined) {
56
57
  paint.setAntiAlias(antiAlias);
57
58
  }
59
+ if (dither !== undefined) {
60
+ paint.setDither(dither);
61
+ }
58
62
  ctx.save();
59
63
  this._children.forEach((child) => {
60
64
  if (child instanceof JsiDeclarationNode) {
@@ -27,6 +27,7 @@ const paintProps = [
27
27
  "strokeMiter",
28
28
  "style",
29
29
  "antiAlias",
30
+ "dither",
30
31
  "opacity",
31
32
  ];
32
33
 
@@ -1,4 +1,9 @@
1
- import type { SkRSXform, SkTextBlob, SkPoint } from "../../../skia/types";
1
+ import type {
2
+ SkRSXform,
3
+ SkTextBlob,
4
+ SkPoint,
5
+ SkFont,
6
+ } from "../../../skia/types";
2
7
  import type {
3
8
  DrawingContext,
4
9
  TextBlobProps,
@@ -11,18 +16,39 @@ import type { GlyphsProps } from "../../types/Drawings";
11
16
  import { JsiDrawingNode } from "../DrawingNode";
12
17
  import type { NodeContext } from "../Node";
13
18
 
14
- export class TextNode extends JsiDrawingNode<TextProps, null> {
19
+ export class TextNode extends JsiDrawingNode<TextProps, SkFont | null> {
15
20
  constructor(ctx: NodeContext, props: TextProps) {
16
21
  super(ctx, NodeType.Text, props);
17
22
  }
18
23
 
19
24
  protected deriveProps() {
20
- return null;
25
+ const { font } = this.props;
26
+ if (font === null) {
27
+ return null;
28
+ } else if (font === undefined) {
29
+ console.warn(
30
+ "<Text />: the font property is mandatory on React Native Web"
31
+ );
32
+ return null;
33
+ // return this.Skia.Font(
34
+ // this.Skia.FontMgr.System().matchFamilyStyle("System", {
35
+ // width: 5,
36
+ // weight: 400,
37
+ // slant: 0,
38
+ // }),
39
+ // 14
40
+ // );
41
+ }
42
+ return font;
21
43
  }
22
44
 
23
45
  draw({ canvas, paint }: DrawingContext) {
24
- const { text, x, y, font } = this.props;
25
- if (font) {
46
+ const { text, x, y } = this.props;
47
+ const font = this.derived;
48
+ if (font === undefined) {
49
+ throw new Error("TextNode: font hasn't been derived");
50
+ }
51
+ if (font != null) {
26
52
  canvas.drawText(text, x, y, paint, font);
27
53
  }
28
54
  }
@@ -79,6 +79,7 @@ export interface PaintProps extends ChildrenProps {
79
79
  strokeMiter?: number;
80
80
  opacity?: number;
81
81
  antiAlias?: boolean;
82
+ dither?: boolean;
82
83
  }
83
84
 
84
85
  export interface GroupProps extends PaintProps, TransformProps {
@@ -76,6 +76,7 @@ class ConcatablePaint {
76
76
  _strokeMiter?: number;
77
77
  _opacity = 1;
78
78
  _antiAlias?: boolean;
79
+ _dither?: boolean;
79
80
 
80
81
  _imageFilter?: SkImageFilter;
81
82
  _shader?: SkShader;
@@ -97,6 +98,7 @@ class ConcatablePaint {
97
98
  this.setStrokeMiter(props.strokeMiter);
98
99
  this.setOpacity(props.opacity);
99
100
  this.setAntiAlias(props.antiAlias);
101
+ this.setDither(props.dither);
100
102
  declCtx.save();
101
103
  children.forEach((child) => {
102
104
  if (child instanceof JsiDeclarationNode) {
@@ -215,6 +217,14 @@ class ConcatablePaint {
215
217
  return this._antiAlias;
216
218
  }
217
219
 
220
+ setDither(dither?: boolean) {
221
+ this.setValue("_dither", dither);
222
+ }
223
+
224
+ getDither() {
225
+ return this._dither;
226
+ }
227
+
218
228
  setImageFilter(imageFilter?: SkImageFilter) {
219
229
  this.setValue("_imageFilter", imageFilter);
220
230
  }
@@ -290,6 +300,9 @@ class ConcatablePaint {
290
300
  if (this._antiAlias !== undefined) {
291
301
  paint.setAntiAlias(this._antiAlias);
292
302
  }
303
+ if (this._dither !== undefined) {
304
+ paint.setDither(this._dither);
305
+ }
293
306
  if (this._imageFilter !== undefined) {
294
307
  paint.setImageFilter(this._imageFilter);
295
308
  }
@@ -114,7 +114,7 @@ export interface DiffRectProps extends DrawingNodeProps {
114
114
  }
115
115
 
116
116
  export interface TextProps extends DrawingNodeProps {
117
- font: SkFont | null;
117
+ font?: SkFont | null;
118
118
  text: string;
119
119
  x: number;
120
120
  y: number;
@@ -12,10 +12,20 @@ export interface FontMetrics {
12
12
  }
13
13
 
14
14
  export interface SkFont extends SkJSIInstance<"Font"> {
15
+ /**
16
+ * Returns the advance width of text.
17
+ * The advance is the normal distance to move before drawing additional text.
18
+ * Returns the bounding box of text
19
+ * @param text
20
+ * @param paint
21
+ */
22
+ measureText(text: string, paint?: SkPaint): SkRect;
23
+
15
24
  /**
16
25
  * Retrieves the total width of the provided text
17
26
  * @param text
18
27
  * @param paint
28
+ * @deprecated Use measureText or getGlyphWidths instead
19
29
  */
20
30
  getTextWidth(text: string, paint?: SkPaint): number;
21
31
 
@@ -21,6 +21,7 @@ export enum ColorType {
21
21
  BGRA_1010102, //!< 10 bits for blue, green, red; 2 bits for alpha; in 32-bit word
22
22
  RGB_101010x, //!< pixel with 10 bits each for red, green, blue; in 32-bit word
23
23
  BGR_101010x, //!< pixel with 10 bits each for blue, green, red; in 32-bit word
24
+ BGR_101010x_XR, //!< pixel with 10 bits each for blue, green, red; in 32-bit word, extended range
24
25
  Gray_8, //!< pixel with grayscale level in 8-bit byte
25
26
  RGBA_F16Norm, //!< pixel with half floats in [0,1] for red, green, blue, alpha;
26
27
  // in 64-bit word
@@ -84,6 +84,12 @@ export interface SkPaint extends SkJSIInstance<"Paint"> {
84
84
  */
85
85
  setAntiAlias: (aa: boolean) => void;
86
86
 
87
+ /**
88
+ * Requests, but does not require, to distribute color error.
89
+ * @param dither
90
+ */
91
+ setDither: (dither: boolean) => void;
92
+
87
93
  /**
88
94
  * Sets the blend mode that is, the mode used to combine source color
89
95
  * with destination color.
@@ -6,10 +6,11 @@ import type {
6
6
  SkFont,
7
7
  SkPaint,
8
8
  SkPoint,
9
+ SkRect,
9
10
  SkTypeface,
10
11
  } from "../types";
11
12
 
12
- import { HostObject, ckEnum } from "./Host";
13
+ import { HostObject, NotImplementedOnRNWeb, ckEnum } from "./Host";
13
14
  import { JsiSkPaint } from "./JsiSkPaint";
14
15
  import { JsiSkPoint } from "./JsiSkPoint";
15
16
  import { JsiSkRect } from "./JsiSkRect";
@@ -20,6 +21,10 @@ export class JsiSkFont extends HostObject<Font, "Font"> implements SkFont {
20
21
  super(CanvasKit, ref, "Font");
21
22
  }
22
23
 
24
+ measureText(_text: string, _paint?: SkPaint | undefined): SkRect {
25
+ throw new NotImplementedOnRNWeb();
26
+ }
27
+
23
28
  dispose = () => {
24
29
  this.ref.delete();
25
30
  };
@@ -70,6 +70,10 @@ export class JsiSkPaint extends HostObject<Paint, "Paint"> implements SkPaint {
70
70
  this.ref.setAntiAlias(aa);
71
71
  }
72
72
 
73
+ setDither(dither: boolean) {
74
+ this.ref.setDither(dither);
75
+ }
76
+
73
77
  setBlendMode(blendMode: BlendMode) {
74
78
  this.ref.setBlendMode(ckEnum(blendMode));
75
79
  }
@@ -28,6 +28,8 @@ const CommandCount = {
28
28
  [PathVerb.Close]: 1,
29
29
  };
30
30
 
31
+ const pinT = (t: number) => Math.min(Math.max(t, 0), 1);
32
+
31
33
  export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
32
34
  constructor(CanvasKit: CanvasKit, ref: Path) {
33
35
  super(CanvasKit, ref, "Path");
@@ -317,7 +319,12 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
317
319
  return this.ref.toSVGString();
318
320
  }
319
321
 
320
- trim(startT: number, stopT: number, isComplement: boolean) {
322
+ trim(start: number, stop: number, isComplement: boolean) {
323
+ const startT = pinT(start);
324
+ const stopT = pinT(stop);
325
+ if (startT === 0 && stopT === 1) {
326
+ return this;
327
+ }
321
328
  const result = this.ref.trim(startT, stopT, isComplement);
322
329
  return result === null ? result : this;
323
330
  }