@shopify/react-native-skia 0.1.218 → 0.1.220

package/android/src/main/java/com/shopify/reactnative/skia/PlatformContext.java

@@ -1,7 +1,5 @@
 package com.shopify.reactnative.skia;
 
-import android.app.Application;
-import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
@@ -10,7 +8,6 @@ import android.view.Choreographer;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -21,8 +18,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public class PlatformContext {
     @DoNotStrip
@@ -35,6 +30,9 @@ public class PlatformContext {
 
     private final String TAG = "PlatformContext";
 
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
+
+
     public PlatformContext(ReactContext reactContext) {
         mContext = reactContext;
         mHybridData = initHybrid(reactContext.getResources().getDisplayMetrics().density);
@@ -66,9 +64,10 @@ public class PlatformContext {
         Choreographer.getInstance().postFrameCallback(frameCallback);
     }
 
+
     @DoNotStrip
     public void notifyTaskReadyOnMainThread() {
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
+        mainHandler.post(new Runnable() {
             @Override
             public void run() {
                 notifyTaskReady();
@@ -83,7 +82,7 @@ public class PlatformContext {
 
     @DoNotStrip
     public void raise(final String message) {
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
+        mainHandler.post(new Runnable() {
             @Override
             public void run() {
                 mContext.handleException(new Exception(message));
@@ -97,7 +96,7 @@ public class PlatformContext {
             return;
         }
         _drawLoopActive = true;
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
+        mainHandler.post(new Runnable() {
             @Override
             public void run() {
                 postFrameLoop();
@@ -169,7 +168,7 @@ public class PlatformContext {
         Log.i(TAG, "Resume");
         if(_drawLoopActive) {
             // Restart draw loop
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
+            mainHandler.post(new Runnable() {
                 @Override
                 public void run() {
                     postFrameLoop();
@@ -188,4 +187,4 @@ public class PlatformContext {
     private native HybridData initHybrid(float pixelDensity);
     private native void notifyDrawLoop();
     private native void notifyTaskReady();
-}
+}

package/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseView.java

@@ -157,9 +157,13 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
         return false;
     }
 
+    //private long _prevTimestamp = 0;
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-        // Nothing special to do here
+//        long timestamp = surface.getTimestamp();
+//        long frameDuration = (timestamp - _prevTimestamp)/1000000;
+//        Log.i(tag, "onSurfaceTextureUpdated "+frameDuration+"ms");
+//        _prevTimestamp = timestamp;
     }
 
     protected abstract void surfaceAvailable(Object surface, int width, int height);

package/cpp/rnskia/RNSkView.h

@@ -398,7 +398,7 @@ private:
 
   std::shared_ptr<RNSkValue> _onSize;
   std::function<void()> _onSizeUnsubscribe;
-  RNSkDrawingMode _drawingMode;
+  RNSkDrawingMode _drawingMode = RNSkDrawingMode::Default;
   size_t _nativeId;
 
   size_t _drawingLoopId = 0;

package/cpp/rnskia/dom/nodes/JsiImageNode.h

@@ -1,12 +1,7 @@
 #pragma once
 
-#ifdef TARGET_OS_IPHONE
-#include <react-native-skia/ImageProps.h>
-#else
-#include "ImageProps.h"
-#endif
-
 #include "JsiDomDrawingNode.h"
+#include "SkImageProps.h"
 
 #include <memory>
 

package/jestEnv.mjs

@@ -0,0 +1,23 @@
+/* eslint-disable import/no-default-export */
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { TestEnvironment } from "jest-environment-node";
+import CanvasKitInit from "canvaskit-wasm/bin/full/canvaskit";
+
+const CanvasKit = await CanvasKitInit({});
+
+export default class SkiaEnvironment extends TestEnvironment {
+  constructor(config, context) {
+    super(config, context);
+  }
+
+  async setup() {
+    await super.setup();
+    this.global.CanvasKit = CanvasKit;
+  }
+
+  async teardown() {}
+
+  getVmContext() {
+    return super.getVmContext();
+  }
+}

package/jestSetup.mjs

@@ -0,0 +1,22 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { jest } from "@jest/globals";
+import CanvasKitInit from "canvaskit-wasm/bin/full/canvaskit";
+import { Mock } from "@shopify/react-native-skia/lib/module/mock";
+
+global.CanvasKit = await CanvasKitInit({});
+
+jest.mock("@shopify/react-native-skia", () => {
+  jest.mock("@shopify/react-native-skia/lib/commonjs/Platform", () => {
+    const Noop = () => undefined;
+    return {
+      OS: "web",
+      PixelRatio: 1,
+      requireNativeComponent: Noop,
+      resolveAsset: Noop,
+      findNodeHandle: Noop,
+      NativeModules: Noop,
+      View: Noop,
+    };
+  });
+  return Mock(global.CanvasKit);
+});

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "0.1.218",
+  "version": "0.1.220",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [
@@ -25,7 +25,8 @@
     "libs/android/**",
     "index.js",
     "jestSetup.js",
-    "globalJestSetup.js",
+    "jestSetup.mjs",
+    "jestEnv.mjs",
     "cpp/**/*.{h,cpp}",
     "ios",
     "libs/ios/libskia.xcframework",
@@ -140,5 +141,5 @@
   },
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
-  "react-native": "lib/module/index.js"
+  "react-native": "src/index.ts"
 }