@shopify/react-native-skia 0.1.228 → 0.1.230

package/android/cpp/jni/JniLoad.cpp

@@ -1,6 +1,5 @@
 #include "JniPlatformContext.h"
 #include "JniSkiaDomView.h"
-#include "JniSkiaDrawView.h"
 #include "JniSkiaManager.h"
 #include "JniSkiaPictureView.h"
 #include <fbjni/fbjni.h>
@@ -9,7 +8,6 @@
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
     RNSkia::JniSkiaManager::registerNatives();
-    RNSkia::JniSkiaDrawView::registerNatives();
     RNSkia::JniSkiaPictureView::registerNatives();
     RNSkia::JniSkiaDomView::registerNatives();
     RNSkia::JniPlatformContext::registerNatives();

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

@@ -6,7 +6,6 @@ import android.util.Log;
 
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.module.annotations.ReactModule;
 

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

@@ -42,8 +42,7 @@ public class RNSkiaPackage extends TurboReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(new SkiaDrawViewManager(),
-                new SkiaPictureViewManager(), new SkiaDomViewManager());
+        return Arrays.<ViewManager>asList(new SkiaPictureViewManager(), new SkiaDomViewManager());
     }
 
     @Override

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

@@ -13,11 +13,8 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
 
     private String tag = "SkiaView";
 
-    private boolean manageTexture = false;
-
-    public SkiaBaseView(Context context, boolean manageTexture) {
+    public SkiaBaseView(Context context) {
         super(context);
-        this.manageTexture = manageTexture;
         mTexture = new TextureView(context);
         mTexture.setSurfaceTextureListener(this);
         mTexture.setOpaque(false);
@@ -30,14 +27,12 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
     }
 
     private void createSurfaceTexture() {
-        if (manageTexture) {
-            // This API Level is >= 26, we created our own SurfaceTexture to have a faster time to first frame
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                Log.i(tag, "Create SurfaceTexture");
-                SurfaceTexture surface = new SurfaceTexture(false);
-                mTexture.setSurfaceTexture(surface);
-                this.onSurfaceTextureAvailable(surface, this.getMeasuredWidth(), this.getMeasuredHeight());
-            }
+        // This API Level is >= 26, we created our own SurfaceTexture to have a faster time to first frame
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            Log.i(tag, "Create SurfaceTexture");
+            SurfaceTexture surface = new SurfaceTexture(false);
+            mTexture.setSurfaceTexture(surface);
+            this.onSurfaceTextureAvailable(surface, this.getMeasuredWidth(), this.getMeasuredHeight());
         }
     }
 

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

