@shopify/react-native-skia 1.10.1 → 1.11.0

package/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseView.java

@@ -32,20 +32,7 @@ public abstract class SkiaBaseView extends ReactViewGroup implements SkiaViewAPI
         }
     }
 
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        if (getMeasuredWidth() == 0) {
-            if (mView instanceof SkiaTextureView) {
-                ((SkiaTextureView) mView).createSurfaceTexture();
-            }
-        }
-    }
-
     void dropInstance() {
-        if (mView instanceof SkiaTextureView) {
-            ((SkiaTextureView)mView).isDropped = true;
-        }
         unregisterView();
     }
 

package/android/src/main/java/com/shopify/reactnative/skia/SkiaTextureView.java

@@ -15,7 +15,6 @@ public class SkiaTextureView extends TextureView implements TextureView.SurfaceT
 
     SkiaViewAPI mApi;
     boolean mDebug;
-    public boolean isDropped = false;
 
     public SkiaTextureView(Context context, SkiaViewAPI api, boolean debug) {
         super(context);
@@ -25,22 +24,6 @@ public class SkiaTextureView extends TextureView implements TextureView.SurfaceT
         setSurfaceTextureListener(this);
     }
 
-    public void createSurfaceTexture() {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            Log.i(tag, "Create SurfaceTexture");
-            SurfaceTexture surfaceTexture = new SurfaceTexture(false);
-            setSurfaceTexture(surfaceTexture);
-            onSurfaceTextureAvailable(surfaceTexture, getWidth(), getHeight());
-        }
-    }
-
-    private void reCreateSurfaceTexture() {
-        boolean surfaceIsAlreadyAvailable = getSurfaceTexture() != null;
-        if (surfaceIsAlreadyAvailable) {
-            createSurfaceTexture();
-        }
-    }
-
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
@@ -55,19 +38,13 @@ public class SkiaTextureView extends TextureView implements TextureView.SurfaceT
     @Override
     public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surfaceTexture, int width, int height) {
         Log.i(tag, "onSurfaceTextureSizeChanged:  " + width + "x" + height);
-        if (isDropped) {
-            return;
-        }
         mApi.onSurfaceTextureChanged(surfaceTexture, width, height);
     }
 
     @Override
     public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surfaceTexture) {
         mApi.onSurfaceDestroyed();
-        if (!isDropped) {
-            reCreateSurfaceTexture();
-        }
-        return false;
+        return true;
     }
 
     private long _prevTimestamp = 0;

package/cpp/api/JsiSkApi.h

@@ -52,6 +52,7 @@
 #include "JsiSkVertices.h"
 #include "JsiSkiaContext.h"
 #include "JsiVideo.h"
+#include "recorder/JsiRecorder.h"
 
 namespace RNSkia {
 
@@ -130,6 +131,8 @@ public:
 
     installReadonlyProperty("NativeBuffer",
                             std::make_shared<JsiNativeBufferFactory>(context));
+
+    installFunction("Recorder", JsiRecorder::createCtor(context));
   }
 };
 } // namespace RNSkia

package/cpp/api/recorder/ColorFilters.h

