@shopify/react-native-skia 0.1.195 → 0.1.196

package/android/CMakeLists.txt

@@ -51,6 +51,7 @@ add_library(
         "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiValue.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/jsi/RuntimeLifecycleMonitor.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/jsi/RuntimeAwareCache.cpp"        
+        "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiPromises.cpp"
 
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkManager.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkJsView.cpp"

package/android/build.gradle

@@ -137,6 +137,12 @@ android {
         abortOnError false
     }
 
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+
     externalNativeBuild {
         cmake {
             path file('CMakeLists.txt')
@@ -223,12 +229,6 @@ dependencies {
 }
 
 afterEvaluate { project ->
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
     android.libraryVariants.all { variant ->
         def name = variant.name.capitalize()
         def javaCompileTask = variant.javaCompileProvider.get()
@@ -237,10 +237,6 @@ afterEvaluate { project ->
             from javaCompileTask.destinationDir
         }
     }
-
-    artifacts {
-        archives androidSourcesJar
-    }
 }
 
 task extractAARHeaders {
@@ -278,7 +274,6 @@ if (ENABLE_PREFAB) {
         into "${project.buildDir}/headers/rnskia/"
         includeEmptyDirs = false
         include "**/*.h"
-        duplicatesStrategy = 'include'
         eachFile {
             String path = it.path
 

package/cpp/api/JsiSkDataFactory.h

@@ -3,17 +3,15 @@
 #include <memory>
 #include <utility>
 
-#include <ReactCommon/TurboModuleUtils.h>
 #include <jsi/jsi.h>
 
-#include "SkBase64.h"
-
+#include "JsiPromises.h"
 #include "JsiSkData.h"
+#include "SkBase64.h"
 
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
-namespace react = facebook::react;
 
 class JsiSkDataFactory : public JsiSkHostObject {
 public:
@@ -21,11 +19,11 @@ public:
     auto jsiLocalUri = arguments[0].asString(runtime);
     auto localUri = jsiLocalUri.utf8(runtime);
     auto context = getContext();
-    return react::createPromiseAsJSIValue(
+    return RNJsi::JsiPromises::createPromiseAsJSIValue(
         runtime,
         [context = std::move(context), localUri = std::move(localUri)](
             jsi::Runtime &runtime,
-            std::shared_ptr<react::Promise> promise) -> void {
+            std::shared_ptr<RNJsi::JsiPromises::Promise> promise) -> void {
           // Create a stream operation - this will be run in a
           // separate thread
           context->performStreamOperation(

package/cpp/api/JsiSkImageFactory.h

@@ -5,6 +5,7 @@
 
 #include <jsi/jsi.h>
 
+#include "JsiPromises.h"
 #include "JsiSkData.h"
 #include "JsiSkHostObjects.h"
 #include "JsiSkImage.h"
@@ -41,11 +42,11 @@ public:
   JSI_HOST_FUNCTION(MakeImageFromViewTag) {
     auto viewTag = arguments[0].asNumber();
     auto context = getContext();
-    return react::createPromiseAsJSIValue(
+    return RNJsi::JsiPromises::createPromiseAsJSIValue(
         runtime,
-        [context = std::move(context),
-         viewTag](jsi::Runtime &runtime,
-                  std::shared_ptr<react::Promise> promise) -> void {
+        [context = std::move(context), viewTag](
+            jsi::Runtime &runtime,
+            std::shared_ptr<RNJsi::JsiPromises::Promise> promise) -> void {
           // Create a stream operation - this will be run on the main thread
           context->makeViewScreenshot(
               viewTag, [&runtime, context = std::move(context),

package/cpp/jsi/JsiPromises.cpp

@@ -0,0 +1,39 @@
+#include "JsiPromises.h"
+
+namespace RNJsi {
+
+JsiPromises::Promise::Promise(jsi::Runtime &rt, jsi::Function resolve,
+                              jsi::Function reject)
+    : runtime_(rt), resolve_(std::move(resolve)), reject_(std::move(reject)) {}
+
+void JsiPromises::Promise::resolve(const jsi::Value &result) {
+  resolve_.call(runtime_, result);
+}
+
+void JsiPromises::Promise::reject(const std::string &message) {
+  jsi::Object error(runtime_);
+  error.setProperty(runtime_, "message",
+                    jsi::String::createFromUtf8(runtime_, message));
+  reject_.call(runtime_, error);
+}
+
+jsi::Value
+JsiPromises::createPromiseAsJSIValue(jsi::Runtime &rt,
+                                     PromiseSetupFunctionType &&func) {
+  jsi::Function JSPromise = rt.global().getPropertyAsFunction(rt, "Promise");
+  jsi::Function fn = jsi::Function::createFromHostFunction(
+      rt, jsi::PropNameID::forAscii(rt, "fn"), 2,
+      [func = std::move(func)](jsi::Runtime &rt2, const jsi::Value &thisVal,
+                               const jsi::Value *args, size_t count) {
+        jsi::Function resolve = args[0].getObject(rt2).getFunction(rt2);
+        jsi::Function reject = args[1].getObject(rt2).getFunction(rt2);
+        auto wrapper = std::make_shared<Promise>(rt2, std::move(resolve),
+                                                 std::move(reject));
+        func(rt2, wrapper);
+        return jsi::Value::undefined();
+      });
+
+  return JSPromise.callAsConstructor(rt, fn);
+}
+
+} // namespace RNJsi

package/cpp/jsi/JsiPromises.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include "SkBase64.h"
+
+namespace RNJsi {
+namespace jsi = facebook::jsi;
+
+/**
+ These classes are taken from ReactCommon TurboModuleUtils. It is no longer (RN
+ 0.72) possible to include and uses TurboModulesUtils without a lot of trouble
+ when use_frameworks are true in POD file. Instead we're now just including the
+ implementations ourselves.
+ */
+
+class LongLivedObject {
+public:
+  void allowRelease();
+
+protected:
+  LongLivedObject() = default;
+  virtual ~LongLivedObject() = default;
+};
+
+class JsiPromises {
+public:
+  struct Promise : public LongLivedObject {
+    Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject);
+
+    void resolve(const jsi::Value &result);
+    void reject(const std::string &error);
+
+    jsi::Runtime &runtime_;
+    jsi::Function resolve_;
+    jsi::Function reject_;
+  };
+
+  using PromiseSetupFunctionType =
+      std::function<void(jsi::Runtime &rt, std::shared_ptr<Promise>)>;
+
+  static jsi::Value createPromiseAsJSIValue(jsi::Runtime &rt,
+                                            PromiseSetupFunctionType &&func);
+};
+
+} // namespace RNJsi

package/cpp/rnskia/RNSkPictureView.h

@@ -55,10 +55,9 @@ public:
   void setPicture(std::shared_ptr<jsi::HostObject> picture) {
     if (picture == nullptr) {
       _picture = nullptr;
-      return;
+    } else {
+      _picture = std::dynamic_pointer_cast<JsiSkPicture>(picture);
     }
-
-    _picture = std::dynamic_pointer_cast<JsiSkPicture>(picture);
     _requestRedraw();
   }
 
@@ -107,7 +106,6 @@ public:
           // Clear picture
           std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
               ->setPicture(nullptr);
-          requestRedraw();
           continue;
         } else if (prop.second.getType() !=
                    RNJsi::JsiWrapperValueType::HostObject) {
@@ -119,9 +117,6 @@ public:
         // Save picture
         std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
             ->setPicture(prop.second.getAsHostObject());
-
-        // Request redraw
-        requestRedraw();
       }
     }
   }

package/package.json

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

package/cpp/skia/include/core/SkEncodedImageFormat.h

@@ -1,9 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// TODO(kjlubick) remove this shim after clients have been moved to the new location
-#include "include/codec/SkEncodedImageFormat.h" // IWYU pragma: export

package/cpp/skia/include/core/SkICC.h

@@ -1,9 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// TODO(kjlubick) remove this shim after clients have been moved to the new location
-#include "include/encode/SkICC.h" // IWYU pragma: export