@@ -11,7 +11,7 @@ public class SkiaDomView extends SkiaBaseView {
     private HybridData mHybridData;
 
     public SkiaDomView(Context context) {
-        super(context, true);
+        super(context);
         RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
         mHybridData = initHybrid(skiaModule.getSkiaManager());
     }

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

@@ -11,7 +11,7 @@ public class SkiaPictureView extends SkiaBaseView {
     private HybridData mHybridData;
 
     public SkiaPictureView(Context context) {
-        super(context, true);
+        super(context);
         RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
         mHybridData = initHybrid(skiaModule.getSkiaManager());
     }

package/cpp/api/JsiSkApi.h

@@ -25,6 +25,7 @@
 #include "JsiSkMatrix.h"
 #include "JsiSkPaint.h"
 #include "JsiSkParagraphBuilder.h"
+#include "JsiSkParagraphBuilderFactory.h"
 #include "JsiSkPath.h"
 #include "JsiSkPathEffect.h"
 #include "JsiSkPathEffectFactory.h"
@@ -62,7 +63,9 @@ public:
    */
   JsiSkApi(jsi::Runtime &runtime, std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(context) {
-
+    // We create the system font manager eagerly since it has proven to be too
+    // slow to do it on demand
+    JsiSkFontMgrFactory::getFontMgr(getContext());
     installFunction("Font", JsiSkFont::createCtor(context));
     installFunction("Paint", JsiSkPaint::createCtor(context));
     installFunction("RSXform", JsiSkRSXform::createCtor(context));

package/cpp/api/JsiSkParagraph.h

@@ -55,6 +55,18 @@ public:
     return static_cast<double>(_paragraph->getMaxWidth());
   }
 
+  JSI_HOST_FUNCTION(getMaxIntrinsicWidth) {
+    return static_cast<double>(_paragraph->getMaxIntrinsicWidth());
+  }
+
+  JSI_HOST_FUNCTION(getMinIntrinsicWidth) {
+    return static_cast<double>(_paragraph->getMinIntrinsicWidth());
+  }
+
+  JSI_HOST_FUNCTION(getLongestLine) {
+    return static_cast<double>(_paragraph->getLongestLine());
+  }
+
   JSI_HOST_FUNCTION(getGlyphPositionAtCoordinate) {
     auto dx = getArgumentAsNumber(runtime, arguments, count, 0);
     auto dy = getArgumentAsNumber(runtime, arguments, count, 1);
@@ -113,6 +125,9 @@ public:
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkParagraph, layout),
                        JSI_EXPORT_FUNC(JsiSkParagraph, paint),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getMaxWidth),
+                       JSI_EXPORT_FUNC(JsiSkParagraph, getMinIntrinsicWidth),
+                       JSI_EXPORT_FUNC(JsiSkParagraph, getMaxIntrinsicWidth),
+                       JSI_EXPORT_FUNC(JsiSkParagraph, getLongestLine),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getHeight),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getRectsForPlaceholders),
                        JSI_EXPORT_FUNC(JsiSkParagraph,

package/cpp/api/JsiSkParagraphBuilder.h

@@ -7,6 +7,7 @@
 
 #include <JsiSkFont.h>
 #include <JsiSkFontMgr.h>
+#include <JsiSkFontMgrFactory.h>
 #include <JsiSkHostObjects.h>
 #include <JsiSkParagraph.h>
 #include <JsiSkParagraphStyle.h>
@@ -113,7 +114,8 @@ public:
                                  sk_sp<SkFontMgr> fontManager)
       : JsiSkHostObject(std::move(context)) {
     _fontCollection = sk_make_sp<para::FontCollection>();
-    _fontCollection->setDefaultFontManager(getContext()->createFontMgr());
+    auto fontMgr = JsiSkFontMgrFactory::getFontMgr(getContext());
+    _fontCollection->setDefaultFontManager(fontMgr);
     if (fontManager != nullptr) {
       _fontCollection->setAssetFontManager(fontManager);
     }
@@ -125,35 +127,4 @@ private:
   std::unique_ptr<para::ParagraphBuilder> _builder;
   sk_sp<para::FontCollection> _fontCollection;
 };
-
-/**
- Implementation of the ParagraphBuilderFactory for making ParagraphBuilder JSI
- object
- */
-class JsiSkParagraphBuilderFactory : public JsiSkHostObject {
-public:
-  JSI_HOST_FUNCTION(Make) {
-    // Get paragraph style from params
-    auto paragraphStyle =
-        count > 0 ? JsiSkParagraphStyle::fromValue(runtime, arguments[0])
-                  : para::ParagraphStyle();
-
-    // get font manager
-    auto fontMgr =
-        count > 1 ? JsiSkTypefaceFontProvider::fromValue(runtime, arguments[1])
-                  : nullptr;
-
-    // Create the paragraph builder
-    return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkParagraphBuilder>(
-                     getContext(), paragraphStyle, fontMgr));
-  }
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkParagraphBuilderFactory, Make))
-
-  explicit JsiSkParagraphBuilderFactory(
-      std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
-};
-
 } // namespace RNSkia

package/cpp/api/JsiSkParagraphBuilderFactory.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include <JsiSkParagraphBuilder.h>
+#include <JsiSkParagraphStyle.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "ParagraphBuilder.h"
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+namespace jsi = facebook::jsi;
+
+namespace para = skia::textlayout;
+
+/**
+ Implementation of the ParagraphBuilderFactory for making ParagraphBuilder JSI
+ object
+ */
+class JsiSkParagraphBuilderFactory : public JsiSkHostObject {
+public:
+  JSI_HOST_FUNCTION(Make) {
+    // Get paragraph style from params
+    auto paragraphStyle =
+        count > 0 ? JsiSkParagraphStyle::fromValue(runtime, arguments[0])
+                  : para::ParagraphStyle();
+
+    // get font manager
+    auto fontMgr =
+        count > 1 ? JsiSkTypefaceFontProvider::fromValue(runtime, arguments[1])
+                  : nullptr;
+
+    // Create the paragraph builder
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkParagraphBuilder>(
+                     getContext(), paragraphStyle, fontMgr));
+  }
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkParagraphBuilderFactory, Make))
+
+  explicit JsiSkParagraphBuilderFactory(
+      std::shared_ptr<RNSkPlatformContext> context)
+      : JsiSkHostObject(std::move(context)) {}
+};
+
+} // namespace RNSkia

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -10,7 +10,6 @@
 #include "JsiHostObject.h"
 #include "JsiValueWrapper.h"
 #include "RNSkPlatformContext.h"
