@shopify/react-native-skia 0.1.154 → 0.1.156

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -4,32 +4,32 @@
 #include <memory>
 #include <mutex>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include <JsiHostObject.h>
 #include <JsiValueWrapper.h>
-#include <RNSkView.h>
 #include <RNSkPlatformContext.h>
 #include <RNSkValue.h>
+#include <RNSkView.h>
 #include <jsi/jsi.h>
 
 namespace RNSkia {
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 using RNSkViewInfo = struct RNSkViewInfo {
-  RNSkViewInfo() {
-    view = nullptr;
-  }
+  RNSkViewInfo() { view = nullptr; }
   std::shared_ptr<RNSkView> view;
-  std::unordered_map<std::string, JsiValueWrapper> props;
+  std::unordered_map<std::string, RNJsi::JsiValueWrapper> props;
 };
 
-class RNSkJsiViewApi : public JsiHostObject, public std::enable_shared_from_this<RNSkJsiViewApi> {
+class RNSkJsiViewApi : public RNJsi::JsiHostObject,
+                       public std::enable_shared_from_this<RNSkJsiViewApi> {
 public:
   /**
-   Sets a custom property on a view given a view id. The property name/value will
-   be stored in a map alongside the id of the view and propagated to the view when
-   needed.
+   Sets a custom property on a view given a view id. The property name/value
+   will be stored in a map alongside the id of the view and propagated to the
+   view when needed.
    */
   JSI_HOST_FUNCTION(setJsiProperty) {
     if (count != 3) {
@@ -46,8 +46,8 @@ public:
     }
 
     if (!arguments[1].isString()) {
-      _platformContext->raiseError(
-          "setJsiProperty: Second argument must be the name of the property to set.");
+      _platformContext->raiseError("setJsiProperty: Second argument must be "
+                                   "the name of the property to set.");
 
       return jsi::Value::undefined();
     }
@@ -55,10 +55,11 @@ public:
     auto info = getEnsuredViewInfo(nativeId);
 
     std::lock_guard<std::mutex> lock(_mutex);
-    info->props.emplace(arguments[1].asString(runtime).utf8(runtime), JsiValueWrapper(runtime, arguments[2]));
+    info->props.emplace(arguments[1].asString(runtime).utf8(runtime),
+                        RNJsi::JsiValueWrapper(runtime, arguments[2]));
 
     // Now let's see if we have a view that we can update
-    if(info->view != nullptr) {
+    if (info->view != nullptr) {
       // Update view!
       info->view->setNativeId(nativeId);
       info->view->setJsiProperties(info->props);
@@ -88,8 +89,8 @@ public:
     }
 
     if (!arguments[1].isString()) {
-      _platformContext->raiseError(
-          "callCustomCommand: Second argument must be the name of the action to call.");
+      _platformContext->raiseError("callCustomCommand: Second argument must be "
+                                   "the name of the action to call.");
 
       return jsi::Value::undefined();
     }
@@ -99,53 +100,58 @@ public:
 
     auto info = getEnsuredViewInfo(nativeId);
 
-    if(info->view == nullptr) {
-      throw jsi::JSError(runtime,
-          std::string("callCustomCommand: Could not call action " + action +
-                      " on view - view not ready.").c_str());
+    if (info->view == nullptr) {
+      throw jsi::JSError(
+          runtime, std::string("callCustomCommand: Could not call action " +
+                               action + " on view - view not ready.")
+                       .c_str());
 
       return jsi::Value::undefined();
     }
 
     // Get arguments
     size_t paramsCount = count - 2;
-    const jsi::Value* params = paramsCount > 0 ? &arguments[2] : nullptr;
+    const jsi::Value *params = paramsCount > 0 ? &arguments[2] : nullptr;
     return info->view->callJsiMethod(runtime, action, params, paramsCount);
   }
 
   JSI_HOST_FUNCTION(requestRedraw) {
     if (count != 1) {
-       _platformContext->raiseError(
-         std::string("requestRedraw: Expected 1 arguments, got " + std::to_string(count) + "."));
+      _platformContext->raiseError(
+          std::string("requestRedraw: Expected 1 arguments, got " +
+                      std::to_string(count) + "."));
 
-       return jsi::Value::undefined();
-     }
+      return jsi::Value::undefined();
+    }
 
-     if (!arguments[0].isNumber()) {
-       _platformContext->raiseError(
-           "requestRedraw: First argument must be a number");
+    if (!arguments[0].isNumber()) {
+      _platformContext->raiseError(
+          "requestRedraw: First argument must be a number");
 
-       return jsi::Value::undefined();
-     }
+      return jsi::Value::undefined();
+    }
 
-     // find Skia View
-     int nativeId = arguments[0].asNumber();
+    // find Skia View
+    int nativeId = arguments[0].asNumber();
 
-     auto info = getEnsuredViewInfo(nativeId);
-     if (info->view != nullptr) {
-       info->view->requestRedraw();
-     }
-     return jsi::Value::undefined();
+    auto info = getEnsuredViewInfo(nativeId);
+    if (info->view != nullptr) {
+      info->view->requestRedraw();
+    }
+    return jsi::Value::undefined();
   }
 
   JSI_HOST_FUNCTION(makeImageSnapshot) {
     if (count < 1) {
-      _platformContext->raiseError(std::string("makeImageSnapshot: Expected at least 1 argument, got " + std::to_string(count) + "."));
+      _platformContext->raiseError(
+          std::string("makeImageSnapshot: Expected at least 1 argument, got " +
+                      std::to_string(count) + "."));
       return jsi::Value::undefined();
     }
 
     if (!arguments[0].isNumber()) {
-      _platformContext->raiseError("makeImageSnapshot: First argument must be a number");
+      _platformContext->raiseError(
+          "makeImageSnapshot: First argument must be a number");
       return jsi::Value::undefined();
     }
 
@@ -154,68 +160,74 @@ public:
     sk_sp<SkImage> image;
     auto info = getEnsuredViewInfo(nativeId);
     if (info->view != nullptr) {
-      if(count > 1 && !arguments[1].isUndefined() && !arguments[1].isNull()) {
+      if (count > 1 && !arguments[1].isUndefined() && !arguments[1].isNull()) {
         auto rect = JsiSkRect::fromValue(runtime, arguments[1]);
         image = info->view->makeImageSnapshot(rect);
       } else {
         image = info->view->makeImageSnapshot(nullptr);
       }
-      if(image == nullptr) {
-        throw jsi::JSError(runtime, "Could not create image from current surface.");
+      if (image == nullptr) {
+        throw jsi::JSError(runtime,
+                           "Could not create image from current surface.");
         return jsi::Value::undefined();
       }
-      return jsi::Object::createFromHostObject(runtime, std::make_shared<JsiSkImage>(_platformContext, image));
+      return jsi::Object::createFromHostObject(
+          runtime, std::make_shared<JsiSkImage>(_platformContext, image));
     }
     throw jsi::JSError(runtime, "No Skia View currently available.");
     return jsi::Value::undefined();
   }
 
   JSI_HOST_FUNCTION(registerValuesInView) {
-      // Check params
-      if(!arguments[1].isObject() || !arguments[1].asObject(runtime).isArray(runtime)) {
-        throw jsi::JSError(runtime, "Expected array of Values as second parameter");
-        return jsi::Value::undefined();
-      }
+    // Check params
+    if (!arguments[1].isObject() ||
+        !arguments[1].asObject(runtime).isArray(runtime)) {
+      throw jsi::JSError(runtime,
+                         "Expected array of Values as second parameter");
+      return jsi::Value::undefined();
+    }
+
+    // Get identifier of native SkiaView
+    int nativeId = arguments[0].asNumber();
 
-      // Get identifier of native SkiaView
-      int nativeId = arguments[0].asNumber();
-
-      // Get values that should be added as dependencies
-      auto values = arguments[1].asObject(runtime).asArray(runtime);
-      std::vector<std::function<void()>> unsubscribers;
-      const std::size_t size = values.size(runtime);
-      unsubscribers.reserve(size);
-      for(size_t i=0; i<size; ++i) {
-        auto value = values.getValueAtIndex(runtime, i).asObject(runtime).asHostObject<RNSkReadonlyValue>(runtime);
-
-        if(value != nullptr) {
-          // Add change listener
-          unsubscribers.push_back(value->addListener([weakSelf = weak_from_this(), nativeId](jsi::Runtime&){
-            auto self = weakSelf.lock();
-            if(self) {
-              auto info = self->getEnsuredViewInfo(nativeId);
-              if(info->view != nullptr) {
-                info->view->requestRedraw();
+    // Get values that should be added as dependencies
+    auto values = arguments[1].asObject(runtime).asArray(runtime);
+    std::vector<std::function<void()>> unsubscribers;
+    const std::size_t size = values.size(runtime);
+    unsubscribers.reserve(size);
+    for (size_t i = 0; i < size; ++i) {
+      auto value = values.getValueAtIndex(runtime, i)
+                       .asObject(runtime)
+                       .asHostObject<RNSkReadonlyValue>(runtime);
+
+      if (value != nullptr) {
+        // Add change listener
+        unsubscribers.push_back(value->addListener(
+            [weakSelf = weak_from_this(), nativeId](jsi::Runtime &) {
+              auto self = weakSelf.lock();
+              if (self) {
+                auto info = self->getEnsuredViewInfo(nativeId);
+                if (info->view != nullptr) {
+                  info->view->requestRedraw();
+                }
               }
-            }
-          }));
-        }
+            }));
       }
-
-      // Return unsubscribe method that unsubscribes to all values
-      // that we subscribed to.
-      return jsi::Function::createFromHostFunction(runtime,
-                                                   jsi::PropNameID::forUtf8(runtime, "unsubscribe"),
-                                                   0,
-                                                   JSI_HOST_FUNCTION_LAMBDA {
-        // decrease dependency count on the Skia View
-        for(auto &unsub : unsubscribers) {
-          unsub();
-        }
-        return jsi::Value::undefined();
-      });
     }
 
+    // Return unsubscribe method that unsubscribes to all values
+    // that we subscribed to.
+    return jsi::Function::createFromHostFunction(
+        runtime, jsi::PropNameID::forUtf8(runtime, "unsubscribe"), 0,
+        JSI_HOST_FUNCTION_LAMBDA {
+          // decrease dependency count on the Skia View
+          for (auto &unsub : unsubscribers) {
+            unsub();
+          }
+          return jsi::Value::undefined();
+        });
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkJsiViewApi, setJsiProperty),
                        JSI_EXPORT_FUNC(RNSkJsiViewApi, callJsiMethod),
                        JSI_EXPORT_FUNC(RNSkJsiViewApi, registerValuesInView),
@@ -226,15 +238,13 @@ public:
    * Constructor
    * @param platformContext Platform context
    */
-  RNSkJsiViewApi(std::shared_ptr<RNSkPlatformContext> platformContext)
+  explicit RNSkJsiViewApi(std::shared_ptr<RNSkPlatformContext> platformContext)
       : JsiHostObject(), _platformContext(platformContext) {}
 
   /**
    * Invalidates the Skia View Api object
    */
-  void invalidate() {
-    unregisterAll();
-  }
+  void invalidate() { unregisterAll(); }
 
   /**
    Call to remove all draw view infos
@@ -242,7 +252,7 @@ public:
   void unregisterAll() {
     // Unregister all views
     auto tempList = _viewInfos;
-    for (const auto& info : tempList) {
+    for (const auto &info : tempList) {
       unregisterSkiaView(info.first);
     }
     std::lock_guard<std::mutex> lock(_mutex);
@@ -295,7 +305,7 @@ public:
       info->view->setNativeId(nativeId);
       info->view->setJsiProperties(info->props);
       info->props.clear();
-    } else if(view == nullptr) {
+    } else if (view == nullptr) {
       info->view = view;
     }
   }

package/cpp/rnskia/RNSkManager.cpp

@@ -7,11 +7,11 @@
 
 #include <JsiSkApi.h>
 #include <RNSkJsiViewApi.h>
-#include <RNSkView.h>
 #include <RNSkValueApi.h>
+#include <RNSkView.h>
 
 namespace RNSkia {
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 RNSkManager::RNSkManager(
     jsi::Runtime *jsRuntime,
@@ -35,17 +35,18 @@ RNSkManager::~RNSkManager() {
 }
 
 void RNSkManager::invalidate() {
-  if(_isInvalidated) {
+  if (_isInvalidated) {
     return;
   }
   _isInvalidated = true;
-  
+
   // Invalidate members
   _viewApi->invalidate();
   _platformContext->invalidate();
 }
 
-void RNSkManager::registerSkiaView(size_t nativeId, std::shared_ptr<RNSkView> view) {
+void RNSkManager::registerSkiaView(size_t nativeId,
+                                   std::shared_ptr<RNSkView> view) {
   if (!_isInvalidated && _viewApi != nullptr)
     _viewApi->registerSkiaView(nativeId, view);
 }
@@ -75,7 +76,7 @@ void RNSkManager::installBindings() {
 
   auto skiaValueApi = std::make_shared<RNSkValueApi>(_platformContext);
   _jsRuntime->global().setProperty(
-    *_jsRuntime, "SkiaValueApi",
-    jsi::Object::createFromHostObject(*_jsRuntime, std::move(skiaValueApi)));
+      *_jsRuntime, "SkiaValueApi",
+      jsi::Object::createFromHostObject(*_jsRuntime, std::move(skiaValueApi)));
 }
 } // namespace RNSkia

package/cpp/rnskia/RNSkManager.h

@@ -6,15 +6,17 @@
 #include "RNSkPlatformContext.h"
 
 namespace facebook {
-  namespace react {
-    class CallInvoker;
-  }
+namespace react {
+class CallInvoker;
 }
+} // namespace facebook
 
 namespace RNSkia {
 class RNSkView;
 class RNSkJsiViewApi;
-using namespace facebook;
+
+namespace jsi = facebook::jsi;
+namespace react = facebook::react;
 
 class RNSkManager {
 public:
@@ -30,7 +32,7 @@ public:
               std::shared_ptr<RNSkPlatformContext> platformContext);
 
   ~RNSkManager();
-  
+
   /**
    Invalidates the Skia Manager
    */
@@ -48,7 +50,7 @@ public:
    * @param nativeId Native view Id
    */
   void unregisterSkiaView(size_t nativeId);
-  
+
   /**
    Sets the view pointed to by nativeId to the provided value.
    Used when we want to remove a view without unregistering it

package/cpp/rnskia/RNSkPictureView.h

@@ -3,25 +3,26 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <vector>
 #include <string>
+#include <unordered_map>
+#include <vector>
 
 #include <jsi/jsi.h>
 
 #include <JsiValueWrapper.h>
 #include <RNSkView.h>
 
+#include <JsiSkPicture.h>
 #include <RNSkInfoParameter.h>
+#include <RNSkLog.h>
 #include <RNSkPlatformContext.h>
 #include <RNSkTimingInfo.h>
-#include <RNSkLog.h>
-#include <JsiSkPicture.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkCanvas.h>
 #include <SkBBHFactory.h>
+#include <SkCanvas.h>
 #include <SkPictureRecorder.h>
 
 #pragma clang diagnostic pop
@@ -32,85 +33,91 @@ class SkImage;
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
-class RNSkPictureRenderer:
-  public RNSkRenderer,
-  public std::enable_shared_from_this<RNSkPictureRenderer> {
+class RNSkPictureRenderer
+    : public RNSkRenderer,
+      public std::enable_shared_from_this<RNSkPictureRenderer> {
 public:
-    RNSkPictureRenderer(std::function<void()> requestRedraw,
-                        std::shared_ptr<RNSkPlatformContext> context):
-    RNSkRenderer(requestRedraw),
-  _platformContext(context) {}
+  RNSkPictureRenderer(std::function<void()> requestRedraw,
+                      std::shared_ptr<RNSkPlatformContext> context)
+      : RNSkRenderer(requestRedraw), _platformContext(context) {}
 
   bool tryRender(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override {
     performDraw(canvasProvider);
     return true;
   }
-  
-  void renderImmediate(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override {
+
+  void
+  renderImmediate(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override {
     performDraw(canvasProvider);
   }
 
   void setPicture(std::shared_ptr<jsi::HostObject> picture) {
-    if(picture == nullptr) {
+    if (picture == nullptr) {
       _picture = nullptr;
       return;
     }
-    
+
     _picture = std::dynamic_pointer_cast<JsiSkPicture>(picture);
     _requestRedraw();
   }
-    
+
 private:
   void performDraw(std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
-    if(_picture == nullptr) {
+    if (_picture == nullptr) {
       return;
     }
-    
-    canvasProvider->renderToCanvas([=](SkCanvas* canvas){
+
+    canvasProvider->renderToCanvas([=](SkCanvas *canvas) {
       // Make sure to scale correctly
       auto pd = _platformContext->getPixelDensity();
       canvas->save();
       canvas->scale(pd, pd);
-      
+
       canvas->drawPicture(_picture->getObject());
-      
+
       // Restore and flush canvas
       canvas->restore();
       canvas->flush();
     });
   }
-  
+
   std::shared_ptr<RNSkPlatformContext> _platformContext;
   std::shared_ptr<JsiSkPicture> _picture;
 };
 
-class RNSkPictureView: public RNSkView {
+class RNSkPictureView : public RNSkView {
 public:
   /**
    * Constructor
    */
   RNSkPictureView(std::shared_ptr<RNSkPlatformContext> context,
-                  std::shared_ptr<RNSkCanvasProvider> canvasProvider):
-    RNSkView(context,
-             canvasProvider,
-             std::make_shared<RNSkPictureRenderer>(std::bind(&RNSkPictureView::requestRedraw, this), context)) {}
-  
-  void setJsiProperties(std::unordered_map<std::string, JsiValueWrapper> &props) override {
-    for(auto& prop: props) {
-      if(prop.first == "picture") {
-        if(prop.second.isUndefinedOrNull()) {
+                  std::shared_ptr<RNSkCanvasProvider> canvasProvider)
+      : RNSkView(
+            context, canvasProvider,
+            std::make_shared<RNSkPictureRenderer>(
+                std::bind(&RNSkPictureView::requestRedraw, this), context)) {}
+
+  void setJsiProperties(
+      std::unordered_map<std::string, RNJsi::JsiValueWrapper> &props) override {
+    for (auto &prop : props) {
+      if (prop.first == "picture") {
+        if (prop.second.isUndefinedOrNull()) {
           // Clear picture
-          std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())->setPicture(nullptr);
+          std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
+              ->setPicture(nullptr);
           return;
-        } else if (prop.second.getType() != JsiWrapperValueType::HostObject) {
+        } else if (prop.second.getType() !=
+                   RNJsi::JsiWrapperValueType::HostObject) {
           // We expect a function for the picture custom property
-          throw std::runtime_error("Expected an object for the picture custom property.");
+          throw std::runtime_error(
+              "Expected an object for the picture custom property.");
         }
 
         // Save picture
-        std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())->setPicture(prop.second.getAsHostObject());
+        std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
+            ->setPicture(prop.second.getAsHostObject());
 
         // Request redraw
         requestRedraw();