@shopify/react-native-skia 0.1.131 → 0.1.134

package/android/CMakeLists.txt

@@ -50,9 +50,9 @@ target_include_directories(
         ${PACKAGE_NAME}
         PRIVATE
 
-        # When installed in the development environment
         "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/react/nativemodule/core"
         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
 

package/android/build.gradle

@@ -51,6 +51,13 @@ def defaultDir = null
 def androidSourcesDir = null
 def androidSourcesName = 'React Native sources'
 
+def buildType = "debug"
+tasks.all({ task ->
+    if (task.name == "buildCMakeRelease") {
+        buildType = "release"
+    }
+})
+
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
   androidSourcesDir = defaultDir.parentFile.toString()
@@ -81,6 +88,7 @@ def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME").split("\\
 logger.warn("react-native-skia: React Native version: ${REACT_NATIVE_VERSION}")
 logger.warn("react-native-skia: Is Source build: ${sourceBuild}")
 logger.warn("react-native-skia: Prebuilt dir: ${prebuiltDir}")
+logger.warn("react-native-skia: Build type: ${buildType}")
 
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
@@ -175,8 +183,15 @@ dependencies {
     //noinspection GradleDynamicVersion
     extractJNI("com.facebook.fbjni:fbjni:0.2.2")
 
-    def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include "**/**/*.aar" }).singleFile
-    extractJNI(files(rnAAR))
+    if(REACT_NATIVE_VERSION < 69) {
+        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include "**/**/*.aar" }).singleFile
+        extractJNI(files(rnAAR))
+    } else {
+        // React Native >= 0.69
+        def rnAarMatcher = "**/react-native/**/*${buildType}.aar"
+        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include rnAarMatcher }).singleFile
+        extractJNI(files(rnAAR))
+    }
 }
 
 afterEvaluate { project ->

package/android/cpp/rnskia-android/RNSkDrawViewImpl.cpp

@@ -53,6 +53,11 @@ namespace RNSkia {
     }
 
     void RNSkDrawViewImpl::surfaceSizeChanged(int width, int height) {
+        if(width == 0 && height == 0) {
+            // Setting width/height to zero is nothing we need to care about when
+            // it comes to invalidating the surface.
+            return;
+        }
         _scaledWidth = width;
         _scaledHeight = height;
 

package/cpp/api/JsiSkFont.h

@@ -5,13 +5,15 @@
 #include <vector>
 
 #include <jsi/jsi.h>
-
 #include "JsiSkHostObjects.h"
+#include <RNSkLog.h>
+
 #include "JsiSkPaint.h"
 #include "JsiSkRect.h"
 #include "JsiSkTypeface.h"
 #include "JsiSkPoint.h"
 
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
@@ -37,6 +39,7 @@ namespace RNSkia
 
         JSI_HOST_FUNCTION(measureText)
         {
+            RNSkLogger::warnToJavascriptConsole(runtime, "measureText() is deprecated.  Clients should use 'Font.getGlyphWidths' instead (the latter does no shaping)");
             auto textVal = arguments[0].asString(runtime).utf8(runtime);
             auto text = textVal.c_str();
             SkRect rect;
@@ -252,6 +255,7 @@ namespace RNSkia
         }
 
         JSI_EXPORT_FUNCTIONS(
+            JSI_EXPORT_FUNC(JsiSkFont, getSize),
             JSI_EXPORT_FUNC(JsiSkFont, measureText),
             JSI_EXPORT_FUNC(JsiSkFont, getMetrics),
             JSI_EXPORT_FUNC(JsiSkFont, getGlyphIDs),
@@ -323,4 +327,4 @@ namespace RNSkia
         }
     };
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/JsiSkImage.h

@@ -65,9 +65,7 @@ namespace RNSkia
     JSI_HOST_FUNCTION(encodeToBytes)
     {
       // Get optional parameters
-      auto format = count >= 1 ? getFormatFromNumber(
-        static_cast<int>(arguments[0].asNumber())) : SkEncodedImageFormat::kPNG;
-      
+      auto format = count >= 1 ? static_cast<SkEncodedImageFormat>(arguments[0].asNumber()) : SkEncodedImageFormat::kPNG;
       auto quality = count == 2 ? arguments[1].asNumber() : 100.0;
       
       // Get data
@@ -89,8 +87,7 @@ namespace RNSkia
     JSI_HOST_FUNCTION(encodeToBase64)
     {
       // Get optional parameters
-      auto format = count >= 1 ? getFormatFromNumber(
-        static_cast<int>(arguments[0].asNumber())) : SkEncodedImageFormat::kPNG;
+      auto format = count >= 1 ? static_cast<SkEncodedImageFormat>(arguments[0].asNumber()) : SkEncodedImageFormat::kPNG;
       
       auto quality = count == 2 ? arguments[1].asNumber() : 100.0;
       
@@ -122,20 +119,6 @@ namespace RNSkia
           .asHostObject<JsiSkImage>(runtime)
           ->getObject();
     }
-  private:
-    
-    SkEncodedImageFormat getFormatFromNumber(int value) {
-      switch(value) {
-        case 0: // PNG
-          return SkEncodedImageFormat::kPNG;
-        case 1: // JPEG
-          return SkEncodedImageFormat::kJPEG;
-        case 2: // WEBP
-          return SkEncodedImageFormat::kWEBP;
-        default:
-          return SkEncodedImageFormat::kPNG;
-      }
-    }
   };
 
 } // namespace RNSkia

