@shopify/react-native-skia 0.1.163 → 0.1.164

package/src/dom/nodes/paint/ImageFilters.ts

@@ -15,7 +15,7 @@ import type {
   RuntimeShaderImageFilterProps,
 } from "../../types";
 import { DeclarationType, NodeType } from "../../types";
-import { processRadius, enumKey, processColor } from "../datatypes";
+import { processRadius, enumKey } from "../datatypes";
 import type { NodeContext } from "../Node";
 import { JsiDeclarationNode } from "../Node";
 
@@ -145,7 +145,7 @@ export class DropShadowImageFilterNode extends ImageFilterDeclaration<DropShadow
 
   materialize() {
     const { dx, dy, blur, shadowOnly, color: cl, inner } = this.props;
-    const color = processColor(this.Skia, cl, 1);
+    const color = this.Skia.Color(cl);
     const input = this.getOptionalChildInstance(0);
     let factory;
     if (inner) {

package/src/dom/nodes/paint/Shaders.ts

@@ -19,7 +19,6 @@ import type {
   TwoPointConicalGradientProps,
 } from "../../types";
 import { DeclarationType, NodeType } from "../../types";
-import { processColor } from "../datatypes/Color";
 import {
   enumKey,
   fitRects,
@@ -99,7 +98,7 @@ export class ColorNode extends ShaderDeclaration<ColorProps> {
 
   materialize() {
     const { color } = this.props;
-    return this.Skia.Shader.MakeColor(processColor(this.Skia, color, 1));
+    return this.Skia.Shader.MakeColor(this.Skia.Color(color));
   }
 }
 

package/src/dom/types/DrawingContext.ts

@@ -3,5 +3,4 @@ import type { SkCanvas, SkPaint } from "../../skia/types";
 export interface DrawingContext {
   canvas: SkCanvas;
   paint: SkPaint;
-  opacity: number;
 }

package/src/renderer/DrawingContext.ts

@@ -1,12 +1,12 @@
 import type { RefObject } from "react";
 
 import type { DrawingInfo, SkiaView } from "../views";
-import type { SkCanvas, SkPaint, Skia, Vector } from "../skia/types";
+import type { Skia, Vector } from "../skia/types";
+import type { DrawingContext as DOMDrawingContext } from "../dom/types";
 
-export interface DrawingContext extends Omit<DrawingInfo, "touches"> {
-  canvas: SkCanvas;
-  paint: SkPaint;
-  opacity: number;
+export interface DrawingContext
+  extends Omit<DrawingInfo, "touches">,
+    DOMDrawingContext {
   center: Vector;
   ref: RefObject<SkiaView>;
   Skia: Skia;

package/src/skia/types/Paint/Paint.ts

@@ -29,6 +29,11 @@ export const isPaint = (obj: SkJSIInstance<string> | null): obj is SkPaint =>
   obj !== null && obj.__typename__ === "Paint";
 
 export interface SkPaint extends SkJSIInstance<"Paint"> {
+  /**
+   * Retrieves alpha from the color used when stroking and filling.
+   */
+  getAlphaf(): number;
+
   /**
    * Returns a copy of this paint.
    */

package/src/skia/web/JsiSkPaint.ts

@@ -34,6 +34,10 @@ export class JsiSkPaint extends HostObject<Paint, "Paint"> implements SkPaint {
     this.ref = new this.CanvasKit.Paint();
   }
 
+  getAlphaf() {
+    return this.getColor()[3];
+  }
+
   getColor() {
     return this.ref.getColor();
   }

package/src/web/LoadSkiaWeb.tsx

@@ -1,5 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
+// @ts-ignore
 import CanvasKitInit from "canvaskit-wasm/bin/full/canvaskit";
 import type {
   CanvasKit as CanvasKitType,

package/lib/commonjs/dom/nodes/datatypes/Color.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.rgbaColor = exports.processColor = exports.RED = exports.GREEN = exports.BLUE = exports.ALPHA = void 0;
-const RED = 0;
-exports.RED = RED;
-const GREEN = 1;
-exports.GREEN = GREEN;
-const BLUE = 2;
-exports.BLUE = BLUE;
-const ALPHA = 3;
-exports.ALPHA = ALPHA;
-
-const rgbaColor = (r, g, b, a) => new Float32Array([r, g, b, a]);
-
-exports.rgbaColor = rgbaColor;
-
-const processColor = (Skia, cl, currentOpacity) => {
-  const color = Skia.Color(cl);
-  color[ALPHA] *= currentOpacity;
-  return color;
-};
-
-exports.processColor = processColor;
-//# sourceMappingURL=Color.js.map

package/lib/commonjs/dom/nodes/datatypes/Color.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["RED","GREEN","BLUE","ALPHA","rgbaColor","r","g","b","a","Float32Array","processColor","Skia","cl","currentOpacity","color","Color"],"sources":["Color.ts"],"sourcesContent":["import type { Color, Skia } from \"../../../skia/types\";\n\nexport const RED = 0;\nexport const GREEN = 1;\nexport const BLUE = 2;\nexport const ALPHA = 3;\n\nexport const rgbaColor = (r: number, g: number, b: number, a: number) =>\n  new Float32Array([r, g, b, a]);\n\nexport const processColor = (Skia: Skia, cl: Color, currentOpacity: number) => {\n  const color = Skia.Color(cl);\n  color[ALPHA] *= currentOpacity;\n  return color;\n};\n"],"mappings":";;;;;;AAEO,MAAMA,GAAG,GAAG,CAAZ;;AACA,MAAMC,KAAK,GAAG,CAAd;;AACA,MAAMC,IAAI,GAAG,CAAb;;AACA,MAAMC,KAAK,GAAG,CAAd;;;AAEA,MAAMC,SAAS,GAAG,CAACC,CAAD,EAAYC,CAAZ,EAAuBC,CAAvB,EAAkCC,CAAlC,KACvB,IAAIC,YAAJ,CAAiB,CAACJ,CAAD,EAAIC,CAAJ,EAAOC,CAAP,EAAUC,CAAV,CAAjB,CADK;;;;AAGA,MAAME,YAAY,GAAG,CAACC,IAAD,EAAaC,EAAb,EAAwBC,cAAxB,KAAmD;EAC7E,MAAMC,KAAK,GAAGH,IAAI,CAACI,KAAL,CAAWH,EAAX,CAAd;EACAE,KAAK,CAACX,KAAD,CAAL,IAAgBU,cAAhB;EACA,OAAOC,KAAP;AACD,CAJM"}

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

@@ -1,11 +0,0 @@
-export const RED = 0;
-export const GREEN = 1;
-export const BLUE = 2;
-export const ALPHA = 3;
-export const rgbaColor = (r, g, b, a) => new Float32Array([r, g, b, a]);
-export const processColor = (Skia, cl, currentOpacity) => {
-  const color = Skia.Color(cl);
-  color[ALPHA] *= currentOpacity;
-  return color;
-};
-//# sourceMappingURL=Color.js.map

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

@@ -1 +0,0 @@
-{"version":3,"names":["RED","GREEN","BLUE","ALPHA","rgbaColor","r","g","b","a","Float32Array","processColor","Skia","cl","currentOpacity","color","Color"],"sources":["Color.ts"],"sourcesContent":["import type { Color, Skia } from \"../../../skia/types\";\n\nexport const RED = 0;\nexport const GREEN = 1;\nexport const BLUE = 2;\nexport const ALPHA = 3;\n\nexport const rgbaColor = (r: number, g: number, b: number, a: number) =>\n  new Float32Array([r, g, b, a]);\n\nexport const processColor = (Skia: Skia, cl: Color, currentOpacity: number) => {\n  const color = Skia.Color(cl);\n  color[ALPHA] *= currentOpacity;\n  return color;\n};\n"],"mappings":"AAEA,OAAO,MAAMA,GAAG,GAAG,CAAZ;AACP,OAAO,MAAMC,KAAK,GAAG,CAAd;AACP,OAAO,MAAMC,IAAI,GAAG,CAAb;AACP,OAAO,MAAMC,KAAK,GAAG,CAAd;AAEP,OAAO,MAAMC,SAAS,GAAG,CAACC,CAAD,EAAYC,CAAZ,EAAuBC,CAAvB,EAAkCC,CAAlC,KACvB,IAAIC,YAAJ,CAAiB,CAACJ,CAAD,EAAIC,CAAJ,EAAOC,CAAP,EAAUC,CAAV,CAAjB,CADK;AAGP,OAAO,MAAME,YAAY,GAAG,CAACC,IAAD,EAAaC,EAAb,EAAwBC,cAAxB,KAAmD;EAC7E,MAAMC,KAAK,GAAGH,IAAI,CAACI,KAAL,CAAWH,EAAX,CAAd;EACAE,KAAK,CAACX,KAAD,CAAL,IAAgBU,cAAhB;EACA,OAAOC,KAAP;AACD,CAJM"}

package/lib/typescript/src/dom/nodes/datatypes/Color.d.ts

@@ -1,7 +0,0 @@
-import type { Color, Skia } from "../../../skia/types";
-export declare const RED = 0;
-export declare const GREEN = 1;
-export declare const BLUE = 2;
-export declare const ALPHA = 3;
-export declare const rgbaColor: (r: number, g: number, b: number, a: number) => Float32Array;
-export declare const processColor: (Skia: Skia, cl: Color, currentOpacity: number) => Float32Array;

package/src/dom/nodes/datatypes/Color.ts

@@ -1,15 +0,0 @@
-import type { Color, Skia } from "../../../skia/types";
-
-export const RED = 0;
-export const GREEN = 1;
-export const BLUE = 2;
-export const ALPHA = 3;
-
-export const rgbaColor = (r: number, g: number, b: number, a: number) =>
-  new Float32Array([r, g, b, a]);
-
-export const processColor = (Skia: Skia, cl: Color, currentOpacity: number) => {
-  const color = Skia.Color(cl);
-  color[ALPHA] *= currentOpacity;
-  return color;
-};