@@ -0,0 +1,133 @@
+#pragma once
+
+#include <optional>
+#include <string>
+#include <variant>
+#include <vector>
+
+#include <include/core/SkColorFilter.h>
+
+#include "Command.h"
+#include "Convertor.h"
+#include "DrawingCtx.h"
+
+namespace RNSkia {
+
+struct MatrixColorFilterProps {
+  std::vector<float> matrix;
+};
+
+class MatrixColorFilterCmd : public Command {
+private:
+  MatrixColorFilterProps props;
+
+public:
+  MatrixColorFilterCmd(jsi::Runtime &runtime, const jsi::Object &object,
+                       Variables &variables)
+      : Command(CommandType::PushColorFilter, "skMatrixColorFilter") {
+    convertProperty(runtime, object, "matrix", props.matrix, variables);
+  }
+
+  void pushColorFilter(DrawingCtx *ctx) {
+    if (props.matrix.size() == 20) {
+      auto cf = SkColorFilters::Matrix(props.matrix.data());
+      ctx->colorFilters.push_back(cf);
+    }
+  }
+};
+
+struct BlendColorFilterProps {
+  SkBlendMode mode;
+  SkColor color;
+};
+
+class BlendColorFilterCmd : public Command {
+private:
+  BlendColorFilterProps props;
+
+public:
+  BlendColorFilterCmd(jsi::Runtime &runtime, const jsi::Object &object,
+                      Variables &variables)
+      : Command(CommandType::PushColorFilter, "skBlendColorFilter") {
+    convertProperty(runtime, object, "mode", props.mode, variables);
+    convertProperty(runtime, object, "color", props.color, variables);
+  }
+
+  void pushColorFilter(DrawingCtx *ctx) {
+    auto cf = SkColorFilters::Blend(props.color, props.mode);
+    ctx->colorFilters.push_back(cf);
+  }
+};
+
+class LinearToSRGBGammaColorFilterCmd : public Command {
+public:
+  LinearToSRGBGammaColorFilterCmd(jsi::Runtime &runtime,
+                                  const jsi::Object &object,
+                                  Variables &variables)
+      : Command(CommandType::PushColorFilter,
+                "skLinearToSRGBGammaColorFilter") {}
+
+  void pushColorFilter(DrawingCtx *ctx) {
+    auto cf = SkColorFilters::LinearToSRGBGamma();
+    ctx->colorFilters.push_back(cf);
+  }
+};
+
+class SRGBToLinearGammaColorFilterCmd : public Command {
+public:
+  SRGBToLinearGammaColorFilterCmd(jsi::Runtime &runtime,
+                                  const jsi::Object &object,
+                                  Variables &variables)
+      : Command(CommandType::PushColorFilter,
+                "skSRGBToLinearGammaColorFilter") {}
+
+  void pushColorFilter(DrawingCtx *ctx) {
+    auto cf = SkColorFilters::SRGBToLinearGamma();
+    ctx->colorFilters.push_back(cf);
+  }
+};
+
+class LumaColorFilterCmd : public Command {
+public:
+  LumaColorFilterCmd(jsi::Runtime &runtime, const jsi::Object &object,
+                     Variables &variables)
+      : Command(CommandType::PushColorFilter, "skLumaColorFilter") {}
+
+  void pushColorFilter(DrawingCtx *ctx) {
+    auto cf = SkLumaColorFilter::Make();
+    ctx->colorFilters.push_back(cf);
+  }
+};
+
+struct LerpColorFilterProps {
+  float t;
+};
+
+class LerpColorFilterCmd : public Command {
+private:
+  LerpColorFilterProps props;
+
+public:
+  LerpColorFilterCmd(jsi::Runtime &runtime, const jsi::Object &object,
+                     Variables &variables)
+      : Command(CommandType::PushColorFilter, "skLerpColorFilter") {
+    convertProperty(runtime, object, "t", props.t, variables);
+  }
+
+  void pushColorFilter(DrawingCtx *ctx) {
+    if (ctx->colorFilters.size() >= 2) {
+      auto second = ctx->colorFilters.back();
+      ctx->colorFilters.pop_back();
+      auto first = ctx->colorFilters.back();
+      ctx->colorFilters.pop_back();
+
+      auto cf = SkColorFilters::Lerp(props.t, first, second);
+      ctx->colorFilters.push_back(cf);
+    } else {
+      // Handle error - not enough filters
+      // Could throw an exception or handle gracefully
+    }
+  }
+};
+
+} // namespace RNSkia

package/cpp/api/recorder/Command.h

@@ -0,0 +1,58 @@
+#pragma once
+
+namespace RNSkia {
+
+enum CommandType {
+  // Context
+  Group,
+  SavePaint,
+  RestorePaint,
+  SaveCTM,
+  RestoreCTM,
+  PushColorFilter,
+  PushBlurMaskFilter,
+  PushImageFilter,
+  PushPathEffect,
+  PushShader,
+  ComposeColorFilter,
+  ComposeImageFilter,
+  ComposePathEffect,
+  MaterializePaint,
+  SaveBackdropFilter,
+  SaveLayer,
+  RestorePaintDeclaration,
+  // Drawing
+  DrawBox,
+  DrawImage,
+  DrawCircle,
+  DrawPaint,
+  DrawPoints,
+  DrawPath,
+  DrawRect,
+  DrawRRect,
+  DrawOval,
+  DrawLine,
+  DrawPatch,
+  DrawVertices,
+  DrawDiffRect,
+  DrawText,
+  DrawTextPath,
+  DrawTextBlob,
+  DrawGlyphs,
+  DrawPicture,
+  DrawImageSVG,
+  DrawParagraph,
+  DrawAtlas,
+};
+
+class Command {
+public:
+  CommandType type;
+  std::string nodeType;
+
+  Command(CommandType t) : type(t) {}
+  Command(CommandType t, std::string nodeT) : type(t), nodeType(nodeT) {}
+  virtual ~Command() = default;
+};
+
+} // namespace RNSkia