package/cpp/api/JsiSkPaint.h

@@ -84,47 +84,20 @@ public:
   }
 
   JSI_HOST_FUNCTION(setStyle) {
-    int styleInt = arguments[0].asNumber();
-    switch (styleInt) {
-    case 0:
-      getObject()->setStyle(SkPaint::kFill_Style);
-      break;
-    case 1:
-      getObject()->setStyle(SkPaint::kStroke_Style);
-      break;
-    }
+    auto style = arguments[0].asNumber();
+    getObject()->setStyle(static_cast<SkPaint::Style>(style));
     return jsi::Value::undefined();
   }
 
   JSI_HOST_FUNCTION(setStrokeCap) {
-    int cap = arguments[0].asNumber();
-    switch (cap) {
-    case 0:
-      getObject()->setStrokeCap(SkPaint::kButt_Cap);
-      break;
-    case 1:
-      getObject()->setStrokeCap(SkPaint::kRound_Cap);
-      break;
-    case 2:
-      getObject()->setStrokeCap(SkPaint::kSquare_Cap);
-      break;
-    }
+    auto cap = arguments[0].asNumber();
+    getObject()->setStrokeCap(static_cast<SkPaint::Cap>(cap));
     return jsi::Value::undefined();
   }
 
   JSI_HOST_FUNCTION(setStrokeJoin) {
     int join = arguments[0].asNumber();
-    switch (join) {
-    case 0:
-      getObject()->setStrokeJoin(SkPaint::kBevel_Join);
-      break;
-    case 1:
-      getObject()->setStrokeJoin(SkPaint::kMiter_Join);
-      break;
-    case 2:
-      getObject()->setStrokeJoin(SkPaint::kRound_Join);
-      break;
-    }
+    getObject()->setStrokeJoin(static_cast<SkPaint::Join>(join));
     return jsi::Value::undefined();
   }
 

package/cpp/api/JsiSkPath.h

@@ -480,8 +480,8 @@ public:
     auto cmds = jsi::Array(runtime, path.countVerbs());
     auto it = SkPath::Iter(path, false);
     //                       { "Move", "Line", "Quad", "Conic", "Cubic", "Close", "Done" };
-    const int pointCount[] = {     1 ,     2 ,     3 ,      3 ,      4 ,      1 ,     0  };
-    const int cmdCount[] =   {     3 ,     5 ,     7 ,      8 ,      9 ,      3 ,     0  };
+    const int pointCount[] = {     1 ,     1 ,     2 ,      2 ,      3 ,      0 ,     0  };
+    const int cmdCount[] =   {     3 ,     3 ,     5 ,      6 ,      7 ,      1 ,     0  };
     SkPoint points[4];
     SkPath::Verb verb;
     auto k = 0;
