@shopify/react-native-skia 0.1.119 → 0.1.122

package/android/CMakeLists.txt

@@ -10,12 +10,20 @@ set (SKIA_SVG_LIB "svg")
 set (SKIA_SKSHAPER_LIB "skshaper")
 
 set(build_DIR ${CMAKE_SOURCE_DIR}/build)
-file (GLOB LIBRN_DIR "${build_DIR}/react-native-0*/jni/${ANDROID_ABI}")
+file(GLOB LIBRN_DIR "${PREBUILT_DIR}/${ANDROID_ABI}")
 file(GLOB libfbjni_link_DIRS "${build_DIR}/fbjni*.aar/jni/${ANDROID_ABI}")
 file(GLOB libfbjni_include_DIRS "${build_DIR}/fbjni-*-headers.jar/")
 
 link_directories(../libs/android/${ANDROID_ABI}/)
 
+if(${REACT_NATIVE_VERSION} LESS 66)
+        file(
+                TO_CMAKE_PATH 
+                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
+                INCLUDE_JSI_CPP
+        )
+endif()
+
 add_library(
         ${PACKAGE_NAME}
         SHARED
@@ -39,16 +47,10 @@ target_include_directories(
         PRIVATE
 
         # When installed in the development environment
-        "../node_modules/react-native/ReactCommon/callinvoker"
-        "../node_modules/react-native/ReactCommon/jsi"
-        "../node_modules/react-native/ReactCommon/react/nativemodule/core"
-        "../node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
-
-        # When installed as a package the paths are a bit different
-        "../../../react-native/ReactCommon/callinvoker"
-        "../../../react-native/ReactCommon/jsi"
-        "../../../react-native/ReactCommon/react/nativemodule/core"
-        "../../../react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/react/nativemodule/core"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
 
         cpp/skia/include/config/
         cpp/skia/include/core/
@@ -87,11 +89,23 @@ find_library(
 )
 
 find_library(
-        JSI_LIB
-        jsi
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
+         JSI_LIB
+         jsi
+         PATHS ${LIBRN_DIR}
+         NO_CMAKE_FIND_ROOT_PATH
+ )
+ 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()
 
 find_library(
         REACT_LIB

package/android/build.gradle

@@ -1,3 +1,5 @@
+import java.nio.file.Paths
+
 // android/build.gradle
 
 // based on:
@@ -26,6 +28,60 @@ def safeExtGet(prop, fallback) {
 
 apply plugin: 'com.android.library'
 
+static def findNodeModules(baseDir) {
+  def basePath = baseDir.toPath().normalize()
+  // Node's module resolution algorithm searches up to the root directory,
+  // after which the base path will be null
+  while (basePath) {
+    def nodeModulesPath = Paths.get(basePath.toString(), "node_modules")
+    def reactNativePath = Paths.get(nodeModulesPath.toString(), "react-native")
+    if (nodeModulesPath.toFile().exists() && reactNativePath.toFile().exists()) {
+      return nodeModulesPath.toString()
+    }
+    basePath = basePath.getParent()
+  }
+  throw new GradleException("React-Native-Skia: Failed to find node_modules/ path!")
+}
+
+def nodeModules = findNodeModules(projectDir)
+logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")
+
+def sourceBuild = false
+def defaultDir = null
+def androidSourcesDir = null
+def androidSourcesName = 'React Native sources'
+
+if (rootProject.ext.has('reactNativeAndroidRoot')) {
+  defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
+  androidSourcesDir = defaultDir.parentFile.toString()
+} else if (findProject(':ReactAndroid') != null) {
+    sourceBuild = true
+    defaultDir = project(':ReactAndroid').projectDir
+    androidSourcesDir = defaultDir.parentFile.toString()
+} else {
+  defaultDir = file("$nodeModules/react-native/android")
+  androidSourcesDir = defaultDir.parentFile.toString()
+}
+
+if (!defaultDir.exists()) {
+    throw new GradleException(
+      "${project.name}: React Native android directory (node_modules/react-native/android) does not exist! Resolved node_modules to: ${nodeModules}"
+    )
+}
+
+def prebuiltDir = sourceBuild
+    ? "$nodeModules/react-native/ReactAndroid/src/main/jni/prebuilt/lib"
+    : "$buildDir/react-native-0*/jni"
+
+
+def reactProperties = new Properties()
+file("$nodeModules/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME").split("\\.")[1].toInteger()
+
+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}")
+
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a
@@ -56,7 +112,10 @@ android {
             cmake {
                 cppFlags "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID"
                 abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-                arguments '-DANDROID_STL=c++_shared'
+                arguments '-DANDROID_STL=c++_shared',
+                          "-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION}",
+                          "-DNODE_MODULES_DIR=${nodeModules}",
+                          "-DPREBUILT_DIR=${prebuiltDir}"
             }
         }
     }
@@ -72,7 +131,13 @@ android {
     }
 
     packagingOptions {
-        excludes = ["**/libc++_shared.so"]
+        excludes = [
+             "**/libc++_shared.so",
+             "**/libfbjni.so",
+             "**/libjsi.so",
+             "**/libreact_nativemodule_core.so",
+             "**/libturbomodulejsijni.so"
+        ]
     }
 
 
@@ -114,33 +179,6 @@ dependencies {
     extractJNI(files(rnAAR))
 }
 
-def configureReactNativePom(def pom) {
-    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.shopify.reactnative.skia"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                name packageJson.author
-            }
-        }
-    }
-}
-
 afterEvaluate { project ->
     task androidSourcesJar(type: Jar) {
         classifier = 'sources'
@@ -188,9 +226,18 @@ task extractJNIFiles {
     }
 }
 
-tasks.whenTaskAdded { task ->
-    if (task.name.contains('externalNativeBuild')) {
-        task.dependsOn(extractAARHeaders)
-        task.dependsOn(extractJNIFiles)
-    }
+extractJNIFiles.mustRunAfter extractAARHeaders
+
+def nativeBuildDependsOn(dependsOnTask, variant) {
+  def buildTasks = tasks.findAll({ task ->
+      !task.name.contains("Clean") && (task.name.contains("externalNative") || task.name.contains("CMake")) })
+  if (variant != null) {
+    buildTasks = buildTasks.findAll({ task -> task.name.contains(variant) })
+  }
+  buildTasks.forEach { task -> task.dependsOn(dependsOnTask) }
 }
+
+afterEvaluate {
+  nativeBuildDependsOn(extractAARHeaders, null)
+  nativeBuildDependsOn(extractJNIFiles, null)  
+}

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

@@ -66,7 +66,7 @@ public class PlatformContext {
         Choreographer.getInstance().postFrameCallback(frameCallback);
     }
 
-    public void raise(String message) {
+    public void raise(final String message) {
         new Handler(Looper.getMainLooper()).post(new Runnable() {
             @Override
             public void run() {

package/cpp/api/JsiSkApi.h

@@ -39,6 +39,7 @@
 #include "JsiSkContourMeasureIter.h"
 #include "JsiSkPictureRecorder.h"
 #include "JsiSkPictureFactory.h"
+#include "JsiSkColor.h"
 
 namespace RNSkia
 {
@@ -67,6 +68,7 @@ namespace RNSkia
       installFunction("ContourMeasureIter", JsiSkContourMeasureIter::createCtor(context));
       installFunction("MakeVertices", JsiSkVertices::createCtor(context));
       installFunction("PictureRecorder", JsiSkPictureRecorder::createCtor(context));
+      installFunction("parseColorString", JsiSkColor::createCtor());
 
       // Static members
       installReadonlyProperty("FontMgr",

package/cpp/api/JsiSkColor.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include "JsiSkHostObjects.h"
+#include "third_party/CSSColorParser.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include <SkColor.h>
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+    using namespace facebook;
+
+    class JsiSkColor : public JsiHostObject {
+    public:
+
+        JsiSkColor(): JsiHostObject() {}
+
+        ~JsiSkColor() {}
+
+        /**
+         * Creates the function for construction a new instance of the SkColor
+         * wrapper
+         * @return A function for creating a new host object wrapper for the SkColor
+         * class
+         */
+        static const jsi::HostFunctionType
+        createCtor() {
+            return JSI_HOST_FUNCTION_LAMBDA {
+                auto text = arguments[0].asString(runtime).utf8(runtime);
+                auto color = CSSColorParser::parse(text);
+                if (color.a == -1.0f) {
+                    return jsi::Value::undefined();
+                }
+                int a = round(color.a * 255);
+                // Because JS numbers are unsigned we need to do this conversion
+                return jsi::Value(static_cast<double>(SkColorSetARGB(a, color.r, color.g, color.b) >> 0));
+            };
+        }
+    };
+} // namespace RNSkia

package/cpp/api/JsiSkPath.h

@@ -29,9 +29,9 @@ namespace RNSkia {
 
 using namespace facebook;
 
+
 class JsiSkPath : public JsiSkWrappingSharedPtrHostObject<SkPath> {
 public:
-
     // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
     JSI_PROPERTY_GET(__typename__) {
       return jsi::String::createFromUtf8(runtime, "Path");
@@ -484,6 +484,33 @@ public:
             runtime, std::make_shared<JsiSkPath>(getContext(), std::move(result)));
   }
 
+  JSI_HOST_FUNCTION(toCmds) {
+    auto path = *getObject();
+    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  };
+    SkPoint points[4];
+    SkPath::Verb verb;
+    auto k = 0;
+    while (SkPath::kDone_Verb != (verb = it.next(points))) {
+      auto verbVal = static_cast<int>(verb);
+      auto cmd = jsi::Array(runtime, cmdCount[verbVal]);
+      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)));
+      }
+      if (SkPath::kConic_Verb == verb) {
+        cmd.setValueAtIndex(runtime, j, jsi::Value(static_cast<double>(it.conicWeight())));
+      }
+      cmds.setValueAtIndex(runtime, k++, cmd);
+    }
+    return cmds;
+  }
+
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPath, __typename__))
 
   JSI_EXPORT_FUNCTIONS(
@@ -518,7 +545,9 @@ public:
     JSI_EXPORT_FUNC(JsiSkPath, simplify),
     JSI_EXPORT_FUNC(JsiSkPath, countPoints), JSI_EXPORT_FUNC(JsiSkPath, copy),
     JSI_EXPORT_FUNC(JsiSkPath, fromText), JSI_EXPORT_FUNC(JsiSkPath, op),
-    JSI_EXPORT_FUNC(JsiSkPath, isInterpolatable), JSI_EXPORT_FUNC(JsiSkPath, interpolate)
+    JSI_EXPORT_FUNC(JsiSkPath, isInterpolatable),
+    JSI_EXPORT_FUNC(JsiSkPath, interpolate),
+    JSI_EXPORT_FUNC(JsiSkPath, toCmds),
   )
 
   JsiSkPath(std::shared_ptr<RNSkPlatformContext> context, SkPath path)

package/cpp/api/JsiSkPathFactory.h

@@ -13,6 +13,7 @@
 
 #include <SkPath.h>
 #include <SkPathOps.h>
+#include <RNSkLog.h>
 
 #pragma clang diagnostic pop
 
@@ -21,6 +22,14 @@ namespace RNSkia {
 using namespace facebook;
 
 class JsiSkPathFactory : public JsiSkHostObject {
+
+  static const int MOVE = 0;
+  static const int LINE = 1;
+  static const int QUAD = 2;
+  static const int CONIC = 3;
+  static const int CUBIC = 4;
+  static const int CLOSE = 5;
+
 public:
   JSI_HOST_FUNCTION(Make) {
     return jsi::Object::createFromHostObject(
@@ -53,9 +62,95 @@ public:
         runtime, std::make_shared<JsiSkPath>(getContext(), std::move(result)));
   }
 
+  JSI_HOST_FUNCTION(MakeFromCmds) {
+    SkPath path;
+    auto cmds = arguments[0].asObject(runtime).asArray(runtime);
+    auto cmdCount = cmds.size(runtime);
+    for (int i = 0; i < cmdCount; i++) {
+      auto cmd = cmds.getValueAtIndex(runtime, i).asObject(runtime).asArray(runtime);
+      if (cmd.size(runtime) < 1) {
+        RNSkLogger::logToConsole("Invalid command found (got an empty array)");
+        return jsi::Value::null();
+      }
+      auto verb = static_cast<int>(cmd.getValueAtIndex(runtime, 0).asNumber());
+      switch (verb) {
+        case MOVE: {
+          if (cmd.size(runtime) < 3) {
+            RNSkLogger::logToConsole( "Invalid move command found");
+            return jsi::Value::null();
+          }
+          auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
+          path.moveTo(x, y);
+          break;
+        }
+        case LINE: {
+          if (cmd.size(runtime) < 3) {
+            RNSkLogger::logToConsole("Invalid line command found");
+            return jsi::Value::null();
+          }
+          auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
+          path.lineTo(x, y);
+          break;
+        }
+        case QUAD: {
+          if (cmd.size(runtime) < 5) {
+            RNSkLogger::logToConsole("Invalid line command found");
+            return jsi::Value::null();
+          }
+          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+          path.quadTo(x1, y1, x2, y2);
+          break;
+        }
+        case CONIC: {
+          if (cmd.size(runtime) < 6) {
+            RNSkLogger::logToConsole("Invalid line command found");
+            return jsi::Value::null();
+          }
+          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+          auto w = cmd.getValueAtIndex(runtime, 5).asNumber();
+          path.conicTo(x1, y1, x2, y2, w);
+          break;
+        }
+        case CUBIC: {
+          if (cmd.size(runtime) < 7) {
+            RNSkLogger::logToConsole("Invalid line command found");
+            return jsi::Value::null();
+          }
+          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+          auto x3 = cmd.getValueAtIndex(runtime, 5).asNumber();
+          auto y3 = cmd.getValueAtIndex(runtime, 6).asNumber();
+          path.cubicTo(x1, y1, x2, y2, x3, y3);
+          break;
+        }
+        case CLOSE: {
+          path.close();
+          break;
+        }
+        default: {
+          RNSkLogger::logToConsole("Found an unknown command");
+          return jsi::Value::null();
+        }
+      }
+    }
+    return jsi::Object::createFromHostObject(
+            runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPathFactory, Make),
                        JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromSVGString),
-                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromOp))
+                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromOp),
+                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromCmds))
 
   JsiSkPathFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}