@shopify/react-native-skia 0.1.186 → 0.1.188

package/android/build.gradle

@@ -272,11 +272,24 @@ task extractJNIFiles {
 extractJNIFiles.mustRunAfter extractAARHeaders
 
 if (ENABLE_PREFAB) {
-    // Package everything with the original file structure
+    // Package all the cpp code in a flattened directory structure
     task prepareHeaders(type: Copy) {
-        from('./cpp')
+        from("./cpp")
         into "${project.buildDir}/headers/rnskia/"
         includeEmptyDirs = false
+        include "**/*.h"
+        eachFile {
+            String path = it.path
+
+            // Skip flattening third_party dir
+            if (path.contains("api/third_party")) {
+                path = path.substring("api/".length())
+            } else {
+                // flatten anything else
+                path = path.substring(path.lastIndexOf("/") + 1)
+            }
+            it.path = path
+        }
     }
     preBuild.dependsOn(prepareHeaders)
 }

package/cpp/rnskia/dom/base/JsiDependencyManager.h

@@ -64,53 +64,53 @@ public:
 
     // Enumerate registered keys for the given node to only handle known
     // properties
-    for (const auto &propMapping :
-         node->getPropsContainer()->getMappedProperties()) {
-      auto key = propMapping.first;
-      auto jsValue = nextProps.getProperty(runtime, key);
-      JsiValue nativeValue(runtime, jsValue);
-
-      if (isAnimatedValue(nativeValue)) {
-        // Handle Skia Animation Values
-        auto animatedValue = getAnimatedValue(nativeValue);
-        auto unsubscribe = animatedValue->addListener(
-            [animatedValue, propMapping](jsi::Runtime &runtime) {
-              // Get value from animation value
-              auto nextJsValue = animatedValue->getCurrent(runtime);
-              // Update all props that listens to this animation value
-              for (auto &prop : propMapping.second) {
-                prop->updateValue(runtime, nextJsValue);
-              }
-            });
-
-        // Save unsubscribe methods
-        unsubscribers.push_back(std::make_pair(animatedValue, unsubscribe));
-
-      } else if (isSelector(nativeValue)) {
-        // Handle Skia Animation Value Selectors
-        auto animatedValue = std::dynamic_pointer_cast<RNSkReadonlyValue>(
-            nativeValue.getValue(PropNameValue).getAsHostObject());
-
-        auto selector = nativeValue.getValue(PropNameSelector).getAsFunction();
-        // Add subscription to animated value in selector
-        auto unsubscribe = animatedValue->addListener(
-            [nativeValue, propMapping, selector = std::move(selector),
-             animatedValue](jsi::Runtime &runtime) {
-              // Get value from animation value
-              jsi::Value jsValue = animatedValue->getCurrent(runtime);
-              // Call selector to transform new value
-              auto selectedJsValue =
-                  selector(runtime, jsi::Value::null(), &jsValue, 1);
-              // Update all props that listens to this animation value
-              for (auto &prop : propMapping.second) {
-                prop->updateValue(runtime, selectedJsValue);
-              }
-            });
-
-        // Save unsubscribe methods
-        unsubscribers.push_back(std::make_pair(animatedValue, unsubscribe));
-      }
-    }
+    node->getPropsContainer()->enumerateMappedProps(
+        [&](const PropId key, const std::vector<NodeProp *> &propMapping) {
+          auto jsValue = nextProps.getProperty(runtime, key);
+          JsiValue nativeValue(runtime, jsValue);
+
+          if (isAnimatedValue(nativeValue)) {
+            // Handle Skia Animation Values
+            auto animatedValue = getAnimatedValue(nativeValue);
+            auto unsubscribe = animatedValue->addListener(
+                [animatedValue, propMapping](jsi::Runtime &runtime) {
+                  // Get value from animation value
+                  auto nextJsValue = animatedValue->getCurrent(runtime);
+                  // Update all props that listens to this animation value
+                  for (auto &prop : propMapping) {
+                    prop->updateValue(runtime, nextJsValue);
+                  }
+                });
+
+            // Save unsubscribe methods
+            unsubscribers.push_back(std::make_pair(animatedValue, unsubscribe));
+
+          } else if (isSelector(nativeValue)) {
+            // Handle Skia Animation Value Selectors
+            auto animatedValue = std::dynamic_pointer_cast<RNSkReadonlyValue>(
+                nativeValue.getValue(PropNameValue).getAsHostObject());
+
+            auto selector =
+                nativeValue.getValue(PropNameSelector).getAsFunction();
+            // Add subscription to animated value in selector
+            auto unsubscribe = animatedValue->addListener(
+                [nativeValue, propMapping, selector = std::move(selector),
+                 animatedValue](jsi::Runtime &runtime) {
+                  // Get value from animation value
+                  jsi::Value jsValue = animatedValue->getCurrent(runtime);
+                  // Call selector to transform new value
+                  auto selectedJsValue =
+                      selector(runtime, jsi::Value::null(), &jsValue, 1);
+                  // Update all props that listens to this animation value
+                  for (auto &prop : propMapping) {
+                    prop->updateValue(runtime, selectedJsValue);
+                  }
+                });
+
+            // Save unsubscribe methods
+            unsubscribers.push_back(std::make_pair(animatedValue, unsubscribe));
+          }
+        });
 
     // Now let's store the subscription info
     _subscriptions.emplace(node.get(), unsubscribers);

package/cpp/rnskia/dom/base/JsiDomNode.h

@@ -98,13 +98,12 @@ public:
     auto propName = arguments[0].asString(runtime).utf8(runtime);
     const jsi::Value &propValue = arguments[1];
 
-    auto mappedProps = _propsContainer->getMappedProperties();
-    auto propMapIt = mappedProps.find(JsiPropId::get(propName));
-    if (propMapIt != mappedProps.end()) {
-      for (auto &prop : propMapIt->second) {
-        prop->updateValue(runtime, propValue);
-      }
-    }
+    // Enumerate all props with this name and update. The
+    // enumerateMappedPropsByName function is thread safe and locks props so it
+    // can be called from all threads.
+    _propsContainer->enumerateMappedPropsByName(propName, [&](NodeProp *prop) {
+      prop->updateValue(runtime, propValue);
+    });
 
     return jsi::Value::undefined();
   }