@@ -491,8 +491,8 @@ public:
       auto j = 0;
       cmd.setValueAtIndex(runtime, j++, jsi::Value(verbVal));
       for (int i = 0; i < pointCount[verbVal]; ++i) {
-        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[i].fX)));
-        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[i].fY)));
+        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[1 + i].fX)));
+        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[1 + i].fY)));
       }
       if (SkPath::kConic_Verb == verb) {
         cmd.setValueAtIndex(runtime, j, jsi::Value(static_cast<double>(it.conicWeight())));

package/cpp/rnskia/RNSkValueApi.h

@@ -4,7 +4,7 @@
 #include <JsiHostObject.h>
 #include <RNSkPlatformContext.h>
 #include <RNSkValue.h>
-#include <RNSkDerivedValue.h>
+#include <RNSkComputedValue.h>
 #include <RNSkAnimation.h>
 #include <jsi/jsi.h>
 
@@ -33,13 +33,13 @@ public:
       std::make_shared<RNSkValue>(_platformContext, runtime, arguments, count));
   }
   
-  JSI_HOST_FUNCTION(createDerivedValue) {
+  JSI_HOST_FUNCTION(createComputedValue) {
     // Creation and initialization is done in two steps to be able to use weak references when setting
     // up dependencies - since weak_from_this needs our instance to be a shared_ptr before calling
     // weak_from_this().
-    auto derivedValue = std::make_shared<RNSkDerivedValue>(_platformContext, runtime, arguments, count);
-    derivedValue->initializeDependencies(runtime, arguments, count);
-    return jsi::Object::createFromHostObject(runtime, derivedValue);
+    auto computedValue = std::make_shared<RNSkComputedValue>(_platformContext, runtime, arguments, count);
+    computedValue->initializeDependencies(runtime, arguments, count);
+    return jsi::Object::createFromHostObject(runtime, computedValue);
   }
   
   JSI_HOST_FUNCTION(createAnimation) {
@@ -61,7 +61,7 @@ public:
   }
   
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkValueApi, createValue),
-                       JSI_EXPORT_FUNC(RNSkValueApi, createDerivedValue),
+                       JSI_EXPORT_FUNC(RNSkValueApi, createComputedValue),
                        JSI_EXPORT_FUNC(RNSkValueApi, createClockValue),
                        JSI_EXPORT_FUNC(RNSkValueApi, createAnimation))
 

package/cpp/rnskia/values/{RNSkDerivedValue.h → RNSkComputedValue.h}

@@ -19,13 +19,13 @@ using namespace facebook;
   Creates a readonly value that depends on one or more other values. The derived value has a callback
   function that is used to calculate the new value when any of the dependencies change.
  */