-#include "RNSkValue.h"
 #include "RNSkView.h"
 #include <jsi/jsi.h>
 
@@ -178,59 +177,8 @@ public:
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(registerValuesInView) {
-    // 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();
-    }
-
-    // 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 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))
 

package/cpp/rnskia/RNSkManager.cpp

@@ -7,7 +7,6 @@
 
 #include <JsiSkApi.h>
 #include <RNSkJsiViewApi.h>
-#include <RNSkValueApi.h>
 #include <RNSkView.h>
 
 #include <JsiDomApi.h>
@@ -80,11 +79,6 @@ void RNSkManager::installBindings() {
       *_jsRuntime, "SkiaViewApi",
       jsi::Object::createFromHostObject(*_jsRuntime, _viewApi));
 
-  auto skiaValueApi = std::make_shared<RNSkValueApi>(_platformContext);
-  _jsRuntime->global().setProperty(
-      *_jsRuntime, "SkiaValueApi",
-      jsi::Object::createFromHostObject(*_jsRuntime, std::move(skiaValueApi)));
-
   auto skiaDomApi = std::make_shared<JsiDomApi>(_platformContext);
   _jsRuntime->global().setProperty(
       *_jsRuntime, "SkiaDomApi",

package/cpp/rnskia/RNSkView.h

@@ -8,7 +8,6 @@
 
 #include "JsiValueWrapper.h"
 #include "RNSkPlatformContext.h"
-#include "RNSkValue.h"
 
 #include "JsiSkImage.h"
 #include "JsiSkPoint.h"
@@ -163,13 +162,7 @@ public:
   /**
    Destructor
    */
-  virtual ~RNSkView() {
-    endDrawingLoop();
-    if (_onSizeUnsubscribe != nullptr) {
-      _onSizeUnsubscribe();
-      _onSizeUnsubscribe = nullptr;
-    }
-  }
+  virtual ~RNSkView() { endDrawingLoop(); }
 
   /**
    Sets custom properties. Custom properties are properties that are set
@@ -177,37 +170,7 @@ public:
    */
   virtual void setJsiProperties(
       std::unordered_map<std::string, RNJsi::JsiValueWrapper> &props) {
-
-    for (auto &prop : props) {
-      if (prop.first == "onSize") {
-        // Start by removing any subscribers to the current onSize
-        if (_onSizeUnsubscribe != nullptr) {
-          _onSizeUnsubscribe();
-          _onSizeUnsubscribe = nullptr;
-        }
-        if (prop.second.isUndefinedOrNull()) {
-          // Clear touchCallback
-          _onSize = nullptr;
-        } else if (prop.second.getType() !=
-                   RNJsi::JsiWrapperValueType::HostObject) {
-          // We expect a function for the draw callback custom property
-          throw std::runtime_error(
-              "Expected a Skia mutable value for the onSize property.");
-        }
-        // Save onSize
-        _onSize =
-            std::dynamic_pointer_cast<RNSkValue>(prop.second.getAsHostObject());
-
-        // Add listener
-        _onSizeUnsubscribe =
-            _onSize->addListener([weakSelf = weak_from_this()](jsi::Runtime &) {
-              auto self = weakSelf.lock();
-              if (self) {
-                self->requestRedraw();
-              }
-            });
-      }
-    }
+    // Nothing here...
   }
 
   /**
@@ -326,53 +289,6 @@ private:
         });
   }
 
-  void updateOnSize() {
-    if (_onSize != nullptr) {
-      auto width = _canvasProvider->getScaledWidth() /
-                   _platformContext->getPixelDensity();
-      auto height = _canvasProvider->getScaledHeight() /
-                    _platformContext->getPixelDensity();
-
-      _platformContext->runOnJavascriptThread(
-          [width, height, weakSelf = weak_from_this()]() {
-            auto self = weakSelf.lock();
-            if (self) {
-              auto runtime = self->_platformContext->getJsRuntime();
-              auto onSize = self->_onSize->getCurrent(*runtime);
-              if (!onSize.isObject()) {
-                throw jsi::JSError(
-                    *runtime,
-                    "Expected onSize property to be a mutable Skia value.");
-                return;
-              }
-              auto onSizeObj = onSize.asObject(*runtime);
-
-              auto wVal = onSizeObj.getProperty(*runtime, "width");
-              auto hVal = onSizeObj.getProperty(*runtime, "height");
-
-              if (!wVal.isNumber() || !hVal.isNumber()) {
-                throw jsi::JSError(*runtime,
-                                   "Expected onSize property to be a mutable "
-                                   "Skia value of type SkSize.");
-                return;
-              }
-
-              auto w = wVal.asNumber();
-              auto h = hVal.asNumber();
-
-              if (w != width || h != height) {
-                // Update
-                auto newValue = jsi::Object(*runtime);
-                newValue.setProperty(*runtime, "width", width);
-                newValue.setProperty(*runtime, "height", height);
-                self->_onSize->set_current(*runtime,
-                                           jsi::Value(*runtime, newValue));
-              }
-            }
-          });
-    }
-  }
-
   /**
     Draw loop callback
    */
@@ -381,9 +297,6 @@ private:
         _drawingMode == RNSkDrawingMode::Continuous) {
       _redrawRequestCounter = 0;
 
-      // Update size if needed
-      updateOnSize();
-
       if (!_renderer->tryRender(_canvasProvider)) {
         // The renderer could not render cause it was busy, just schedule
         // redrawing on the next frame.
@@ -396,8 +309,6 @@ private:
   std::shared_ptr<RNSkCanvasProvider> _canvasProvider;
   std::shared_ptr<RNSkRenderer> _renderer;
 
-  std::shared_ptr<RNSkValue> _onSize;
-  std::function<void()> _onSizeUnsubscribe;
   RNSkDrawingMode _drawingMode = RNSkDrawingMode::Default;
   size_t _nativeId;
 

package/cpp/rnskia/dom/JsiDomApi.h

@@ -8,8 +8,6 @@
 
 #include "JsiHostObject.h"
 
-#include "base/JsiDependencyManager.h"
-
 #include "nodes/JsiCircleNode.h"
 #include "nodes/JsiDiffRectNode.h"
 #include "nodes/JsiFillNode.h"
@@ -40,8 +38,6 @@
 #include "nodes/JsiBoxNode.h"
 #include "nodes/JsiBoxShadowNode.h"
 
-#include "nodes/JsiCustomDrawingNode.h"
-
 #include "nodes/JsiGlyphsNode.h"
 #include "nodes/JsiTextBlobNode.h"
 #include "nodes/JsiTextNode.h"
@@ -58,8 +54,6 @@ class JsiDomApi : public JsiHostObject {
 public:
   explicit JsiDomApi(std::shared_ptr<RNSkPlatformContext> context)
       : JsiHostObject() {
-    installFunction("DependencyManager",
-                    JsiDependencyManager::createCtor(context));
 
     // Shapes
     installFunction("RectNode", JsiRectNode::createCtor(context));
@@ -154,9 +148,6 @@ public:
     installFunction("BoxNode", JsiBoxNode::createCtor(context));
     installFunction("BoxShadowNode", JsiBoxShadowNode::createCtor(context));
 
-    installFunction("CustomDrawingNode",
-                    JsiCustomDrawingNode::createCtor(context));
-
     installFunction("GlyphsNode", JsiGlyphsNode::createCtor(context));
     installFunction("TextNode", JsiTextNode::createCtor(context));
     installFunction("TextPathNode", JsiTextPathNode::createCtor(context));

package/lib/commonjs/animation/index.d.ts

@@ -1,4 +1 @@
-export * from "./timing";
-export * from "./spring";
-export * from "./decay";
 export * from "./functions";

package/lib/commonjs/animation/index.js

@@ -4,45 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _timing = require("./timing");
-
-Object.keys(_timing).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _timing[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _timing[key];
-    }
-  });
-});
-
-var _spring = require("./spring");
-
-Object.keys(_spring).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _spring[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _spring[key];
-    }
-  });
-});
-
-var _decay = require("./decay");
-
-Object.keys(_decay).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _decay[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _decay[key];
-    }
-  });
-});
-
 var _functions = require("./functions");
 
 Object.keys(_functions).forEach(function (key) {

package/lib/commonjs/animation/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./timing\";\nexport * from \"./spring\";\nexport * from \"./decay\";\nexport * from \"./functions\";\n"],"mappings":";;;;;;AAAA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./functions\";\n"],"mappings":";;;;;;AAAA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}