package/cpp/rnskia/dom/base/NodePropsContainer.h

@@ -41,10 +41,30 @@ public:
   }
 
   /**
-   Returns a list of mappings betwen property names and property objects
+   Enumerate all mapped properties
    */
-  const std::map<PropId, std::vector<NodeProp *>> &getMappedProperties() {
-    return _mappedProperties;
+  void enumerateMappedProps(
+      const std::function<void(const PropId name,
+                               const std::vector<NodeProp *>)> &callback) {
+    std::lock_guard<std::mutex> lock(_mappedPropsLock);
+    for (auto &props : _mappedProperties) {
+      callback(props.first, props.second);
+    }
+  }
+
+  /**
+   Enumerates a named property instances from the mapped properties list
+   */
+  void
+  enumerateMappedPropsByName(const std::string &name,
+                             const std::function<void(NodeProp *)> &callback) {
+    std::lock_guard<std::mutex> lock(_mappedPropsLock);
+    auto propMapIt = _mappedProperties.find(JsiPropId::get(name));
+    if (propMapIt != _mappedProperties.end()) {
+      for (auto &prop : propMapIt->second) {
+        callback(prop);
+      }
+    }
   }
 
   /**
@@ -75,6 +95,7 @@ public:
    Clears all props and data from the container
    */
   void dispose() {
+    std::lock_guard<std::mutex> lock(_mappedPropsLock);
     _properties.clear();
     _mappedProperties.clear();
   }
@@ -83,6 +104,8 @@ public:
    Called when the React / JS side sets properties on a node
    */
   void setProps(jsi::Runtime &runtime, const jsi::Value &maybePropsObject) {
+    std::lock_guard<std::mutex> lock(_mappedPropsLock);
+
     // Clear property mapping
     _mappedProperties.clear();
 
@@ -129,6 +152,7 @@ private:
   std::vector<std::shared_ptr<BaseNodeProp>> _properties;
   std::map<PropId, std::vector<NodeProp *>> _mappedProperties;
   PropId _type;
+  std::mutex _mappedPropsLock;
 };
 
 } // namespace RNSkia

package/cpp/rnskia/dom/props/ColorProp.h

@@ -42,6 +42,13 @@ public:
       return SkColorSetARGB(a.getAsNumber() * 255.0f, r.getAsNumber() * 255.0f,
                             g.getAsNumber() * 255.0f, b.getAsNumber() * 255.0f);
 
+    } else if (color.getType() == PropType::Array) {
+      auto r = color.getAsArray().at(0);
+      auto g = color.getAsArray().at(1);
+      auto b = color.getAsArray().at(2);
+      auto a = color.getAsArray().at(3);
+      return SkColorSetARGB(a.getAsNumber() * 255.0f, r.getAsNumber() * 255.0f,
+                            g.getAsNumber() * 255.0f, b.getAsNumber() * 255.0f);
     } else if (color.getType() == PropType::Number) {
       return static_cast<SkColor>(color.getAsNumber());
     } else {

package/globalJestSetup.js

@@ -0,0 +1,6 @@
+module.exports = async () => {
+  const {
+    LoadSkiaWeb,
+  } = require("@shopify/react-native-skia/lib/commonjs/web/LoadSkiaWeb");
+  await LoadSkiaWeb();
+};

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.h

@@ -1,6 +1,8 @@
 #pragma once
 
+#import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
+#import <ReactCommon/RCTTurboModule.h>
 
 #include <functional>
 #include <memory>
@@ -8,6 +10,7 @@
 
 #include "DisplayLink.h"
 #include "RNSkPlatformContext.h"
+#include "ViewScreenshotService.h"
 
 #include <jsi/jsi.h>
 
@@ -27,13 +30,8 @@ static void handleNotification(CFNotificationCenterRef center, void *observer,
 
 class RNSkiOSPlatformContext : public RNSkPlatformContext {
 public:
-  RNSkiOSPlatformContext(
-      jsi::Runtime *runtime, std::shared_ptr<react::CallInvoker> callInvoker,
-      std::function<void(std::function<void()>)> dispatchMainThread,
-      std::function<sk_sp<SkImage>(size_t viewTag)> takeViewScreenshot)
-      : _dispatchMainThread(dispatchMainThread),
-        _takeViewScreenshot(takeViewScreenshot),
-        RNSkPlatformContext(runtime, callInvoker,
+  RNSkiOSPlatformContext(jsi::Runtime *runtime, RCTBridge *bridge)
+      : RNSkPlatformContext(runtime, bridge.jsCallInvoker,
                             [[UIScreen mainScreen] scale]) {
 
     // We need to make sure we invalidate when modules are freed
@@ -41,6 +39,10 @@ public:
         CFNotificationCenterGetLocalCenter(), this, &handleNotification,
         (__bridge CFStringRef)RCTBridgeWillInvalidateModulesNotification, NULL,
         CFNotificationSuspensionBehaviorDeliverImmediately);
+
+    // Create screenshot manager
+    _screenshotService =
+        [[ViewScreenshotService alloc] initWithUiManager:bridge.uiManager];
   }
 
   ~RNSkiOSPlatformContext() {
@@ -70,8 +72,7 @@ public:
 
 private:
   DisplayLink *_displayLink;
-  std::function<void(std::function<void()>)> _dispatchMainThread;
-  std::function<sk_sp<SkImage>(size_t viewTag)> _takeViewScreenshot;
+  ViewScreenshotService *_screenshotService;
 };
 
 static void handleNotification(CFNotificationCenterRef center, void *observer,

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.mm

@@ -63,11 +63,15 @@ sk_sp<SkSurface> RNSkiOSPlatformContext::makeOffscreenSurface(int width,
 }
 
 void RNSkiOSPlatformContext::runOnMainThread(std::function<void()> func) {
-  _dispatchMainThread(func);
+  dispatch_async(dispatch_get_main_queue(), ^{
+    func();
+  });
 }
 
-sk_sp<SkImage> RNSkiOSPlatformContext::takeScreenshotFromViewTag(size_t tag) {
-  return _takeViewScreenshot(tag);
+sk_sp<SkImage>
+RNSkiOSPlatformContext::takeScreenshotFromViewTag(size_t viewTag) {
+  return [_screenshotService
+      screenshotOfViewWithTag:[NSNumber numberWithLong:viewTag]];
 }
 
 void RNSkiOSPlatformContext::startDrawLoop() {

package/ios/RNSkia-iOS/SkiaManager.mm

@@ -9,12 +9,9 @@
 #import <ReactCommon/RCTTurboModule.h>
 
 #import "RNSkiOSPlatformContext.h"
-#import "ViewScreenshotService.h"
 
 @implementation SkiaManager {
   std::shared_ptr<RNSkia::RNSkManager> _skManager;
-  std::shared_ptr<RNSkia::RNSkiOSPlatformContext> _platformContext;
-  ViewScreenshotService *_screenshot;
   __weak RCTBridge *weakBridge;
 }
 
@@ -27,7 +24,6 @@
     _skManager->invalidate();
   }
   _skManager = nullptr;
-  _platformContext = nullptr;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge {
@@ -36,33 +32,13 @@
     RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge;
     if (cxxBridge.runtime) {
 
-      auto callInvoker = bridge.jsCallInvoker;
       facebook::jsi::Runtime *jsRuntime =
           (facebook::jsi::Runtime *)cxxBridge.runtime;
 
-      // Create screenshot manager
-      _screenshot =
-          [[ViewScreenshotService alloc] initWithUiManager:bridge.uiManager];
-
-      auto takeScreenshot = [self](size_t viewTag) {
-        return [_screenshot
-            screenshotOfViewWithTag:[NSNumber numberWithLong:viewTag]];
-      };
-
-      auto dispatchOnMainThread = [self](std::function<void()> fp) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-          fp();
-        });
-      };
-
-      // Create platform context
-      _platformContext = std::make_shared<RNSkia::RNSkiOSPlatformContext>(
-          jsRuntime, callInvoker, std::move(dispatchOnMainThread),
-          std::move(takeScreenshot));
-
       // Create the RNSkiaManager (cross platform)
-      _skManager = std::make_shared<RNSkia::RNSkManager>(jsRuntime, callInvoker,
-                                                         _platformContext);
+      _skManager = std::make_shared<RNSkia::RNSkManager>(
+          jsRuntime, bridge.jsCallInvoker,
+          std::make_shared<RNSkia::RNSkiOSPlatformContext>(jsRuntime, bridge));
     }
   }
   return self;

package/jestSetup.js

@@ -1,5 +1,4 @@
 /* globals jest */
-jest.mock(
-  "@shopify/react-native-skia",
-  () => require("@shopify/react-native-skia/lib/commonjs/mock").Mock
+jest.mock("@shopify/react-native-skia", () =>
+  require("@shopify/react-native-skia/lib/commonjs/mock").Mock(global.CanvasKit)
 );

package/lib/commonjs/animation/functions/interpolateColors.d.ts

@@ -1,3 +1,3 @@
 import type { Color } from "../../skia";
-export declare const interpolateColors: (value: number, inputRange: number[], _outputRange: Color[]) => Float32Array;
+export declare const interpolateColors: (value: number, inputRange: number[], _outputRange: Color[]) => number[];
 export declare const mixColors: (value: number, x: Color, y: Color) => Float32Array;

package/lib/commonjs/animation/functions/interpolateColors.js

@@ -17,8 +17,9 @@ const interpolateColorsRGB = (value, inputRange, outputRange) => {
   const r = (0, _interpolate.interpolate)(value, inputRange, outputRange.map(c => c[0]), "clamp");
   const g = (0, _interpolate.interpolate)(value, inputRange, outputRange.map(c => c[1]), "clamp");
   const b = (0, _interpolate.interpolate)(value, inputRange, outputRange.map(c => c[2]), "clamp");
-  const a = (0, _interpolate.interpolate)(value, inputRange, outputRange.map(c => c[3]), "clamp");
-  return new Float32Array([r, g, b, a]);
+  const a = (0, _interpolate.interpolate)(value, inputRange, outputRange.map(c => c[3]), "clamp"); // TODO: once Float32Array are supported in the reanimated integration we can switch there
+
+  return [r, g, b, a];
 };
 
 const interpolateColors = (value, inputRange, _outputRange) => {

package/lib/commonjs/animation/functions/interpolateColors.js.map

@@ -1 +1 @@
-{"version":3,"names":["interpolateColorsRGB","value","inputRange","outputRange","r","interpolate","map","c","g","b","a","Float32Array","interpolateColors","_outputRange","cl","Skia","Color","mixColors","x","y","c1","c2","mix"],"sources":["interpolateColors.ts"],"sourcesContent":["import { mix } from \"../../renderer/processors/math\";\nimport type { Color, SkColor } from \"../../skia\";\nimport { Skia } from \"../../skia\";\n\nimport { interpolate } from \"./interpolate\";\n\nconst interpolateColorsRGB = (\n  value: number,\n  inputRange: number[],\n  outputRange: SkColor[]\n) => {\n  \"worklet\";\n  const r = interpolate(\n    value,\n    inputRange,\n    outputRange.map((c) => c[0]),\n    \"clamp\"\n  );\n  const g = interpolate(\n    value,\n    inputRange,\n    outputRange.map((c) => c[1]),\n    \"clamp\"\n  );\n  const b = interpolate(\n    value,\n    inputRange,\n    outputRange.map((c) => c[2]),\n    \"clamp\"\n  );\n  const a = interpolate(\n    value,\n    inputRange,\n    outputRange.map((c) => c[3]),\n    \"clamp\"\n  );\n  return new Float32Array([r, g, b, a]);\n};\n\nexport const interpolateColors = (\n  value: number,\n  inputRange: number[],\n  _outputRange: Color[]\n) => {\n  \"worklet\";\n  const outputRange = _outputRange.map((cl) => Skia.Color(cl));\n  return interpolateColorsRGB(value, inputRange, outputRange);\n};\n\nexport const mixColors = (value: number, x: Color, y: Color) => {\n  \"worklet\";\n  const c1 = Skia.Color(x);\n  const c2 = Skia.Color(y);\n  return new Float32Array([\n    mix(value, c1[0], c2[0]),\n    mix(value, c1[1], c2[1]),\n    mix(value, c1[2], c2[2]),\n    mix(value, c1[3], c2[3]),\n  ]);\n};\n"],"mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAEA,MAAMA,oBAAoB,GAAG,CAC3BC,KAD2B,EAE3BC,UAF2B,EAG3BC,WAH2B,KAIxB;EACH;;EACA,MAAMC,CAAC,GAAG,IAAAC,wBAAA,EACRJ,KADQ,EAERC,UAFQ,EAGRC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAAC,CAAD,CAAxB,CAHQ,EAIR,OAJQ,CAAV;EAMA,MAAMC,CAAC,GAAG,IAAAH,wBAAA,EACRJ,KADQ,EAERC,UAFQ,EAGRC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAAC,CAAD,CAAxB,CAHQ,EAIR,OAJQ,CAAV;EAMA,MAAME,CAAC,GAAG,IAAAJ,wBAAA,EACRJ,KADQ,EAERC,UAFQ,EAGRC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAAC,CAAD,CAAxB,CAHQ,EAIR,OAJQ,CAAV;EAMA,MAAMG,CAAC,GAAG,IAAAL,wBAAA,EACRJ,KADQ,EAERC,UAFQ,EAGRC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAAC,CAAD,CAAxB,CAHQ,EAIR,OAJQ,CAAV;EAMA,OAAO,IAAII,YAAJ,CAAiB,CAACP,CAAD,EAAII,CAAJ,EAAOC,CAAP,EAAUC,CAAV,CAAjB,CAAP;AACD,CA/BD;;AAiCO,MAAME,iBAAiB,GAAG,CAC/BX,KAD+B,EAE/BC,UAF+B,EAG/BW,YAH+B,KAI5B;EACH;;EACA,MAAMV,WAAW,GAAGU,YAAY,CAACP,GAAb,CAAkBQ,EAAD,IAAQC,UAAA,CAAKC,KAAL,CAAWF,EAAX,CAAzB,CAApB;;EACA,OAAOd,oBAAoB,CAACC,KAAD,EAAQC,UAAR,EAAoBC,WAApB,CAA3B;AACD,CARM;;;;AAUA,MAAMc,SAAS,GAAG,CAAChB,KAAD,EAAgBiB,CAAhB,EAA0BC,CAA1B,KAAuC;EAC9D;;EACA,MAAMC,EAAE,GAAGL,UAAA,CAAKC,KAAL,CAAWE,CAAX,CAAX;;EACA,MAAMG,EAAE,GAAGN,UAAA,CAAKC,KAAL,CAAWG,CAAX,CAAX;;EACA,OAAO,IAAIR,YAAJ,CAAiB,CACtB,IAAAW,SAAA,EAAIrB,KAAJ,EAAWmB,EAAE,CAAC,CAAD,CAAb,EAAkBC,EAAE,CAAC,CAAD,CAApB,CADsB,EAEtB,IAAAC,SAAA,EAAIrB,KAAJ,EAAWmB,EAAE,CAAC,CAAD,CAAb,EAAkBC,EAAE,CAAC,CAAD,CAApB,CAFsB,EAGtB,IAAAC,SAAA,EAAIrB,KAAJ,EAAWmB,EAAE,CAAC,CAAD,CAAb,EAAkBC,EAAE,CAAC,CAAD,CAApB,CAHsB,EAItB,IAAAC,SAAA,EAAIrB,KAAJ,EAAWmB,EAAE,CAAC,CAAD,CAAb,EAAkBC,EAAE,CAAC,CAAD,CAApB,CAJsB,CAAjB,CAAP;AAMD,CAVM"}
+{"version":3,"names":["interpolateColorsRGB","value","inputRange","outputRange","r","interpolate","map","c","g","b","a","interpolateColors","_outputRange","cl","Skia","Color","mixColors","x","y","c1","c2","Float32Array","mix"],"sources":["interpolateColors.ts"],"sourcesContent":["import { mix } from \"../../renderer/processors/math\";\nimport type { Color, SkColor } from \"../../skia\";\nimport { Skia } from \"../../skia\";\n\nimport { interpolate } from \"./interpolate\";\n\nconst interpolateColorsRGB = (\n  value: number,\n  inputRange: number[],\n  outputRange: SkColor[]\n) => {\n  \"worklet\";\n  const r = interpolate(\n    value,\n    inputRange,\n    outputRange.map((c) => c[0]),\n    \"clamp\"\n  );\n  const g = interpolate(\n    value,\n    inputRange,\n    outputRange.map((c) => c[1]),\n    \"clamp\"\n  );\n  const b = interpolate(\n    value,\n    inputRange,\n    outputRange.map((c) => c[2]),\n    \"clamp\"\n  );\n  const a = interpolate(\n    value,\n    inputRange,\n    outputRange.map((c) => c[3]),\n    \"clamp\"\n  );\n  // TODO: once Float32Array are supported in the reanimated integration we can switch there\n  return [r, g, b, a];\n};\n\nexport const interpolateColors = (\n  value: number,\n  inputRange: number[],\n  _outputRange: Color[]\n) => {\n  \"worklet\";\n  const outputRange = _outputRange.map((cl) => Skia.Color(cl));\n  return interpolateColorsRGB(value, inputRange, outputRange);\n};\n\nexport const mixColors = (value: number, x: Color, y: Color) => {\n  \"worklet\";\n  const c1 = Skia.Color(x);\n  const c2 = Skia.Color(y);\n  return new Float32Array([\n    mix(value, c1[0], c2[0]),\n    mix(value, c1[1], c2[1]),\n    mix(value, c1[2], c2[2]),\n    mix(value, c1[3], c2[3]),\n  ]);\n};\n"],"mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAEA,MAAMA,oBAAoB,GAAG,CAC3BC,KAD2B,EAE3BC,UAF2B,EAG3BC,WAH2B,KAIxB;EACH;;EACA,MAAMC,CAAC,GAAG,IAAAC,wBAAA,EACRJ,KADQ,EAERC,UAFQ,EAGRC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAAC,CAAD,CAAxB,CAHQ,EAIR,OAJQ,CAAV;EAMA,MAAMC,CAAC,GAAG,IAAAH,wBAAA,EACRJ,KADQ,EAERC,UAFQ,EAGRC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAAC,CAAD,CAAxB,CAHQ,EAIR,OAJQ,CAAV;EAMA,MAAME,CAAC,GAAG,IAAAJ,wBAAA,EACRJ,KADQ,EAERC,UAFQ,EAGRC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAAC,CAAD,CAAxB,CAHQ,EAIR,OAJQ,CAAV;EAMA,MAAMG,CAAC,GAAG,IAAAL,wBAAA,EACRJ,KADQ,EAERC,UAFQ,EAGRC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAAC,CAAD,CAAxB,CAHQ,EAIR,OAJQ,CAAV,CApBG,CA0BH;;EACA,OAAO,CAACH,CAAD,EAAII,CAAJ,EAAOC,CAAP,EAAUC,CAAV,CAAP;AACD,CAhCD;;AAkCO,MAAMC,iBAAiB,GAAG,CAC/BV,KAD+B,EAE/BC,UAF+B,EAG/BU,YAH+B,KAI5B;EACH;;EACA,MAAMT,WAAW,GAAGS,YAAY,CAACN,GAAb,CAAkBO,EAAD,IAAQC,UAAA,CAAKC,KAAL,CAAWF,EAAX,CAAzB,CAApB;;EACA,OAAOb,oBAAoB,CAACC,KAAD,EAAQC,UAAR,EAAoBC,WAApB,CAA3B;AACD,CARM;;;;AAUA,MAAMa,SAAS,GAAG,CAACf,KAAD,EAAgBgB,CAAhB,EAA0BC,CAA1B,KAAuC;EAC9D;;EACA,MAAMC,EAAE,GAAGL,UAAA,CAAKC,KAAL,CAAWE,CAAX,CAAX;;EACA,MAAMG,EAAE,GAAGN,UAAA,CAAKC,KAAL,CAAWG,CAAX,CAAX;;EACA,OAAO,IAAIG,YAAJ,CAAiB,CACtB,IAAAC,SAAA,EAAIrB,KAAJ,EAAWkB,EAAE,CAAC,CAAD,CAAb,EAAkBC,EAAE,CAAC,CAAD,CAApB,CADsB,EAEtB,IAAAE,SAAA,EAAIrB,KAAJ,EAAWkB,EAAE,CAAC,CAAD,CAAb,EAAkBC,EAAE,CAAC,CAAD,CAApB,CAFsB,EAGtB,IAAAE,SAAA,EAAIrB,KAAJ,EAAWkB,EAAE,CAAC,CAAD,CAAb,EAAkBC,EAAE,CAAC,CAAD,CAApB,CAHsB,EAItB,IAAAE,SAAA,EAAIrB,KAAJ,EAAWkB,EAAE,CAAC,CAAD,CAAb,EAAkBC,EAAE,CAAC,CAAD,CAApB,CAJsB,CAAjB,CAAP;AAMD,CAVM"}

package/lib/commonjs/mock/index.d.ts

@@ -1,15 +1,2 @@
-import type { Skia as SkiaApi } from "../skia/types";
-import type * as SkiaExports from "../skia";
-import type * as ValueExports from "../values";
-import type * as AnimationExports from "../animation";
-import { ShaderLib } from "../renderer/components/shaders/ShaderLib";
-export declare const Skia: SkiaApi;
-export declare const vec: (x?: number, y?: number) => {
-    x: number;
-    y: number;
-};
-export declare const Mock: typeof SkiaExports & typeof ValueExports & typeof AnimationExports & {
-    createDrawing: () => any;
-    createDeclaration: () => any;
-    ShaderLib: typeof ShaderLib;
-};
+import type { CanvasKit } from "canvaskit-wasm";
+export declare const Mock: (CanvasKit: CanvasKit) => any;

package/lib/commonjs/mock/index.js

@@ -3,123 +3,49 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.vec = exports.Skia = exports.Mock = void 0;
+exports.Mock = void 0;
 
-var Values = _interopRequireWildcard(require("../values/web"));
+var _web = require("../skia/web");
 
-var ValuesHooks = _interopRequireWildcard(require("../values/hooks"));
+var _web2 = require("../values/web");
 
-var _selector = require("../values/selector");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const Noop = () => undefined;
 
-var BaseSkia = _interopRequireWildcard(require("../skia/types"));
-
-var timingFunctions = _interopRequireWildcard(require("../animation/timing"));
-
-var springFunctions = _interopRequireWildcard(require("../animation/spring"));
-
-var decayFunctions = _interopRequireWildcard(require("../animation/decay"));
-
-var interpolateFn = _interopRequireWildcard(require("../animation/functions/interpolate"));
-
-var interpolatePathFn = _interopRequireWildcard(require("../animation/functions/interpolatePaths"));
-
-var interpolateVectorFn = _interopRequireWildcard(require("../animation/functions/interpolateVector"));
-
-var _ShaderLib = require("../renderer/components/shaders/ShaderLib");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-class Stub {
-  constructor() {
-    return new Proxy(() => {}, {
-      get: () => new Stub(),
-      apply: () => new Stub(),
-      set: () => true
-    });
-  }
-
-}
-
-const Noop = () => {};
-
-const Skia = new Stub();
-exports.Skia = Skia;
-
-const vec = (x, y) => ({
-  x: x ?? 0,
-  y: y ?? x ?? 0
+const NoopValue = () => ({
+  current: 0
 });
 
-exports.vec = vec;
-const Mock = {
-  // SkiaExports
-  // 1. Skia API. BaseSkia contains the enums, and functions like isPaint etc
-  Skia,
-  ...BaseSkia,
-  // 2. Hooks
-  useRawData: Noop,
-  useData: Noop,
-  useFont: Noop,
-  useTypeface: Noop,
-  useImage: Noop,
-  useSVG: Noop,
-  createPicture: Noop,
-  // 3. Point/Rect/Transform utilities
-  vec,
-  rect: (x, y, width, height) => ({
-    x,
-    y,
-    width,
-    height
-  }),
-  rrect: (r, rx, ry) => ({
-    rect: r,
-    rx,
-    ry
-  }),
-  point: vec,
-  add: (a, b) => vec(a.x + b.x, a.y + b.y),
-  sub: (a, b) => vec(a.x - b.x, a.y - b.y),
-  neg: a => vec(-a.x, -a.y),
-  dist: (a, b) => Math.hypot(a.x - b.x, a.y - b.y),
-  translate: _ref => {
-    let {
-      x,
-      y
-    } = _ref;
-    return [{
-      translateX: x
-    }, {
-      translateY: y
-    }];
-  },
-  bounds: Noop,
-  topLeft: Noop,
-  topRight: Noop,
-  bottomLeft: Noop,
-  bottomRight: Noop,
-  center: Noop,
-  processTransform2d: Noop,
-  // ValueExports
-  ...Values,
-  ...ValuesHooks,
-  Selector: _selector.Selector,
-  // Animations
-  ...timingFunctions,
-  ...springFunctions,
-  ...decayFunctions,
-  ...interpolateFn,
-  ...interpolatePathFn,
-  ...interpolateVectorFn,
-  interpolateColors: (_value, _inputRange, _outputRange) => Float32Array.of(0, 0, 0, 0),
-  mixColors: (_v, _x, _y) => Float32Array.of(0, 0, 0, 0),
-  ShaderLib: _ShaderLib.ShaderLib,
-  createDrawing: Noop,
-  createDeclaration: Noop,
-  makeImageFromView: Noop
+const Mock = CanvasKit => {
+  global.SkiaApi = (0, _web.JsiSkApi)(CanvasKit);
+  global.SkiaValueApi = _web2.ValueApi;
+  const Skia = global.SkiaApi;
+  return {
+    Skia,
+    ...require("../renderer/components"),
+    ...require("../skia"),
+    ...require("../values"),
+    ...require("../animation"),
+    ...require("../dom/types"),
+    ...require("../dom/nodes"),
+    // We could use the real Canvas if we mock the SkiaView component for node
+    Canvas: Noop,
+    useValue: NoopValue,
+    useComputedValue: NoopValue,
+    useTouchHandler: Noop,
+    useTiming: NoopValue,
+    useLoop: NoopValue,
+    useSpring: NoopValue,
+    useClockValue: NoopValue,
+    useValueEffect: Noop,
+    useRawData: Noop,
+    useData: Noop,
+    useFont: () => Skia.Font(undefined, 0),
+    useTypeface: () => null,
+    useImage: () => null,
+    useSVG: () => null
+  };
 };
+
 exports.Mock = Mock;
 //# sourceMappingURL=index.js.map

package/lib/commonjs/mock/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["Stub","constructor","Proxy","get","apply","set","Noop","Skia","vec","x","y","Mock","BaseSkia","useRawData","useData","useFont","useTypeface","useImage","useSVG","createPicture","rect","width","height","rrect","r","rx","ry","point","add","a","b","sub","neg","dist","Math","hypot","translate","translateX","translateY","bounds","topLeft","topRight","bottomLeft","bottomRight","center","processTransform2d","Values","ValuesHooks","Selector","timingFunctions","springFunctions","decayFunctions","interpolateFn","interpolatePathFn","interpolateVectorFn","interpolateColors","_value","_inputRange","_outputRange","Float32Array","of","mixColors","_v","_x","_y","ShaderLib","createDrawing","createDeclaration","makeImageFromView"],"sources":["index.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\n\nimport type { Color, Skia as SkiaApi, SkRect, Vector } from \"../skia/types\";\nimport * as Values from \"../values/web\";\nimport * as ValuesHooks from \"../values/hooks\";\nimport { Selector } from \"../values/selector\";\nimport * as BaseSkia from \"../skia/types\";\nimport type * as SkiaExports from \"../skia\";\nimport type * as ValueExports from \"../values\";\nimport type * as AnimationExports from \"../animation\";\nimport * as timingFunctions from \"../animation/timing\";\nimport * as springFunctions from \"../animation/spring\";\nimport * as decayFunctions from \"../animation/decay\";\nimport * as interpolateFn from \"../animation/functions/interpolate\";\nimport * as interpolatePathFn from \"../animation/functions/interpolatePaths\";\nimport * as interpolateVectorFn from \"../animation/functions/interpolateVector\";\nimport { ShaderLib } from \"../renderer/components/shaders/ShaderLib\";\n\nclass Stub {\n  constructor() {\n    return new Proxy(() => {}, {\n      get: () => new Stub(),\n      apply: () => new Stub(),\n      set: () => true,\n    });\n  }\n}\n\nconst Noop: () => any = () => {};\n\nexport const Skia: SkiaApi = new Stub() as any;\n\nexport const vec = (x?: number, y?: number) => ({ x: x ?? 0, y: y ?? x ?? 0 });\n\nexport const Mock: typeof SkiaExports &\n  typeof ValueExports &\n  typeof AnimationExports & {\n    createDrawing: () => any;\n    createDeclaration: () => any;\n    ShaderLib: typeof ShaderLib;\n  } = {\n  // SkiaExports\n  // 1. Skia API. BaseSkia contains the enums, and functions like isPaint etc\n  Skia,\n  ...BaseSkia,\n  // 2. Hooks\n  useRawData: Noop,\n  useData: Noop,\n  useFont: Noop,\n  useTypeface: Noop,\n  useImage: Noop,\n  useSVG: Noop,\n  createPicture: Noop,\n  // 3. Point/Rect/Transform utilities\n  vec,\n  rect: (x: number, y: number, width: number, height: number) => ({\n    x,\n    y,\n    width,\n    height,\n  }),\n  rrect: (r: SkRect, rx: number, ry: number) => ({\n    rect: r,\n    rx,\n    ry,\n  }),\n  point: vec,\n  add: (a: Vector, b: Vector) => vec(a.x + b.x, a.y + b.y),\n  sub: (a: Vector, b: Vector) => vec(a.x - b.x, a.y - b.y),\n  neg: (a: Vector) => vec(-a.x, -a.y),\n  dist: (a: Vector, b: Vector) => Math.hypot(a.x - b.x, a.y - b.y),\n  translate: ({ x, y }: Vector) =>\n    [{ translateX: x }, { translateY: y }] as const,\n\n  bounds: Noop,\n  topLeft: Noop,\n  topRight: Noop,\n  bottomLeft: Noop,\n  bottomRight: Noop,\n  center: Noop,\n  processTransform2d: Noop,\n  // ValueExports\n  ...Values,\n  ...ValuesHooks,\n  Selector,\n  // Animations\n  ...timingFunctions,\n  ...springFunctions,\n  ...decayFunctions,\n  ...interpolateFn,\n  ...interpolatePathFn,\n  ...interpolateVectorFn,\n  interpolateColors: (\n    _value: number,\n    _inputRange: number[],\n    _outputRange: Color[]\n  ) => Float32Array.of(0, 0, 0, 0),\n  mixColors: (_v: number, _x: Color, _y: Color) => Float32Array.of(0, 0, 0, 0),\n  ShaderLib,\n  createDrawing: Noop,\n  createDeclaration: Noop,\n  makeImageFromView: Noop,\n};\n"],"mappings":"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"}
+{"version":3,"names":["Noop","undefined","NoopValue","current","Mock","CanvasKit","global","SkiaApi","JsiSkApi","SkiaValueApi","ValueApi","Skia","require","Canvas","useValue","useComputedValue","useTouchHandler","useTiming","useLoop","useSpring","useClockValue","useValueEffect","useRawData","useData","useFont","Font","useTypeface","useImage","useSVG"],"sources":["index.ts"],"sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport { JsiSkApi } from \"../skia/web\";\nimport { ValueApi } from \"../values/web\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst Noop: () => any = () => undefined;\nconst NoopValue = () => ({ current: 0 });\n\nexport const Mock = (CanvasKit: CanvasKit) => {\n  global.SkiaApi = JsiSkApi(CanvasKit);\n  global.SkiaValueApi = ValueApi;\n  const Skia = global.SkiaApi;\n  return {\n    Skia,\n    ...require(\"../renderer/components\"),\n    ...require(\"../skia\"),\n    ...require(\"../values\"),\n    ...require(\"../animation\"),\n    ...require(\"../dom/types\"),\n    ...require(\"../dom/nodes\"),\n    // We could use the real Canvas if we mock the SkiaView component for node\n    Canvas: Noop,\n    useValue: NoopValue,\n    useComputedValue: NoopValue,\n    useTouchHandler: Noop,\n    useTiming: NoopValue,\n    useLoop: NoopValue,\n    useSpring: NoopValue,\n    useClockValue: NoopValue,\n    useValueEffect: Noop,\n    useRawData: Noop,\n    useData: Noop,\n    useFont: () => Skia.Font(undefined, 0),\n    useTypeface: () => null,\n    useImage: () => null,\n    useSVG: () => null,\n  };\n};\n"],"mappings":";;;;;;;AAEA;;AACA;;AAEA;AACA,MAAMA,IAAe,GAAG,MAAMC,SAA9B;;AACA,MAAMC,SAAS,GAAG,OAAO;EAAEC,OAAO,EAAE;AAAX,CAAP,CAAlB;;AAEO,MAAMC,IAAI,GAAIC,SAAD,IAA0B;EAC5CC,MAAM,CAACC,OAAP,GAAiB,IAAAC,aAAA,EAASH,SAAT,CAAjB;EACAC,MAAM,CAACG,YAAP,GAAsBC,cAAtB;EACA,MAAMC,IAAI,GAAGL,MAAM,CAACC,OAApB;EACA,OAAO;IACLI,IADK;IAEL,GAAGC,OAAO,CAAC,wBAAD,CAFL;IAGL,GAAGA,OAAO,CAAC,SAAD,CAHL;IAIL,GAAGA,OAAO,CAAC,WAAD,CAJL;IAKL,GAAGA,OAAO,CAAC,cAAD,CALL;IAML,GAAGA,OAAO,CAAC,cAAD,CANL;IAOL,GAAGA,OAAO,CAAC,cAAD,CAPL;IAQL;IACAC,MAAM,EAAEb,IATH;IAULc,QAAQ,EAAEZ,SAVL;IAWLa,gBAAgB,EAAEb,SAXb;IAYLc,eAAe,EAAEhB,IAZZ;IAaLiB,SAAS,EAAEf,SAbN;IAcLgB,OAAO,EAAEhB,SAdJ;IAeLiB,SAAS,EAAEjB,SAfN;IAgBLkB,aAAa,EAAElB,SAhBV;IAiBLmB,cAAc,EAAErB,IAjBX;IAkBLsB,UAAU,EAAEtB,IAlBP;IAmBLuB,OAAO,EAAEvB,IAnBJ;IAoBLwB,OAAO,EAAE,MAAMb,IAAI,CAACc,IAAL,CAAUxB,SAAV,EAAqB,CAArB,CApBV;IAqBLyB,WAAW,EAAE,MAAM,IArBd;IAsBLC,QAAQ,EAAE,MAAM,IAtBX;IAuBLC,MAAM,EAAE,MAAM;EAvBT,CAAP;AAyBD,CA7BM"}

package/lib/commonjs/skia/types/Color.d.ts

@@ -1,2 +1,2 @@
 export declare type SkColor = Float32Array;
-export declare type Color = string | Float32Array | number;
+export declare type Color = string | Float32Array | number | number[];

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["Color.ts"],"sourcesContent":["// This is the JSI color\nexport type SkColor = Float32Array;\n// Input colors can be string, number or Float32Array\nexport type Color = string | Float32Array | number;\n"],"mappings":""}
+{"version":3,"names":[],"sources":["Color.ts"],"sourcesContent":["// This is the JSI color\nexport type SkColor = Float32Array;\n// Input colors can be string, number or Float32Array\nexport type Color = string | Float32Array | number | number[];\n"],"mappings":""}