@shopify/react-native-skia 0.1.169 → 0.1.171

package/android/CMakeLists.txt

@@ -12,6 +12,11 @@ set (SKIA_SKSHAPER_LIB "skshaper")
 #set (SKIA_SKPARAGRAPH_LIB "skparagraph")
 #set (SKIA_SKUNICODE_LIB "skunicode")
 
+# Clear some variables
+unset(LIBRN_DIR CACHE)
+unset(libfbjni_link_DIRS CACHE)
+unset(libfbjni_include_DIRS CACHE)
+
 set(build_DIR ${CMAKE_SOURCE_DIR}/build)
 file(GLOB LIBRN_DIR "${PREBUILT_DIR}/${ANDROID_ABI}")
 file(GLOB libfbjni_link_DIRS "${build_DIR}/fbjni*.aar/jni/${ANDROID_ABI}")
@@ -114,49 +119,72 @@ find_library(
         LOG_LIB
         log
 )
-
 message("-- LOG     : " ${LOG_LIB})
 
- if(${REACT_NATIVE_VERSION} LESS 66)
-         # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
-         set (JSI_LIB "")
- else()
-         # RN 0.66 distributes libjsi.so, can be used instead of compiling jsi.cpp manually.
-         find_library(
-                 JSI_LIB
-                 jsi
-                 PATHS ${LIBRN_DIR}
-                 NO_CMAKE_FIND_ROOT_PATH
-         )
- endif()
-
- message("-- JSI     : " ${JSI_LIB})
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+    # We need to find packages since from RN 0.71 binaries are prebuilt
+    find_package(fbjni REQUIRED CONFIG)
+    find_package(ReactAndroid REQUIRED CONFIG)
+endif()
 
