@shopify/react-native-skia 0.1.123 → 0.1.126

package/android/CMakeLists.txt

@@ -39,6 +39,9 @@ add_library(
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkManager.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkDrawView.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkDispatchQueue.cpp"
+
+
+        "${PROJECT_SOURCE_DIR}/cpp/api/third_party/CSSColorParser.cpp"
         
 )
 

package/android/build.gradle

@@ -175,7 +175,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     extractJNI("com.facebook.fbjni:fbjni:0.2.2")
 
-    def rnAAR = fileTree("${rootDir}/../node_modules/react-native/android").matching({ it.include "**/**/*.aar" }).singleFile
+    def rnAAR = fileTree("${nodeModules}/react-native/android").matching({ it.include "**/**/*.aar" }).singleFile
     extractJNI(files(rnAAR))
 }
 

package/android/cpp/rnskia-android/RNSkDrawViewImpl.cpp

@@ -16,8 +16,8 @@ namespace RNSkia {
         _releaseSurfaceCallback(std::move(releaseSurfaceCallback)) {}
 
     void RNSkDrawViewImpl::surfaceAvailable(ANativeWindow* surface, int width, int height) {
-        _width = width;
-        _height = height;
+        _scaledWidth = width;
+        _scaledHeight = height;
 
         if (_renderer == nullptr)
         {
@@ -53,8 +53,8 @@ namespace RNSkia {
     }
 
     void RNSkDrawViewImpl::surfaceSizeChanged(int width, int height) {
-        _width = width;
-        _height = height;
+        _scaledWidth = width;
+        _scaledHeight = height;
 
         // Redraw after size change
         requestRedraw();
@@ -62,7 +62,7 @@ namespace RNSkia {
 
     void RNSkDrawViewImpl::drawPicture(const sk_sp <SkPicture> picture) {
         if(_renderer != nullptr) {
-            _renderer->run(picture, _width, _height);
+            _renderer->run(picture, _scaledWidth, _scaledHeight);
         }
     }
 }

package/android/cpp/rnskia-android/RNSkDrawViewImpl.h

@@ -28,9 +28,9 @@ namespace RNSkia {
         }
 
     protected:
-        int getWidth() override { return _width * getPlatformContext()->getPixelDensity(); };
+        float getScaledWidth() override { return _scaledWidth; };
 
-        int getHeight() override { return _height * getPlatformContext()->getPixelDensity(); };
+        float getScaledHeight() override { return _scaledHeight; };
 
         void drawPicture(const sk_sp <SkPicture> picture) override;
 
@@ -40,8 +40,8 @@ namespace RNSkia {
         std::unique_ptr<SkiaOpenGLRenderer> _renderer = nullptr;
 
         int _nativeId;
-        int _width = -1;
-        int _height = -1;
+        float _scaledWidth = -1;
+        float _scaledHeight = -1;
 
         std::function<void()> _releaseSurfaceCallback;
     };

package/cpp/api/JsiSkApi.h

@@ -39,6 +39,7 @@
 #include "JsiSkContourMeasureIter.h"
 #include "JsiSkPictureRecorder.h"
 #include "JsiSkPictureFactory.h"
+#include "JsiSkRuntimeShaderBuilder.h"
 #include "JsiSkColor.h"
 
 namespace RNSkia
@@ -65,10 +66,11 @@ namespace RNSkia
       installFunction("XYWHRect", JsiSkRect::createCtor(context));
       installFunction("RRectXY", JsiSkRRect::createCtor(context));
       installFunction("Point", JsiSkPoint::createCtor(context));
+      installFunction("RuntimeShaderBuilder", JsiSkRuntimeShaderBuilder::createCtor(context));
       installFunction("ContourMeasureIter", JsiSkContourMeasureIter::createCtor(context));
       installFunction("MakeVertices", JsiSkVertices::createCtor(context));
       installFunction("PictureRecorder", JsiSkPictureRecorder::createCtor(context));
-      installFunction("parseColorString", JsiSkColor::createCtor());
+      installFunction("Color", JsiSkColor::createCtor());
 
       // Static members
       installReadonlyProperty("FontMgr",

package/cpp/api/JsiSkCanvas.h

@@ -278,7 +278,7 @@ public:
       auto colorsSize = jsiColors.size(runtime);
       colors.reserve(colorsSize);
       for (int i = 0; i < colorsSize; i++) {
-        SkColor color = jsiColors.getValueAtIndex(runtime, i).asNumber();
+        SkColor color = JsiSkColor::fromValue(runtime, jsiColors.getValueAtIndex(runtime, i));
         colors.push_back(color);
       }
     }

package/cpp/api/JsiSkColor.h

@@ -26,6 +26,35 @@ namespace RNSkia {
 
         ~JsiSkColor() {}
 
+        static jsi::Object toValue(jsi::Runtime &runtime, SkColor color) {
+            auto result = runtime
+                    .global()
+                    .getPropertyAsFunction(runtime, "Float32Array")
+                    .callAsConstructor(runtime, 4)
+                    .getObject(runtime);
+            jsi::ArrayBuffer buffer = result
+                    .getProperty(runtime, jsi::PropNameID::forAscii(runtime, "buffer"))
+                    .asObject(runtime)
+                    .getArrayBuffer(runtime);
+            auto bfrPtr = reinterpret_cast<float *>(buffer.data(runtime));
+            auto color4f = SkColor4f::FromColor(color).array();
+            std::copy(color4f.begin(), color4f.end(), bfrPtr);
+            return result;
+        }
+
+        static SkColor fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
+            const auto& object = obj.asObject(runtime);
+            jsi::ArrayBuffer buffer = object
+                    .getProperty(runtime, jsi::PropNameID::forAscii(runtime, "buffer"))
+                    .asObject(runtime)
+                    .getArrayBuffer(runtime);
+            auto bfrPtr = reinterpret_cast<float *>(buffer.data(runtime));
+            if (bfrPtr[0] > 1 || bfrPtr[1] > 1 || bfrPtr[2] > 1 || bfrPtr[3] > 1) {
+                return SK_ColorBLACK;
+            }
+            return SkColorSetARGB(bfrPtr[3] * 255, bfrPtr[0] * 255, bfrPtr[1] * 255, bfrPtr[2] * 255);
+        }
+
         /**
          * Creates the function for construction a new instance of the SkColor
          * wrapper
@@ -35,14 +64,19 @@ namespace RNSkia {
         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();
+                if (arguments[0].isNumber()) {
+                    return JsiSkColor::toValue(runtime, arguments[0].getNumber());
+                } else if(arguments[0].isString()) {
+                    auto text = arguments[0].asString(runtime).utf8(runtime);
+                    auto color = CSSColorParser::parse(text);
+                    if (color.a == -1.0f) {
+                        return JsiSkColor::toValue(runtime, SK_ColorBLACK);
+                    }
+                    return JsiSkColor::toValue(runtime, SkColorSetARGB(color.a * 255, color.r, color.g, color.b));
+                } else if (arguments[0].isObject()) {
+                    return arguments[0].getObject(runtime);
                 }
-                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));
+                return jsi::Value::undefined();
             };
         }
     };

package/cpp/api/JsiSkColorFilterFactory.h

@@ -2,6 +2,7 @@
 
 #include "JsiSkColorFilter.h"
 #include "JsiSkHostObjects.h"
+#include "JsiSkColor.h"
 #include <jsi/jsi.h>
 #include <utility>
 
@@ -34,7 +35,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(MakeBlend) {
-    auto color = arguments[0].asNumber();
+    auto color = JsiSkColor::fromValue(runtime, arguments[0]);
     SkBlendMode blend = (SkBlendMode)arguments[1].asNumber();
     // Return the newly constructed object
     return jsi::Object::createFromHostObject(

package/cpp/api/JsiSkImageFilter.h

@@ -5,13 +5,11 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkColorFilter.h"
 #include "JsiSkHostObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColorFilter.h>
 #include <SkImageFilters.h>
 
 #pragma clang diagnostic pop

package/cpp/api/JsiSkImageFilterFactory.h

@@ -7,11 +7,12 @@
 
 #include "JsiSkHostObjects.h"
 #include "JsiSkImageFilter.h"
+#include "JsiSkRuntimeShaderBuilder.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColorFilter.h>
+#include <SkImageFilter.h>
 
 #pragma clang diagnostic pop
 
@@ -123,7 +124,7 @@ public:
     auto dy = arguments[1].asNumber();
     auto sigmaX = arguments[2].asNumber();
     auto sigmaY = arguments[3].asNumber();
-    auto color = arguments[4].asNumber();
+    auto color = JsiSkColor::fromValue(runtime, arguments[4]);
     sk_sp<SkImageFilter> input;
     if (!arguments[5].isNull() && !arguments[5].isUndefined()) {
       input = JsiSkImageFilter::fromValue(runtime, arguments[5]);
@@ -144,7 +145,7 @@ public:
     auto dy = arguments[1].asNumber();
     auto sigmaX = arguments[2].asNumber();
     auto sigmaY = arguments[3].asNumber();
-    auto color = arguments[4].asNumber();
+    auto color = JsiSkColor::fromValue(runtime, arguments[4]);
     sk_sp<SkImageFilter> input;
     if (!arguments[5].isNull() && !arguments[5].isUndefined()) {
       input = JsiSkImageFilter::fromValue(runtime, arguments[5]);
@@ -195,20 +196,39 @@ public:
                     getContext(), SkImageFilters::Dilate(rx, ry, std::move(input), cropRect)));
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeBlur),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeOffset),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory,
-                                       MakeColorFilter),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory,
-                                       MakeShader),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeDisplacementMap),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeCompose),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeErode),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeDilate),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeBlend),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeDropShadow),
-                       JSI_EXPORT_FUNC(JsiSkImageFilterFactory,
-                                       MakeDropShadowOnly))
+    JSI_HOST_FUNCTION(MakeRuntimeShader) {
+      auto rtb = JsiSkRuntimeShaderBuilder::fromValue(runtime, arguments[0]);
+
+      const char* childName = nullptr;
+      if (!arguments[1].isNull() && !arguments[1].isUndefined()) {
+        childName = arguments[1].asString(runtime).utf8(runtime).c_str();
+      }
+
+      sk_sp<SkImageFilter> input;
+      if (!arguments[2].isNull() && !arguments[2].isUndefined()) {
+        input = JsiSkImageFilter::fromValue(runtime, arguments[2]);
+      }
+      return jsi::Object::createFromHostObject(
+            runtime,
+            std::make_shared<JsiSkImageFilter>(
+                getContext(), SkImageFilters::RuntimeShader(*rtb, childName, std::move(input)))
+      );
+    }
+
+  JSI_EXPORT_FUNCTIONS(
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeBlur),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeOffset),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeColorFilter),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeShader),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeDisplacementMap),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeCompose),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeErode),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeDilate),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeBlend),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeDropShadow),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeDropShadowOnly),
+        JSI_EXPORT_FUNC(JsiSkImageFilterFactory, MakeRuntimeShader)
+   )
 
   JsiSkImageFilterFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}

package/cpp/api/JsiSkMatrix.h

@@ -25,9 +25,51 @@ public:
       : JsiSkWrappingSharedPtrHostObject<SkMatrix>(
             context, std::make_shared<SkMatrix>(std::move(m))) {}
 
+
+  JSI_HOST_FUNCTION(preConcat) {
+    auto m3 = JsiSkMatrix::fromValue(runtime, arguments[0]);
+    getObject()->preConcat(*m3);
+    return jsi::Value::undefined();
+  }
+
+  JSI_HOST_FUNCTION(preTranslate) {
+    auto x = arguments[0].asNumber();
+    auto y = arguments[1].asNumber();
+    getObject()->preTranslate(x, y);
+    return jsi::Value::undefined();
+  }
+
+  JSI_HOST_FUNCTION(preScale) {
+    auto x = arguments[0].asNumber();
+    auto y = arguments[1].asNumber();
+    getObject()->preScale(x, y);
+    return jsi::Value::undefined();
+  }
+
+  JSI_HOST_FUNCTION(preSkew) {
+    auto x = arguments[0].asNumber();
+    auto y = arguments[1].asNumber();
+    getObject()->preSkew(x, y);
+    return jsi::Value::undefined();
+  }
+
+  JSI_HOST_FUNCTION(preRotate) {
+    auto a = arguments[0].asNumber();
+    getObject()->preRotate(a);
+    return jsi::Value::undefined();
+  }
+
+  JSI_EXPORT_FUNCTIONS(
+    JSI_EXPORT_FUNC(JsiSkMatrix, preConcat),
+    JSI_EXPORT_FUNC(JsiSkMatrix, preTranslate),
+    JSI_EXPORT_FUNC(JsiSkMatrix, preScale),
+    JSI_EXPORT_FUNC(JsiSkMatrix, preSkew),
+    JSI_EXPORT_FUNC(JsiSkMatrix, preRotate),
+  )
+
   /**
-Returns the underlying object from a host object of this type
-*/
+   * Returns the underlying object from a host object of this type
+   */
   static std::shared_ptr<SkMatrix> fromValue(jsi::Runtime &runtime,
                                              const jsi::Value &obj) {
     const auto& object = obj.asObject(runtime);

package/cpp/api/JsiSkPaint.h

@@ -8,8 +8,10 @@
 #include <JsiSkHostObjects.h>
 #include <JsiSkImageFilter.h>
 #include <JsiSkMaskFilter.h>
+#include <JsiSkColorFilter.h>
 #include <JsiSkPathEffect.h>
 #include <JsiSkShader.h>
+#include <JsiSkColor.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -38,7 +40,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(getColor) {
-    return static_cast<double>(getObject()->getColor());
+    return JsiSkColor::toValue(runtime, getObject()->getColor());
   }
 
   JSI_HOST_FUNCTION(getStrokeCap) {
@@ -58,7 +60,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(setColor) {
-    SkColor color = arguments[0].asNumber();
+    SkColor color = JsiSkColor::fromValue(runtime, arguments[0]);
     getObject()->setColor(color);
     return jsi::Value::undefined();
   }
@@ -90,11 +92,6 @@ public:
     case 1:
       getObject()->setStyle(SkPaint::kStroke_Style);
       break;
-      // This API is expected to be deprecated
-      // https://github.com/flutter/flutter/issues/5912
-      //                    case 2:
-      //                        getObject()->setStyle(SkPaint::kStrokeAndFill_Style);
-      //                        break;
     }
     return jsi::Value::undefined();
   }

package/cpp/api/JsiSkRuntimeEffect.h

@@ -35,6 +35,12 @@ 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();
+    }
+
     JSI_HOST_FUNCTION(makeShader)
     {
       auto uniforms = castUniforms(runtime, arguments[0]);
@@ -213,5 +219,6 @@ namespace RNSkia
       su.slot = (int)(u.offset / sizeof(float));
       return su;
     }
+
   };
 } // namespace RNSkia