package/lib/commonjs/dom/nodes/JsiSkDOM.d.ts

@@ -1,4 +1,4 @@
-import type { PathProps, SkDOM, GroupProps, ImageProps, BlurImageFilterProps, MatrixColorFilterProps, CircleProps, BlurMaskFilterProps, LinearGradientProps, PaintProps, ShaderProps, ImageShaderProps, CustomDrawingNodeProps, LineProps, OvalProps, PatchProps, PointsProps, RectProps, RoundedRectProps, VerticesProps, TextProps, DiffRectProps, OffsetImageFilterProps, BlendColorFilterProps, TextPathProps, TextBlobProps, GlyphsProps, TwoPointConicalGradientProps, TurbulenceProps, SweepGradientProps, RadialGradientProps, FractalNoiseProps, ColorProps, PictureProps, ImageSVGProps, LerpColorFilterProps, DrawingNodeProps, BoxProps, BoxShadowProps, ChildrenProps } from "../types";
+import type { PathProps, SkDOM, GroupProps, ImageProps, BlurImageFilterProps, MatrixColorFilterProps, CircleProps, BlurMaskFilterProps, LinearGradientProps, PaintProps, ShaderProps, ImageShaderProps, LineProps, OvalProps, PatchProps, PointsProps, RectProps, RoundedRectProps, VerticesProps, TextProps, DiffRectProps, OffsetImageFilterProps, BlendColorFilterProps, TextPathProps, TextBlobProps, GlyphsProps, TwoPointConicalGradientProps, TurbulenceProps, SweepGradientProps, RadialGradientProps, FractalNoiseProps, ColorProps, PictureProps, ImageSVGProps, LerpColorFilterProps, DrawingNodeProps, BoxProps, BoxShadowProps, ChildrenProps } from "../types";
 import type { BlendImageFilterProps, BlendProps, DisplacementMapImageFilterProps, DropShadowImageFilterProps, MorphologyImageFilterProps, RuntimeShaderImageFilterProps } from "../types/ImageFilters";
 import type { CornerPathEffectProps, DashPathEffectProps, DiscretePathEffectProps, Line2DPathEffectProps, Path1DPathEffectProps, Path2DPathEffectProps } from "../types/PathEffects";
 import type { ParagraphProps } from "../types/Paragraph";
