@shopify/react-native-skia 0.1.163 → 0.1.164

package/lib/commonjs/dom/nodes/paint/Shaders.js

@@ -11,8 +11,6 @@ var _Node = require("../Node");
 
 var _types2 = require("../../types");
 
-var _Color = require("../datatypes/Color");
-
 var _datatypes = require("../datatypes");
 
 class ShaderDeclaration extends _Node.JsiDeclarationNode {
@@ -90,7 +88,7 @@ class ColorNode extends ShaderDeclaration {
     const {
       color
     } = this.props;
-    return this.Skia.Shader.MakeColor((0, _Color.processColor)(this.Skia, color, 1));
+    return this.Skia.Shader.MakeColor(this.Skia.Color(color));
   }
 
 }

package/lib/commonjs/dom/nodes/paint/Shaders.js.map

@@ -1 +1 @@
-{"version":3,"names":["ShaderDeclaration","JsiDeclarationNode","constructor","ctx","type","props","DeclarationType","Shader","ShaderNode","NodeType","materialize","source","uniforms","transform","m3","Skia","Matrix","processTransformProps","makeShaderWithChildren","processUniforms","children","filter","child","isShader","map","ImageShaderNode","ImageShader","fit","image","tx","ty","fm","mm","imageShaderProps","rct","getRect","rects","fitRects","x","y","width","height","rect2rect","src","dst","lm","makeShaderOptions","TileMode","enumKey","FilterMode","MipmapMode","ColorNode","ColorShader","color","MakeColor","processColor","TurbulenceNode","Turbulence","freqX","freqY","octaves","seed","tileWidth","tileHeight","MakeTurbulence","FractalNoiseNode","FractalNoise","MakeFractalNoise","LinearGradientNode","LinearGradient","start","end","colors","positions","mode","localMatrix","flags","processGradientProps","MakeLinearGradient","RadialGradientNode","RadialGradient","c","r","MakeRadialGradient","SweepGradientNode","SweepGradient","MakeSweepGradient","TwoPointConicalGradientNode","TwoPointConicalGradient","startR","endR","MakeTwoPointConicalGradient"],"sources":["Shaders.ts"],"sourcesContent":["import {\n  processUniforms,\n  FilterMode,\n  MipmapMode,\n  TileMode,\n} from \"../../../skia/types\";\nimport type { SkShader } from \"../../../skia/types\";\nimport type { NodeContext } from \"../Node\";\nimport { JsiDeclarationNode } from \"../Node\";\nimport type {\n  ColorProps,\n  FractalNoiseProps,\n  ImageShaderProps,\n  LinearGradientProps,\n  RadialGradientProps,\n  ShaderProps,\n  SweepGradientProps,\n  TurbulenceProps,\n  TwoPointConicalGradientProps,\n} from \"../../types\";\nimport { DeclarationType, NodeType } from \"../../types\";\nimport { processColor } from \"../datatypes/Color\";\nimport {\n  enumKey,\n  fitRects,\n  getRect,\n  processGradientProps,\n  processTransformProps,\n  rect2rect,\n} from \"../datatypes\";\n\nexport abstract class ShaderDeclaration<P> extends JsiDeclarationNode<\n  P,\n  SkShader\n> {\n  constructor(ctx: NodeContext, type: NodeType, props: P) {\n    super(ctx, DeclarationType.Shader, type, props);\n  }\n}\n\nexport class ShaderNode extends ShaderDeclaration<ShaderProps> {\n  constructor(ctx: NodeContext, props: ShaderProps) {\n    super(ctx, NodeType.Shader, props);\n  }\n\n  materialize() {\n    const { source, uniforms, ...transform } = this.props;\n    const m3 = this.Skia.Matrix();\n    processTransformProps(m3, transform);\n    return source.makeShaderWithChildren(\n      processUniforms(source, uniforms),\n      this.children()\n        .filter(\n          (child): child is JsiDeclarationNode<unknown, SkShader> =>\n            child instanceof JsiDeclarationNode && child.isShader()\n        )\n        .map((child) => child.materialize()),\n      m3\n    );\n  }\n}\n\nexport class ImageShaderNode extends ShaderDeclaration<ImageShaderProps> {\n  constructor(ctx: NodeContext, props: ImageShaderProps) {\n    super(ctx, NodeType.ImageShader, props);\n  }\n\n  materialize() {\n    const { fit, image, tx, ty, fm, mm, ...imageShaderProps } = this.props;\n    const rct = getRect(this.Skia, imageShaderProps);\n    if (rct) {\n      const rects = fitRects(\n        fit,\n        { x: 0, y: 0, width: image.width(), height: image.height() },\n        rct\n      );\n      const m3 = rect2rect(rects.src, rects.dst);\n      imageShaderProps.transform = [\n        ...(imageShaderProps.transform ?? []),\n        ...m3,\n      ];\n    }\n    const lm = this.Skia.Matrix();\n    processTransformProps(lm, imageShaderProps);\n    return image.makeShaderOptions(\n      TileMode[enumKey(tx)],\n      TileMode[enumKey(ty)],\n      FilterMode[enumKey(fm)],\n      MipmapMode[enumKey(mm)],\n      lm\n    );\n  }\n}\n\nexport class ColorNode extends ShaderDeclaration<ColorProps> {\n  constructor(ctx: NodeContext, props: ColorProps) {\n    super(ctx, NodeType.ColorShader, props);\n  }\n\n  materialize() {\n    const { color } = this.props;\n    return this.Skia.Shader.MakeColor(processColor(this.Skia, color, 1));\n  }\n}\n\nexport class TurbulenceNode extends ShaderDeclaration<TurbulenceProps> {\n  constructor(ctx: NodeContext, props: TurbulenceProps) {\n    super(ctx, NodeType.Turbulence, props);\n  }\n\n  materialize() {\n    const { freqX, freqY, octaves, seed, tileWidth, tileHeight } = this.props;\n    return this.Skia.Shader.MakeTurbulence(\n      freqX,\n      freqY,\n      octaves,\n      seed,\n      tileWidth,\n      tileHeight\n    );\n  }\n}\n\nexport class FractalNoiseNode extends ShaderDeclaration<FractalNoiseProps> {\n  constructor(ctx: NodeContext, props: FractalNoiseProps) {\n    super(ctx, NodeType.FractalNoise, props);\n  }\n\n  materialize() {\n    const { freqX, freqY, octaves, seed, tileWidth, tileHeight } = this.props;\n    return this.Skia.Shader.MakeFractalNoise(\n      freqX,\n      freqY,\n      octaves,\n      seed,\n      tileWidth,\n      tileHeight\n    );\n  }\n}\n\nexport class LinearGradientNode extends ShaderDeclaration<LinearGradientProps> {\n  constructor(ctx: NodeContext, props: LinearGradientProps) {\n    super(ctx, NodeType.LinearGradient, props);\n  }\n\n  materialize() {\n    const { start, end } = this.props;\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(this.Skia, this.props);\n    return this.Skia.Shader.MakeLinearGradient(\n      start,\n      end,\n      colors,\n      positions ?? null,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n}\n\nexport class RadialGradientNode extends ShaderDeclaration<RadialGradientProps> {\n  constructor(ctx: NodeContext, props: RadialGradientProps) {\n    super(ctx, NodeType.RadialGradient, props);\n  }\n\n  materialize() {\n    const { c, r } = this.props;\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(this.Skia, this.props);\n    return this.Skia.Shader.MakeRadialGradient(\n      c,\n      r,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n}\n\nexport class SweepGradientNode extends ShaderDeclaration<SweepGradientProps> {\n  constructor(ctx: NodeContext, props: SweepGradientProps) {\n    super(ctx, NodeType.SweepGradient, props);\n  }\n\n  materialize() {\n    const { c, start, end } = this.props;\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(this.Skia, this.props);\n    return this.Skia.Shader.MakeSweepGradient(\n      c.x,\n      c.y,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags,\n      start,\n      end\n    );\n  }\n}\n\nexport class TwoPointConicalGradientNode extends ShaderDeclaration<TwoPointConicalGradientProps> {\n  constructor(ctx: NodeContext, props: TwoPointConicalGradientProps) {\n    super(ctx, NodeType.TwoPointConicalGradient, props);\n  }\n\n  materialize() {\n    const { startR, endR, start, end } = this.props;\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(this.Skia, this.props);\n    return this.Skia.Shader.MakeTwoPointConicalGradient(\n      start,\n      startR,\n      end,\n      endR,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["ShaderDeclaration","JsiDeclarationNode","constructor","ctx","type","props","DeclarationType","Shader","ShaderNode","NodeType","materialize","source","uniforms","transform","m3","Skia","Matrix","processTransformProps","makeShaderWithChildren","processUniforms","children","filter","child","isShader","map","ImageShaderNode","ImageShader","fit","image","tx","ty","fm","mm","imageShaderProps","rct","getRect","rects","fitRects","x","y","width","height","rect2rect","src","dst","lm","makeShaderOptions","TileMode","enumKey","FilterMode","MipmapMode","ColorNode","ColorShader","color","MakeColor","Color","TurbulenceNode","Turbulence","freqX","freqY","octaves","seed","tileWidth","tileHeight","MakeTurbulence","FractalNoiseNode","FractalNoise","MakeFractalNoise","LinearGradientNode","LinearGradient","start","end","colors","positions","mode","localMatrix","flags","processGradientProps","MakeLinearGradient","RadialGradientNode","RadialGradient","c","r","MakeRadialGradient","SweepGradientNode","SweepGradient","MakeSweepGradient","TwoPointConicalGradientNode","TwoPointConicalGradient","startR","endR","MakeTwoPointConicalGradient"],"sources":["Shaders.ts"],"sourcesContent":["import {\n  processUniforms,\n  FilterMode,\n  MipmapMode,\n  TileMode,\n} from \"../../../skia/types\";\nimport type { SkShader } from \"../../../skia/types\";\nimport type { NodeContext } from \"../Node\";\nimport { JsiDeclarationNode } from \"../Node\";\nimport type {\n  ColorProps,\n  FractalNoiseProps,\n  ImageShaderProps,\n  LinearGradientProps,\n  RadialGradientProps,\n  ShaderProps,\n  SweepGradientProps,\n  TurbulenceProps,\n  TwoPointConicalGradientProps,\n} from \"../../types\";\nimport { DeclarationType, NodeType } from \"../../types\";\nimport {\n  enumKey,\n  fitRects,\n  getRect,\n  processGradientProps,\n  processTransformProps,\n  rect2rect,\n} from \"../datatypes\";\n\nexport abstract class ShaderDeclaration<P> extends JsiDeclarationNode<\n  P,\n  SkShader\n> {\n  constructor(ctx: NodeContext, type: NodeType, props: P) {\n    super(ctx, DeclarationType.Shader, type, props);\n  }\n}\n\nexport class ShaderNode extends ShaderDeclaration<ShaderProps> {\n  constructor(ctx: NodeContext, props: ShaderProps) {\n    super(ctx, NodeType.Shader, props);\n  }\n\n  materialize() {\n    const { source, uniforms, ...transform } = this.props;\n    const m3 = this.Skia.Matrix();\n    processTransformProps(m3, transform);\n    return source.makeShaderWithChildren(\n      processUniforms(source, uniforms),\n      this.children()\n        .filter(\n          (child): child is JsiDeclarationNode<unknown, SkShader> =>\n            child instanceof JsiDeclarationNode && child.isShader()\n        )\n        .map((child) => child.materialize()),\n      m3\n    );\n  }\n}\n\nexport class ImageShaderNode extends ShaderDeclaration<ImageShaderProps> {\n  constructor(ctx: NodeContext, props: ImageShaderProps) {\n    super(ctx, NodeType.ImageShader, props);\n  }\n\n  materialize() {\n    const { fit, image, tx, ty, fm, mm, ...imageShaderProps } = this.props;\n    const rct = getRect(this.Skia, imageShaderProps);\n    if (rct) {\n      const rects = fitRects(\n        fit,\n        { x: 0, y: 0, width: image.width(), height: image.height() },\n        rct\n      );\n      const m3 = rect2rect(rects.src, rects.dst);\n      imageShaderProps.transform = [\n        ...(imageShaderProps.transform ?? []),\n        ...m3,\n      ];\n    }\n    const lm = this.Skia.Matrix();\n    processTransformProps(lm, imageShaderProps);\n    return image.makeShaderOptions(\n      TileMode[enumKey(tx)],\n      TileMode[enumKey(ty)],\n      FilterMode[enumKey(fm)],\n      MipmapMode[enumKey(mm)],\n      lm\n    );\n  }\n}\n\nexport class ColorNode extends ShaderDeclaration<ColorProps> {\n  constructor(ctx: NodeContext, props: ColorProps) {\n    super(ctx, NodeType.ColorShader, props);\n  }\n\n  materialize() {\n    const { color } = this.props;\n    return this.Skia.Shader.MakeColor(this.Skia.Color(color));\n  }\n}\n\nexport class TurbulenceNode extends ShaderDeclaration<TurbulenceProps> {\n  constructor(ctx: NodeContext, props: TurbulenceProps) {\n    super(ctx, NodeType.Turbulence, props);\n  }\n\n  materialize() {\n    const { freqX, freqY, octaves, seed, tileWidth, tileHeight } = this.props;\n    return this.Skia.Shader.MakeTurbulence(\n      freqX,\n      freqY,\n      octaves,\n      seed,\n      tileWidth,\n      tileHeight\n    );\n  }\n}\n\nexport class FractalNoiseNode extends ShaderDeclaration<FractalNoiseProps> {\n  constructor(ctx: NodeContext, props: FractalNoiseProps) {\n    super(ctx, NodeType.FractalNoise, props);\n  }\n\n  materialize() {\n    const { freqX, freqY, octaves, seed, tileWidth, tileHeight } = this.props;\n    return this.Skia.Shader.MakeFractalNoise(\n      freqX,\n      freqY,\n      octaves,\n      seed,\n      tileWidth,\n      tileHeight\n    );\n  }\n}\n\nexport class LinearGradientNode extends ShaderDeclaration<LinearGradientProps> {\n  constructor(ctx: NodeContext, props: LinearGradientProps) {\n    super(ctx, NodeType.LinearGradient, props);\n  }\n\n  materialize() {\n    const { start, end } = this.props;\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(this.Skia, this.props);\n    return this.Skia.Shader.MakeLinearGradient(\n      start,\n      end,\n      colors,\n      positions ?? null,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n}\n\nexport class RadialGradientNode extends ShaderDeclaration<RadialGradientProps> {\n  constructor(ctx: NodeContext, props: RadialGradientProps) {\n    super(ctx, NodeType.RadialGradient, props);\n  }\n\n  materialize() {\n    const { c, r } = this.props;\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(this.Skia, this.props);\n    return this.Skia.Shader.MakeRadialGradient(\n      c,\n      r,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n}\n\nexport class SweepGradientNode extends ShaderDeclaration<SweepGradientProps> {\n  constructor(ctx: NodeContext, props: SweepGradientProps) {\n    super(ctx, NodeType.SweepGradient, props);\n  }\n\n  materialize() {\n    const { c, start, end } = this.props;\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(this.Skia, this.props);\n    return this.Skia.Shader.MakeSweepGradient(\n      c.x,\n      c.y,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags,\n      start,\n      end\n    );\n  }\n}\n\nexport class TwoPointConicalGradientNode extends ShaderDeclaration<TwoPointConicalGradientProps> {\n  constructor(ctx: NodeContext, props: TwoPointConicalGradientProps) {\n    super(ctx, NodeType.TwoPointConicalGradient, props);\n  }\n\n  materialize() {\n    const { startR, endR, start, end } = this.props;\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(this.Skia, this.props);\n    return this.Skia.Shader.MakeTwoPointConicalGradient(\n      start,\n      startR,\n      end,\n      endR,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n}\n"],"mappings":"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"}