-class RNSkDerivedValue : public RNSkReadonlyValue
+class RNSkComputedValue : public RNSkReadonlyValue
 {
 public:
-  RNSkDerivedValue(std::shared_ptr<RNSkPlatformContext> platformContext,
-                   jsi::Runtime &runtime,
-                   const jsi::Value *arguments,
-                   size_t count
+  RNSkComputedValue(std::shared_ptr<RNSkPlatformContext> platformContext,
+                    jsi::Runtime &runtime,
+                    const jsi::Value *arguments,
+                    size_t count
                    )
       : RNSkReadonlyValue(platformContext) {
     // Verify input
@@ -70,7 +70,7 @@ public:
       _unsubscribers.push_back(dep->addListener([weakSelf = weak_from_this()](jsi::Runtime& runtime) {
         auto self = weakSelf.lock();
         if(self) {
-          auto selfAsThis = std::dynamic_pointer_cast<RNSkDerivedValue>(self);
+          auto selfAsThis = std::dynamic_pointer_cast<RNSkComputedValue>(self);
           selfAsThis->dependencyUpdated(runtime);
         }
       }));
@@ -80,7 +80,7 @@ public:
     dependencyUpdated(runtime);
   }
   
-  virtual ~RNSkDerivedValue() {
+  virtual ~RNSkComputedValue() {
     // Unregister listeners
     for(const auto &unsubscribe: _unsubscribers) {
       unsubscribe();

package/cpp/utils/RNSkLog.h

@@ -5,6 +5,8 @@
 #pragma once
 
 #include <string>
+#include <jsi/jsi.h>
+
 #ifdef ANDROID
 #include <android/log.h>
 #endif
@@ -14,6 +16,9 @@
 #endif
 
 namespace RNSkia {
+
+using namespace facebook;
+
 class RNSkLogger {
 public:
   /**

package/ios/RNSkia-iOS/SkiaManager.mm

@@ -34,7 +34,7 @@
     if (cxxBridge.runtime) {
       
       auto callInvoker = bridge.jsCallInvoker;
-      jsi::Runtime* jsRuntime = (jsi::Runtime*)cxxBridge.runtime;
+      facebook::jsi::Runtime* jsRuntime = (facebook::jsi::Runtime*)cxxBridge.runtime;
       
       // Create platform context
       _platformContext = std::make_shared<RNSkia::PlatformContext>(jsRuntime, callInvoker);

package/lib/commonjs/mock/index.js

@@ -0,0 +1,190 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.vec = exports.useValueEffect = exports.useValue = exports.useTypeface = exports.useTouchHandler = exports.useTiming = exports.useSpring = exports.useSharedValueEffect = exports.useSVG = exports.usePicture = exports.useImage = exports.useFont = exports.useDataCollection = exports.useData = exports.useComputedValue = exports.useClockValue = exports.timing = exports.spring = exports.runTiming = exports.runSpring = exports.runDecay = exports.rrect = exports.rect = exports.decay = exports.Skia = void 0;
+
+/**
+ * Mock implementation for test runners.
+ *
+ * Example:
+ *
+ * ```js
+ * jest.mock('@shopify/react-native-skia', () => require('@shopify/react-native-skia/lib/commonjs/mock'));
+ * ```
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const MockJSIInstance = {};
+
+const Noop = () => MockJSIInstance;
+
+const Skia = {
+  Point: Noop,
+  XYWHRect: Noop,
+  RuntimeShaderBuilder: Noop,
+  RRectXY: Noop,
+  RSXform: Noop,
+  Color: Noop,
+  ContourMeasureIter: Noop,
+  Paint: Noop,
+  PictureRecorder: Noop,
+  Picture: {
+    MakePicture: Noop
+  },
+  Path: {
+    Make: Noop,
+    MakeFromSVGString: Noop,
+    MakeFromOp: Noop,
+    MakeFromCmds: Noop,
+    MakeFromText: Noop
+  },
+  Matrix: Noop,
+  ColorFilter: {
+    MakeMatrix: Noop,
+    MakeBlend: Noop,
+    MakeCompose: Noop,
+    MakeLerp: Noop,
+    MakeLinearToSRGBGamma: Noop,
+    MakeSRGBToLinearGamma: Noop,
+    MakeLumaColorFilter: Noop
+  },
+  Font: Noop,
+  Typeface: {
+    MakeFreeTypeFaceFromData: Noop
+  },
+  MaskFilter: {
+    MakeBlur: Noop
+  },
+  RuntimeEffect: {
+    Make: Noop
+  },
+  ImageFilter: {
+    MakeOffset: Noop,
+    MakeDisplacementMap: Noop,
+    MakeShader: Noop,
+    MakeBlur: Noop,
+    MakeColorFilter: Noop,
+    MakeCompose: Noop,
+    MakeDropShadow: Noop,
+    MakeDropShadowOnly: Noop,
+    MakeErode: Noop,
+    MakeDilate: Noop,
+    MakeBlend: Noop,
+    MakeRuntimeShader: Noop
+  },
+  Shader: {
+    MakeLinearGradient: Noop,
+    MakeRadialGradient: Noop,
+    MakeTwoPointConicalGradient: Noop,
+    MakeSweepGradient: Noop,
+    MakeTurbulence: Noop,
+    MakeFractalNoise: Noop,
+    MakeBlend: Noop,
+    MakeColor: Noop
+  },
+  PathEffect: {
+    MakeCorner: Noop,
+    MakeDash: Noop,
+    MakeDiscrete: Noop,
+    MakeCompose: Noop,
+    MakeSum: Noop,
+    MakeLine2D: Noop,
+    MakePath1D: Noop,
+    MakePath2D: Noop
+  },
+  MakeVertices: Noop,
+  Data: {
+    fromURI: Noop,
+    fromBytes: Noop,
+    fromBase64: Noop
+  },
+  Image: {
+    MakeImageFromEncoded: Noop,
+    MakeImage: Noop
+  },
+  SVG: {
+    MakeFromData: Noop,
+    MakeFromString: Noop
+  },
+  FontMgr: {
+    RefDefault: Noop
+  },
+  TextBlob: {
+    MakeFromText: Noop,
+    MakeFromGlyphs: Noop,
+    MakeFromRSXform: Noop,
+    MakeFromRSXformGlyphs: Noop
+  },
+  Surface: {
+    Make: Noop
+  }
+};
+exports.Skia = Skia;
+
+const vec = (x, y) => ({
+  x,
+  y
+});
+
+exports.vec = vec;
+
+const rect = (x, y, width, height) => ({
+  x,
+  y,
+  width,
+  height
+});
+
+exports.rect = rect;
+
+const rrect = (r, rx, ry) => ({
+  rect: r,
+  rx,
+  ry
+});
+
+exports.rrect = rrect;
+const useTouchHandler = Noop;
+exports.useTouchHandler = useTouchHandler;
+const useComputedValue = Noop;
+exports.useComputedValue = useComputedValue;
+const useValue = Noop;
+exports.useValue = useValue;
+const useClockValue = Noop;
+exports.useClockValue = useClockValue;
+const useValueEffect = Noop;
+exports.useValueEffect = useValueEffect;
+const useTiming = Noop;
+exports.useTiming = useTiming;
+const runTiming = Noop;
+exports.runTiming = runTiming;
+const timing = Noop;
+exports.timing = timing;
+const useSpring = Noop;
+exports.useSpring = useSpring;
+const runSpring = Noop;
+exports.runSpring = runSpring;
+const spring = Noop;
+exports.spring = spring;
+const runDecay = Noop;
+exports.runDecay = runDecay;
+const decay = Noop;
+exports.decay = decay;
+const useSharedValueEffect = Noop;
+exports.useSharedValueEffect = useSharedValueEffect;
+const useData = Noop;
+exports.useData = useData;
+const useDataCollection = Noop;
+exports.useDataCollection = useDataCollection;
+const useFont = Noop;
+exports.useFont = useFont;
+const useImage = Noop;
+exports.useImage = useImage;
+const usePicture = Noop;
+exports.usePicture = usePicture;
+const useSVG = Noop;
+exports.useSVG = useSVG;
+const useTypeface = Noop;
+exports.useTypeface = useTypeface;
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["index.ts"],"names":["MockJSIInstance","Noop","Skia","Point","XYWHRect","RuntimeShaderBuilder","RRectXY","RSXform","Color","ContourMeasureIter","Paint","PictureRecorder","Picture","MakePicture","Path","Make","MakeFromSVGString","MakeFromOp","MakeFromCmds","MakeFromText","Matrix","ColorFilter","MakeMatrix","MakeBlend","MakeCompose","MakeLerp","MakeLinearToSRGBGamma","MakeSRGBToLinearGamma","MakeLumaColorFilter","Font","Typeface","MakeFreeTypeFaceFromData","MaskFilter","MakeBlur","RuntimeEffect","ImageFilter","MakeOffset","MakeDisplacementMap","MakeShader","MakeColorFilter","MakeDropShadow","MakeDropShadowOnly","MakeErode","MakeDilate","MakeRuntimeShader","Shader","MakeLinearGradient","MakeRadialGradient","MakeTwoPointConicalGradient","MakeSweepGradient","MakeTurbulence","MakeFractalNoise","MakeColor","PathEffect","MakeCorner","MakeDash","MakeDiscrete","MakeSum","MakeLine2D","MakePath1D","MakePath2D","MakeVertices","Data","fromURI","fromBytes","fromBase64","Image","MakeImageFromEncoded","MakeImage","SVG","MakeFromData","MakeFromString","FontMgr","RefDefault","TextBlob","MakeFromGlyphs","MakeFromRSXform","MakeFromRSXformGlyphs","Surface","vec","x","y","rect","width","height","rrect","r","rx","ry","useTouchHandler","useComputedValue","useValue","useClockValue","useValueEffect","useTiming","runTiming","timing","useSpring","runSpring","spring","runDecay","decay","useSharedValueEffect","useData","useDataCollection","useFont","useImage","usePicture","useSVG","useTypeface"],"mappings":"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","sourcesContent":["/**\n * Mock implementation for test runners.\n *\n * Example:\n *\n * ```js\n * jest.mock('@shopify/react-native-skia', () => require('@shopify/react-native-skia/lib/commonjs/mock'));\n * ```\n */\n\nimport type { Skia as SkiaApi, SkRect } from \"../skia/types\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst MockJSIInstance: any = {};\nconst Noop = () => MockJSIInstance;\n\nexport const Skia: SkiaApi = {\n  Point: Noop,\n  XYWHRect: Noop,\n  RuntimeShaderBuilder: Noop,\n  RRectXY: Noop,\n  RSXform: Noop,\n  Color: Noop,\n  ContourMeasureIter: Noop,\n  Paint: Noop,\n  PictureRecorder: Noop,\n  Picture: {\n    MakePicture: Noop,\n  },\n  Path: {\n    Make: Noop,\n    MakeFromSVGString: Noop,\n    MakeFromOp: Noop,\n    MakeFromCmds: Noop,\n    MakeFromText: Noop,\n  },\n  Matrix: Noop,\n  ColorFilter: {\n    MakeMatrix: Noop,\n    MakeBlend: Noop,\n    MakeCompose: Noop,\n    MakeLerp: Noop,\n    MakeLinearToSRGBGamma: Noop,\n    MakeSRGBToLinearGamma: Noop,\n    MakeLumaColorFilter: Noop,\n  },\n  Font: Noop,\n  Typeface: {\n    MakeFreeTypeFaceFromData: Noop,\n  },\n  MaskFilter: {\n    MakeBlur: Noop,\n  },\n  RuntimeEffect: {\n    Make: Noop,\n  },\n  ImageFilter: {\n    MakeOffset: Noop,\n    MakeDisplacementMap: Noop,\n    MakeShader: Noop,\n    MakeBlur: Noop,\n    MakeColorFilter: Noop,\n    MakeCompose: Noop,\n    MakeDropShadow: Noop,\n    MakeDropShadowOnly: Noop,\n    MakeErode: Noop,\n    MakeDilate: Noop,\n    MakeBlend: Noop,\n    MakeRuntimeShader: Noop,\n  },\n  Shader: {\n    MakeLinearGradient: Noop,\n    MakeRadialGradient: Noop,\n    MakeTwoPointConicalGradient: Noop,\n    MakeSweepGradient: Noop,\n    MakeTurbulence: Noop,\n    MakeFractalNoise: Noop,\n    MakeBlend: Noop,\n    MakeColor: Noop,\n  },\n  PathEffect: {\n    MakeCorner: Noop,\n    MakeDash: Noop,\n    MakeDiscrete: Noop,\n    MakeCompose: Noop,\n    MakeSum: Noop,\n    MakeLine2D: Noop,\n    MakePath1D: Noop,\n    MakePath2D: Noop,\n  },\n  MakeVertices: Noop,\n  Data: {\n    fromURI: Noop,\n    fromBytes: Noop,\n    fromBase64: Noop,\n  },\n  Image: {\n    MakeImageFromEncoded: Noop,\n    MakeImage: Noop,\n  },\n  SVG: {\n    MakeFromData: Noop,\n    MakeFromString: Noop,\n  },\n  FontMgr: {\n    RefDefault: Noop,\n  },\n  TextBlob: {\n    MakeFromText: Noop,\n    MakeFromGlyphs: Noop,\n    MakeFromRSXform: Noop,\n    MakeFromRSXformGlyphs: Noop,\n  },\n  Surface: {\n    Make: Noop,\n  },\n};\n\nexport const vec = (x: number, y: number) => ({ x, y });\n\nexport const rect = (x: number, y: number, width: number, height: number) => ({\n  x,\n  y,\n  width,\n  height,\n});\n\nexport const rrect = (r: SkRect, rx: number, ry: number) => ({\n  rect: r,\n  rx,\n  ry,\n});\n\nexport const useTouchHandler = Noop;\nexport const useComputedValue = Noop;\nexport const useValue = Noop;\nexport const useClockValue = Noop;\nexport const useValueEffect = Noop;\nexport const useTiming = Noop;\nexport const runTiming = Noop;\nexport const timing = Noop;\nexport const useSpring = Noop;\nexport const runSpring = Noop;\nexport const spring = Noop;\nexport const runDecay = Noop;\nexport const decay = Noop;\n\nexport const useSharedValueEffect = Noop;\n\nexport const useData = Noop;\nexport const useDataCollection = Noop;\nexport const useFont = Noop;\nexport const useImage = Noop;\nexport const usePicture = Noop;\nexport const useSVG = Noop;\nexport const useTypeface = Noop;\n"]}

package/lib/commonjs/skia/core/Data.js

@@ -15,65 +15,55 @@ const resolveAsset = source => {
   return _reactNative.Platform.OS === "web" ? source.default : _reactNative.Image.resolveAssetSource(source).uri;
 };
 
-const useDataCollection = function (sources, factory) {
-  let deps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  const [data, setData] = (0, _react.useState)(null);
-  (0, _react.useEffect)(() => {
-    const bytesOrURIs = sources.map(source => {
-      if (source instanceof Uint8Array) {
-        return source;
-      }
-
-      return typeof source === "string" ? source : resolveAsset(source);
-    });
-    Promise.all(bytesOrURIs.map(bytesOrURI => bytesOrURI instanceof Uint8Array ? _Skia.Skia.Data.fromBytes(bytesOrURI) : _Skia.Skia.Data.fromURI(bytesOrURI))).then(d => setData(factory(d))); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, deps);
-  return data;
+const factoryWrapper = (data2, factory, onError) => {
+  const factoryResult = factory(data2);
+
+  if (factoryResult === null) {
+    onError && onError(new Error("Could not load data"));
+    return null;
+  } else {
+    return factoryResult;
+  }
 };
 
-exports.useDataCollection = useDataCollection;
+const loadDataCollection = (sources, factory, onError) => Promise.all(sources.map(source => loadData(source, factory, onError)));
+
+const loadData = (source, factory, onError) => {
+  if (source instanceof Uint8Array) {
+    return new Promise(resolve => resolve(factoryWrapper(_Skia.Skia.Data.fromBytes(source), factory, onError)));
+  } else {
+    const uri = typeof source === "string" ? source : resolveAsset(source);
+    return _Skia.Skia.Data.fromURI(uri).then(d => factoryWrapper(d, factory, onError));
+  }
+};
 
-const useRawData = (source, factory, onError) => {
+const useLoading = function (source, loader) {
+  let deps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   const [data, setData] = (0, _react.useState)(null);
   const prevSourceRef = (0, _react.useRef)();
   (0, _react.useEffect)(() => {
-    // Track to avoid re-fetching the same data
     if (prevSourceRef.current !== source) {
       prevSourceRef.current = source;
+      loader().then(setData);
+    } else {
+      setData(null);
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-      if (source !== null && source !== undefined) {
-        const factoryWrapper = data2 => {
-          const factoryResult = factory(data2);
-
-          if (factoryResult === null) {
-            onError && onError(new Error("Could not load data"));
-            setData(null);
-          } else {
-            setData(factoryResult);
-          }
-        };
-
-        if (source instanceof Uint8Array) {
-          factoryWrapper(_Skia.Skia.Data.fromBytes(source));
-        } else {
-          const uri = typeof source === "string" ? source : resolveAsset(source);
-
-          _Skia.Skia.Data.fromURI(uri).then(d => factoryWrapper(d));
-        }
-      } else {
-        // new source is null or undefined -> remove cached data
-        setData(null);
-      }
-    }
-  }, [factory, onError, source]);
+  }, deps);
   return data;
 };
 
+const useDataCollection = (sources, factory, onError, deps) => useLoading(sources, () => loadDataCollection(sources, factory, onError), deps);
+
+exports.useDataCollection = useDataCollection;
+
+const useRawData = (source, factory, onError, deps) => useLoading(source, () => loadData(source, factory, onError), deps);
+
 exports.useRawData = useRawData;
 
 const identity = data => data;
 
-const useData = (source, onError) => useRawData(source, identity, onError);
+const useData = (source, onError, deps) => useRawData(source, identity, onError, deps);
 
 exports.useData = useData;
 //# sourceMappingURL=Data.js.map