@shopify/react-native-skia 0.1.124 → 0.1.125

package/lib/typescript/src/skia/SkiaApi.d.ts

@@ -0,0 +1,71 @@
+import type { ImageFilterFactory } from "./ImageFilter";
+import type { PathFactory } from "./Path";
+import type { ColorFilterFactory } from "./ColorFilter";
+import type { SkFont } from "./Font";
+import type { SkTypeface, TypefaceFactory } from "./Typeface";
+import type { ImageFactory } from "./Image";
+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 { ShaderFactory } from "./Shader";
+import type { SkMatrix } from "./Matrix";
+import type { PathEffectFactory } from "./PathEffect";
+import type { SkPoint } from "./Point";
+import type { SkVertices, VertexMode } from "./Vertices/Vertices";
+import type { DataFactory } from "./Data";
+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 {
+    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, resScale: number) => SkContourMeasureIter;
+    Paint: () => SkPaint;
+    PictureRecorder: () => SkPictureRecorder;
+    Picture: PictureFactory;
+    Path: PathFactory;
+    Matrix: () => SkMatrix;
+    ColorFilter: ColorFilterFactory;
+    Font: (typeface?: SkTypeface, size?: number) => SkFont;
+    Typeface: TypefaceFactory;
+    MaskFilter: MaskFilterFactory;
+    RuntimeEffect: RuntimeEffectFactory;
+    ImageFilter: ImageFilterFactory;
+    Shader: ShaderFactory;
+    PathEffect: PathEffectFactory;
+    /**
+     * Returns an Vertices based on the given positions and optional parameters.
+     * See SkVertices.h (especially the Builder) for more details.
+     * @param mode
+     * @param positions
+     * @param textureCoordinates
+     * @param colors - either a list of int colors or a flattened color array.
+     * @param indices
+     * @param isVolatile
+     */
+    MakeVertices(mode: VertexMode, positions: SkPoint[], textureCoordinates?: SkPoint[] | null, colors?: SkColor[], indices?: number[] | null, isVolatile?: boolean): SkVertices;
+    Data: DataFactory;
+    Image: ImageFactory;
+    SVG: SVGFactory;
+    FontMgr: FontMgrFactory;
+    TextBlob: TextBlobFactory;
+    Surface: SurfaceFactory;
+}

package/lib/typescript/src/skia/Surface/Surface.d.ts

@@ -2,7 +2,7 @@ import type { SkImage } from "../Image";
 import type { SkCanvas } from "../Canvas";
 import type { SkJSIInstance } from "../JsiInstance";
 import type { SkRect } from "../Rect";