package/lib/commonjs/dom/types/DrawingContext.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["DrawingContext.ts"],"sourcesContent":["import type { SkCanvas, SkPaint } from \"../../skia/types\";\n\nexport interface DrawingContext {\n  canvas: SkCanvas;\n  paint: SkPaint;\n  opacity: number;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["DrawingContext.ts"],"sourcesContent":["import type { SkCanvas, SkPaint } from \"../../skia/types\";\n\nexport interface DrawingContext {\n  canvas: SkCanvas;\n  paint: SkPaint;\n}\n"],"mappings":""}

package/lib/commonjs/renderer/DrawingContext.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["DrawingContext.ts"],"sourcesContent":["import type { RefObject } from \"react\";\n\nimport type { DrawingInfo, SkiaView } from \"../views\";\nimport type { SkCanvas, SkPaint, Skia, Vector } from \"../skia/types\";\n\nexport interface DrawingContext extends Omit<DrawingInfo, \"touches\"> {\n  canvas: SkCanvas;\n  paint: SkPaint;\n  opacity: number;\n  center: Vector;\n  ref: RefObject<SkiaView>;\n  Skia: Skia;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["DrawingContext.ts"],"sourcesContent":["import type { RefObject } from \"react\";\n\nimport type { DrawingInfo, SkiaView } from \"../views\";\nimport type { Skia, Vector } from \"../skia/types\";\nimport type { DrawingContext as DOMDrawingContext } from \"../dom/types\";\n\nexport interface DrawingContext\n  extends Omit<DrawingInfo, \"touches\">,\n    DOMDrawingContext {\n  center: Vector;\n  ref: RefObject<SkiaView>;\n  Skia: Skia;\n}\n"],"mappings":""}

package/lib/commonjs/skia/types/Paint/Paint.js.map

@@ -1 +1 @@
-{"version":3,"names":["PaintStyle","StrokeCap","StrokeJoin","isPaint","obj","__typename__"],"sources":["Paint.ts"],"sourcesContent":["import type { SkImageFilter } from \"../ImageFilter\";\nimport type { SkMaskFilter } from \"../MaskFilter\";\nimport type { SkColorFilter } from \"../ColorFilter\";\nimport type { SkColor } from \"../Color\";\nimport type { SkPathEffect } from \"../PathEffect\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { BlendMode } from \"./BlendMode\";\n\nexport enum PaintStyle {\n  Fill,\n  Stroke,\n}\n\nexport enum StrokeCap {\n  Butt,\n  Round,\n  Square,\n}\n\nexport enum StrokeJoin {\n  Miter,\n  Round,\n  Bevel,\n}\n\nexport const isPaint = (obj: SkJSIInstance<string> | null): obj is SkPaint =>\n  obj !== null && obj.__typename__ === \"Paint\";\n\nexport interface SkPaint extends SkJSIInstance<\"Paint\"> {\n  /**\n   * Returns a copy of this paint.\n   */\n  copy(): SkPaint;\n\n  /**\n   * Sets all SkPaint contents to their initial values. This is equivalent to replacing\n     SkPaint with the result of SkPaint().\n   */\n  reset(): void;\n\n  /**\n   * Retrieves the alpha and RGB unpremultiplied. RGB are extended sRGB values\n   * (sRGB gamut, and encoded with the sRGB transfer function).\n   */\n  getColor(): SkColor;\n\n  /**\n   * Returns the geometry drawn at the beginning and end of strokes.\n   */\n  getStrokeCap(): StrokeCap;\n\n  /**\n   * Returns the geometry drawn at the corners of strokes.\n   */\n  getStrokeJoin(): StrokeJoin;\n\n  /**\n   *  Returns the limit at which a sharp corner is drawn beveled.\n   */\n  getStrokeMiter(): number;\n\n  /**\n   * Returns the thickness of the pen used to outline the shape.\n   */\n  getStrokeWidth(): number;\n\n  /**\n   * Replaces alpha, leaving RGBA unchanged. 0 means fully transparent, 1.0 means opaque.\n   * @param alpha\n   */\n  setAlphaf(alpha: number): void;\n\n  /**\n   * Requests, but does not require, that edge pixels draw opaque or with\n   * partial transparency.\n   * @param aa\n   */\n  setAntiAlias: (aa: boolean) => void;\n\n  /**\n   * Sets the blend mode that is, the mode used to combine source color\n   * with destination color.\n   * @param mode\n   */\n  setBlendMode: (blendMode: BlendMode) => void;\n\n  /**\n   *  Sets alpha and RGB used when stroking and filling. The color is a 32-bit\n   *  value, unpremultiplied, packing 8-bit components for alpha, red, blue,\n   *  and green.\n   *\n   *   @param color  unpremultiplied ARGB\n   *\n   *    example: https://fiddle.skia.org/c/@Paint_setColor\n   */\n  setColor(color: SkColor): void;\n\n  /**\n   * Sets the current color filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setColorFilter(filter: SkColorFilter | null): void;\n\n  /**\n   * Sets the current image filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setImageFilter(filter: SkImageFilter | null): void;\n\n  /**\n   * Sets the current mask filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setMaskFilter(filter: SkMaskFilter | null): void;\n\n  /**\n   * Sets the current path effect, replacing the existing one if there was one.\n   * @param effect\n   */\n  setPathEffect(effect: SkPathEffect | null): void;\n\n  /**\n   * Sets the current shader, replacing the existing one if there was one.\n   * @param shader\n   */\n  setShader(shader: SkShader | null): void;\n\n  /**\n   * Sets the geometry drawn at the beginning and end of strokes.\n   * @param cap\n   */\n  setStrokeCap(cap: StrokeCap): void;\n\n  /**\n   * Sets the geometry drawn at the corners of strokes.\n   * @param join\n   */\n  setStrokeJoin(join: StrokeJoin): void;\n\n  /**\n   * Sets the limit at which a sharp corner is drawn beveled.\n   * @param limit\n   */\n  setStrokeMiter(limit: number): void;\n\n  /**\n   * Sets the thickness of the pen used to outline the shape.\n   * @param width\n   */\n  setStrokeWidth(width: number): void;\n\n  /**\n   * Sets whether the geometry is filled or stroked.\n   * @param style\n   */\n  setStyle(style: PaintStyle): void;\n}\n"],"mappings":";;;;;;IAUYA,U;;;WAAAA,U;EAAAA,U,CAAAA,U;EAAAA,U,CAAAA,U;GAAAA,U,0BAAAA,U;;IAKAC,S;;;WAAAA,S;EAAAA,S,CAAAA,S;EAAAA,S,CAAAA,S;EAAAA,S,CAAAA,S;GAAAA,S,yBAAAA,S;;IAMAC,U;;;WAAAA,U;EAAAA,U,CAAAA,U;EAAAA,U,CAAAA,U;EAAAA,U,CAAAA,U;GAAAA,U,0BAAAA,U;;AAML,MAAMC,OAAO,GAAIC,GAAD,IACrBA,GAAG,KAAK,IAAR,IAAgBA,GAAG,CAACC,YAAJ,KAAqB,OADhC"}
+{"version":3,"names":["PaintStyle","StrokeCap","StrokeJoin","isPaint","obj","__typename__"],"sources":["Paint.ts"],"sourcesContent":["import type { SkImageFilter } from \"../ImageFilter\";\nimport type { SkMaskFilter } from \"../MaskFilter\";\nimport type { SkColorFilter } from \"../ColorFilter\";\nimport type { SkColor } from \"../Color\";\nimport type { SkPathEffect } from \"../PathEffect\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { BlendMode } from \"./BlendMode\";\n\nexport enum PaintStyle {\n  Fill,\n  Stroke,\n}\n\nexport enum StrokeCap {\n  Butt,\n  Round,\n  Square,\n}\n\nexport enum StrokeJoin {\n  Miter,\n  Round,\n  Bevel,\n}\n\nexport const isPaint = (obj: SkJSIInstance<string> | null): obj is SkPaint =>\n  obj !== null && obj.__typename__ === \"Paint\";\n\nexport interface SkPaint extends SkJSIInstance<\"Paint\"> {\n  /**\n   * Retrieves alpha from the color used when stroking and filling.\n   */\n  getAlphaf(): number;\n\n  /**\n   * Returns a copy of this paint.\n   */\n  copy(): SkPaint;\n\n  /**\n   * Sets all SkPaint contents to their initial values. This is equivalent to replacing\n     SkPaint with the result of SkPaint().\n   */\n  reset(): void;\n\n  /**\n   * Retrieves the alpha and RGB unpremultiplied. RGB are extended sRGB values\n   * (sRGB gamut, and encoded with the sRGB transfer function).\n   */\n  getColor(): SkColor;\n\n  /**\n   * Returns the geometry drawn at the beginning and end of strokes.\n   */\n  getStrokeCap(): StrokeCap;\n\n  /**\n   * Returns the geometry drawn at the corners of strokes.\n   */\n  getStrokeJoin(): StrokeJoin;\n\n  /**\n   *  Returns the limit at which a sharp corner is drawn beveled.\n   */\n  getStrokeMiter(): number;\n\n  /**\n   * Returns the thickness of the pen used to outline the shape.\n   */\n  getStrokeWidth(): number;\n\n  /**\n   * Replaces alpha, leaving RGBA unchanged. 0 means fully transparent, 1.0 means opaque.\n   * @param alpha\n   */\n  setAlphaf(alpha: number): void;\n\n  /**\n   * Requests, but does not require, that edge pixels draw opaque or with\n   * partial transparency.\n   * @param aa\n   */\n  setAntiAlias: (aa: boolean) => void;\n\n  /**\n   * Sets the blend mode that is, the mode used to combine source color\n   * with destination color.\n   * @param mode\n   */\n  setBlendMode: (blendMode: BlendMode) => void;\n\n  /**\n   *  Sets alpha and RGB used when stroking and filling. The color is a 32-bit\n   *  value, unpremultiplied, packing 8-bit components for alpha, red, blue,\n   *  and green.\n   *\n   *   @param color  unpremultiplied ARGB\n   *\n   *    example: https://fiddle.skia.org/c/@Paint_setColor\n   */\n  setColor(color: SkColor): void;\n\n  /**\n   * Sets the current color filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setColorFilter(filter: SkColorFilter | null): void;\n\n  /**\n   * Sets the current image filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setImageFilter(filter: SkImageFilter | null): void;\n\n  /**\n   * Sets the current mask filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setMaskFilter(filter: SkMaskFilter | null): void;\n\n  /**\n   * Sets the current path effect, replacing the existing one if there was one.\n   * @param effect\n   */\n  setPathEffect(effect: SkPathEffect | null): void;\n\n  /**\n   * Sets the current shader, replacing the existing one if there was one.\n   * @param shader\n   */\n  setShader(shader: SkShader | null): void;\n\n  /**\n   * Sets the geometry drawn at the beginning and end of strokes.\n   * @param cap\n   */\n  setStrokeCap(cap: StrokeCap): void;\n\n  /**\n   * Sets the geometry drawn at the corners of strokes.\n   * @param join\n   */\n  setStrokeJoin(join: StrokeJoin): void;\n\n  /**\n   * Sets the limit at which a sharp corner is drawn beveled.\n   * @param limit\n   */\n  setStrokeMiter(limit: number): void;\n\n  /**\n   * Sets the thickness of the pen used to outline the shape.\n   * @param width\n   */\n  setStrokeWidth(width: number): void;\n\n  /**\n   * Sets whether the geometry is filled or stroked.\n   * @param style\n   */\n  setStyle(style: PaintStyle): void;\n}\n"],"mappings":";;;;;;IAUYA,U;;;WAAAA,U;EAAAA,U,CAAAA,U;EAAAA,U,CAAAA,U;GAAAA,U,0BAAAA,U;;IAKAC,S;;;WAAAA,S;EAAAA,S,CAAAA,S;EAAAA,S,CAAAA,S;EAAAA,S,CAAAA,S;GAAAA,S,yBAAAA,S;;IAMAC,U;;;WAAAA,U;EAAAA,U,CAAAA,U;EAAAA,U,CAAAA,U;EAAAA,U,CAAAA,U;GAAAA,U,0BAAAA,U;;AAML,MAAMC,OAAO,GAAIC,GAAD,IACrBA,GAAG,KAAK,IAAR,IAAgBA,GAAG,CAACC,YAAJ,KAAqB,OADhC"}

