@shopify/react-native-skia 0.1.145 → 0.1.146

package/cpp/api/JsiSkContourMeasure.h

@@ -29,7 +29,7 @@ namespace RNSkia
         {
             if (contourMeasure == nullptr)
             {
-                jsi::detail::throwJSError(*context->getJsRuntime(), "Contour measure is null");
+                throw jsi::JSError(*context->getJsRuntime(), "Contour measure is null");
             }
         };
 
@@ -41,7 +41,7 @@ namespace RNSkia
             auto result = getObject()->getPosTan(dist, &position, &tangent);
             if (!result)
             {
-                jsi::detail::throwJSError(runtime, "getSegment() failed");
+                throw jsi::JSError(runtime, "getSegment() failed");
             }
             auto posTan = jsi::Object(runtime);
             posTan.setProperty(runtime, "px", position.x());
@@ -70,7 +70,7 @@ namespace RNSkia
             auto result = getObject()->getSegment(start, end, &path, startWithMoveTo);
             if (!result)
             {
-                jsi::detail::throwJSError(runtime, "getSegment() failed");
+                throw jsi::JSError(runtime, "getSegment() failed");
             }
             return JsiSkPath::toValue(runtime, getContext(), std::move(path));
         }
@@ -99,4 +99,4 @@ namespace RNSkia
                 ->getObject();
         }
     };
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/JsiSkDataFactory.h