package/cpp/api/JsiSkRuntimeEffectFactory.h

@@ -7,7 +7,6 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkRuntimeEffect.h"
-#include "JsiSkColorFilter.h"
 #include "JsiSkHostObjects.h"
 
 namespace RNSkia {
@@ -32,7 +31,9 @@ public:
         runtime, std::make_shared<JsiSkRuntimeEffect>(getContext(), std::move(effect)));
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffectFactory, Make))
+  JSI_EXPORT_FUNCTIONS(
+    JSI_EXPORT_FUNC(JsiSkRuntimeEffectFactory, Make)
+  )
 
   JsiSkRuntimeEffectFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}

package/cpp/api/JsiSkRuntimeShaderBuilder.h

@@ -0,0 +1,70 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include "JsiSkHostObjects.h"
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "JsiSkRuntimeEffect.h"
+#include <SkRuntimeEffect.h>
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+    using namespace facebook;
+
+    class JsiSkRuntimeShaderBuilder : public JsiSkWrappingSharedPtrHostObject<SkRuntimeShaderBuilder> {
+    public:
+       
+        /**
+         Constructor
+         */
+        JsiSkRuntimeShaderBuilder(std::shared_ptr<RNSkPlatformContext> context, const SkRuntimeShaderBuilder &rt)
+                : JsiSkWrappingSharedPtrHostObject<SkRuntimeShaderBuilder>(
+                std::move(context), std::make_shared<SkRuntimeShaderBuilder>(rt)){}
+
+        /**
+          Returns the underlying object from a host object of this type
+         */
+        static std::shared_ptr<SkRuntimeShaderBuilder> fromValue(jsi::Runtime &runtime,
+                                                 const jsi::Value &obj) {
+            const auto& object = obj.asObject(runtime);
+            return object.asHostObject<JsiSkRuntimeShaderBuilder>(runtime)->getObject();
+           
+        }
+
+        /**
+          Returns the jsi object from a host object of this type
+         */
+        static jsi::Value toValue(jsi::Runtime &runtime,
+                                  std::shared_ptr<RNSkPlatformContext> context,
+                                  const SkRuntimeShaderBuilder &rt) {
+            return jsi::Object::createFromHostObject(
+                    runtime, std::make_shared<JsiSkRuntimeShaderBuilder>(std::move(context), rt));
+        }
+
+        /**
+         * Creates the function for construction a new instance of the SkRect
+         * wrapper
+         * @param context platform context
+         * @return A function for creating a new host object wrapper for the SkRect
+         * class
+         */
+        static const jsi::HostFunctionType
+        createCtor(std::shared_ptr<RNSkPlatformContext> context) {
+            return JSI_HOST_FUNCTION_LAMBDA {
+                auto rt = JsiSkRuntimeEffect::fromValue(runtime, arguments[0]);
+                auto rtb = SkRuntimeShaderBuilder(rt);
+                // Return the newly constructed object
+                return jsi::Object::createFromHostObject(
+                    runtime, std::make_shared<JsiSkRuntimeShaderBuilder>(std::move(context), std::move(rtb)));
+            };
+        }
+    };
+} // namespace RNSkia