package/lib/commonjs/skia/web/JsiSkPaint.js

@@ -30,6 +30,10 @@ class JsiSkPaint extends _Host.HostObject {
     this.ref = new this.CanvasKit.Paint();
   }
 
+  getAlphaf() {
+    return this.getColor()[3];
+  }
+
   getColor() {
     return this.ref.getColor();
   }

package/lib/commonjs/skia/web/JsiSkPaint.js.map

@@ -1 +1 @@
-{"version":3,"names":["JsiSkPaint","HostObject","constructor","CanvasKit","ref","copy","reset","Paint","getColor","getStrokeCap","value","getStrokeJoin","getStrokeMiter","getStrokeWidth","setAlphaf","alpha","setAntiAlias","aa","setBlendMode","blendMode","ckEnum","setColor","color","setColorFilter","filter","JsiSkColorFilter","fromValue","setImageFilter","JsiSkImageFilter","setMaskFilter","JsiSkMaskFilter","setPathEffect","effect","JsiSkPathEffect","setShader","shader","JsiSkShader","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  copy() {\n    return new JsiSkPaint(this.CanvasKit, this.ref.copy());\n  }\n\n  reset() {\n    this.ref = new this.CanvasKit.Paint();\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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"}
+{"version":3,"names":["JsiSkPaint","HostObject","constructor","CanvasKit","ref","copy","reset","Paint","getAlphaf","getColor","getStrokeCap","value","getStrokeJoin","getStrokeMiter","getStrokeWidth","setAlphaf","alpha","setAntiAlias","aa","setBlendMode","blendMode","ckEnum","setColor","color","setColorFilter","filter","JsiSkColorFilter","fromValue","setImageFilter","JsiSkImageFilter","setMaskFilter","JsiSkMaskFilter","setPathEffect","effect","JsiSkPathEffect","setShader","shader","JsiSkShader","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  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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"}

package/lib/commonjs/web/LoadSkiaWeb.js

@@ -10,7 +10,7 @@ var _canvaskit = _interopRequireDefault(require("canvaskit-wasm/bin/full/canvask
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
+// @ts-ignore
 const LoadSkiaWeb = async opts => {
   if (global.CanvasKit !== undefined) {
     return;

package/lib/commonjs/web/LoadSkiaWeb.js.map

@@ -1 +1 @@
-{"version":3,"names":["LoadSkiaWeb","opts","global","CanvasKit","undefined","CanvasKitInit","LoadSkia"],"sources":["LoadSkiaWeb.tsx"],"sourcesContent":["// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-expect-error\nimport CanvasKitInit from \"canvaskit-wasm/bin/full/canvaskit\";\nimport type {\n  CanvasKit as CanvasKitType,\n  CanvasKitInitOptions,\n} from \"canvaskit-wasm\";\n\ndeclare global {\n  var CanvasKit: CanvasKitType;\n}\n\nexport const LoadSkiaWeb = async (opts?: CanvasKitInitOptions) => {\n  if (global.CanvasKit !== undefined) {\n    return;\n  }\n  const CanvasKit = await CanvasKitInit(opts);\n  // The CanvasKit API is stored on the global object and used\n  // to create the JsiSKApi in the Skia.web.ts file.\n  global.CanvasKit = CanvasKit;\n};\n\n// We keep this function for backward compatibility\nexport const LoadSkia = LoadSkiaWeb;\n"],"mappings":";;;;;;;AAEA;;;;AAFA;AACA;AAWO,MAAMA,WAAW,GAAG,MAAOC,IAAP,IAAuC;EAChE,IAAIC,MAAM,CAACC,SAAP,KAAqBC,SAAzB,EAAoC;IAClC;EACD;;EACD,MAAMD,SAAS,GAAG,MAAM,IAAAE,kBAAA,EAAcJ,IAAd,CAAxB,CAJgE,CAKhE;EACA;;EACAC,MAAM,CAACC,SAAP,GAAmBA,SAAnB;AACD,CARM,C,CAUP;;;;AACO,MAAMG,QAAQ,GAAGN,WAAjB"}
+{"version":3,"names":["LoadSkiaWeb","opts","global","CanvasKit","undefined","CanvasKitInit","LoadSkia"],"sources":["LoadSkiaWeb.tsx"],"sourcesContent":["// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-ignore\nimport CanvasKitInit from \"canvaskit-wasm/bin/full/canvaskit\";\nimport type {\n  CanvasKit as CanvasKitType,\n  CanvasKitInitOptions,\n} from \"canvaskit-wasm\";\n\ndeclare global {\n  var CanvasKit: CanvasKitType;\n}\n\nexport const LoadSkiaWeb = async (opts?: CanvasKitInitOptions) => {\n  if (global.CanvasKit !== undefined) {\n    return;\n  }\n  const CanvasKit = await CanvasKitInit(opts);\n  // The CanvasKit API is stored on the global object and used\n  // to create the JsiSKApi in the Skia.web.ts file.\n  global.CanvasKit = CanvasKit;\n};\n\n// We keep this function for backward compatibility\nexport const LoadSkia = LoadSkiaWeb;\n"],"mappings":";;;;;;;AAEA;;;;AAFA;AACA;AAWO,MAAMA,WAAW,GAAG,MAAOC,IAAP,IAAuC;EAChE,IAAIC,MAAM,CAACC,SAAP,KAAqBC,SAAzB,EAAoC;IAClC;EACD;;EACD,MAAMD,SAAS,GAAG,MAAM,IAAAE,kBAAA,EAAcJ,IAAd,CAAxB,CAJgE,CAKhE;EACA;;EACAC,MAAM,CAACC,SAAP,GAAmBA,SAAnB;AACD,CARM,C,CAUP;;;;AACO,MAAMG,QAAQ,GAAGN,WAAjB"}

package/lib/module/dom/nodes/RenderNode.js

@@ -103,7 +103,9 @@ export class JsiRenderNode extends JsiNode {
     } = this.props;
 
     if (color !== undefined || strokeWidth !== undefined || blendMode !== undefined || style !== undefined || strokeJoin !== undefined || strokeCap !== undefined || strokeMiter !== undefined || opacity !== undefined || antiAlias !== undefined) {
-      ctx = {};
+      ctx = {
+        opacity: 1
+      };
 
       if (color !== undefined) {
         ctx.color = this.Skia.Color(color);
@@ -181,11 +183,10 @@ export class JsiRenderNode extends JsiNode {
     const {
       canvas
     } = parentCtx;
-    const opacity = this.props.opacity !== undefined ? parentCtx.opacity * this.props.opacity : parentCtx.opacity;
 
     if (this.paintCache === null || this.paintCache.parent !== parentCtx.paint) {
       const paintCtx = this.getPaintCtx();
-      const child = paintCtx ? concatPaint(parentCtx.paint, paintCtx, parentCtx.opacity) : parentCtx.paint;
+      const child = paintCtx ? concatPaint(parentCtx.paint.copy(), paintCtx) : parentCtx.paint;
       this.paintCache = {
         parent: parentCtx.paint,
         child
@@ -195,7 +196,6 @@ export class JsiRenderNode extends JsiNode {
     const paint = this.paintCache.child; // TODO: can we only recreate a new context here if needed?
 
     const ctx = { ...parentCtx,
-      opacity,
       paint
     };
     const hasTransform = matrix !== undefined || transform !== undefined;
@@ -236,7 +236,7 @@ export class JsiRenderNode extends JsiNode {
 
 }
 
-const concatPaint = (parent, _ref, opacity) => {
+const concatPaint = (paint, _ref) => {
   let {
     color,
     strokeWidth,
@@ -247,22 +247,22 @@ const concatPaint = (parent, _ref, opacity) => {
     imageFilter,
     maskFilter,
     pathEffect,
-    opacity: alpha,
+    opacity,
     strokeCap,
     strokeJoin,
     strokeMiter,
     style
   } = _ref;
-  const paint = parent.copy();
+
+  if (opacity !== undefined) {
+    paint.setAlphaf(paint.getAlphaf() * opacity);
+  }
 
   if (color !== undefined) {
+    const currentOpacity = paint.getAlphaf();
     paint.setShader(null);
-    color[3] *= opacity;
     paint.setColor(color);
-  } else {
-    const cl = paint.getColor();
-    cl[3] = opacity;
-    paint.setColor(cl);
+    paint.setAlphaf(currentOpacity * paint.getAlphaf());
   }
 
   if (strokeWidth !== undefined) {
@@ -297,10 +297,6 @@ const concatPaint = (parent, _ref, opacity) => {
     paint.setPathEffect(pathEffect);
   }
 
-  if (alpha !== undefined) {
-    paint.setAlphaf(alpha * opacity);
-  }
-
   if (strokeCap !== undefined) {
     paint.setStrokeCap(strokeCap);
   }

package/lib/module/dom/nodes/RenderNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["StrokeCap","StrokeJoin","PaintStyle","BlendMode","ClipOp","isRRect","isPathDef","processPath","processTransformProps","JsiNode","JsiDeclarationNode","enumKey","paintProps","JsiRenderNode","constructor","ctx","type","props","matrix","Skia","Matrix","onPropChange","setProps","paintCache","setProp","key","value","hasChanged","includes","identity","clipPath","undefined","clipRect","clipRRect","computeMatrix","computeClip","addChild","child","setInvalidate","insertChildBefore","before","clip","getPaintCtx","color","strokeWidth","blendMode","style","strokeJoin","strokeCap","strokeMiter","opacity","antiAlias","Color","_children","forEach","isColorFilter","cf","materialize","colorFilter","ColorFilter","MakeCompose","isShader","shader","isPathEffect","pe","pathEffect","PathEffect","isImageFilter","filter","imageFilter","ImageFilter","isMaskFilter","maskFilter","render","parentCtx","invertClip","layer","transform","canvas","parent","paint","paintCtx","concatPaint","hasTransform","hasClip","shouldSave","op","Difference","Intersect","saveLayer","save","concat","renderNode","restore","alpha","copy","setShader","setColor","cl","getColor","setStrokeWidth","setAntiAlias","setBlendMode","setColorFilter","setImageFilter","setMaskFilter","setPathEffect","setAlphaf","setStrokeCap","setStrokeJoin","setStrokeMiter","setStyle"],"sources":["RenderNode.ts"],"sourcesContent":["import type {\n  SkMatrix,\n  SkRect,\n  SkRRect,\n  SkPath,\n  SkPaint,\n} from \"../../skia/types\";\nimport {\n  StrokeCap,\n  StrokeJoin,\n  PaintStyle,\n  BlendMode,\n  ClipOp,\n  isRRect,\n} from \"../../skia/types\";\nimport type {\n  RenderNode,\n  GroupProps,\n  DrawingContext,\n  NodeType,\n  Node,\n} from \"../types\";\n\nimport { isPathDef, processPath, processTransformProps } from \"./datatypes\";\nimport type { NodeContext } from \"./Node\";\nimport { JsiNode, JsiDeclarationNode } from \"./Node\";\nimport type { PaintContext } from \"./PaintContext\";\nimport { enumKey } from \"./datatypes/Enum\";\n\nconst paintProps = [\n  \"color\",\n  \"strokeWidth\",\n  \"blendMode\",\n  \"strokeCap\",\n  \"strokeJoin\",\n  \"strokeMiter\",\n  \"style\",\n  \"antiAlias\",\n  \"opacity\",\n];\n\ninterface PaintCache {\n  parent: SkPaint;\n  child: SkPaint;\n}\n\nexport abstract class JsiRenderNode<P extends GroupProps>\n  extends JsiNode<P>\n  implements RenderNode<P>\n{\n  paintCache: PaintCache | null = null;\n  matrix: SkMatrix;\n  clipRect?: SkRect;\n  clipRRect?: SkRRect;\n  clipPath?: SkPath;\n\n  constructor(ctx: NodeContext, type: NodeType, props: P) {\n    super(ctx, type, props);\n    this.matrix = this.Skia.Matrix();\n    this.onPropChange();\n  }\n\n  setProps(props: P) {\n    super.setProps(props);\n    this.onPropChange();\n    this.paintCache = null;\n  }\n\n  setProp<K extends keyof P>(key: K, value: P[K]) {\n    const hasChanged = super.setProp(key, value);\n    if (hasChanged) {\n      this.onPropChange();\n      if (paintProps.includes(key as string)) {\n        this.paintCache = null;\n      }\n    }\n    return hasChanged;\n  }\n\n  protected onPropChange() {\n    this.matrix.identity();\n    this.clipPath = undefined;\n    this.clipRect = undefined;\n    this.clipRRect = undefined;\n    this.computeMatrix();\n    this.computeClip();\n  }\n\n  addChild(child: Node<unknown>) {\n    if (child instanceof JsiDeclarationNode) {\n      child.setInvalidate(() => (this.paintCache = null));\n    }\n    super.addChild(child);\n  }\n\n  insertChildBefore(child: Node<unknown>, before: Node<unknown>) {\n    if (child instanceof JsiDeclarationNode) {\n      child.setInvalidate(() => (this.paintCache = null));\n    }\n    super.insertChildBefore(child, before);\n  }\n\n  private computeClip() {\n    const { clip } = this.props;\n    if (clip) {\n      if (isPathDef(clip)) {\n        this.clipPath = processPath(this.Skia, clip);\n      } else if (isRRect(clip)) {\n        this.clipRRect = clip;\n      } else {\n        this.clipRect = clip;\n      }\n    }\n  }\n\n  private computeMatrix() {\n    processTransformProps(this.matrix, this.props);\n  }\n\n  private getPaintCtx() {\n    let ctx: PaintContext | undefined;\n    const {\n      color,\n      strokeWidth,\n      blendMode,\n      style,\n      strokeJoin,\n      strokeCap,\n      strokeMiter,\n      opacity,\n      antiAlias,\n    } = this.props;\n    if (\n      color !== undefined ||\n      strokeWidth !== undefined ||\n      blendMode !== undefined ||\n      style !== undefined ||\n      strokeJoin !== undefined ||\n      strokeCap !== undefined ||\n      strokeMiter !== undefined ||\n      opacity !== undefined ||\n      antiAlias !== undefined\n    ) {\n      ctx = {};\n      if (color !== undefined) {\n        ctx.color = this.Skia.Color(color);\n      }\n      if (strokeWidth !== undefined) {\n        ctx.strokeWidth = strokeWidth;\n      }\n      if (blendMode !== undefined) {\n        ctx.blendMode = BlendMode[enumKey(blendMode)];\n      }\n      if (style !== undefined) {\n        ctx.style = PaintStyle[enumKey(style)];\n      }\n      if (strokeJoin !== undefined) {\n        ctx.strokeJoin = StrokeJoin[enumKey(strokeJoin)];\n      }\n      if (strokeCap !== undefined) {\n        ctx.strokeCap = StrokeCap[enumKey(strokeCap)];\n      }\n      if (strokeMiter !== undefined) {\n        ctx.strokeMiter = strokeMiter;\n      }\n      if (opacity !== undefined) {\n        ctx.opacity = opacity;\n      }\n      if (antiAlias !== undefined) {\n        ctx.antiAlias = antiAlias;\n      }\n    }\n    this._children.forEach((child) => {\n      if (child instanceof JsiDeclarationNode) {\n        if (child.isColorFilter()) {\n          ctx = ctx || {};\n          const cf = child.materialize();\n          ctx.colorFilter = ctx.colorFilter\n            ? this.Skia.ColorFilter.MakeCompose(cf, ctx.colorFilter)\n            : cf;\n        } else if (child.isShader()) {\n          ctx = ctx || {};\n          const shader = child.materialize();\n          ctx.shader = shader;\n        } else if (child.isPathEffect()) {\n          ctx = ctx || {};\n          const pe = child.materialize();\n          ctx.pathEffect = ctx.pathEffect\n            ? this.Skia.PathEffect.MakeCompose(pe, ctx.pathEffect)\n            : pe;\n        } else if (child.isImageFilter()) {\n          ctx = ctx || {};\n          const filter = child.materialize();\n          ctx.imageFilter = ctx.imageFilter\n            ? this.Skia.ImageFilter.MakeCompose(filter, ctx.imageFilter)\n            : filter;\n        } else if (child.isMaskFilter()) {\n          ctx = ctx || {};\n          const filter = child.materialize();\n          ctx.maskFilter = filter;\n        }\n      }\n    });\n    return ctx;\n  }\n\n  render(parentCtx: DrawingContext) {\n    const { invertClip, layer, matrix, transform } = this.props;\n    const { canvas } = parentCtx;\n\n    const opacity =\n      this.props.opacity !== undefined\n        ? parentCtx.opacity * this.props.opacity\n        : parentCtx.opacity;\n\n    if (\n      this.paintCache === null ||\n      this.paintCache.parent !== parentCtx.paint\n    ) {\n      const paintCtx = this.getPaintCtx();\n      const child = paintCtx\n        ? concatPaint(parentCtx.paint, paintCtx, parentCtx.opacity)\n        : parentCtx.paint;\n      this.paintCache = { parent: parentCtx.paint, child };\n    }\n    const paint = this.paintCache.child;\n    // TODO: can we only recreate a new context here if needed?\n    const ctx = { ...parentCtx, opacity, paint };\n    const hasTransform = matrix !== undefined || transform !== undefined;\n    const hasClip =\n      this.clipRect !== undefined ||\n      this.clipPath !== undefined ||\n      this.clipRRect !== undefined;\n    const shouldSave = hasTransform || hasClip || !!layer;\n    const op = invertClip ? ClipOp.Difference : ClipOp.Intersect;\n    if (shouldSave) {\n      if (layer) {\n        if (typeof layer === \"boolean\") {\n          canvas.saveLayer();\n        } else {\n          canvas.saveLayer(layer);\n        }\n      } else {\n        canvas.save();\n      }\n    }\n\n    if (this.matrix) {\n      canvas.concat(this.matrix);\n    }\n    if (this.clipRect) {\n      canvas.clipRect(this.clipRect, op, true);\n    } else if (this.clipRRect) {\n      canvas.clipRRect(this.clipRRect, op, true);\n    } else if (this.clipPath) {\n      canvas.clipPath(this.clipPath, op, true);\n    }\n\n    this.renderNode(ctx);\n\n    if (shouldSave) {\n      canvas.restore();\n    }\n  }\n\n  abstract renderNode(ctx: DrawingContext): void;\n}\n\nconst concatPaint = (\n  parent: SkPaint,\n  {\n    color,\n    strokeWidth,\n    shader,\n    antiAlias,\n    blendMode,\n    colorFilter,\n    imageFilter,\n    maskFilter,\n    pathEffect,\n    opacity: alpha,\n    strokeCap,\n    strokeJoin,\n    strokeMiter,\n    style,\n  }: PaintContext,\n  opacity: number\n) => {\n  const paint = parent.copy();\n  if (color !== undefined) {\n    paint.setShader(null);\n    color[3] *= opacity;\n    paint.setColor(color);\n  } else {\n    const cl = paint.getColor();\n    cl[3] = opacity;\n    paint.setColor(cl);\n  }\n  if (strokeWidth !== undefined) {\n    paint.setStrokeWidth(strokeWidth);\n  }\n  if (shader !== undefined) {\n    paint.setShader(shader);\n  }\n  if (antiAlias !== undefined) {\n    paint.setAntiAlias(antiAlias);\n  }\n  if (blendMode !== undefined) {\n    paint.setBlendMode(blendMode);\n  }\n  if (colorFilter !== undefined) {\n    paint.setColorFilter(colorFilter);\n  }\n  if (imageFilter !== undefined) {\n    paint.setImageFilter(imageFilter);\n  }\n  if (maskFilter !== undefined) {\n    paint.setMaskFilter(maskFilter);\n  }\n  if (pathEffect !== undefined) {\n    paint.setPathEffect(pathEffect);\n  }\n  if (alpha !== undefined) {\n    paint.setAlphaf(alpha * opacity);\n  }\n  if (strokeCap !== undefined) {\n    paint.setStrokeCap(strokeCap);\n  }\n  if (strokeJoin !== undefined) {\n    paint.setStrokeJoin(strokeJoin);\n  }\n  if (strokeMiter !== undefined) {\n    paint.setStrokeMiter(strokeMiter);\n  }\n  if (style !== undefined) {\n    paint.setStyle(style);\n  }\n  return paint;\n};\n"],"mappings":"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"}
+{"version":3,"names":["StrokeCap","StrokeJoin","PaintStyle","BlendMode","ClipOp","isRRect","isPathDef","processPath","processTransformProps","JsiNode","JsiDeclarationNode","enumKey","paintProps","JsiRenderNode","constructor","ctx","type","props","matrix","Skia","Matrix","onPropChange","setProps","paintCache","setProp","key","value","hasChanged","includes","identity","clipPath","undefined","clipRect","clipRRect","computeMatrix","computeClip","addChild","child","setInvalidate","insertChildBefore","before","clip","getPaintCtx","color","strokeWidth","blendMode","style","strokeJoin","strokeCap","strokeMiter","opacity","antiAlias","Color","_children","forEach","isColorFilter","cf","materialize","colorFilter","ColorFilter","MakeCompose","isShader","shader","isPathEffect","pe","pathEffect","PathEffect","isImageFilter","filter","imageFilter","ImageFilter","isMaskFilter","maskFilter","render","parentCtx","invertClip","layer","transform","canvas","parent","paint","paintCtx","concatPaint","copy","hasTransform","hasClip","shouldSave","op","Difference","Intersect","saveLayer","save","concat","renderNode","restore","setAlphaf","getAlphaf","currentOpacity","setShader","setColor","setStrokeWidth","setAntiAlias","setBlendMode","setColorFilter","setImageFilter","setMaskFilter","setPathEffect","setStrokeCap","setStrokeJoin","setStrokeMiter","setStyle"],"sources":["RenderNode.ts"],"sourcesContent":["import type {\n  SkMatrix,\n  SkRect,\n  SkRRect,\n  SkPath,\n  SkPaint,\n} from \"../../skia/types\";\nimport {\n  StrokeCap,\n  StrokeJoin,\n  PaintStyle,\n  BlendMode,\n  ClipOp,\n  isRRect,\n} from \"../../skia/types\";\nimport type {\n  RenderNode,\n  GroupProps,\n  DrawingContext,\n  NodeType,\n  Node,\n} from \"../types\";\n\nimport { isPathDef, processPath, processTransformProps } from \"./datatypes\";\nimport type { NodeContext } from \"./Node\";\nimport { JsiNode, JsiDeclarationNode } from \"./Node\";\nimport type { PaintContext } from \"./PaintContext\";\nimport { enumKey } from \"./datatypes/Enum\";\n\nconst paintProps = [\n  \"color\",\n  \"strokeWidth\",\n  \"blendMode\",\n  \"strokeCap\",\n  \"strokeJoin\",\n  \"strokeMiter\",\n  \"style\",\n  \"antiAlias\",\n  \"opacity\",\n];\n\ninterface PaintCache {\n  parent: SkPaint;\n  child: SkPaint;\n}\n\nexport abstract class JsiRenderNode<P extends GroupProps>\n  extends JsiNode<P>\n  implements RenderNode<P>\n{\n  paintCache: PaintCache | null = null;\n  matrix: SkMatrix;\n  clipRect?: SkRect;\n  clipRRect?: SkRRect;\n  clipPath?: SkPath;\n\n  constructor(ctx: NodeContext, type: NodeType, props: P) {\n    super(ctx, type, props);\n    this.matrix = this.Skia.Matrix();\n    this.onPropChange();\n  }\n\n  setProps(props: P) {\n    super.setProps(props);\n    this.onPropChange();\n    this.paintCache = null;\n  }\n\n  setProp<K extends keyof P>(key: K, value: P[K]) {\n    const hasChanged = super.setProp(key, value);\n    if (hasChanged) {\n      this.onPropChange();\n      if (paintProps.includes(key as string)) {\n        this.paintCache = null;\n      }\n    }\n    return hasChanged;\n  }\n\n  protected onPropChange() {\n    this.matrix.identity();\n    this.clipPath = undefined;\n    this.clipRect = undefined;\n    this.clipRRect = undefined;\n    this.computeMatrix();\n    this.computeClip();\n  }\n\n  addChild(child: Node<unknown>) {\n    if (child instanceof JsiDeclarationNode) {\n      child.setInvalidate(() => (this.paintCache = null));\n    }\n    super.addChild(child);\n  }\n\n  insertChildBefore(child: Node<unknown>, before: Node<unknown>) {\n    if (child instanceof JsiDeclarationNode) {\n      child.setInvalidate(() => (this.paintCache = null));\n    }\n    super.insertChildBefore(child, before);\n  }\n\n  private computeClip() {\n    const { clip } = this.props;\n    if (clip) {\n      if (isPathDef(clip)) {\n        this.clipPath = processPath(this.Skia, clip);\n      } else if (isRRect(clip)) {\n        this.clipRRect = clip;\n      } else {\n        this.clipRect = clip;\n      }\n    }\n  }\n\n  private computeMatrix() {\n    processTransformProps(this.matrix, this.props);\n  }\n\n  private getPaintCtx() {\n    let ctx: PaintContext | undefined;\n    const {\n      color,\n      strokeWidth,\n      blendMode,\n      style,\n      strokeJoin,\n      strokeCap,\n      strokeMiter,\n      opacity,\n      antiAlias,\n    } = this.props;\n    if (\n      color !== undefined ||\n      strokeWidth !== undefined ||\n      blendMode !== undefined ||\n      style !== undefined ||\n      strokeJoin !== undefined ||\n      strokeCap !== undefined ||\n      strokeMiter !== undefined ||\n      opacity !== undefined ||\n      antiAlias !== undefined\n    ) {\n      ctx = { opacity: 1 };\n      if (color !== undefined) {\n        ctx.color = this.Skia.Color(color);\n      }\n      if (strokeWidth !== undefined) {\n        ctx.strokeWidth = strokeWidth;\n      }\n      if (blendMode !== undefined) {\n        ctx.blendMode = BlendMode[enumKey(blendMode)];\n      }\n      if (style !== undefined) {\n        ctx.style = PaintStyle[enumKey(style)];\n      }\n      if (strokeJoin !== undefined) {\n        ctx.strokeJoin = StrokeJoin[enumKey(strokeJoin)];\n      }\n      if (strokeCap !== undefined) {\n        ctx.strokeCap = StrokeCap[enumKey(strokeCap)];\n      }\n      if (strokeMiter !== undefined) {\n        ctx.strokeMiter = strokeMiter;\n      }\n      if (opacity !== undefined) {\n        ctx.opacity = opacity;\n      }\n      if (antiAlias !== undefined) {\n        ctx.antiAlias = antiAlias;\n      }\n    }\n    this._children.forEach((child) => {\n      if (child instanceof JsiDeclarationNode) {\n        if (child.isColorFilter()) {\n          ctx = ctx || {};\n          const cf = child.materialize();\n          ctx.colorFilter = ctx.colorFilter\n            ? this.Skia.ColorFilter.MakeCompose(cf, ctx.colorFilter)\n            : cf;\n        } else if (child.isShader()) {\n          ctx = ctx || {};\n          const shader = child.materialize();\n          ctx.shader = shader;\n        } else if (child.isPathEffect()) {\n          ctx = ctx || {};\n          const pe = child.materialize();\n          ctx.pathEffect = ctx.pathEffect\n            ? this.Skia.PathEffect.MakeCompose(pe, ctx.pathEffect)\n            : pe;\n        } else if (child.isImageFilter()) {\n          ctx = ctx || {};\n          const filter = child.materialize();\n          ctx.imageFilter = ctx.imageFilter\n            ? this.Skia.ImageFilter.MakeCompose(filter, ctx.imageFilter)\n            : filter;\n        } else if (child.isMaskFilter()) {\n          ctx = ctx || {};\n          const filter = child.materialize();\n          ctx.maskFilter = filter;\n        }\n      }\n    });\n    return ctx;\n  }\n\n  render(parentCtx: DrawingContext) {\n    const { invertClip, layer, matrix, transform } = this.props;\n    const { canvas } = parentCtx;\n\n    if (\n      this.paintCache === null ||\n      this.paintCache.parent !== parentCtx.paint\n    ) {\n      const paintCtx = this.getPaintCtx();\n      const child = paintCtx\n        ? concatPaint(parentCtx.paint.copy(), paintCtx)\n        : parentCtx.paint;\n      this.paintCache = { parent: parentCtx.paint, child };\n    }\n    const paint = this.paintCache.child;\n    // TODO: can we only recreate a new context here if needed?\n    const ctx = { ...parentCtx, paint };\n    const hasTransform = matrix !== undefined || transform !== undefined;\n    const hasClip =\n      this.clipRect !== undefined ||\n      this.clipPath !== undefined ||\n      this.clipRRect !== undefined;\n    const shouldSave = hasTransform || hasClip || !!layer;\n    const op = invertClip ? ClipOp.Difference : ClipOp.Intersect;\n    if (shouldSave) {\n      if (layer) {\n        if (typeof layer === \"boolean\") {\n          canvas.saveLayer();\n        } else {\n          canvas.saveLayer(layer);\n        }\n      } else {\n        canvas.save();\n      }\n    }\n\n    if (this.matrix) {\n      canvas.concat(this.matrix);\n    }\n    if (this.clipRect) {\n      canvas.clipRect(this.clipRect, op, true);\n    } else if (this.clipRRect) {\n      canvas.clipRRect(this.clipRRect, op, true);\n    } else if (this.clipPath) {\n      canvas.clipPath(this.clipPath, op, true);\n    }\n\n    this.renderNode(ctx);\n\n    if (shouldSave) {\n      canvas.restore();\n    }\n  }\n\n  abstract renderNode(ctx: DrawingContext): void;\n}\n\nconst concatPaint = (\n  paint: SkPaint,\n  {\n    color,\n    strokeWidth,\n    shader,\n    antiAlias,\n    blendMode,\n    colorFilter,\n    imageFilter,\n    maskFilter,\n    pathEffect,\n    opacity,\n    strokeCap,\n    strokeJoin,\n    strokeMiter,\n    style,\n  }: PaintContext\n) => {\n  if (opacity !== undefined) {\n    paint.setAlphaf(paint.getAlphaf() * opacity);\n  }\n  if (color !== undefined) {\n    const currentOpacity = paint.getAlphaf();\n    paint.setShader(null);\n    paint.setColor(color);\n    paint.setAlphaf(currentOpacity * paint.getAlphaf());\n  }\n  if (strokeWidth !== undefined) {\n    paint.setStrokeWidth(strokeWidth);\n  }\n  if (shader !== undefined) {\n    paint.setShader(shader);\n  }\n  if (antiAlias !== undefined) {\n    paint.setAntiAlias(antiAlias);\n  }\n  if (blendMode !== undefined) {\n    paint.setBlendMode(blendMode);\n  }\n  if (colorFilter !== undefined) {\n    paint.setColorFilter(colorFilter);\n  }\n  if (imageFilter !== undefined) {\n    paint.setImageFilter(imageFilter);\n  }\n  if (maskFilter !== undefined) {\n    paint.setMaskFilter(maskFilter);\n  }\n  if (pathEffect !== undefined) {\n    paint.setPathEffect(pathEffect);\n  }\n  if (strokeCap !== undefined) {\n    paint.setStrokeCap(strokeCap);\n  }\n  if (strokeJoin !== undefined) {\n    paint.setStrokeJoin(strokeJoin);\n  }\n  if (strokeMiter !== undefined) {\n    paint.setStrokeMiter(strokeMiter);\n  }\n  if (style !== undefined) {\n    paint.setStyle(style);\n  }\n  return paint;\n};\n"],"mappings":"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"}

package/lib/module/dom/nodes/datatypes/index.js

@@ -1,7 +1,6 @@
 export * from "./Enum";
 export * from "./Path";
 export * from "./Fitting";
-export * from "./Color";
 export * from "./Rect";
 export * from "./Radius";
 export * from "./Circle";

package/lib/module/dom/nodes/datatypes/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./Enum\";\nexport * from \"./Path\";\nexport * from \"./Fitting\";\nexport * from \"./Color\";\nexport * from \"./Rect\";\nexport * from \"./Radius\";\nexport * from \"./Circle\";\nexport * from \"./Gradient\";\nexport * from \"./Transform\";\n"],"mappings":"AAAA,cAAc,QAAd;AACA,cAAc,QAAd;AACA,cAAc,WAAd;AACA,cAAc,SAAd;AACA,cAAc,QAAd;AACA,cAAc,UAAd;AACA,cAAc,UAAd;AACA,cAAc,YAAd;AACA,cAAc,aAAd"}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./Enum\";\nexport * from \"./Path\";\nexport * from \"./Fitting\";\nexport * from \"./Rect\";\nexport * from \"./Radius\";\nexport * from \"./Circle\";\nexport * from \"./Gradient\";\nexport * from \"./Transform\";\n"],"mappings":"AAAA,cAAc,QAAd;AACA,cAAc,QAAd;AACA,cAAc,WAAd;AACA,cAAc,QAAd;AACA,cAAc,UAAd;AACA,cAAc,UAAd;AACA,cAAc,YAAd;AACA,cAAc,aAAd"}

package/lib/module/dom/nodes/drawings/Box.js

@@ -1,7 +1,6 @@
 import { BlurStyle, ClipOp, isRRect } from "../../../skia/types";
 import { DeclarationType, NodeType } from "../../types";
 import { JsiDeclarationNode } from "../Node";
-import { processColor } from "../datatypes";
 import { JsiRenderNode } from "../RenderNode";
 
 const inflate = function (Skia, box, dx, dy) {
@@ -34,12 +33,12 @@ export class BoxNode extends JsiRenderNode {
   renderNode(_ref) {
     let {
       canvas,
-      paint,
-      opacity
+      paint
     } = _ref;
     const {
       box: defaultBox
     } = this.props;
+    const opacity = paint.getAlphaf();
     const box = isRRect(defaultBox) ? defaultBox : this.Skia.RRectXY(defaultBox, 0, 0);
 
     const shadows = this._children.map(node => {
@@ -59,7 +58,8 @@ export class BoxNode extends JsiRenderNode {
         dy = 0
       } = shadow;
       const lPaint = this.Skia.Paint();
-      lPaint.setColor(processColor(this.Skia, color, opacity));
+      lPaint.setColor(this.Skia.Color(color));
+      lPaint.setAlphaf(paint.getAlphaf() * opacity);
       lPaint.setMaskFilter(this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true));
       canvas.drawRRect(inflate(this.Skia, box, spread, spread, dx, dy), lPaint);
     });
@@ -76,7 +76,8 @@ export class BoxNode extends JsiRenderNode {
       canvas.save();
       canvas.clipRRect(box, ClipOp.Intersect, false);
       const lPaint = this.Skia.Paint();
-      lPaint.setColor(processColor(this.Skia, color, opacity));
+      lPaint.setColor(this.Skia.Color(color));
+      lPaint.setAlphaf(paint.getAlphaf() * opacity);
       lPaint.setMaskFilter(this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true));
       const inner = deflate(this.Skia, box, spread, spread, dx, dy);
       const outer = inflate(this.Skia, box, delta.x, delta.y);

package/lib/module/dom/nodes/drawings/Box.js.map

@@ -1 +1 @@
-{"version":3,"names":["BlurStyle","ClipOp","isRRect","DeclarationType","NodeType","JsiDeclarationNode","processColor","JsiRenderNode","inflate","Skia","box","dx","dy","tx","ty","RRectXY","XYWHRect","rect","x","y","width","height","rx","ry","deflate","BoxShadowNode","constructor","ctx","props","Unknown","Box","materialize","BoxNode","renderNode","canvas","paint","opacity","defaultBox","shadows","_children","map","node","filter","n","shadow","inner","color","blur","spread","lPaint","Paint","setColor","setMaskFilter","MaskFilter","MakeBlur","Normal","drawRRect","delta","Point","Math","abs","save","clipRRect","Intersect","outer","drawDRRect","restore"],"sources":["Box.ts"],"sourcesContent":["import type { SkRRect, Skia } from \"../../../skia/types\";\nimport { BlurStyle, ClipOp, isRRect } from \"../../../skia/types\";\nimport type { DrawingContext } from \"../../types\";\nimport { DeclarationType, NodeType } from \"../../types\";\nimport type { BoxShadowProps, BoxProps } from \"../../types/Drawings\";\nimport type { NodeContext } from \"../Node\";\nimport { JsiDeclarationNode } from \"../Node\";\nimport { processColor } from \"../datatypes\";\nimport { JsiRenderNode } from \"../RenderNode\";\n\nconst inflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) =>\n  Skia.RRectXY(\n    Skia.XYWHRect(\n      box.rect.x - dx + tx,\n      box.rect.y - dy + ty,\n      box.rect.width + 2 * dx,\n      box.rect.height + 2 * dy\n    ),\n    box.rx + dx,\n    box.ry + dy\n  );\n\nconst deflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => inflate(Skia, box, -dx, -dy, tx, ty);\n\nexport class BoxShadowNode extends JsiDeclarationNode<\n  BoxShadowProps,\n  BoxShadowProps\n> {\n  constructor(ctx: NodeContext, props: BoxShadowProps) {\n    super(ctx, DeclarationType.Unknown, NodeType.Box, props);\n  }\n\n  materialize() {\n    return this.props;\n  }\n}\n\nexport class BoxNode extends JsiRenderNode<BoxProps> {\n  constructor(ctx: NodeContext, props: BoxProps) {\n    super(ctx, NodeType.Box, props);\n  }\n\n  renderNode({ canvas, paint, opacity }: DrawingContext) {\n    const { box: defaultBox } = this.props;\n    const box = isRRect(defaultBox)\n      ? defaultBox\n      : this.Skia.RRectXY(defaultBox, 0, 0);\n    const shadows = this._children\n      .map((node) => {\n        if (node instanceof BoxShadowNode) {\n          return node.materialize();\n        }\n        return null;\n      })\n      .filter((n): n is BoxShadowProps => n !== null);\n    shadows\n      .filter((shadow) => !shadow.inner)\n      .map((shadow) => {\n        const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n        const lPaint = this.Skia.Paint();\n        lPaint.setColor(processColor(this.Skia, color, opacity));\n        lPaint.setMaskFilter(\n          this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n        );\n        canvas.drawRRect(\n          inflate(this.Skia, box, spread, spread, dx, dy),\n          lPaint\n        );\n      });\n\n    canvas.drawRRect(box, paint);\n\n    shadows\n      .filter((shadow) => shadow.inner)\n      .map((shadow) => {\n        const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n        const delta = this.Skia.Point(10 + Math.abs(dx), 10 + Math.abs(dy));\n        canvas.save();\n        canvas.clipRRect(box, ClipOp.Intersect, false);\n        const lPaint = this.Skia.Paint();\n        lPaint.setColor(processColor(this.Skia, color, opacity));\n        lPaint.setMaskFilter(\n          this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n        );\n        const inner = deflate(this.Skia, box, spread, spread, dx, dy);\n        const outer = inflate(this.Skia, box, delta.x, delta.y);\n        canvas.drawDRRect(outer, inner, lPaint);\n        canvas.restore();\n      });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["BlurStyle","ClipOp","isRRect","DeclarationType","NodeType","JsiDeclarationNode","JsiRenderNode","inflate","Skia","box","dx","dy","tx","ty","RRectXY","XYWHRect","rect","x","y","width","height","rx","ry","deflate","BoxShadowNode","constructor","ctx","props","Unknown","Box","materialize","BoxNode","renderNode","canvas","paint","defaultBox","opacity","getAlphaf","shadows","_children","map","node","filter","n","shadow","inner","color","blur","spread","lPaint","Paint","setColor","Color","setAlphaf","setMaskFilter","MaskFilter","MakeBlur","Normal","drawRRect","delta","Point","Math","abs","save","clipRRect","Intersect","outer","drawDRRect","restore"],"sources":["Box.ts"],"sourcesContent":["import type { SkRRect, Skia } from \"../../../skia/types\";\nimport { BlurStyle, ClipOp, isRRect } from \"../../../skia/types\";\nimport type { DrawingContext } from \"../../types\";\nimport { DeclarationType, NodeType } from \"../../types\";\nimport type { BoxShadowProps, BoxProps } from \"../../types/Drawings\";\nimport type { NodeContext } from \"../Node\";\nimport { JsiDeclarationNode } from \"../Node\";\nimport { JsiRenderNode } from \"../RenderNode\";\n\nconst inflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) =>\n  Skia.RRectXY(\n    Skia.XYWHRect(\n      box.rect.x - dx + tx,\n      box.rect.y - dy + ty,\n      box.rect.width + 2 * dx,\n      box.rect.height + 2 * dy\n    ),\n    box.rx + dx,\n    box.ry + dy\n  );\n\nconst deflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => inflate(Skia, box, -dx, -dy, tx, ty);\n\nexport class BoxShadowNode extends JsiDeclarationNode<\n  BoxShadowProps,\n  BoxShadowProps\n> {\n  constructor(ctx: NodeContext, props: BoxShadowProps) {\n    super(ctx, DeclarationType.Unknown, NodeType.Box, props);\n  }\n\n  materialize() {\n    return this.props;\n  }\n}\n\nexport class BoxNode extends JsiRenderNode<BoxProps> {\n  constructor(ctx: NodeContext, props: BoxProps) {\n    super(ctx, NodeType.Box, props);\n  }\n\n  renderNode({ canvas, paint }: DrawingContext) {\n    const { box: defaultBox } = this.props;\n    const opacity = paint.getAlphaf();\n    const box = isRRect(defaultBox)\n      ? defaultBox\n      : this.Skia.RRectXY(defaultBox, 0, 0);\n    const shadows = this._children\n      .map((node) => {\n        if (node instanceof BoxShadowNode) {\n          return node.materialize();\n        }\n        return null;\n      })\n      .filter((n): n is BoxShadowProps => n !== null);\n    shadows\n      .filter((shadow) => !shadow.inner)\n      .map((shadow) => {\n        const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n        const lPaint = this.Skia.Paint();\n        lPaint.setColor(this.Skia.Color(color));\n        lPaint.setAlphaf(paint.getAlphaf() * opacity);\n        lPaint.setMaskFilter(\n          this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n        );\n        canvas.drawRRect(\n          inflate(this.Skia, box, spread, spread, dx, dy),\n          lPaint\n        );\n      });\n\n    canvas.drawRRect(box, paint);\n\n    shadows\n      .filter((shadow) => shadow.inner)\n      .map((shadow) => {\n        const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n        const delta = this.Skia.Point(10 + Math.abs(dx), 10 + Math.abs(dy));\n        canvas.save();\n        canvas.clipRRect(box, ClipOp.Intersect, false);\n        const lPaint = this.Skia.Paint();\n        lPaint.setColor(this.Skia.Color(color));\n        lPaint.setAlphaf(paint.getAlphaf() * opacity);\n\n        lPaint.setMaskFilter(\n          this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n        );\n        const inner = deflate(this.Skia, box, spread, spread, dx, dy);\n        const outer = inflate(this.Skia, box, delta.x, delta.y);\n        canvas.drawDRRect(outer, inner, lPaint);\n        canvas.restore();\n      });\n  }\n}\n"],"mappings":"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"}

package/lib/module/dom/nodes/drawings/PatchNode.js

@@ -1,6 +1,6 @@
 import { BlendMode } from "../../../skia/types";
 import { NodeType } from "../../types";
-import { ALPHA, enumKey, processColor } from "../datatypes";
+import { enumKey } from "../datatypes";
 import { JsiDrawingNode } from "../DrawingNode";
 export class PatchNode extends JsiDrawingNode {
   constructor(ctx, props) {
@@ -23,15 +23,14 @@ export class PatchNode extends JsiDrawingNode {
     return {
       mode,
       points: [patch[0].pos, patch[0].c2, patch[1].c1, patch[1].pos, patch[1].c2, patch[2].c1, patch[2].pos, patch[2].c2, patch[3].c1, patch[3].pos, patch[3].c2, patch[0].c1],
-      colors: colors ? colors.map(c => processColor(this.Skia, c, 1)) : undefined
+      colors: colors ? colors.map(c => this.Skia.Color(c)) : undefined
     };
   }
 
   draw(_ref) {
     let {
       canvas,
-      paint,
-      opacity
+      paint
     } = _ref;
 
     if (!this.derived) {
@@ -46,10 +45,7 @@ export class PatchNode extends JsiDrawingNode {
       points,
       mode
     } = this.derived;
-    canvas.drawPatch(points, opacity === 1 ? colors : colors && colors.map(c => {
-      c[ALPHA] = c[ALPHA] * opacity;
-      return c;
-    }), texture, mode, paint);
+    canvas.drawPatch(points, colors, texture, mode, paint);
   }
 
 }

package/lib/module/dom/nodes/drawings/PatchNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["BlendMode","NodeType","ALPHA","enumKey","processColor","JsiDrawingNode","PatchNode","constructor","ctx","props","Patch","deriveProps","colors","blendMode","patch","defaultBlendMode","DstOver","SrcOver","mode","points","pos","c2","c1","map","c","Skia","undefined","draw","canvas","paint","opacity","derived","Error","texture","drawPatch"],"sources":["PatchNode.ts"],"sourcesContent":["import type { SkColor, SkPoint } from \"../../../skia/types\";\nimport { BlendMode } from \"../../../skia/types\";\nimport type { DrawingContext, PatchProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { ALPHA, enumKey, processColor } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class PatchNode extends JsiDrawingNode<\n  PatchProps,\n  { points: SkPoint[]; colors: SkColor[] | undefined; mode: BlendMode }\n> {\n  constructor(ctx: NodeContext, props: PatchProps) {\n    super(ctx, NodeType.Patch, props);\n  }\n\n  deriveProps() {\n    const { colors, blendMode, patch } = this.props;\n    const defaultBlendMode = colors ? BlendMode.DstOver : BlendMode.SrcOver;\n    const mode = blendMode ? BlendMode[enumKey(blendMode)] : defaultBlendMode;\n    // Patch requires a path with the following constraints:\n    // M tl\n    // C c1 c2 br\n    // C c1 c2 bl\n    // C c1 c2 tl (the redundant point in the last command is removed)\n    return {\n      mode,\n      points: [\n        patch[0].pos,\n        patch[0].c2,\n        patch[1].c1,\n        patch[1].pos,\n        patch[1].c2,\n        patch[2].c1,\n        patch[2].pos,\n        patch[2].c2,\n        patch[3].c1,\n        patch[3].pos,\n        patch[3].c2,\n        patch[0].c1,\n      ],\n      colors: colors\n        ? colors.map((c) => processColor(this.Skia, c, 1))\n        : undefined,\n    };\n  }\n\n  draw({ canvas, paint, opacity }: DrawingContext) {\n    if (!this.derived) {\n      throw new Error(\"PatchNode: derived props not set\");\n    }\n    const { texture } = this.props;\n    const { colors, points, mode } = this.derived;\n    canvas.drawPatch(\n      points,\n      opacity === 1\n        ? colors\n        : colors &&\n            colors.map((c) => {\n              c[ALPHA] = c[ALPHA] * opacity;\n              return c;\n            }),\n      texture,\n      mode,\n      paint\n    );\n  }\n}\n"],"mappings":"AACA,SAASA,SAAT,QAA0B,qBAA1B;AAEA,SAASC,QAAT,QAAyB,aAAzB;AACA,SAASC,KAAT,EAAgBC,OAAhB,EAAyBC,YAAzB,QAA6C,cAA7C;AACA,SAASC,cAAT,QAA+B,gBAA/B;AAGA,OAAO,MAAMC,SAAN,SAAwBD,cAAxB,CAGL;EACAE,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAsC;IAC/C,MAAMD,GAAN,EAAWP,QAAQ,CAACS,KAApB,EAA2BD,KAA3B;EACD;;EAEDE,WAAW,GAAG;IACZ,MAAM;MAAEC,MAAF;MAAUC,SAAV;MAAqBC;IAArB,IAA+B,KAAKL,KAA1C;IACA,MAAMM,gBAAgB,GAAGH,MAAM,GAAGZ,SAAS,CAACgB,OAAb,GAAuBhB,SAAS,CAACiB,OAAhE;IACA,MAAMC,IAAI,GAAGL,SAAS,GAAGb,SAAS,CAACG,OAAO,CAACU,SAAD,CAAR,CAAZ,GAAmCE,gBAAzD,CAHY,CAIZ;IACA;IACA;IACA;IACA;;IACA,OAAO;MACLG,IADK;MAELC,MAAM,EAAE,CACNL,KAAK,CAAC,CAAD,CAAL,CAASM,GADH,EAENN,KAAK,CAAC,CAAD,CAAL,CAASO,EAFH,EAGNP,KAAK,CAAC,CAAD,CAAL,CAASQ,EAHH,EAINR,KAAK,CAAC,CAAD,CAAL,CAASM,GAJH,EAKNN,KAAK,CAAC,CAAD,CAAL,CAASO,EALH,EAMNP,KAAK,CAAC,CAAD,CAAL,CAASQ,EANH,EAONR,KAAK,CAAC,CAAD,CAAL,CAASM,GAPH,EAQNN,KAAK,CAAC,CAAD,CAAL,CAASO,EARH,EASNP,KAAK,CAAC,CAAD,CAAL,CAASQ,EATH,EAUNR,KAAK,CAAC,CAAD,CAAL,CAASM,GAVH,EAWNN,KAAK,CAAC,CAAD,CAAL,CAASO,EAXH,EAYNP,KAAK,CAAC,CAAD,CAAL,CAASQ,EAZH,CAFH;MAgBLV,MAAM,EAAEA,MAAM,GACVA,MAAM,CAACW,GAAP,CAAYC,CAAD,IAAOpB,YAAY,CAAC,KAAKqB,IAAN,EAAYD,CAAZ,EAAe,CAAf,CAA9B,CADU,GAEVE;IAlBC,CAAP;EAoBD;;EAEDC,IAAI,OAA6C;IAAA,IAA5C;MAAEC,MAAF;MAAUC,KAAV;MAAiBC;IAAjB,CAA4C;;IAC/C,IAAI,CAAC,KAAKC,OAAV,EAAmB;MACjB,MAAM,IAAIC,KAAJ,CAAU,kCAAV,CAAN;IACD;;IACD,MAAM;MAAEC;IAAF,IAAc,KAAKxB,KAAzB;IACA,MAAM;MAAEG,MAAF;MAAUO,MAAV;MAAkBD;IAAlB,IAA2B,KAAKa,OAAtC;IACAH,MAAM,CAACM,SAAP,CACEf,MADF,EAEEW,OAAO,KAAK,CAAZ,GACIlB,MADJ,GAEIA,MAAM,IACJA,MAAM,CAACW,GAAP,CAAYC,CAAD,IAAO;MAChBA,CAAC,CAACtB,KAAD,CAAD,GAAWsB,CAAC,CAACtB,KAAD,CAAD,GAAW4B,OAAtB;MACA,OAAON,CAAP;IACD,CAHD,CALR,EASES,OATF,EAUEf,IAVF,EAWEW,KAXF;EAaD;;AAvDD"}
+{"version":3,"names":["BlendMode","NodeType","enumKey","JsiDrawingNode","PatchNode","constructor","ctx","props","Patch","deriveProps","colors","blendMode","patch","defaultBlendMode","DstOver","SrcOver","mode","points","pos","c2","c1","map","c","Skia","Color","undefined","draw","canvas","paint","derived","Error","texture","drawPatch"],"sources":["PatchNode.ts"],"sourcesContent":["import type { SkColor, SkPoint } from \"../../../skia/types\";\nimport { BlendMode } from \"../../../skia/types\";\nimport type { DrawingContext, PatchProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { enumKey } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class PatchNode extends JsiDrawingNode<\n  PatchProps,\n  { points: SkPoint[]; colors: SkColor[] | undefined; mode: BlendMode }\n> {\n  constructor(ctx: NodeContext, props: PatchProps) {\n    super(ctx, NodeType.Patch, props);\n  }\n\n  deriveProps() {\n    const { colors, blendMode, patch } = this.props;\n    const defaultBlendMode = colors ? BlendMode.DstOver : BlendMode.SrcOver;\n    const mode = blendMode ? BlendMode[enumKey(blendMode)] : defaultBlendMode;\n    // Patch requires a path with the following constraints:\n    // M tl\n    // C c1 c2 br\n    // C c1 c2 bl\n    // C c1 c2 tl (the redundant point in the last command is removed)\n    return {\n      mode,\n      points: [\n        patch[0].pos,\n        patch[0].c2,\n        patch[1].c1,\n        patch[1].pos,\n        patch[1].c2,\n        patch[2].c1,\n        patch[2].pos,\n        patch[2].c2,\n        patch[3].c1,\n        patch[3].pos,\n        patch[3].c2,\n        patch[0].c1,\n      ],\n      colors: colors ? colors.map((c) => this.Skia.Color(c)) : undefined,\n    };\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    if (!this.derived) {\n      throw new Error(\"PatchNode: derived props not set\");\n    }\n    const { texture } = this.props;\n    const { colors, points, mode } = this.derived;\n    canvas.drawPatch(points, colors, texture, mode, paint);\n  }\n}\n"],"mappings":"AACA,SAASA,SAAT,QAA0B,qBAA1B;AAEA,SAASC,QAAT,QAAyB,aAAzB;AACA,SAASC,OAAT,QAAwB,cAAxB;AACA,SAASC,cAAT,QAA+B,gBAA/B;AAGA,OAAO,MAAMC,SAAN,SAAwBD,cAAxB,CAGL;EACAE,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAsC;IAC/C,MAAMD,GAAN,EAAWL,QAAQ,CAACO,KAApB,EAA2BD,KAA3B;EACD;;EAEDE,WAAW,GAAG;IACZ,MAAM;MAAEC,MAAF;MAAUC,SAAV;MAAqBC;IAArB,IAA+B,KAAKL,KAA1C;IACA,MAAMM,gBAAgB,GAAGH,MAAM,GAAGV,SAAS,CAACc,OAAb,GAAuBd,SAAS,CAACe,OAAhE;IACA,MAAMC,IAAI,GAAGL,SAAS,GAAGX,SAAS,CAACE,OAAO,CAACS,SAAD,CAAR,CAAZ,GAAmCE,gBAAzD,CAHY,CAIZ;IACA;IACA;IACA;IACA;;IACA,OAAO;MACLG,IADK;MAELC,MAAM,EAAE,CACNL,KAAK,CAAC,CAAD,CAAL,CAASM,GADH,EAENN,KAAK,CAAC,CAAD,CAAL,CAASO,EAFH,EAGNP,KAAK,CAAC,CAAD,CAAL,CAASQ,EAHH,EAINR,KAAK,CAAC,CAAD,CAAL,CAASM,GAJH,EAKNN,KAAK,CAAC,CAAD,CAAL,CAASO,EALH,EAMNP,KAAK,CAAC,CAAD,CAAL,CAASQ,EANH,EAONR,KAAK,CAAC,CAAD,CAAL,CAASM,GAPH,EAQNN,KAAK,CAAC,CAAD,CAAL,CAASO,EARH,EASNP,KAAK,CAAC,CAAD,CAAL,CAASQ,EATH,EAUNR,KAAK,CAAC,CAAD,CAAL,CAASM,GAVH,EAWNN,KAAK,CAAC,CAAD,CAAL,CAASO,EAXH,EAYNP,KAAK,CAAC,CAAD,CAAL,CAASQ,EAZH,CAFH;MAgBLV,MAAM,EAAEA,MAAM,GAAGA,MAAM,CAACW,GAAP,CAAYC,CAAD,IAAO,KAAKC,IAAL,CAAUC,KAAV,CAAgBF,CAAhB,CAAlB,CAAH,GAA2CG;IAhBpD,CAAP;EAkBD;;EAEDC,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;;IACtC,IAAI,CAAC,KAAKC,OAAV,EAAmB;MACjB,MAAM,IAAIC,KAAJ,CAAU,kCAAV,CAAN;IACD;;IACD,MAAM;MAAEC;IAAF,IAAc,KAAKxB,KAAzB;IACA,MAAM;MAAEG,MAAF;MAAUO,MAAV;MAAkBD;IAAlB,IAA2B,KAAKa,OAAtC;IACAF,MAAM,CAACK,SAAP,CAAiBf,MAAjB,EAAyBP,MAAzB,EAAiCqB,OAAjC,EAA0Cf,IAA1C,EAAgDY,KAAhD;EACD;;AAzCD"}

package/lib/module/dom/nodes/drawings/VerticesNode.js

@@ -1,6 +1,6 @@
 import { VertexMode, BlendMode } from "../../../skia/types";
 import { NodeType } from "../../types";
-import { enumKey, processColor } from "../datatypes";
+import { enumKey } from "../datatypes";
 import { JsiDrawingNode } from "../DrawingNode";
 export class VerticesNode extends JsiDrawingNode {
   constructor(ctx, props) {
@@ -16,7 +16,7 @@ export class VerticesNode extends JsiDrawingNode {
       indices
     } = this.props;
     const vertexMode = mode ? VertexMode[enumKey(mode)] : VertexMode.Triangles;
-    return this.Skia.MakeVertices(vertexMode, vertices, textures, colors ? colors.map(c => processColor(this.Skia, c, 1)) : undefined, indices);
+    return this.Skia.MakeVertices(vertexMode, vertices, textures, colors ? colors.map(c => this.Skia.Color(c)) : undefined, indices);
   }
 
   draw(_ref) {

package/lib/module/dom/nodes/drawings/VerticesNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["VertexMode","BlendMode","NodeType","enumKey","processColor","JsiDrawingNode","VerticesNode","constructor","ctx","props","Vertices","deriveProps","mode","vertices","textures","colors","indices","vertexMode","Triangles","Skia","MakeVertices","map","c","undefined","draw","canvas","paint","blendMode","defaultBlendMode","DstOver","SrcOver","blend","derived","Error","drawVertices"],"sources":["VerticesNode.ts"],"sourcesContent":["import type { SkVertices } from \"../../../skia/types\";\nimport { VertexMode, BlendMode } from \"../../../skia/types\";\nimport type { DrawingContext, VerticesProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { enumKey, processColor } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class VerticesNode extends JsiDrawingNode<VerticesProps, SkVertices> {\n  constructor(ctx: NodeContext, props: VerticesProps) {\n    super(ctx, NodeType.Vertices, props);\n  }\n\n  protected deriveProps() {\n    const { mode, vertices, textures, colors, indices } = this.props;\n    const vertexMode = mode ? VertexMode[enumKey(mode)] : VertexMode.Triangles;\n    return this.Skia.MakeVertices(\n      vertexMode,\n      vertices,\n      textures,\n      colors ? colors.map((c) => processColor(this.Skia, c, 1)) : undefined,\n      indices\n    );\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { colors, blendMode } = this.props;\n    const defaultBlendMode = colors ? BlendMode.DstOver : BlendMode.SrcOver;\n    const blend = blendMode ? BlendMode[enumKey(blendMode)] : defaultBlendMode;\n    if (this.derived === undefined) {\n      throw new Error(\"VerticesNode: vertices is undefined\");\n    }\n    canvas.drawVertices(this.derived, blend, paint);\n  }\n}\n"],"mappings":"AACA,SAASA,UAAT,EAAqBC,SAArB,QAAsC,qBAAtC;AAEA,SAASC,QAAT,QAAyB,aAAzB;AACA,SAASC,OAAT,EAAkBC,YAAlB,QAAsC,cAAtC;AACA,SAASC,cAAT,QAA+B,gBAA/B;AAGA,OAAO,MAAMC,YAAN,SAA2BD,cAA3B,CAAqE;EAC1EE,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAyC;IAClD,MAAMD,GAAN,EAAWN,QAAQ,CAACQ,QAApB,EAA8BD,KAA9B;EACD;;EAESE,WAAW,GAAG;IACtB,MAAM;MAAEC,IAAF;MAAQC,QAAR;MAAkBC,QAAlB;MAA4BC,MAA5B;MAAoCC;IAApC,IAAgD,KAAKP,KAA3D;IACA,MAAMQ,UAAU,GAAGL,IAAI,GAAGZ,UAAU,CAACG,OAAO,CAACS,IAAD,CAAR,CAAb,GAA+BZ,UAAU,CAACkB,SAAjE;IACA,OAAO,KAAKC,IAAL,CAAUC,YAAV,CACLH,UADK,EAELJ,QAFK,EAGLC,QAHK,EAILC,MAAM,GAAGA,MAAM,CAACM,GAAP,CAAYC,CAAD,IAAOlB,YAAY,CAAC,KAAKe,IAAN,EAAYG,CAAZ,EAAe,CAAf,CAA9B,CAAH,GAAsDC,SAJvD,EAKLP,OALK,CAAP;EAOD;;EAEDQ,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;IACtC,MAAM;MAAEX,MAAF;MAAUY;IAAV,IAAwB,KAAKlB,KAAnC;IACA,MAAMmB,gBAAgB,GAAGb,MAAM,GAAGd,SAAS,CAAC4B,OAAb,GAAuB5B,SAAS,CAAC6B,OAAhE;IACA,MAAMC,KAAK,GAAGJ,SAAS,GAAG1B,SAAS,CAACE,OAAO,CAACwB,SAAD,CAAR,CAAZ,GAAmCC,gBAA1D;;IACA,IAAI,KAAKI,OAAL,KAAiBT,SAArB,EAAgC;MAC9B,MAAM,IAAIU,KAAJ,CAAU,qCAAV,CAAN;IACD;;IACDR,MAAM,CAACS,YAAP,CAAoB,KAAKF,OAAzB,EAAkCD,KAAlC,EAAyCL,KAAzC;EACD;;AAzByE"}
+{"version":3,"names":["VertexMode","BlendMode","NodeType","enumKey","JsiDrawingNode","VerticesNode","constructor","ctx","props","Vertices","deriveProps","mode","vertices","textures","colors","indices","vertexMode","Triangles","Skia","MakeVertices","map","c","Color","undefined","draw","canvas","paint","blendMode","defaultBlendMode","DstOver","SrcOver","blend","derived","Error","drawVertices"],"sources":["VerticesNode.ts"],"sourcesContent":["import type { SkVertices } from \"../../../skia/types\";\nimport { VertexMode, BlendMode } from \"../../../skia/types\";\nimport type { DrawingContext, VerticesProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { enumKey } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class VerticesNode extends JsiDrawingNode<VerticesProps, SkVertices> {\n  constructor(ctx: NodeContext, props: VerticesProps) {\n    super(ctx, NodeType.Vertices, props);\n  }\n\n  protected deriveProps() {\n    const { mode, vertices, textures, colors, indices } = this.props;\n    const vertexMode = mode ? VertexMode[enumKey(mode)] : VertexMode.Triangles;\n    return this.Skia.MakeVertices(\n      vertexMode,\n      vertices,\n      textures,\n      colors ? colors.map((c) => this.Skia.Color(c)) : undefined,\n      indices\n    );\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { colors, blendMode } = this.props;\n    const defaultBlendMode = colors ? BlendMode.DstOver : BlendMode.SrcOver;\n    const blend = blendMode ? BlendMode[enumKey(blendMode)] : defaultBlendMode;\n    if (this.derived === undefined) {\n      throw new Error(\"VerticesNode: vertices is undefined\");\n    }\n    canvas.drawVertices(this.derived, blend, paint);\n  }\n}\n"],"mappings":"AACA,SAASA,UAAT,EAAqBC,SAArB,QAAsC,qBAAtC;AAEA,SAASC,QAAT,QAAyB,aAAzB;AACA,SAASC,OAAT,QAAwB,cAAxB;AACA,SAASC,cAAT,QAA+B,gBAA/B;AAGA,OAAO,MAAMC,YAAN,SAA2BD,cAA3B,CAAqE;EAC1EE,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAyC;IAClD,MAAMD,GAAN,EAAWL,QAAQ,CAACO,QAApB,EAA8BD,KAA9B;EACD;;EAESE,WAAW,GAAG;IACtB,MAAM;MAAEC,IAAF;MAAQC,QAAR;MAAkBC,QAAlB;MAA4BC,MAA5B;MAAoCC;IAApC,IAAgD,KAAKP,KAA3D;IACA,MAAMQ,UAAU,GAAGL,IAAI,GAAGX,UAAU,CAACG,OAAO,CAACQ,IAAD,CAAR,CAAb,GAA+BX,UAAU,CAACiB,SAAjE;IACA,OAAO,KAAKC,IAAL,CAAUC,YAAV,CACLH,UADK,EAELJ,QAFK,EAGLC,QAHK,EAILC,MAAM,GAAGA,MAAM,CAACM,GAAP,CAAYC,CAAD,IAAO,KAAKH,IAAL,CAAUI,KAAV,CAAgBD,CAAhB,CAAlB,CAAH,GAA2CE,SAJ5C,EAKLR,OALK,CAAP;EAOD;;EAEDS,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;IACtC,MAAM;MAAEZ,MAAF;MAAUa;IAAV,IAAwB,KAAKnB,KAAnC;IACA,MAAMoB,gBAAgB,GAAGd,MAAM,GAAGb,SAAS,CAAC4B,OAAb,GAAuB5B,SAAS,CAAC6B,OAAhE;IACA,MAAMC,KAAK,GAAGJ,SAAS,GAAG1B,SAAS,CAACE,OAAO,CAACwB,SAAD,CAAR,CAAZ,GAAmCC,gBAA1D;;IACA,IAAI,KAAKI,OAAL,KAAiBT,SAArB,EAAgC;MAC9B,MAAM,IAAIU,KAAJ,CAAU,qCAAV,CAAN;IACD;;IACDR,MAAM,CAACS,YAAP,CAAoB,KAAKF,OAAzB,EAAkCD,KAAlC,EAAyCL,KAAzC;EACD;;AAzByE"}

package/lib/module/dom/nodes/paint/ColorFilters.js

@@ -1,7 +1,6 @@
 import { BlendMode } from "../../../skia/types";
 import { JsiDeclarationNode } from "../Node";
 import { DeclarationType, NodeType } from "../../types";
-import { processColor } from "../datatypes";
 import { enumKey } from "../datatypes/Enum";
 export class ColorFilterDeclaration extends JsiDeclarationNode {
   constructor(ctx, type, props) {
@@ -64,7 +63,7 @@ export class BlendColorFilterNode extends ColorFilterDeclaration {
     const {
       mode
     } = this.props;
-    const color = processColor(this.Skia, this.props.color, 1);
+    const color = this.Skia.Color(this.props.color);
     const cf = this.Skia.ColorFilter.MakeBlend(color, BlendMode[enumKey(mode)]);
     return this.compose(cf);
   }