-export interface ISurface extends SkJSIInstance<"Surface"> {
+export interface SkSurface extends SkJSIInstance<"Surface"> {
     /** Returns Canvas that draws into the surface. Subsequent calls return the
        same Canvas. Canvas returned is managed and owned by Surface, and is
        deleted when Surface is deleted.

package/lib/typescript/src/skia/Surface/SurfaceFactory.d.ts

@@ -1,4 +1,4 @@
-import type { ISurface } from "./Surface";
+import type { SkSurface } from "./Surface";
 export interface SurfaceFactory {
     /**
      * Returns a CPU backed surface with the given dimensions, an SRGB colorspace, Unpremul
@@ -7,5 +7,5 @@ export interface SurfaceFactory {
      * @param width - number of pixels of the width of the drawable area.
      * @param height - number of pixels of the height of the drawable area.
      */
-    Make: (width: number, height: number) => ISurface | null;
+    Make: (width: number, height: number) => SkSurface | null;
 }

package/lib/typescript/src/values/api.d.ts

@@ -1,29 +1,6 @@
-import type { SkiaAnimation, AnimationState, SkiaReadonlyValue, SkiaClockValue, SkiaValue } from "./types";
-export interface ISkiaValueApi {
-    /**
-     * Creates a new value that holds the initial value and that
-     * can be changed.
-     */
-    createValue: <T>(initialValue: T) => SkiaValue<T>;
-    /**
-     * Creates a derived value. This is a calculated value that returns the result of
-     * a function that is called with the values of the dependencies.
-     */
-    createDerivedValue: <R>(cb: () => R, values: Array<SkiaReadonlyValue<unknown>>) => SkiaReadonlyValue<R>;
-    /**
-     * Creates a clock value where the value is the number of milliseconds elapsed
-     * since the clock was created
-     */
-    createClockValue: () => SkiaClockValue;
-    /**
-     * Creates an animation that is driven from a clock and updated every frame.
-     * @param cb Callback to calculate next value from time.
-     * @returns An animation object that can control a value.
-     */
-    createAnimation: <S extends AnimationState = AnimationState>(cb: (t: number, state: S | undefined) => S) => SkiaAnimation;
-}
+import type { ISkiaValueApi } from "./types";
 declare global {
     var SkiaValueApi: ISkiaValueApi;
 }
 export declare const ValueApi: ISkiaValueApi;
-export declare const createValue: <T>(initialValue: T) => SkiaValue<T>, createDerivedValue: <R>(cb: () => R, values: Array<SkiaReadonlyValue<unknown>>) => SkiaReadonlyValue<R>;
+export declare const createValue: <T>(initialValue: T) => import("./types").SkiaValue<T>, createDerivedValue: <R>(cb: () => R, values: import("./types").SkiaReadonlyValue<unknown>[]) => import("./types").SkiaReadonlyValue<R>;

package/lib/typescript/src/values/api.web.d.ts

@@ -0,0 +1,2 @@
+export declare const ValueApi: import("./types").ISkiaValueApi;
+export declare const createValue: <T>(initialValue: T) => import("./types").SkiaValue<T>, createDerivedValue: <R>(cb: () => R, values: import("./types").SkiaReadonlyValue<unknown>[]) => import("./types").SkiaReadonlyValue<R>;

package/lib/typescript/src/values/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./types";
 export * from "./hooks";
-export * from "./animation";
 export * from "./api";

package/lib/typescript/src/values/types.d.ts

@@ -27,10 +27,33 @@ export interface SkiaClockValue extends SkiaReadonlyValue<number> {
     start: () => void;
     stop: () => void;
 }
-export interface SkiaAnimation {
+export interface SkiaAnimation extends SkiaClockValue {
     cancel: () => void;
 }
 export interface AnimationState {
     current: number;
     finished: boolean;
 }
+export interface ISkiaValueApi {
+    /**
+     * Creates a new value that holds the initial value and that
+     * can be changed.
+     */
+    createValue: <T>(initialValue: T) => SkiaValue<T>;
+    /**
+     * Creates a derived value. This is a calculated value that returns the result of
+     * a function that is called with the values of the dependencies.
+     */
+    createDerivedValue: <R>(cb: () => R, values: Array<SkiaReadonlyValue<unknown>>) => SkiaReadonlyValue<R>;
+    /**
+     * Creates a clock value where the value is the number of milliseconds elapsed
+     * since the clock was created
+     */
+    createClockValue: () => SkiaClockValue;
+    /**
+     * Creates an animation that is driven from a clock and updated every frame.
+     * @param cb Callback to calculate next value from time.
+     * @returns An animation object that can control a value.
+     */
+    createAnimation: <S extends AnimationState = AnimationState>(cb: (t: number, state: S | undefined) => S) => SkiaAnimation;
+}

package/lib/typescript/src/values/web/RNSkAnimation.d.ts

@@ -0,0 +1,9 @@
+import type { AnimationState, SkiaAnimation } from "../types";
+import { RNSkClockValue } from "./RNSkClockValue";
+export declare class RNSkAnimation<S extends AnimationState = AnimationState> extends RNSkClockValue implements SkiaAnimation {
+    constructor(callback: (t: number, state: S | undefined) => S, raf: (callback: (time: number) => void) => number);
+    private _callback;
+    private _animationState;
+    cancel(): void;
+    protected update(nextValue: number): void;
+}

package/lib/typescript/src/values/web/RNSkClockValue.d.ts

@@ -0,0 +1,13 @@
+import type { SkiaClockValue } from "../types";
+import { RNSkReadonlyValue } from "./RNSkReadonlyValue";
+export declare class RNSkClockValue extends RNSkReadonlyValue<number> implements SkiaClockValue {
+    constructor(raf: (callback: (time: number) => void) => number);
+    private _raf;
+    private _start;
+    private _stop;
+    private _state;
+    private notifyUpdate;
+    protected tick(value: number): void;
+    start(): void;
+    stop(): void;
+}

package/lib/typescript/src/values/web/RNSkDerivedValue.d.ts

@@ -0,0 +1,9 @@
+import type { DependencyList } from "react";
+import { RNSkReadonlyValue } from "./RNSkReadonlyValue";
+export declare class RNSkDerivedValue<T> extends RNSkReadonlyValue<T> {
+    constructor(callback: () => T, dependencies: DependencyList);
+    private dependecyUpdated;
+    private _callback;
+    private _unsubscribers;
+    unsubscribe(): void;
+}

package/lib/typescript/src/values/web/RNSkReadonlyValue.d.ts

@@ -0,0 +1,11 @@
+import type { SkiaReadonlyValue } from "../types";
+export declare class RNSkReadonlyValue<T> implements SkiaReadonlyValue<T> {
+    constructor(value: T);
+    private _current;
+    private _listeners;
+    private notifyListeners;
+    protected update(nextValue: T): void;
+    readonly __typename__ = "RNSkValue";
+    get current(): T;
+    addListener(cb: (value: T) => void): () => void;
+}

package/lib/typescript/src/values/web/RNSkValue.d.ts

@@ -0,0 +1,14 @@
+import type { SkiaAnimation, SkiaValue } from "../types";
+import { RNSkReadonlyValue } from "./RNSkReadonlyValue";
+export declare class RNSkValue<T> extends RNSkReadonlyValue<T> implements SkiaValue<T> {
+    constructor(value: T);
+    set current(value: T);
+    get current(): T;
+    private _unsubscribe;
+    private unsubscribe;
+    private subscribe;
+    private animationDidUpdate;
+    private _animation;
+    get animation(): SkiaAnimation | undefined;
+    set animation(v: SkiaAnimation | undefined);
+}

package/lib/typescript/src/values/web/api.d.ts

@@ -0,0 +1,2 @@
+import type { ISkiaValueApi } from "../types";
+export declare const ValueApi: ISkiaValueApi;

package/lib/typescript/src/values/web/index.d.ts

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

package/lib/typescript/src/views/SkiaView.d.ts

@@ -1,40 +1,7 @@
 import React from "react";
-import type { ViewProps } from "react-native";
-import type { SkImage, SkRect } from "../skia";
+import type { SkRect } from "../skia";
 import type { SkiaReadonlyValue } from "../values";
-import type { DrawMode, RNSkiaDrawCallback } from "./types";
-declare global {
-    var SkiaViewApi: {
-        invalidateSkiaView: (nativeId: number) => void;
-        makeImageSnapshot: (nativeId: number, rect?: SkRect) => SkImage;
-        setDrawCallback: (nativeId: number, callback: RNSkiaDrawCallback | undefined) => void;
-        setDrawMode: (nativeId: number, mode: DrawMode) => void;
-        registerValuesInView: (nativeId: number, values: SkiaReadonlyValue<unknown>[]) => () => void;
-    };
-}
-export interface SkiaViewProps extends ViewProps {
-    /**
-     * Sets the drawing mode for the skia view. There are two drawing
-     * modes, "continuous" and "default", where the continuous mode will
-     * continuously redraw the view, and the default mode will only
-     * redraw when any of the regular react properties are changed like
-     * sizes and margins.
-     */
-    mode?: DrawMode;
-    /**
-     * When set to true the view will display information about the
-     * average time it takes to render.
-     */
-    debug?: boolean;
-    /**
-     * Draw callback. Will be called whenever the view is invalidated and
-     * needs to redraw. This is either caused by a change in a react
-     * property, a touch event, or a call to redraw. If the view is in
-     * continuous mode the callback will be called 60 frames per second
-     * by the native view.
-     */
-    onDraw?: RNSkiaDrawCallback;
-}
+import type { DrawMode, SkiaViewProps } from "./types";
 export declare class SkiaView extends React.Component<SkiaViewProps> {
     constructor(props: SkiaViewProps);
     private _nativeId;
@@ -45,7 +12,7 @@ export declare class SkiaView extends React.Component<SkiaViewProps> {
      * @param rect Rect to use as bounds. Optional.
      * @returns An Image object.
      */
-    makeImageSnapshot(rect?: SkRect): SkImage;
+    makeImageSnapshot(rect?: SkRect): import("../skia").SkImage;
     /**
      * Sends a redraw request to the native SkiaView.
      */

package/lib/typescript/src/views/api.d.ts

@@ -0,0 +1,5 @@
+import type { ISkiaViewApi } from "./types";
+declare global {
+    var SkiaViewApi: ISkiaViewApi;
+}
+export declare const SkiaViewApi: ISkiaViewApi;

package/lib/typescript/src/views/types.d.ts

@@ -1,5 +1,7 @@
 import type { ViewProps } from "react-native";
+import type { SkImage, SkRect } from "../skia";
 import type { SkCanvas } from "../skia/Canvas";
+import type { SkiaReadonlyValue } from "../values";
 export declare type DrawMode = "continuous" | "default";
 export declare type NativeSkiaViewProps = ViewProps & {
     mode?: DrawMode;
@@ -42,3 +44,33 @@ export interface ValueListener {
     addListener: (callback: () => void) => number;
     removeListener: (id: number) => void;
 }
+export interface ISkiaViewApi {
+    invalidateSkiaView: (nativeId: number) => void;
+    makeImageSnapshot: (nativeId: number, rect?: SkRect) => SkImage;
+    setDrawCallback: (nativeId: number, callback: RNSkiaDrawCallback | undefined) => void;
+    setDrawMode: (nativeId: number, mode: DrawMode) => void;
+    registerValuesInView: (nativeId: number, values: SkiaReadonlyValue<unknown>[]) => () => void;
+}
+export interface SkiaViewProps extends ViewProps {
+    /**
+     * Sets the drawing mode for the skia view. There are two drawing
+     * modes, "continuous" and "default", where the continuous mode will
+     * continuously redraw the view, and the default mode will only
+     * redraw when any of the regular react properties are changed like
+     * sizes and margins.
+     */
+    mode?: DrawMode;
+    /**
+     * When set to true the view will display information about the
+     * average time it takes to render.
+     */
+    debug?: boolean;
+    /**
+     * Draw callback. Will be called whenever the view is invalidated and
+     * needs to redraw. This is either caused by a change in a react
+     * property, a touch event, or a call to redraw. If the view is in
+     * continuous mode the callback will be called 60 frames per second
+     * by the native view.
+     */
+    onDraw?: RNSkiaDrawCallback;
+}

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "React Native Skia",
-  "version": "0.1.124",
+  "version": "0.1.125",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [
@@ -76,7 +76,7 @@
     "react-native": "0.66.2",
     "react-native-builder-bob": "^0.18.2",
     "ts-jest": "^27.0.7",
-    "typescript": "^4.6.2"
+    "typescript": "^4.6.4"
   },
   "dependencies": {
     "react-reconciler": "^0.26.2"

package/src/{values/animation → animation}/decay/runDecay.ts

@@ -1,5 +1,5 @@
-import { ValueApi } from "../../api";
-import type { SkiaValue } from "../../types";
+import { ValueApi } from "../../values/api";
+import type { SkiaValue } from "../../values/types";
 
 import { decay } from "./decay";
 import type { DecayConfig, DefaultDecayConfig, DecayState } from "./types";

package/src/{values/animation → animation}/decay/types.ts

@@ -1,4 +1,4 @@
-import type { AnimationState } from "../../types";
+import type { AnimationState } from "../../values/types";
 
 export interface DecayConfig {
   from?: number;

package/src/animation/functions/interpolate.ts

@@ -0,0 +1,182 @@
+/* eslint-disable max-len */
+export enum Extrapolate {
+  IDENTITY = "identity",
+  CLAMP = "clamp",
+  EXTEND = "extend",
+}
+
+interface InterpolationNarrowedInput {
+  leftEdgeInput: number;
+  rightEdgeInput: number;
+  leftEdgeOutput: number;
+  rightEdgeOutput: number;
+}
+
+export interface ExtrapolationConfig {
+  extrapolateLeft?: Extrapolate | string;
+  extrapolateRight?: Extrapolate | string;
+}
+
+interface RequiredExtrapolationConfig {
+  extrapolateLeft: Extrapolate;
+  extrapolateRight: Extrapolate;
+}
+
+export type ExtrapolationType =
+  | ExtrapolationConfig
+  | Extrapolate
+  | string
+  | undefined;
+
+function getVal(
+  type: Extrapolate,
+  coef: number,
+  val: number,
+  leftEdgeOutput: number,
+  rightEdgeOutput: number,
+  x: number
+): number {
+  switch (type) {
+    case Extrapolate.IDENTITY:
+      return x;
+    case Extrapolate.CLAMP:
+      if (coef * val < coef * leftEdgeOutput) {
+        return leftEdgeOutput;
+      }
+      return rightEdgeOutput;
+    case Extrapolate.EXTEND:
+    default:
+      return val;
+  }
+}
+
+function isExtrapolate(value: string): value is Extrapolate {
+  return (
+    value === Extrapolate.EXTEND ||
+    value === Extrapolate.CLAMP ||
+    value === Extrapolate.IDENTITY
+  );
+}
+
+// validates extrapolations type
+// if type is correct, converts it to ExtrapolationConfig
+function validateType(type: ExtrapolationType): RequiredExtrapolationConfig {
+  // initialize extrapolationConfig with default extrapolation
+  const extrapolationConfig: RequiredExtrapolationConfig = {
+    extrapolateLeft: Extrapolate.EXTEND,
+    extrapolateRight: Extrapolate.EXTEND,
+  };
+
+  if (!type) {
+    return extrapolationConfig;
+  }
+
+  if (typeof type === "string") {
+    if (!isExtrapolate(type)) {
+      throw new Error(
+        `No supported value for "interpolate" \nSupported values: ["extend", "clamp", "identity", Extrapolatation.CLAMP, Extrapolatation.EXTEND, Extrapolatation.IDENTITY]\n Valid example:
+        interpolate(value, [inputRange], [outputRange], "clamp")`
+      );
+    }
+    extrapolationConfig.extrapolateLeft = type;
+    extrapolationConfig.extrapolateRight = type;
+    return extrapolationConfig;
+  }
+
+  // otherwise type is extrapolation config object
+  if (
+    (type.extrapolateLeft && !isExtrapolate(type.extrapolateLeft)) ||
+    (type.extrapolateRight && !isExtrapolate(type.extrapolateRight))
+  ) {
+    throw new Error(
+      `No supported value for "interpolate" \nSupported values: ["extend", "clamp", "identity", Extrapolatation.CLAMP, Extrapolatation.EXTEND, Extrapolatation.IDENTITY]\n Valid example:
+      interpolate(value, [inputRange], [outputRange], {
+        extrapolateLeft: Extrapolation.CLAMP,
+        extrapolateRight: Extrapolation.IDENTITY
+      }})`
+    );
+  }
+
+  Object.assign(extrapolationConfig, type);
+  return extrapolationConfig;
+}
+
+function internalInterpolate(
+  x: number,
+  narrowedInput: InterpolationNarrowedInput,
+  extrapolationConfig: RequiredExtrapolationConfig
+) {
+  const { leftEdgeInput, rightEdgeInput, leftEdgeOutput, rightEdgeOutput } =
+    narrowedInput;
+  if (rightEdgeInput - leftEdgeInput === 0) {
+    return leftEdgeOutput;
+  }
+  const progress = (x - leftEdgeInput) / (rightEdgeInput - leftEdgeInput);
+  const val = leftEdgeOutput + progress * (rightEdgeOutput - leftEdgeOutput);
+  const coef = rightEdgeOutput >= leftEdgeOutput ? 1 : -1;
+
+  if (coef * val < coef * leftEdgeOutput) {
+    return getVal(
+      extrapolationConfig.extrapolateLeft,
+      coef,
+      val,
+      leftEdgeOutput,
+      rightEdgeOutput,
+      x
+    );
+  } else if (coef * val > coef * rightEdgeOutput) {
+    return getVal(
+      extrapolationConfig.extrapolateRight,
+      coef,
+      val,
+      leftEdgeOutput,
+      rightEdgeOutput,
+      x
+    );
+  }
+
+  return val;
+}
+
+// e.g. function interpolate(x, input, output, type = Extrapolatation.CLAMP)
+export function interpolate(
+  x: number,
+  input: readonly number[],
+  output: readonly number[],
+  type?: ExtrapolationType
+): number {
+  if (input.length < 2 || output.length < 2) {
+    throw Error(
+      "Interpolation input and output should contain at least two values."
+    );
+  }
+
+  const extrapolationConfig = validateType(type);
+  const { length } = input;
+  const narrowedInput: InterpolationNarrowedInput = {
+    leftEdgeInput: input[0],
+    rightEdgeInput: input[1],
+    leftEdgeOutput: output[0],
+    rightEdgeOutput: output[1],
+  };
+  if (length > 2) {
+    if (x > input[length - 1]) {
+      narrowedInput.leftEdgeInput = input[length - 2];
+      narrowedInput.rightEdgeInput = input[length - 1];
+      narrowedInput.leftEdgeOutput = output[length - 2];
+      narrowedInput.rightEdgeOutput = output[length - 1];
+    } else {
+      for (let i = 1; i < length; ++i) {
+        if (x <= input[i]) {
+          narrowedInput.leftEdgeInput = input[i - 1];
+          narrowedInput.rightEdgeInput = input[i];
+          narrowedInput.leftEdgeOutput = output[i - 1];
+          narrowedInput.rightEdgeOutput = output[i];
+          break;
+        }
+      }
+    }
+  }
+
+  return internalInterpolate(x, narrowedInput, extrapolationConfig);
+}

package/src/animation/functions/interpolateColors.ts

@@ -0,0 +1,58 @@
+import { mix } from "../../renderer";
+import type { Color } from "../../skia";
+import { Skia } from "../../skia";
+import type { SkColor } from "../../skia/Color";
+
+import { interpolate } from "./interpolate";
+
+const interpolateColorsRGB = (
+  value: number,
+  inputRange: number[],
+  outputRange: SkColor[]
+) => {
+  const r = interpolate(
+    value,
+    inputRange,
+    outputRange.map((c) => c[0]),
+    "clamp"
+  );
+  const g = interpolate(
+    value,
+    inputRange,
+    outputRange.map((c) => c[1]),
+    "clamp"
+  );
+  const b = interpolate(
+    value,
+    inputRange,
+    outputRange.map((c) => c[2]),
+    "clamp"
+  );
+  const a = interpolate(
+    value,
+    inputRange,
+    outputRange.map((c) => c[3]),
+    "clamp"
+  );
+  return new Float32Array([r, g, b, a]);
+};
+
+export const interpolateColors = (
+  value: number,
+  inputRange: number[],
+  _outputRange: Color[]
+) => {
+  const outputRange = _outputRange.map((cl) => Skia.Color(cl));
+  return interpolateColorsRGB(value, inputRange, outputRange);
+};
+
+export const mixColors = (value: number, x: Color, y: Color) => {
+  const c1 = Skia.Color(x);
+  const c2 = Skia.Color(y);
+  return new Float32Array([
+    mix(value, c1[0], c2[0]),
+    mix(value, c1[1], c2[1]),
+    mix(value, c1[2], c2[2]),
+    mix(value, c1[3], c2[3]),
+  ]);
+};

package/src/{values/animation → animation}/spring/runSpring.ts

@@ -1,4 +1,4 @@
-import type { SkiaValue, SkiaAnimation } from "../../types";
+import type { SkiaValue, SkiaAnimation } from "../../values/types";
 import type {
   AnimationParams,
   SpringConfig,

package/src/{values/animation → animation}/spring/useSpring.ts

@@ -1,4 +1,4 @@
-import type { SkiaReadonlyValue } from "../../types";
+import type { SkiaReadonlyValue } from "../../values/types";
 import type {
   SpringConfig,
   AnimationParams,