@shopify/react-native-skia 0.1.163 → 0.1.165

package/src/renderer/processors/Animations/Animations.ts

@@ -54,10 +54,16 @@ export type AnimatedProps<T, O extends keyof T | never = never> = {
     : AnimatedProp<T[K]>;
 };
 
-// TODO: switch to AnimatedProps<GroupProps> and remove duplicate properties.
-// For instance matrix in color filter becomes colorMatrix
-
 export type SkiaProps<
   P = object,
   O extends keyof P | never = never
 > = AnimatedProps<P, O>;
+
+type WithOptional<T extends object, N extends keyof T> = Omit<T, N> & {
+  [K in N]?: T[K];
+};
+
+export type SkiaDefaultProps<
+  T extends object,
+  N extends keyof T
+> = WithOptional<SkiaProps<T>, N>;

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/types/RuntimeEffect/RuntimeEffect.ts

@@ -58,4 +58,9 @@ export interface SkRuntimeEffect extends SkJSIInstance<"RuntimeEffect"> {
    * @param index
    */
   getUniformName(index: number): string;
+
+  /**
+   * Returns the SkSL source of the runtime effect shader.
+   */
+  source(): string;
 }

package/src/skia/types/Shader/Shader.ts

@@ -9,7 +9,7 @@ export type SkShader = SkJSIInstance<"Shader">;
 
 export type UniformValue = number | Vector | readonly number[];
 
-export type Uniform = UniformValue | readonly UniformValue[];
+export type Uniform = UniformValue | readonly UniformValue[] | Float32Array;
 
 export interface Uniforms {
   [name: string]: Uniform;
@@ -36,10 +36,12 @@ export const processUniforms = (
     .fill(0)
     .flatMap((_, i) => {
       const name = source.getUniformName(i);
-      const value = uniforms[name];
-      if (value === undefined) {
+      const rawValue = uniforms[name];
+      if (rawValue === undefined) {
         throw new Error(`No value specified for uniform ${name}`);
       }
+      const value =
+        rawValue instanceof Float32Array ? Array.from(rawValue) : rawValue;
       const result = Array.isArray(value)
         ? value.flatMap(processValue)
         : processValue(value as UniformValue);

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/skia/web/JsiSkRuntimeEffect.ts

@@ -11,10 +11,14 @@ export class JsiSkRuntimeEffect
   extends HostObject<RuntimeEffect, "RuntimeEffect">
   implements SkRuntimeEffect
 {
-  constructor(CanvasKit: CanvasKit, ref: RuntimeEffect) {
+  constructor(CanvasKit: CanvasKit, ref: RuntimeEffect, private sksl: string) {
     super(CanvasKit, ref, "RuntimeEffect");
   }
 
+  source() {
+    return this.sksl;
+  }
+
   makeShader(uniforms: number[], localMatrix?: SkMatrix) {
     return new JsiSkShader(
       this.CanvasKit,

package/src/skia/web/JsiSkRuntimeEffectFactory.ts

@@ -18,6 +18,6 @@ export class JsiSkRuntimeEffectFactory
     if (re === null) {
       return null;
     }
-    return new JsiSkRuntimeEffect(this.CanvasKit, re);
+    return new JsiSkRuntimeEffect(this.CanvasKit, re, sksl);
   }
 }

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;
-};