@@ -64,7 +64,7 @@ namespace RNSkia {
             size_t len;
             auto err = SkBase64::Decode(&base64.utf8(runtime).c_str()[0], size, nullptr, &len);
             if(err != SkBase64::Error::kNoError) {
-              jsi::detail::throwJSError(runtime, "Error decoding base64 string");
+              throw jsi::JSError(runtime, "Error decoding base64 string");
               return jsi::Value::undefined();
             }
 
@@ -72,10 +72,10 @@ namespace RNSkia {
             auto data = SkData::MakeUninitialized(len);
             err = SkBase64::Decode(&base64.utf8(runtime).c_str()[0], size, data->writable_data(), &len);
             if(err != SkBase64::Error::kNoError) {
-              jsi::detail::throwJSError(runtime, "Error decoding base64 string");
+              throw jsi::JSError(runtime, "Error decoding base64 string");
               return jsi::Value::undefined();
             }
-          
+
             return jsi::Object::createFromHostObject(runtime,
                                                      std::make_shared<JsiSkData>(
                                                              getContext(), std::move(data)));

package/cpp/api/JsiSkFont.h

@@ -152,7 +152,7 @@ namespace RNSkia
 
             if (glyphs.size() > positions.size())
             {
-                jsi::detail::throwJSError(runtime, "Not enough x,y position pairs for glyphs");
+                throw jsi::JSError(runtime, "Not enough x,y position pairs for glyphs");
                 return jsi::Value::null();
             }
             auto sects = getObject()->getIntercepts(glyphs.data(), SkToInt(glyphs.size()), positions.data(), top, bottom);

package/cpp/api/JsiSkPathFactory.h

@@ -41,7 +41,7 @@ public:
     SkPath result;
 
     if (!SkParsePath::FromSVGString(svgString.c_str(), &result)) {
-      jsi::detail::throwJSError(runtime, "Could not parse Svg path");
+      throw jsi::JSError(runtime, "Could not parse Svg path");
       return jsi::Value(nullptr);
     }
 

package/cpp/api/JsiSkPictureFactory.h

@@ -22,7 +22,7 @@ class JsiSkPictureFactory : public JsiSkHostObject {
 public:
   JSI_HOST_FUNCTION(MakePicture) {
     if(!arguments[0].isObject()) {
-      jsi::detail::throwJSError(runtime, "Expected arraybuffer as first parameter");
+      throw jsi::JSError(runtime, "Expected arraybuffer as first parameter");
     }
     auto array = arguments[0].asObject(runtime);
     jsi::ArrayBuffer buffer = array

package/cpp/api/JsiSkRuntimeEffect.h

@@ -35,7 +35,7 @@ namespace RNSkia
       : public JsiSkWrappingSkPtrHostObject<SkRuntimeEffect>
   {
   public:
-      
+
     static sk_sp<SkRuntimeEffect> fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
         const auto& object = obj.asObject(runtime);
         return object.asHostObject<JsiSkRuntimeEffect>(runtime)->getObject();
@@ -44,7 +44,7 @@ namespace RNSkia
     JSI_HOST_FUNCTION(makeShader)
     {
       auto uniforms = castUniforms(runtime, arguments[0]);
-      
+
       auto matrix = count >= 2 && !arguments[1].isUndefined()  && !arguments[1].isNull()  ? JsiSkMatrix::fromValue(runtime, arguments[1]).get() : nullptr;
 
       // Create and return shader as host object
@@ -57,7 +57,7 @@ namespace RNSkia
     JSI_HOST_FUNCTION(makeShaderWithChildren)
     {
       auto uniforms = castUniforms(runtime, arguments[0]);
-      
+
       // Children
       std::vector<sk_sp<SkShader>> children;
       auto jsiChildren = arguments[1].asObject(runtime).asArray(runtime);
@@ -96,7 +96,7 @@ namespace RNSkia
     {
       auto i = static_cast<int>(arguments[0].asNumber());
       if (i < 0 || i >= getObject()->uniforms().size()) {
-        jsi::detail::throwJSError(runtime, "invalid uniform index");
+        throw jsi::JSError(runtime, "invalid uniform index");
       }
       auto it = getObject()->uniforms().begin() + i;
       return jsi::String::createFromAscii(runtime, it->name.c_str());
@@ -106,7 +106,7 @@ namespace RNSkia
     {
       auto i = static_cast<int>(arguments[0].asNumber());
       if (i < 0 || i >= getObject()->uniforms().size()) {
-        jsi::detail::throwJSError(runtime, "invalid uniform index");
+        throw jsi::JSError(runtime, "invalid uniform index");
       }
       auto it = getObject()->uniforms().begin() + i;
       auto result = jsi::Object(runtime);
@@ -144,7 +144,7 @@ namespace RNSkia
                 std::to_string(jsiUniformsSize) +
                 " expected " +
                 std::to_string(getObject()->uniformSize() / sizeof(float));
-        jsi::detail::throwJSError(runtime, msg.c_str());
+        throw jsi::JSError(runtime, msg.c_str());
       }
 
       auto uniforms = SkData::MakeUninitialized(getObject()->uniformSize());

package/cpp/api/JsiSkRuntimeEffectFactory.h

@@ -21,7 +21,7 @@ public:
     auto effect = result.effect;
     auto errorText = result.errorText;
     if (!effect) {
-      jsi::detail::throwJSError(
+      throw jsi::JSError(
           runtime,
           std::string("Error in sksl:\n" + std::string(errorText.c_str()))
               .c_str());

package/cpp/jsi/JsiSimpleValueWrapper.h

@@ -7,26 +7,26 @@ namespace RNJsi
 {
 using namespace facebook;
 
-enum JsiWrapperValueType
+/**
+ Implements a simple wrapper class for JSI primitives like numbers and boolean values. Objects,
+ strings and arrays are stored as values inside a property holder. The class also provides a method
+ for comparing values that will compare numbers, booleans and strings.
+ */
+class JsiSimpleValueWrapper
 {
+private:
+  enum ValueType {
     NonInitialized,
     Undefined,
     Null,
     Bool,
     Number,
     JsiValue
-};
+  };
 
-/**
- Implements a simple wrapper class for JSI primitives like numbers and boolean values. Objects,
- strings and arrays are stored as values inside a property holder. The class also provides a method
- for comparing values that will compare numbers, booleans and strings.
- */
-class JsiSimpleValueWrapper
-{
 public:
     JsiSimpleValueWrapper(jsi::Runtime& runtime) :
-      _type(JsiWrapperValueType::NonInitialized),
+      _type(ValueType::NonInitialized),
       _propNameId(jsi::PropNameID::forUtf8(runtime, "value"))
     {}
 
@@ -34,17 +34,17 @@ public:
     {
       switch (_type)
       {
-          case JsiWrapperValueType::NonInitialized:
+          case ValueType::NonInitialized:
               return nullptr;
-          case JsiWrapperValueType::Undefined:
+          case ValueType::Undefined:
             return jsi::Value::undefined();
-          case JsiWrapperValueType::Null:
+          case ValueType::Null:
             return jsi::Value::null();
-          case JsiWrapperValueType::Bool:
+          case ValueType::Bool:
             return _boolValue;
-          case JsiWrapperValueType::Number:
+          case ValueType::Number:
             return _numberValue;
-          case JsiWrapperValueType::JsiValue:
+          case ValueType::JsiValue:
             if (_valueHolder == nullptr) {
                 return jsi::Value::undefined();
             }
@@ -55,17 +55,17 @@ public:
     void setCurrent(jsi::Runtime &runtime, const jsi::Value &value)
     {
       if(value.isNumber()) {
-        _type = JsiWrapperValueType::Number;
+        _type = ValueType::Number;
         _numberValue = value.asNumber();
       } else if(value.isBool()) {
-        _type = JsiWrapperValueType::Bool;
+        _type = ValueType::Bool;
         _boolValue = value.getBool();
       } else if(value.isUndefined()) {
-        _type = JsiWrapperValueType::Undefined;
+        _type = ValueType::Undefined;
       } else if(value.isNull()) {
-        _type = JsiWrapperValueType::Null;
+        _type = ValueType::Null;
       } else {
-        _type = JsiWrapperValueType::JsiValue;
+        _type = ValueType::JsiValue;
         // Save as javascript object - we don't want to have to copy strings, objects and values
         if(_valueHolder == nullptr) {
             _valueHolder = std::make_shared<jsi::Object>(runtime);
@@ -75,17 +75,17 @@ public:
     }
 
     bool equals(jsi::Runtime& runtime, const jsi::Value &value) {
-      if (_type == JsiWrapperValueType::NonInitialized) {
+      if (_type == ValueType::NonInitialized) {
           return false;
       }
-      if(value.isNumber() && _type == JsiWrapperValueType::Number) {
+      if(value.isNumber() && _type == ValueType::Number) {
         return _numberValue == value.asNumber();
-      } else if(value.isBool() && _type == JsiWrapperValueType::Bool) {
+      } else if(value.isBool() && _type == ValueType::Bool) {
         return _boolValue == value.getBool();
       } else if(value.isUndefined()) {
-        return _type == JsiWrapperValueType::Undefined;
+        return _type == ValueType::Undefined;
       } else if(value.isNull()) {
-        return _type == JsiWrapperValueType::Null;
+        return _type == ValueType::Null;
       } else if(value.isString()) {
           auto current = getCurrent(runtime);
           if (current.isString()) {
@@ -103,6 +103,6 @@ private:
     bool _boolValue;
     double _numberValue;
 
-    JsiWrapperValueType _type;
+    ValueType _type;
 };
 }

package/cpp/jsi/JsiValueWrapper.h

@@ -0,0 +1,127 @@
+
+#pragma once
+
+#include <jsi/jsi.h>
+
+namespace RNJsi
+{
+using namespace facebook;
+
+enum JsiWrapperValueType
+{
+    NonInitialized,
+    Undefined,
+    Null,
+    Bool,
+    Number,
+    String,
+    Object,
+    Function,
+    Array,
+    Unknown
+};
+
+/**
+ Implements a simple wrapper class for JSI values where the value can be read without asking the runtime for any assistance
+ Meaning that we can access members without being on the JS thread.
+ */
+class JsiValueWrapper
+{
+public:
+  JsiValueWrapper(jsi::Runtime& runtime) :
+    _type(JsiWrapperValueType::NonInitialized)
+  {}
+  
+  JsiValueWrapper(jsi::Runtime& runtime, const jsi::Value &value) :
+    _type(JsiWrapperValueType::NonInitialized)
+  {
+    setCurrent(runtime, value);
+  }
+
+  void setCurrent(jsi::Runtime &runtime, const jsi::Value &value)
+  {
+    if (value.isNumber()) {
+      _type = JsiWrapperValueType::Number;
+      _numberValue = value.asNumber();
+    } else if (value.isBool()) {
+      _type = JsiWrapperValueType::Bool;
+      _boolValue = value.getBool();
+    } else if (value.isString()) {
+      _type = JsiWrapperValueType::String;
+      _stringValue = value.asString(runtime).utf8(runtime);
+    } else if (value.isUndefined()) {
+      _type = JsiWrapperValueType::Undefined;
+    } else if (value.isNull()) {
+      _type = JsiWrapperValueType::Null;
+    } else if (value.isObject()) {
+      _type = JsiWrapperValueType::Object;
+      _objectValue = std::make_shared<jsi::Object>(value.asObject(runtime));
+      if (_objectValue->isFunction(runtime)) {
+        _type = JsiWrapperValueType::Function;
+        _functionValue = std::make_shared<jsi::Function>(_objectValue->asFunction(runtime));
+        _objectValue = nullptr;
+      } else if (_objectValue->isArray(runtime)) {
+        _type = JsiWrapperValueType::Array;
+        _arrayValue = std::make_shared<jsi::Array>(_objectValue->asArray(runtime));
+        _objectValue = nullptr;
+      }
+    } else {
+      throw std::runtime_error("Could not store jsi::Value of provided type");
+    }
+    // Save in value holder as well so that we can return current
+    if(_valueHolder == nullptr) {
+      _valueHolder = std::make_shared<jsi::Object>(runtime);
+    }
+    _valueHolder->setProperty(runtime, "current", value);
+  }
+
+  bool isUndefinedOrNull() {
+    return _type == JsiWrapperValueType::Undefined ||
+      _type == JsiWrapperValueType::Null;
+  }
+  
+  bool getAsBool() {
+    assert(_type == JsiWrapperValueType::Bool);
+    return _boolValue;
+  }
+  
+  double getAsNumber() {
+    assert(_type == JsiWrapperValueType::Number);
+    return _numberValue;
+  }
+  
+  const std::string& getAsString() {
+    assert(_type == JsiWrapperValueType::String);
+    return _stringValue;
+  }
+  
+  std::shared_ptr<jsi::Function> getAsFunction() {
+    assert(_type == JsiWrapperValueType::Function);
+    return _functionValue;
+  }
+  
+  std::shared_ptr<jsi::Array> getAsArray() {
+    assert(_type == JsiWrapperValueType::Array);
+    return _arrayValue;
+  }
+  
+  std::shared_ptr<jsi::Object> getAsObject() {
+    assert(_type == JsiWrapperValueType::Object);
+    return _objectValue;
+  }
+  
+  JsiWrapperValueType getType() { return _type; }
+
+private:
+    std::shared_ptr<jsi::Object> _valueHolder;
+
+    bool _boolValue;
+    double _numberValue;
+    std::string _stringValue;
+    std::shared_ptr<jsi::Object> _objectValue;
+    std::shared_ptr<jsi::Function> _functionValue;
+    std::shared_ptr<jsi::Array> _arrayValue;
+
+    JsiWrapperValueType _type;
+};
+}

package/cpp/rnskia/RNSkDrawView.cpp

@@ -49,12 +49,52 @@ RNSkDrawView::~RNSkDrawView() {
   endDrawingLoop();
 }
 
+void RNSkDrawView::setJsiProperties(std::unordered_map<std::string, JsiValueWrapper> &props) {
+  for(auto& prop: props) {
+    if(prop.first == "drawCallback") {
+      if(prop.second.isUndefinedOrNull()) {
+        // Clear drawcallback
+        _drawCallback = nullptr;
+        // We can just reset everything - this is a signal that we're done.
+        endDrawingLoop();
+        return;
+      } else if (prop.second.getType() != JsiWrapperValueType::Function) {
+        // We expect a function for the draw callback custom property
+        throw std::runtime_error("Expected a function for the drawCallback custom property.");
+      }
+
+      // Save callback
+      _drawCallback = prop.second.getAsFunction();
+
+      // Request redraw
+      requestRedraw();
+
+    } else {
+      throw std::runtime_error("Property " + prop.first + " not found.");
+    }
+  }
+}
+
+jsi::Value RNSkDrawView::callJsiMethod(jsi::Runtime& runtime,
+                                       const std::string& name,
+                                       const jsi::Value *arguments,
+                                       size_t count) {
+  
+  // This subclass doesn't support any jsi methods at the moment, but
+  // new subclasses created in the future will.
+  throw std::runtime_error("RNSkDrawView does not support any JSI methods. Method " + name + "() not found.");
+  return jsi::Value::undefined();
+}
+
 void RNSkDrawView::setNativeId(size_t nativeId) {
   _nativeId = nativeId;
   beginDrawingLoop();
 }
 
-void RNSkDrawView::callJsDrawCallback(std::shared_ptr<JsiSkCanvas> canvas, int width, int height, double timestamp) {
+void RNSkDrawView::callJsDrawCallback(std::shared_ptr<JsiSkCanvas> canvas,
+                                      int width,
+                                      int height,
+                                      double timestamp) {
   if(_drawCallback == nullptr) {
     return;
   }
@@ -110,22 +150,6 @@ void RNSkDrawView::callJsDrawCallback(std::shared_ptr<JsiSkCanvas> canvas, int w
   }
 }
 
-void RNSkDrawView::setDrawCallback(std::shared_ptr<FunctionWrapper> callback) {
-
-  if (callback == nullptr) {
-    _drawCallback = nullptr;
-    // We can just reset everything - this is a signal that we're done.
-    endDrawingLoop();
-    return;
-  }
-
-  // Save callback
-  _drawCallback = callback;
-
-  // Request redraw
-  requestRedraw();
-}
-
 void RNSkDrawView::drawInCanvas(std::shared_ptr<JsiSkCanvas> canvas,
                                 int width,
                                 int height,

package/cpp/rnskia/RNSkDrawView.h

@@ -8,6 +8,8 @@
 
 #include <jsi/jsi.h>
 
+#include <JsiValueWrapper.h>
+
 #include <RNSkInfoParameter.h>
 #include <RNSkPlatformContext.h>
 #include <RNSkTimingInfo.h>
@@ -27,22 +29,9 @@ class SkImage;
 namespace RNSkia {
 class JsiSkCanvas;
 using namespace facebook;
-using RNSkDrawCallback =
-    std::function<void(std::shared_ptr<JsiSkCanvas>, int, int, double,
-                       std::shared_ptr<RNSkPlatformContext>)>;
 
 enum RNSkDrawingMode { Default, Continuous };
 
-class FunctionWrapper {
-public:
-    FunctionWrapper(jsi::Function &&func): _func(std::move(func)) {}
-    jsi::Value call(jsi::Runtime& runtime, const jsi::Value* args, size_t count) {
-      return _func.call(runtime, args, count);
-    }
-private:
-    jsi::Function _func;
-};
-
 class RNSkDrawView: public std::enable_shared_from_this<RNSkDrawView> {
 public:
   /**
@@ -54,6 +43,20 @@ public:
    Destructor
    */
   virtual ~RNSkDrawView();
+  
+  /**
+   Sets custom properties. Custom properties are properties that are set directly from Javascript without having
+   to go through the async bridge.
+   */
+  void setJsiProperties(std::unordered_map<std::string, JsiValueWrapper> &props);
+  
+  /**
+   Calls a custom action.
+   */
+  jsi::Value callJsiMethod(jsi::Runtime& runtime,
+                           const std::string& name,
+                           const jsi::Value *arguments,
+                           size_t count);
 
   /**
    * Repaints the Skia view using the underlying context and the drawcallback.
@@ -66,11 +69,6 @@ public:
    Calls the drawing callback on the javascript thread
    */
   void performDraw();
-
-  /**
-   * Installs the draw callback for the view
-   */
-  void setDrawCallback(std::shared_ptr<FunctionWrapper> callback);
   
   /**
    Sets the native id of the view
@@ -159,7 +157,7 @@ private:
   /**
    * Stores the draw drawCallback
    */
-  std::shared_ptr<FunctionWrapper> _drawCallback;
+  std::shared_ptr<jsi::Function> _drawCallback;
 
   /**
    * Stores a pointer to the jsi wrapper for the canvas. The reason for