@shopify/react-native-skia 0.1.127 → 0.1.130

package/src/skia/core/Image.ts

@@ -0,0 +1,12 @@
+import { Skia } from "../Skia";
+import type { DataSource } from "../types";
+
+import { useRawData } from "./Data";
+
+/**
+ * Returns a Skia Image object
+ * */
+export const useImage = (
+  source: DataSource | null | undefined,
+  onError?: (err: Error) => void
+) => useRawData(source, Skia.Image.MakeImageFromEncoded, onError);

package/src/skia/{Paint/usePaint.ts → core/Paint.ts}

@@ -1,9 +1,14 @@
 import type { DependencyList } from "react";
 import { useMemo } from "react";
 
-import { SkiaPaint } from "./Paint";
-import type { SkPaint } from "./Paint";
+import { Skia } from "../Skia";
+import type { SkPaint } from "../types";
 
+export const SkiaPaint = () => {
+  const paint = Skia.Paint();
+  paint.setAntiAlias(true);
+  return paint;
+};
 /**
  * Returns a Skia Paint object
  * */

package/src/skia/{Path/usePath.ts → core/Path.ts}

@@ -1,10 +1,8 @@
 import type { DependencyList } from "react";
 import { useMemo } from "react";
 
-import type { SkFont } from "../Font";
 import { Skia } from "../Skia";
-
-import type { SkPath } from "./Path";
+import type { SkFont, SkPath } from "../types";
 
 /**
  * Memoizes and returns a Skia Path object with optional initializer

package/src/skia/{Picture/usePicture.ts → core/Picture.ts}

@@ -1,11 +1,8 @@
 import type { DependencyList } from "react";
 import { useMemo } from "react";
 
-import type { SkCanvas } from "../Canvas";
-import type { SkRect } from "../Rect";
 import { Skia } from "../Skia";
-
-import type { SkPicture } from "./Picture";
+import type { SkCanvas, SkPicture, SkRect } from "../types";
 
 /**
  * Memoizes and returns an SkPicture that can be drawn to another canvas.

package/src/skia/core/SVG.ts

@@ -0,0 +1,9 @@
+import { Skia } from "../Skia";
+import type { DataSource } from "../types";
+
+import { useRawData } from "./Data";
+
+export const useSVG = (
+  source: DataSource | null | undefined,
+  onError?: (err: Error) => void
+) => useRawData(source, Skia.SVG.MakeFromData, onError);

package/src/skia/core/Typeface.ts

@@ -0,0 +1,11 @@
+import { Skia } from "../Skia";
+import type { DataSource } from "../types";
+
+import { useRawData } from "./Data";
+/**
+ * Returns a Skia Typeface object
+ * */
+export const useTypeface = (
+  source: DataSource | null | undefined,
+  onError?: (err: Error) => void
+) => useRawData(source, Skia.Typeface.MakeFreeTypeFaceFromData, onError);

package/src/skia/core/index.ts

@@ -0,0 +1,10 @@
+export * from "./Color";
+export * from "./Data";
+export * from "./Font";
+export * from "./Typeface";
+export * from "./Image";
+export * from "./Picture";
+export * from "./SVG";
+export * from "./Shader";
+export * from "./Paint";
+export * from "./Path";

package/src/skia/index.ts

@@ -1,24 +1,3 @@
 export { Skia } from "./Skia";
-export * from "./Canvas";
-export * from "./Paint";
-export * from "./Rect";
-export * from "./RRect";
-export * from "./Point";
-export * from "./Path";
-export * from "./Font";
-export * from "./Typeface";
-export * from "./MaskFilter";
-export * from "./ColorFilter";
-export * from "./ImageFilter";
-export * from "./PathEffect";
-export * from "./RuntimeEffect";
-export * from "./Shader";
-export * from "./Image";
-export * from "./Matrix";
-export * from "./SVG";
-export * from "./Surface";
-export * from "./FontMgr";
-export * from "./Vertices";
-export * from "./Color";
-export * from "./Picture";
-export * from "./Data";
+export * from "./core";
+export * from "./types";

package/src/skia/types/Color.ts