package/cpp/api/JsiSkShaderFactory.h

@@ -50,7 +50,7 @@ std::vector<SkColor> getColors(jsi::Runtime &runtime, const jsi::Value& value) {
     auto size = jsiColors.size(runtime);
     colors.reserve(size);
     for (int i = 0; i < size; i++) {
-      SkColor color = jsiColors.getValueAtIndex(runtime, i).asNumber();
+      SkColor color = JsiSkColor::fromValue(runtime, jsiColors.getValueAtIndex(runtime, i));
       colors.push_back(color);
     }
   }
@@ -191,7 +191,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(MakeColor) {
-    auto color = arguments[0].asNumber();
+    auto color = JsiSkColor::fromValue(runtime, arguments[0]);
     sk_sp<SkShader> gradient = SkShaders::Color(color);
     return jsi::Object::createFromHostObject(
         runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));

package/cpp/api/JsiSkVertices.h

@@ -97,7 +97,7 @@ namespace RNSkia {
                     auto colorsSize = jsiColors.size(runtime);
                     colors.reserve(colorsSize);
                     for (int i = 0; i < colorsSize; i++) {
-                        SkColor color = jsiColors.getValueAtIndex(runtime, i).asNumber();
+                        SkColor color = JsiSkColor::fromValue(runtime, jsiColors.getValueAtIndex(runtime, i));
                         colors.push_back(color);
                     }
                 }