@shopify/react-native-skia 2.5.4 → 2.6.0

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

@@ -5,24 +5,24 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
-import com.facebook.react.viewmanagers.WebGPUViewManagerDelegate;
-import com.facebook.react.viewmanagers.WebGPUViewManagerInterface;
+import com.facebook.react.viewmanagers.SkiaWebGPUViewManagerDelegate;
+import com.facebook.react.viewmanagers.SkiaWebGPUViewManagerInterface;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 @ReactModule(name = WebGPUViewManager.NAME)
-public class WebGPUViewManager extends ReactViewManager implements WebGPUViewManagerInterface<WebGPUView> {
+public class WebGPUViewManager extends ReactViewManager implements SkiaWebGPUViewManagerInterface<WebGPUView> {
 
-  public static final String NAME = "WebGPUView";
+  public static final String NAME = "SkiaWebGPUView";
 
-  protected WebGPUViewManagerDelegate mDelegate;
+  protected SkiaWebGPUViewManagerDelegate mDelegate;
 
   public WebGPUViewManager() {
-    mDelegate = new WebGPUViewManagerDelegate(this);
+    mDelegate = new SkiaWebGPUViewManagerDelegate(this);
   }
 
-  protected WebGPUViewManagerDelegate getDelegate() {
+  protected SkiaWebGPUViewManagerDelegate getDelegate() {
     return mDelegate;
   }
 

package/apple/{WebGPUView.h → SkiaWebGPUView.h}

@@ -12,7 +12,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface WebGPUView : RCTViewComponentView
+@interface SkiaWebGPUView : RCTViewComponentView
 @end
 
 NS_ASSUME_NONNULL_END

package/apple/{WebGPUView.mm → SkiaWebGPUView.mm}

@@ -1,6 +1,6 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
-#import "WebGPUView.h"
+#import "SkiaWebGPUView.h"
 
 #import <react/renderer/components/rnskia/ComponentDescriptors.h>
 #import <react/renderer/components/rnskia/EventEmitters.h>
@@ -12,18 +12,18 @@
 
 using namespace facebook::react;
 
-@implementation WebGPUView
+@implementation SkiaWebGPUView
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const WebGPUViewProps>();
+    static const auto defaultProps = std::make_shared<const SkiaWebGPUViewProps>();
     _props = defaultProps;
   }
   return self;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
-  return concreteComponentDescriptorProvider<WebGPUViewComponentDescriptor>();
+  return concreteComponentDescriptorProvider<SkiaWebGPUViewComponentDescriptor>();
 }
 
 - (void)prepareForRecycle {
@@ -46,9 +46,9 @@ using namespace facebook::react;
 - (void)updateProps:(const Props::Shared &)props
            oldProps:(const Props::Shared &)oldProps {
   const auto &oldViewProps =
-      *std::static_pointer_cast<const WebGPUViewProps>(_props);
+      *std::static_pointer_cast<const SkiaWebGPUViewProps>(_props);
   const auto &newViewProps =
-      *std::static_pointer_cast<const WebGPUViewProps>(props);
+      *std::static_pointer_cast<const SkiaWebGPUViewProps>(props);
 
   if (newViewProps.contextId != oldViewProps.contextId) {
     /*
@@ -72,6 +72,6 @@ using namespace facebook::react;
 
 @end
 
-Class<RCTComponentViewProtocol> WebGPUViewCls(void) { return WebGPUView.class; }
+Class<RCTComponentViewProtocol> SkiaWebGPUViewCls(void) { return SkiaWebGPUView.class; }
 
 #endif // RCT_NEW_ARCH_ENABLED

package/cpp/api/CustomBlendModes.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "include/core/SkBlender.h"
+#include "include/core/SkPaint.h"
 #include "include/core/SkString.h"
 #include "include/effects/SkRuntimeEffect.h"
 

package/cpp/api/JsiSkApi.h

@@ -34,6 +34,8 @@
 #include "JsiSkParagraphBuilder.h"
 #include "JsiSkParagraphBuilderFactory.h"
 #include "JsiSkPath.h"
+#include "JsiSkPathBuilder.h"
+#include "JsiSkPathBuilderFactory.h"
 #include "JsiSkPathEffect.h"
 #include "JsiSkPathEffectFactory.h"
 #include "JsiSkPathFactory.h"
@@ -116,6 +118,8 @@ public:
                             std::make_shared<JsiSkPathEffectFactory>(context));
     installReadonlyProperty("Path",
                             std::make_shared<JsiSkPathFactory>(context));
+    installReadonlyProperty("PathBuilder",
+                            std::make_shared<JsiSkPathBuilderFactory>(context));
     installReadonlyProperty("ColorFilter",
                             std::make_shared<JsiSkColorFilterFactory>(context));
     installReadonlyProperty("MaskFilter",

package/cpp/api/JsiSkCanvas.h

@@ -352,7 +352,7 @@ public:
     auto path = JsiSkPath::fromValue(runtime, arguments[0]);
     auto paint = JsiSkPaint::fromValue(runtime, arguments[1]);
 
-    _canvas->drawPath(*path, *paint);
+    _canvas->drawPath(path->snapshot(), *paint);
 
     return jsi::Value::undefined();
   }
@@ -439,7 +439,7 @@ public:
     auto path = JsiSkPath::fromValue(runtime, arguments[0]);
     auto op = (SkClipOp)arguments[1].asNumber();
     auto doAntiAlias = arguments[2].getBool();
-    _canvas->clipPath(*path, op, doAntiAlias);
+    _canvas->clipPath(path->snapshot(), op, doAntiAlias);
     return jsi::Value::undefined();
   }
 

package/cpp/api/JsiSkContourMeasureIter.h

@@ -69,7 +69,7 @@ public:
       auto resScale = arguments[2].asNumber();
       // Return the newly constructed object
       auto iter = std::make_shared<JsiSkContourMeasureIter>(
-          std::move(context), *path, forceClosed, resScale);
+          std::move(context), path->snapshot(), forceClosed, resScale);
       return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, iter,
                                                          context);
     };