-find_library(
-        REACT_LIB
-        react_nativemodule_core
+unset(JSI_LIB CACHE)
+if(${REACT_NATIVE_VERSION} LESS 66)
+    # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
+    set (JSI_LIB "")
+elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+    # RN 0.71 distributes prebuilt binaries.
+    set (JSI_LIB ReactAndroid::jsi)
+else()
+    # RN 0.66 distributes libjsi.so, can be used instead of compiling jsi.cpp manually.
+    find_library(
+        JSI_LIB
+        jsi
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
-)
-
+    )
+endif()
+message("-- JSI     : " ${JSI_LIB})
+
+unset(REACT_LIB CACHE)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+    # RN 0.71 distributes prebuilt binaries.
+    set (REACT_LIB ReactAndroid::react_nativemodule_core)
+else()
+    find_library(
+            REACT_LIB
+            react_nativemodule_core
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
 message("-- REACT   : " ${REACT_LIB})
 
-find_library(
-        FBJNI_LIBRARY 
-        fbjni 
-        PATHS ${libfbjni_link_DIRS}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
+unset(FBJNI_LIBRARY CACHE)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+    # RN 0.71 distributes prebuilt binaries.
+    set (FBJNI_LIBRARY fbjni::fbjni)
+else()
+    find_library(
+            FBJNI_LIBRARY
+            fbjni
+            PATHS ${libfbjni_link_DIRS}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
 message("-- FBJNI   : " ${FBJNI_LIBRARY})
 
-find_library(
-        TURBOMODULES_LIB
-        turbomodulejsijni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
+unset(TURBOMODULES_LIB CACHE)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+    # RN 0.71 distributes prebuilt binaries.
+    set (TURBOMODULES_LIB "ReactAndroid::turbomodulejsijni")
+else()
+    find_library(
+            TURBOMODULES_LIB
+            turbomodulejsijni
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
 message("-- TURBO   : " ${TURBOMODULES_LIB})
 
 # Link

package/android/build.gradle

@@ -47,7 +47,7 @@ def nodeModules = findNodeModules(projectDir)
 logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")
 
 def sourceBuild = false
-def defaultDir = null
+def defaultDir
 
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
@@ -55,7 +55,7 @@ if (rootProject.ext.has('reactNativeAndroidRoot')) {
     sourceBuild = true
     defaultDir = project(':ReactAndroid').projectDir
 } else {
-  defaultDir = file("$nodeModules/react-native/android")
+  defaultDir = file("$nodeModules/react-native")
 }
 
 if (!defaultDir.exists()) {
@@ -78,7 +78,7 @@ if (gradle.startParameter.taskRequests.args[0].toString().contains("Release")) {
 
 def reactProperties = new Properties()
 file("$nodeModules/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
-def FULL_RN_VERSION = reactProperties.getProperty("VERSION_NAME")
+def FULL_RN_VERSION =  (System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME"))
 def REACT_NATIVE_VERSION = FULL_RN_VERSION.split("\\.")[1].toInteger()
 
 logger.warn("react-native-skia: RN Version: ${REACT_NATIVE_VERSION} / ${FULL_RN_VERSION}")
@@ -136,6 +136,10 @@ android {
         }
     }
 
+    buildFeatures {
+        prefab true
+    }
+
     packagingOptions {
         excludes = [
              "**/libc++_shared.so",
@@ -146,8 +150,6 @@ android {
         ]
     }
 
-
-
     // Create new configurations that can be referred to in dependencies.
     // The Android Gradle Plugin 3.* does not allow hooking into existing
     // configurations like `implementation`.
@@ -181,17 +183,25 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
 
-    //noinspection GradleDynamicVersion
-    extractHeaders("com.facebook.fbjni:fbjni:0.2.2:headers")
-    //noinspection GradleDynamicVersion
-    extractJNI("com.facebook.fbjni:fbjni:0.2.2")
+    if (REACT_NATIVE_VERSION < 71) {
+        logger.warn("react-native-skia: Extracting files from AAR (pre RN 0.71)")
+        //noinspection GradleDynamicVersion
+        extractHeaders("com.facebook.fbjni:fbjni:0.2.2:headers")
+        //noinspection GradleDynamicVersion
+        extractJNI("com.facebook.fbjni:fbjni:0.2.2")
+    }
 
     if (!sourceBuild) {
         def rnAarMatcher = "**/react-native/**/*${buildType}.aar"
         if (REACT_NATIVE_VERSION < 69) {
+            logger.warn("react-native-skia: aar state pre 69. match **/**/*.aar")
             rnAarMatcher = "**/**/*.aar"
+        } else if (REACT_NATIVE_VERSION >= 71) {
+            logger.warn("react-native-skia: aar state post 70, do nothing")
+            return
         }
-        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include rnAarMatcher }).singleFile        
+        def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include rnAarMatcher }).singleFile
+        logger.warn("react-native-skia: Extracting JNI files (pre RN 0.71) ${rnAAR}")
         extractJNI(files(rnAAR))
     }
 }

package/cpp/jsi/JsiValue.h

@@ -13,15 +13,15 @@ namespace RNJsi {
 namespace jsi = facebook::jsi;
 
 enum struct PropType {
-  Undefined = 1,
-  Null = 2,
-  Bool = 4,
-  Number = 8,
-  String = 16,
-  Object = 32,
-  HostObject = 64,
-  HostFunction = 128,
-  Array = 256
+  Undefined = 0,
+  Null = 1, // Keep undefined / null constant so that we can do checks faster
+  Bool = 2,
+  Number = 3,
+  String = 4,
+  Object = 5,
+  HostObject = 6,
+  HostFunction = 7,
+  Array = 8
 };
 
 using PropId = const char *;
@@ -80,7 +80,7 @@ public:
   /**
    Returns true if the value is undefined or null.
    */
-  bool isUndefinedOrNull() const { return isUndefined() || isNull(); }
+  bool isUndefinedOrNull() const { return _type <= PropType::Null; }
 
   /**
    Returns true if the value is undefined.

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

@@ -41,9 +41,9 @@ public:
     // Materialize children first so that any inner nodes get the opportunity
     // to calculate their state before this node continues.
     for (auto &child : getChildren()) {
-      auto decl = std::dynamic_pointer_cast<JsiBaseDomDeclarationNode>(child);
-      if (decl != nullptr) {
-        decl->decorateContext(context);
+      if (child->getNodeClass() == JsiDomNodeClass::DeclarationNode) {
+        std::static_pointer_cast<JsiBaseDomDeclarationNode>(child)
+            ->decorateContext(context);
       }
     }
 
@@ -55,6 +55,10 @@ public:
 #endif
   }
 
+  JsiDomNodeClass getNodeClass() override {
+    return JsiDomNodeClass::DeclarationNode;
+  }
+
 protected:
   /**
    Invalidates and marks then context as changed. The implementation in the

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

@@ -30,6 +30,11 @@ public:
 
 static std::atomic<size_t> NodeIdent = 1000;
 
+typedef enum {
+  RenderNode = 1,
+  DeclarationNode = 2,
+} JsiDomNodeClass;
+
 /**
  Implements an abstract base class for nodes in the Skia Reconciler. This node
  coresponds to the native implementation of the Node.ts class in Javascript.
@@ -174,6 +179,12 @@ public:
    */
   virtual void invalidateContext() = 0;
 
+  /*
+   Returns the class of node so that we can do loops faster without
+   having to check using runtime type information
+   */
+  virtual JsiDomNodeClass getNodeClass() = 0;
+
   /**
    Updates any pending property changes in all nodes and child nodes. This
    function will swap any pending property changes in this and children with any

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

@@ -149,6 +149,10 @@ public:
     }
   }
 
+  JsiDomNodeClass getNodeClass() override {
+    return JsiDomNodeClass::RenderNode;
+  }
+
 protected:
   /**
    Invalidates and marks then context as changed.
@@ -211,9 +215,9 @@ private:
    */
   void materializeDeclarations() {
     for (auto &child : getChildren()) {
-      auto ptr = std::dynamic_pointer_cast<JsiBaseDomDeclarationNode>(child);
-      if (ptr != nullptr) {
-        ptr->decorateContext(_localContext.get());
+      if (child->getNodeClass() == JsiDomNodeClass::DeclarationNode) {
+        std::static_pointer_cast<JsiBaseDomDeclarationNode>(child)
+            ->decorateContext(_localContext.get());
       }
     }
   }

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

@@ -86,9 +86,7 @@ public:
       {
         // Swap buffers
         std::lock_guard<std::mutex> lock(_swapMutex);
-        auto tmp = _value;
-        _value = _buffer;
-        _buffer = tmp;
+        _value.swap(_buffer);
 
         // turn off pending changes flag
         _hasNewValue = false;

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

@@ -15,9 +15,8 @@ public:
 
   void renderNode(DrawingContext *context) override {
     for (auto &child : getChildren()) {
-      auto renderNode = std::dynamic_pointer_cast<JsiDomRenderNode>(child);
-      if (renderNode != nullptr) {
-        renderNode->render(context);
+      if (child->getNodeClass() == JsiDomNodeClass::RenderNode) {
+        std::static_pointer_cast<JsiDomRenderNode>(child)->render(context);
       }
     }
   }

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

@@ -15,7 +15,8 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (_fontProp->value().getType() != PropType::HostObject) {
+    if (!_fontProp->isSet() ||
+        _fontProp->value().getType() != PropType::HostObject) {
       throw std::runtime_error("Expected SkFont object for the Font property.");
     }
 

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -66,6 +66,16 @@ void RNSkMetalCanvasProvider::renderToCanvas(const std::function<void(SkCanvas*)
     return;
   }
   
+  // Make sure to NOT render or try any render operations while we're in the background or inactive.
+  // This will cause an error that might clear the CAMetalLayer so that the canvas is empty when
+  // the app receives focus again.
+  // Reference: https://github.com/Shopify/react-native-skia/issues/1257
+  auto state = UIApplication.sharedApplication.applicationState;
+  if (state == UIApplicationStateBackground || state == UIApplicationStateInactive)
+  {
+    return;
+  }
+  
   // Get render context for current thread
   auto renderContext = getMetalRenderContext();
   

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "0.1.169",
+  "version": "0.1.171",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [