@shopify/react-native-skia 0.1.145 → 0.1.146

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -2,10 +2,12 @@
 
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <vector>
 
 #include <JsiHostObject.h>
+#include <JsiValueWrapper.h>
 #include <RNSkDrawView.h>
 #include <RNSkPlatformContext.h>
 #include <RNSkValue.h>
@@ -14,96 +16,143 @@
 namespace RNSkia {
 using namespace facebook;
 
-using CallbackInfo = struct CallbackInfo {
-  CallbackInfo() {
-    drawCallback = nullptr;
+using RNSkViewInfo = struct RNSkViewInfo {
+  RNSkViewInfo() {
     view = nullptr;
   }
-  std::shared_ptr<FunctionWrapper> drawCallback;
   std::shared_ptr<RNSkDrawView> view;
+  std::unordered_map<std::string, JsiValueWrapper> props;
 };
 
-class RNSkJsiViewApi : public JsiHostObject {
+class RNSkJsiViewApi : public JsiHostObject, public std::enable_shared_from_this<RNSkJsiViewApi> {
 public:
-  JSI_HOST_FUNCTION(setDrawCallback) {
-    if (count != 2) {
+  /**
+   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) {
       _platformContext->raiseError(
-          std::string("setDrawCallback: Expected 2 arguments, got " +
+          std::string("setJsiProperty: Expected 3 arguments, got " +
                       std::to_string(count) + "."));
       return jsi::Value::undefined();
     }
 
     if (!arguments[0].isNumber()) {
       _platformContext->raiseError(
-          "setDrawCallback: First argument must be a number");
+          "setJsiProperty: First argument must be a number");
       return jsi::Value::undefined();
     }
 
-    // We accept undefined to zero out the drawCallback
-    if (!arguments[1].isUndefined()) {
-      if (!arguments[1].isObject()) {
-        _platformContext->raiseError(
-            "setDrawCallback: Second argument must be a function");
-        return jsi::Value::undefined();
-      }
-      if (!arguments[1].asObject(runtime).isFunction(runtime)) {
-        _platformContext->raiseError(
-            "setDrawCallback: Second argument must be a function");
-        return jsi::Value::undefined();
-      }
-    }
-
-    // find skia draw view
-    int nativeId = arguments[0].asNumber();
+    if (!arguments[1].isString()) {
+      _platformContext->raiseError(
+          "setJsiProperty: Second argument must be the name of the property to set.");
 
-    // and function to install as the draw drawCallback
-    auto info = getEnsuredCallbackInfo(nativeId);
-    if (arguments[1].isUndefined()) {
-      info->drawCallback = nullptr;
-    } else {
-      info->drawCallback = std::make_shared<FunctionWrapper>(
-          arguments[1].asObject(runtime).asFunction(runtime));
+      return jsi::Value::undefined();
     }
+    auto nativeId = arguments[0].asNumber();
+    auto info = getEnsuredViewInfo(nativeId);
 
-    // Update view if set
-    if (info->view != nullptr && info->drawCallback != nullptr) {
+    std::lock_guard<std::mutex> lock(_mutex);
+    info->props.emplace(arguments[1].asString(runtime).utf8(runtime), JsiValueWrapper(runtime, arguments[2]));
+
+    // Now let's see if we have a view that we can update
+    if(info->view != nullptr) {
+      // Update view!
       info->view->setNativeId(nativeId);
-      info->view->setDrawCallback(info->drawCallback);
+      info->view->setJsiProperties(info->props);
+      info->props.clear();
     }
 
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(invalidateSkiaView) {
-    if (count != 1) {
+  /**
+   Calls a custom command / method on a view by the view id.
+   */
+  JSI_HOST_FUNCTION(callJsiMethod) {
+    if (count < 2) {
       _platformContext->raiseError(
-          std::string("invalidateSkiaView: Expected 2 arguments, got " +
+          std::string("callCustomCommand: Expected at least 2 arguments, got " +
                       std::to_string(count) + "."));
+
       return jsi::Value::undefined();
     }
 
     if (!arguments[0].isNumber()) {
       _platformContext->raiseError(
-          "invalidateSkiaView: First argument must be a number");
+          "callCustomCommand: First argument must be a number");
+
       return jsi::Value::undefined();
     }
 
-    // find skia draw view
-    int nativeId = arguments[0].asNumber();
+    if (!arguments[1].isString()) {
+      _platformContext->raiseError(
+          "callCustomCommand: Second argument must be the name of the action to call.");
 
-    auto info = getEnsuredCallbackInfo(nativeId);
-    if (info->view != nullptr) {
-      info->view->requestRedraw();
+      return jsi::Value::undefined();
     }
-    return jsi::Value::undefined();
+
+    auto nativeId = arguments[0].asNumber();
+    auto action = arguments[1].asString(runtime).utf8(runtime);
+
+    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());
+
+      return jsi::Value::undefined();
+    }
+
+    // Get arguments
+    size_t paramsCount = count - 2;
+    const jsi::Value* params = paramsCount > 0 ? &arguments[2] : nullptr;
+    return info->view->callJsiMethod(runtime, action, params, paramsCount);
   }
-  
+
+  JSI_HOST_FUNCTION(requestRedraw) {
+    if (count < 2) {
+       _platformContext->raiseError(
+         std::string("requestRedraw: Expected 2 arguments, got " + std::to_string(count) + "."));
+
+       return jsi::Value::undefined();
+     }
+
+     if (!arguments[0].isNumber()) {
+       _platformContext->raiseError(
+           "requestRedraw: First argument must be a number");
+
+       return jsi::Value::undefined();
+     }
+
+     // find Skia View
+     int nativeId = arguments[0].asNumber();
+
+     auto info = getEnsuredViewInfo(nativeId);
+     if (info->view != nullptr) {
+       info->view->requestRedraw();
+     }
+     return jsi::Value::undefined();
+  }
+
   JSI_HOST_FUNCTION(makeImageSnapshot) {
-    
-    // find skia draw view
+    if (count < 1) {
+      _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");
+      return jsi::Value::undefined();
+    }
+
+    // find Skia view
     int nativeId = arguments[0].asNumber();
     sk_sp<SkImage> image;
-    auto info = getEnsuredCallbackInfo(nativeId);
+    auto info = getEnsuredViewInfo(nativeId);
     if (info->view != nullptr) {
       if(count > 1 && !arguments[1].isUndefined() && !arguments[1].isNull()) {
         auto rect = JsiSkRect::fromValue(runtime, arguments[1]);
@@ -112,88 +161,66 @@ public:
         image = info->view->makeImageSnapshot(nullptr);
       }
       if(image == nullptr) {
-        jsi::detail::throwJSError(runtime, "Could not create image from current surface.");
+        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));
     }
-    jsi::detail::throwJSError(runtime, "No Skia View currently available.");
+    throw jsi::JSError(runtime, "No Skia View currently available.");
     return jsi::Value::undefined();
   }
-  
-  JSI_HOST_FUNCTION(setDrawMode) {
-    if (count != 2) {
-      _platformContext->raiseError(
-          std::string("setDrawMode: Expected 2 arguments, got " +
-                      std::to_string(count) + "."));
-      return jsi::Value::undefined();
-    }
 
-    if (!arguments[0].isNumber()) {
-      _platformContext->raiseError(
-          "setDrawMode: First argument must be a number");
-      return jsi::Value::undefined();
-    }
-
-    // find skia draw view
-    int nativeId = arguments[0].asNumber();
-    auto info = getEnsuredCallbackInfo(nativeId);
-    if (info->view != nullptr) {
-      auto nextMode = arguments[1].asString(runtime).utf8(runtime);
-      if(nextMode.compare("continuous") == 0) {
-        info->view->setDrawingMode(RNSkDrawingMode::Continuous);
-      } else {
-        info->view->setDrawingMode(RNSkDrawingMode::Default);
-      }
-    }
-    return jsi::Value::undefined();
-  }
-  
   JSI_HOST_FUNCTION(registerValuesInView) {
-    // Check params
-    if(!arguments[1].isObject() || !arguments[1].asObject(runtime).isArray(runtime)) {
-      jsi::detail::throwJSError(runtime, "Expected array of Values as second parameter");
-      return jsi::Value::undefined();
-    }
-    
-    // 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([this, nativeId](jsi::Runtime&){
-          requestRedrawView(nativeId);
-        }));
+      // 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();
       }
-    }
-    
-    // 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();
+
+      // 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();
+              }
+            }
+          }));
+        }
       }
-      return jsi::Value::undefined();
-    });
-  }
-  
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkJsiViewApi, setDrawCallback),
-                       JSI_EXPORT_FUNC(RNSkJsiViewApi, invalidateSkiaView),
-                       JSI_EXPORT_FUNC(RNSkJsiViewApi, makeImageSnapshot),
-                       JSI_EXPORT_FUNC(RNSkJsiViewApi, setDrawMode),
-                       JSI_EXPORT_FUNC(RNSkJsiViewApi, registerValuesInView))
+
+      // 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),
+                       JSI_EXPORT_FUNC(RNSkJsiViewApi, requestRedraw),
+                       JSI_EXPORT_FUNC(RNSkJsiViewApi, makeImageSnapshot))
 
   /**
    * Constructor
@@ -203,7 +230,7 @@ public:
       : JsiHostObject(), _platformContext(platformContext) {}
 
   /**
-   * Invalidates the api object
+   * Invalidates the Skia View Api object
    */
   void invalidate() {
     unregisterAll();
@@ -214,11 +241,12 @@ public:
    */
   void unregisterAll() {
     // Unregister all views
-    auto tempList = _callbackInfos;
+    auto tempList = _viewInfos;
     for (const auto& info : tempList) {
       unregisterSkiaDrawView(info.first);
     }
-    _callbackInfos.clear();
+    std::lock_guard<std::mutex> lock(_mutex);
+    _viewInfos.clear();
   }
 
   /**
@@ -227,12 +255,12 @@ public:
    * @param view View to register
    */
   void registerSkiaDrawView(size_t nativeId, std::shared_ptr<RNSkDrawView> view) {
-    auto info = getEnsuredCallbackInfo(nativeId);
+    auto info = getEnsuredViewInfo(nativeId);
+    std::lock_guard<std::mutex> lock(_mutex);
     info->view = view;
-    if (info->drawCallback != nullptr) {
-      info->view->setNativeId(nativeId);
-      info->view->setDrawCallback(info->drawCallback);
-    }
+    info->view->setNativeId(nativeId);
+    info->view->setJsiProperties(info->props);
+    info->props.clear();
   }
 
   /**
@@ -240,37 +268,34 @@ public:
    * @param nativeId View id
    */
   void unregisterSkiaDrawView(size_t nativeId) {
-    if (_callbackInfos.count(nativeId) == 0) {
+    if (_viewInfos.count(nativeId) == 0) {
       return;
     }
-    auto info = getEnsuredCallbackInfo(nativeId);
-    if (info->view != nullptr) {
-      info->view->setDrawCallback(nullptr);
-    }
+    auto info = getEnsuredViewInfo(nativeId);
+
+    std::lock_guard<std::mutex> lock(_mutex);
     info->view = nullptr;
-    info->drawCallback = nullptr;
-    _callbackInfos.erase(nativeId);
+    _viewInfos.erase(nativeId);
   }
-  
+
   /**
    Sets a skia draw view for the given id. This function can be used
    to mark that an underlying SkiaView is not available (it could be
    removed due to ex. a transition). The view can be set to a nullptr
-   or a valid view, effectively toggling the view's availability. If
-   a valid view is set, the setDrawCallback method is called on the
-   view (if a valid callback exists).
+   or a valid view, effectively toggling the view's availability.
    */
   void setSkiaDrawView(size_t nativeId, std::shared_ptr<RNSkDrawView> view) {
-    if (_callbackInfos.find(nativeId) == _callbackInfos.end()) {
+    if (_viewInfos.find(nativeId) == _viewInfos.end()) {
       return;
     }
-    auto info = getEnsuredCallbackInfo(nativeId);
-    if (view != nullptr && info->drawCallback != nullptr) {
+    auto info = getEnsuredViewInfo(nativeId);
+    std::lock_guard<std::mutex> lock(_mutex);
+    if (view != nullptr) {
       info->view = view;
       info->view->setNativeId(nativeId);
-      info->view->setDrawCallback(info->drawCallback);
-    } else if(view == nullptr && info->drawCallback != nullptr) {
-      info->view->setDrawCallback(nullptr);
+      info->view->setJsiProperties(info->props);
+      info->props.clear();
+    } else if(view == nullptr) {
       info->view = view;
     }
   }
@@ -281,28 +306,17 @@ private:
    * @param nativeId View id
    * @return The callback info object for the requested view
    */
-  CallbackInfo *getEnsuredCallbackInfo(size_t nativeId) {
-    if (_callbackInfos.count(nativeId) == 0) {
-      CallbackInfo info;
-      _callbackInfos.emplace(nativeId, info);
-    }
-    return &_callbackInfos.at(nativeId);
-  }
-  
-  /**
-    Send a redraw request to the view
-   */
-  void requestRedrawView(size_t nativeId) {
-    auto info = getEnsuredCallbackInfo(nativeId);
-    if(info->view != nullptr) {
-      info->view->requestRedraw();
+  RNSkViewInfo *getEnsuredViewInfo(size_t nativeId) {
+    if (_viewInfos.count(nativeId) == 0) {
+      RNSkViewInfo info;
+      std::lock_guard<std::mutex> lock(_mutex);
+      _viewInfos.emplace(nativeId, info);
     }
+    return &_viewInfos.at(nativeId);
   }
-  
-  // List of callbacks
-  std::unordered_map<size_t, CallbackInfo> _callbackInfos;
-  
-  // Platform context
+
+  std::unordered_map<size_t, RNSkViewInfo> _viewInfos;
   std::shared_ptr<RNSkPlatformContext> _platformContext;
+  std::mutex _mutex;
 };
 } // namespace RNSkia

package/cpp/rnskia/values/RNSkComputedValue.h

@@ -31,32 +31,32 @@ public:
     // Verify input
     if(!arguments[0].isObject() ||
        !arguments[0].asObject(runtime).isFunction(runtime)) {
-      jsi::detail::throwJSError(runtime, "Expected callback function as first parameter");
+      throw jsi::JSError(runtime, "Expected callback function as first parameter");
     }
-        
+
     if(!arguments[1].isObject() ||
        !arguments[1].asObject(runtime).isArray(runtime)) {
-      jsi::detail::throwJSError(runtime, "Expected array of dependencies as second parameter");
+      throw jsi::JSError(runtime, "Expected array of dependencies as second parameter");
     }
-        
+
     // Get callback for calculating result
     _callback = std::make_shared<jsi::Function>(arguments[0].asObject(runtime).asFunction(runtime));
   }
-  
+
   void invalidate() override {
     RNSkReadonlyValue::invalidate();
-    
+
     // Unregister listeners
     for(const auto &unsubscribe: _unsubscribers) {
       unsubscribe();
     }
     _unsubscribers.clear();
   }
-  
+
   void initializeDependencies(jsi::Runtime &runtime, const jsi::Value *arguments, size_t count) {
     // Save dependencies
     std::vector<std::shared_ptr<RNSkReadonlyValue>> dependencies;
-        
+
     // Ensure that all dependencies are Values
     auto deps = arguments[1].asObject(runtime).asArray(runtime);
     const std::size_t size = deps.size(runtime);
@@ -73,7 +73,7 @@ public:
       }
       dependencies.push_back(value);
     }
-    
+
     // register change handler on dependencies
     _unsubscribers.reserve(_unsubscribers.size() + size);
     for(const auto &dep: dependencies) {
@@ -85,11 +85,11 @@ public:
         }
       }));
     }
-        
+
     // Set initial value
     dependencyUpdated(runtime);
   }
-  
+
 private:
   void dependencyUpdated(jsi::Runtime &runtime) {
     // Calculate new value

package/cpp/rnskia/values/RNSkReadonlyValue.h

@@ -29,7 +29,7 @@ public:
       : JsiSkHostObject(platformContext),
       _valueHolder(std::make_unique<JsiSimpleValueWrapper>(*platformContext->getJsRuntime()))
       { }
-  
+
   virtual ~RNSkReadonlyValue() {
     invalidate();
   }
@@ -37,21 +37,21 @@ public:
   JSI_PROPERTY_GET(__typename__) {
     return jsi::String::createFromUtf8(runtime, "RNSkValue");
   }
-  
+
   JSI_PROPERTY_GET(current) {
     return getCurrent(runtime);
   }
-  
+
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(RNSkReadonlyValue, __typename__),
                               JSI_EXPORT_PROP_GET(RNSkReadonlyValue, current))
-      
+
   JSI_HOST_FUNCTION(addListener) {
     if(!arguments[0].isObject() || !arguments[0].asObject(runtime).isFunction(runtime)) {
-      jsi::detail::throwJSError(runtime, "Expected function as first parameter.");
+      throw jsi::JSError(runtime, "Expected function as first parameter.");
       return jsi::Value::undefined();
     }
     auto callback = std::make_shared<jsi::Function>(arguments[0].asObject(runtime).asFunction(runtime));
-    
+
     auto unsubscribe = addListener([weakSelf = weak_from_this(),
                                     callback = std::move(callback)](jsi::Runtime& runtime){
       auto self = weakSelf.lock();
@@ -60,7 +60,7 @@ public:
         callback->call(runtime, selfReadonlyValue->get_current(runtime));
       }
     });
-    
+
     return jsi::Function::createFromHostFunction(runtime,
                                                  jsi::PropNameID::forUtf8(runtime, "unsubscribe"),
                                                  0,
@@ -69,17 +69,17 @@ public:
       return jsi::Value::undefined();
     });
   }
-  
-  
-  
+
+
+
   JSI_HOST_FUNCTION(__invalidate) {
     invalidate();
     return jsi::Value::undefined();
   }
-  
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkReadonlyValue, addListener),
                        JSI_EXPORT_FUNC(RNSkReadonlyValue, __invalidate))
-    
+
   /**
   * Adds a callback that will be called whenever the value changes
   * @param cb Callback
@@ -96,7 +96,7 @@ public:
       }
     };
   }
-  
+
   /**
     Updates the underlying value and notifies all listeners about the change.
     Listeners are only notified if the value was actually changed for numeric, boolean and string
@@ -111,7 +111,7 @@ public:
       notifyListeners(runtime);
     }
   }
-  
+
   /**
    Override to implement invalidation logic for the value. In the base class this function
    clears all subscribers.
@@ -120,13 +120,13 @@ public:
     std::lock_guard<std::mutex> lock(_mutex);
     _listeners.clear();
   }
-  
+
   jsi::Value getCurrent(jsi::Runtime &runtime) {
     return _valueHolder->getCurrent(runtime);
   }
-  
+
 protected:
-  
+
   /**
     Notifies listeners about changes
    @param runtime Current JS Runtime
@@ -141,7 +141,7 @@ protected:
       listener.second(runtime);
     }
   }
-  
+
   /**
    Removes a subscription listeners
    @param listenerId identifier of listener to remove
@@ -153,7 +153,7 @@ protected:
 
 private:
   std::unique_ptr<JsiSimpleValueWrapper> _valueHolder;
-  
+
   long _listenerId = 0;
   std::unordered_map<long, std::function<void(jsi::Runtime&)>> _listeners;
   std::mutex _mutex;