@@ -0,0 +1,4 @@
+// This is the JSI color
+export type SkColor = Float32Array;
+// Input colors can be string, number or Float32Array
+export type Color = string | Float32Array | number;

package/src/skia/{ColorFilter → types/ColorFilter}/ColorFilterFactory.ts

@@ -1,5 +1,5 @@
 import type { SkColor } from "../Color";
-import type { BlendMode } from "../Paint/BlendMode";
+import type { BlendMode } from "../Paint";
 
 import type { SkColorFilter } from "./ColorFilter";
 

package/src/skia/types/Data/Data.ts

@@ -0,0 +1,5 @@
+import type { SkJSIInstance } from "../JsiInstance";
+
+export type Data = SkJSIInstance<"Data">;
+
+export type DataSource = ReturnType<typeof require> | string | Uint8Array;

package/src/skia/{Font → types/Font}/Font.ts

@@ -2,7 +2,7 @@ import type { SkJSIInstance } from "../JsiInstance";
 import type { SkPaint } from "../Paint";
 import type { SkRect } from "../Rect";
 import type { SkPoint } from "../Point";
-import type { SkTypeface } from "../Typeface/Typeface";
+import type { SkTypeface } from "../Typeface";
 
 export interface FontMetrics {
   ascent: number; // suggested space above the baseline. < 0

package/src/skia/types/Font/index.ts

@@ -0,0 +1 @@
+export * from "./Font";

package/src/skia/{FontMgr → types/FontMgr}/FontMgr.ts

@@ -1,6 +1,6 @@
 import type { SkJSIInstance } from "../JsiInstance";
-import type { SkTypeface } from "../Typeface/Typeface";
 import type { FontStyle } from "../Font/Font";
+import type { SkTypeface } from "../Typeface";
 
 export interface FontMgr extends SkJSIInstance<"FontMgr"> {
   /**

package/src/skia/{FontMgr → types/FontMgr}/FontMgrFactory.ts

@@ -1,11 +1,6 @@
-// import type { DependencyList } from "react";
-
-// import type { Data, DataSource } from "../Data";
-// import { useDataCollection } from "../Data/Data";
-// import { Skia } from "../Skia";
-
 import type { FontMgr } from "./FontMgr";
 
+// Commented code below is the CanvasKit reference
 export interface FontMgrFactory {
   // FromData: (...data: Data[]) => FontMgr | null;
   RefDefault: () => FontMgr;

package/src/skia/{FontMgr → types/FontMgr}/index.ts

@@ -1 +1,2 @@
 export * from "./FontMgrFactory";
+export * from "./FontMgr";

package/src/skia/{Image → types/Image}/Image.ts

@@ -1,7 +1,7 @@
-import type { TileMode } from "../ImageFilter";
-import type { SkShader } from "../Shader";
 import type { SkMatrix } from "../Matrix";
 import type { SkJSIInstance } from "../JsiInstance";
+import type { TileMode } from "../ImageFilter";
+import type { SkShader } from "../Shader";
 
 export enum FilterMode {
   Linear,

package/src/skia/{Image → types/Image}/index.ts

@@ -1,3 +1,2 @@
 export * from "./Image";
 export * from "./ImageFactory";
-export * from "./useImage";

package/src/skia/{ImageFilter → types/ImageFilter}/ImageFilterFactory.ts

@@ -1,9 +1,9 @@
 import type { SkColor } from "../Color";
 import type { SkColorFilter } from "../ColorFilter/ColorFilter";
-import type { SkShader } from "../Shader/Shader";
+import type { BlendMode } from "../Paint";
 import type { SkRect } from "../Rect";
-import type { BlendMode } from "../Paint/BlendMode";
 import type { SkRuntimeShaderBuilder } from "../RuntimeEffect";
+import type { SkShader } from "../Shader";
 
 import type { SkImageFilter, TileMode } from "./ImageFilter";
 

package/src/skia/{MaskFilter.ts → types/MaskFilter.ts}

@@ -9,9 +9,9 @@ export enum BlurStyle {
 
 export const isMaskFilter = (
   obj: SkJSIInstance<string> | null
-): obj is IMaskFilter => obj !== null && obj.__typename__ === "MaskFilter";
+): obj is SkMaskFilter => obj !== null && obj.__typename__ === "MaskFilter";
 
-export type IMaskFilter = SkJSIInstance<"MaskFilter">;
+export type SkMaskFilter = SkJSIInstance<"MaskFilter">;
 
 /**
  * See SkMaskFilter.h for more details.
@@ -23,5 +23,5 @@ export interface MaskFilterFactory {
    * @param sigma - Standard deviation of the Gaussian blur to apply. Must be > 0.
    * @param respectCTM - if true the blur's sigma is modified by the CTM.
    */
-  MakeBlur(style: BlurStyle, sigma: number, respectCTM: boolean): IMaskFilter;
+  MakeBlur(style: BlurStyle, sigma: number, respectCTM: boolean): SkMaskFilter;
 }

package/src/skia/{Paint → types/Paint}/Paint.ts

@@ -1,11 +1,10 @@
 import type { SkImageFilter } from "../ImageFilter";
-import type { IMaskFilter } from "../MaskFilter";
+import type { SkMaskFilter } from "../MaskFilter";
 import type { SkColorFilter } from "../ColorFilter";
-import type { SkShader } from "../Shader";
 import type { SkColor } from "../Color";
-import type { IPathEffect } from "../PathEffect";
+import type { SkPathEffect } from "../PathEffect";
 import type { SkJSIInstance } from "../JsiInstance";
-import { Skia } from "../Skia";
+import type { SkShader } from "../Shader";
 
 import type { BlendMode } from "./BlendMode";
 
@@ -26,12 +25,6 @@ export enum StrokeJoin {
   Round,
 }
 
-export const SkiaPaint = () => {
-  const paint = Skia.Paint();
-  paint.setAntiAlias(true);
-  return paint;
-};
-
 export const isPaint = (obj: SkJSIInstance<string> | null): obj is SkPaint =>
   obj !== null && obj.__typename__ === "Paint";
 
@@ -114,13 +107,13 @@ export interface SkPaint extends SkJSIInstance<"Paint"> {
    * Sets the current mask filter, replacing the existing one if there was one.
    * @param filter
    */
-  setMaskFilter(filter: IMaskFilter | null): void;
+  setMaskFilter(filter: SkMaskFilter | null): void;
 
   /**
    * Sets the current path effect, replacing the existing one if there was one.
    * @param effect
    */
-  setPathEffect(effect: IPathEffect | null): void;
+  setPathEffect(effect: SkPathEffect | null): void;
 
   /**
    * Sets the current shader, replacing the existing one if there was one.

package/src/skia/{Paint → types/Paint}/index.ts

@@ -1,3 +1,2 @@
 export * from "./Paint";
 export * from "./BlendMode";
-export * from "./usePaint";

package/src/skia/{Path → types/Path}/index.ts

@@ -1,3 +1,2 @@
 export * from "./Path";
 export * from "./PathFactory";
-export * from "./usePath";

package/src/skia/{PathEffect.ts → types/PathEffect.ts}

@@ -2,11 +2,11 @@ import type { SkJSIInstance } from "./JsiInstance";
 import type { SkPath } from "./Path/Path";
 import type { SkMatrix } from "./Matrix";
 
-export type IPathEffect = SkJSIInstance<"PathEffect">;
+export type SkPathEffect = SkJSIInstance<"PathEffect">;
 
 export const isPathEffect = (
   obj: SkJSIInstance<string> | null
-): obj is IPathEffect => obj !== null && obj.__typename__ === "PathEffect";
+): obj is SkPathEffect => obj !== null && obj.__typename__ === "PathEffect";
 
 export enum Path1DEffectStyle {
   Translate,
@@ -19,7 +19,7 @@ export interface PathEffectFactory {
    * Returns a PathEffect that can turn sharp corners into rounded corners.
    * @param radius - if <=0, returns null
    */
-  MakeCorner(radius: number): IPathEffect | null;
+  MakeCorner(radius: number): SkPathEffect | null;
 
   /**
    * Returns a PathEffect that add dashes to the path.
@@ -30,7 +30,7 @@ export interface PathEffectFactory {
    *                    the "on" intervals, and the odd indices specifying the length of "off".
    * @param phase - offset length into the intervals array. Defaults to 0.
    */
-  MakeDash(intervals: number[], phase?: number): IPathEffect;
+  MakeDash(intervals: number[], phase?: number): SkPathEffect;
 
   /**
    * Returns a PathEffect that breaks path into segments of segLength length, and randomly move
@@ -39,7 +39,11 @@ export interface PathEffectFactory {
    * @param dev - limit of the movement of the endpoints.
    * @param seedAssist - modifies the randomness. See SkDiscretePathEffect.h for more.
    */
-  MakeDiscrete(segLength: number, dev: number, seedAssist: number): IPathEffect;
+  MakeDiscrete(
+    segLength: number,
+    dev: number,
+    seedAssist: number
+  ): SkPathEffect;
 
   /**
    *
@@ -47,7 +51,7 @@ export interface PathEffectFactory {
    * outer pathEffect (i.e. outer(inner(path))).
    *
    */
-  MakeCompose(outer: IPathEffect, inner: IPathEffect): IPathEffect;
+  MakeCompose(outer: SkPathEffect, inner: SkPathEffect): SkPathEffect;
 
   /**
    *
@@ -55,7 +59,7 @@ export interface PathEffectFactory {
    * in sequence (i.e. first(path) + second(path)).
    *
    */
-  MakeSum(outer: IPathEffect, inner: IPathEffect): IPathEffect;
+  MakeSum(outer: SkPathEffect, inner: SkPathEffect): SkPathEffect;
 
   /**
    * Returns a PathEffect that will fill the drawing path with a pattern made by applying
@@ -65,7 +69,7 @@ export interface PathEffectFactory {
    * @param width - must be >= 0
    * @param matrix
    */
-  MakeLine2D(width: number, matrix: SkMatrix): IPathEffect | null;
+  MakeLine2D(width: number, matrix: SkMatrix): SkPathEffect | null;
 
   /**
    * Returns a PathEffect which implements dashing by replicating the specified path.
@@ -80,7 +84,7 @@ export interface PathEffectFactory {
     advance: number,
     phase: number,
     style: Path1DEffectStyle
-  ): IPathEffect | null;
+  ): SkPathEffect | null;
 
   /**
    * Returns a PathEffect that will fill the drawing path with a pattern by repeating the
@@ -89,5 +93,5 @@ export interface PathEffectFactory {
    * @param matrix
    * @param path
    */
-  MakePath2D(matrix: SkMatrix, path: SkPath): IPathEffect | null;
+  MakePath2D(matrix: SkMatrix, path: SkPath): SkPathEffect | null;
 }

package/src/skia/{Picture → types/Picture}/index.ts

@@ -1,4 +1,3 @@
 export * from "./Picture";
 export * from "./PictureRecorder";
-export * from "./usePicture";
 export * from "./PictureFactory";

package/src/skia/{RuntimeEffect → types/RuntimeEffect}/RuntimeEffect.ts

@@ -16,25 +16,18 @@ export interface SkRuntimeEffect extends SkJSIInstance<"RuntimeEffect"> {
   /**
    * Returns a shader executed using the given uniform data.
    * @param uniforms
-   * @param isOpaque
    * @param localMatrix
    */
-  makeShader(
-    uniforms: number[],
-    isOpaque?: boolean,
-    localMatrix?: SkMatrix
-  ): SkShader;
+  makeShader(uniforms: number[], localMatrix?: SkMatrix): SkShader;
 
   /**
    * Returns a shader executed using the given uniform data and the children as inputs.
    * @param uniforms
-   * @param isOpaque
    * @param children
    * @param localMatrix
    */
   makeShaderWithChildren(
     uniforms: number[],
-    isOpaque?: boolean,
     children?: SkShader[],
     localMatrix?: SkMatrix
   ): SkShader;

package/src/skia/{SVG → types/SVG}/SVGFactory.ts

@@ -1,4 +1,4 @@
-import type { Data } from "../Data/Data";
+import type { Data } from "../Data";
 
 import type { SkSVG } from "./SVG";
 

package/src/skia/{SVG → types/SVG}/index.ts

@@ -1,3 +1,2 @@
 export * from "./SVG";
 export * from "./SVGFactory";
-export * from "./useSvg";

package/src/skia/{Shader → types/Shader}/index.ts

@@ -1,3 +1,2 @@
 export * from "./Shader";
 export * from "./ShaderFactory";
-export * from "./useShader";

package/src/skia/{SkiaApi.ts → types/Skia.ts}

@@ -8,7 +8,11 @@ import type { MaskFilterFactory } from "./MaskFilter";
 import type { SkPaint } from "./Paint";
 import type { SkRect } from "./Rect";
 import type { SkRRect } from "./RRect";
-import type { RuntimeEffectFactory } from "./RuntimeEffect";
+import type {
+  RuntimeEffectFactory,
+  SkRuntimeEffect,
+  SkRuntimeShaderBuilder,
+} from "./RuntimeEffect";
 import type { ShaderFactory } from "./Shader";
 import type { SkMatrix } from "./Matrix";
 import type { PathEffectFactory } from "./PathEffect";
@@ -19,28 +23,22 @@ import type { SVGFactory } from "./SVG";
 import type { TextBlobFactory } from "./TextBlob";
 import type { FontMgrFactory } from "./FontMgr/FontMgrFactory";
 import type { SurfaceFactory } from "./Surface";
-import "./NativeSetup";
 import type { SkRSXform } from "./RSXform";
 import type { SkPath } from "./Path/Path";
 import type { SkContourMeasureIter } from "./ContourMeasure";
 import type { PictureFactory, SkPictureRecorder } from "./Picture";
 import type { Color, SkColor } from "./Color";
-import type {
-  SkRuntimeShaderBuilder,
-  SkRuntimeEffect,
-} from "./RuntimeEffect/RuntimeEffect";
 
 /**
  * Declares the interface for the native Skia API
  */
-export interface SkiaApi {
+export interface Skia {
   Point: (x: number, y: number) => SkPoint;
   XYWHRect: (x: number, y: number, width: number, height: number) => SkRect;
   RuntimeShaderBuilder: (rt: SkRuntimeEffect) => SkRuntimeShaderBuilder;
   RRectXY: (rect: SkRect, rx: number, ry: number) => SkRRect;
   RSXform: (scos: number, ssin: number, tx: number, ty: number) => SkRSXform;
   Color: (color: Color) => SkColor;
-  parseColorString: (color: string) => SkColor | undefined;
   ContourMeasureIter: (
     path: SkPath,
     forceClosed: boolean,

package/src/skia/{Typeface → types/Typeface}/TypefaceFactory.ts

@@ -1,4 +1,4 @@
-import type { Data } from "../Data/Data";
+import type { Data } from "../Data";
 
 import type { SkTypeface } from "./Typeface";
 

package/src/skia/{Typeface → types/Typeface}/index.ts

@@ -1,3 +1,2 @@
 export * from "./Typeface";
-export * from "./useTypeface";
 export * from "./TypefaceFactory";

package/src/skia/types/index.ts

@@ -0,0 +1,28 @@
+export * from "./Picture";
+export * from "./Data";
+export * from "./SVG";
+export * from "./Surface";
+export * from "./FontMgr";
+export * from "./Vertices";
+export * from "./RuntimeEffect";
+export * from "./Shader";
+export * from "./Image";
+export * from "./ColorFilter";
+export * from "./ImageFilter";
+export * from "./Font";
+export * from "./Typeface";
+export * from "./Paint";
+export * from "./Path";
+export * from "./Color";
+export * from "./Canvas";
+export * from "./ContourMeasure";
+export * from "./MaskFilter";
+export * from "./Matrix";
+export * from "./PathEffect";
+export * from "./Point";
+export * from "./Rect";
+export * from "./RRect";
+export * from "./RSXform";
+export * from "./JsiInstance";
+export * from "./Skia";
+export * from "./TextBlob";