@@ -13,7 +13,6 @@ export declare class JsiSkDOM implements SkDOM {
     Image(props: ImageProps): import("../types").RenderNode<ImageProps>;
     Circle(props: CircleProps): import("../types").RenderNode<CircleProps>;
     Path(props: PathProps): import("../types").RenderNode<PathProps>;
-    CustomDrawing(props: CustomDrawingNodeProps): import("../types").RenderNode<CustomDrawingNodeProps>;
     Line(props: LineProps): import("../types").RenderNode<LineProps>;
     Oval(props: OvalProps): import("../types").RenderNode<OvalProps>;
     Patch(props: PatchProps): import("../types").RenderNode<PatchProps>;

package/lib/commonjs/dom/nodes/JsiSkDOM.js

@@ -59,12 +59,6 @@ class JsiSkDOM {
     return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.PathNode(props ?? {}) : new _drawings.PathNode(this.ctx, props);
   }
 
-  CustomDrawing(props) {
-    console.warn( // eslint-disable-next-line max-len
-    "The <Drawing /> component is deprecated and will be removed in the next release. For custom drawings, please sure the <Picture /> component: https://shopify.github.io/react-native-skia/docs/shapes/pictures/");
-    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.CustomDrawingNode(props ?? {}) : new _drawings.CustomDrawingNode(this.ctx, props);
-  }
-
   Line(props) {
     return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.LineNode(props ?? {}) : new _drawings.LineNode(this.ctx, props);
   }