@shopify/react-native-skia 1.8.1 → 1.9.0

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

@@ -7,7 +7,7 @@
 class MainThreadDispatcher {
 private:
   ALooper *mainLooper = nullptr;
-  int messagePipe[2] = { -1, -1 };
+  int messagePipe[2] = {-1, -1};
   std::queue<std::function<void()>> taskQueue;
   std::mutex queueMutex;
 

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

@@ -122,8 +122,8 @@ public:
       format = GrBackendFormats::MakeGL(GR_GL_RGBA16F, GR_GL_TEXTURE_EXTERNAL);
       break;
     case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
-        GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
-        break;
+      GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
+      break;
     case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGB10_A2, GR_GL_TEXTURE_EXTERNAL);
       break;
@@ -146,8 +146,8 @@ public:
     auto height = static_cast<int>(description.height);
     auto backendTex = MakeGLBackendTexture(
         _directContext.get(), const_cast<AHardwareBuffer *>(hardwareBuffer),
-        width, height, &deleteImageProc,
-        &updateImageProc, &deleteImageCtx, false, format, false);
+        width, height, &deleteImageProc, &updateImageProc, &deleteImageCtx,
+        false, format, false);
     if (!backendTex.isValid()) {
       RNSkLogger::logToConsole(
           "Failed to convert HardwareBuffer to OpenGL Texture!");

package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp

@@ -26,7 +26,8 @@ namespace RNSkia {
 RNSkOpenGLCanvasProvider::RNSkOpenGLCanvasProvider(
     std::function<void()> requestRedraw,
     std::shared_ptr<RNSkia::RNSkPlatformContext> platformContext)
-    : RNSkCanvasProvider(std::move(requestRedraw)), _platformContext(std::move(platformContext)) {}
+    : RNSkCanvasProvider(std::move(requestRedraw)),
+      _platformContext(std::move(platformContext)) {}
 
 RNSkOpenGLCanvasProvider::~RNSkOpenGLCanvasProvider() = default;
 
@@ -109,8 +110,7 @@ void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject jSurfaceTexture,
 #if defined(SK_GRAPHITE)
   _surfaceHolder = DawnContext::getInstance().MakeWindow(window, width, height);
 #else
-  _surfaceHolder =
-      OpenGLContext::getInstance().MakeWindow(window);
+  _surfaceHolder = OpenGLContext::getInstance().MakeWindow(window);
 #endif
 
   // Post redraw request to ensure we paint in the next draw cycle.

package/cpp/api/JsiSkCanvas.h

@@ -525,32 +525,34 @@ public:
 
     std::vector<SkColor> colors;
     if (count > 5 && !arguments[5].isUndefined()) {
-        auto colorsArray = arguments[5].asObject(runtime).asArray(runtime);
-        int colorsSize = static_cast<int>(colorsArray.size(runtime));
-        colors.reserve(colorsSize);
-        for (int i = 0; i < colorsSize; i++) {
-            // Convert from [r,g,b,a] in [0,1] to SkColor
-            auto val = colorsArray.getValueAtIndex(runtime, i).asObject(runtime);
-            float r = val.getProperty(runtime, "0").asNumber();
-            float g = val.getProperty(runtime, "1").asNumber();
-            float b = val.getProperty(runtime, "2").asNumber();
-            float a = val.getProperty(runtime, "3").asNumber();
-
-            // Convert to 8-bit color channels and pack into SkColor
-            uint8_t r8 = static_cast<uint8_t>(r * 255);
-            uint8_t g8 = static_cast<uint8_t>(g * 255);
-            uint8_t b8 = static_cast<uint8_t>(b * 255);
-            uint8_t a8 = static_cast<uint8_t>(a * 255);
-            
-            SkColor color = SkColorSetARGB(a8, r8, g8, b8);
-            colors.push_back(color);
-        }
+      auto colorsArray = arguments[5].asObject(runtime).asArray(runtime);
+      int colorsSize = static_cast<int>(colorsArray.size(runtime));
+      colors.reserve(colorsSize);
+      for (int i = 0; i < colorsSize; i++) {
+        // Convert from [r,g,b,a] in [0,1] to SkColor
+        auto val = colorsArray.getValueAtIndex(runtime, i).asObject(runtime);
+        float r = val.getProperty(runtime, "0").asNumber();
+        float g = val.getProperty(runtime, "1").asNumber();
+        float b = val.getProperty(runtime, "2").asNumber();
+        float a = val.getProperty(runtime, "3").asNumber();
+
+        // Convert to 8-bit color channels and pack into SkColor
+        uint8_t r8 = static_cast<uint8_t>(r * 255);
+        uint8_t g8 = static_cast<uint8_t>(g * 255);
+        uint8_t b8 = static_cast<uint8_t>(b * 255);
+        uint8_t a8 = static_cast<uint8_t>(a * 255);
+
+        SkColor color = SkColorSetARGB(a8, r8, g8, b8);
+        colors.push_back(color);
+      }
     }
-
-    SkSamplingOptions sampling(SkFilterMode::kLinear, SkMipmapMode::kNone);
-    _canvas->drawAtlas(atlas.get(), xforms.data(), skRects.data(), colors.data(),
-                       skRects.size(), blendMode, sampling, nullptr,
-                       paint.get());
+    SkSamplingOptions sampling(SkFilterMode::kLinear);
+    if (count > 6) {
+      sampling = SamplingOptionsFromValue(runtime, arguments[5]);
+    }
+    _canvas->drawAtlas(atlas.get(), xforms.data(), skRects.data(),
+                       colors.data(), skRects.size(), blendMode, sampling,
+                       nullptr, paint.get());
 
     return jsi::Value::undefined();
   }

package/cpp/api/JsiSkImage.h

@@ -36,6 +36,30 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
+inline SkSamplingOptions SamplingOptionsFromValue(jsi::Runtime &runtime,
+                                                  const jsi::Value &val) {
+  SkSamplingOptions samplingOptions(SkFilterMode::kLinear);
+  if (val.isObject()) {
+    auto object = val.asObject(runtime);
+    if (object.hasProperty(runtime, "B") && object.hasProperty(runtime, "C")) {
+      auto B = static_cast<float>(object.getProperty(runtime, "B").asNumber());
+      auto C = static_cast<float>(object.getProperty(runtime, "C").asNumber());
+      samplingOptions = SkSamplingOptions({B, C});
+    } else if (object.hasProperty(runtime, "filter")) {
+      auto filter = static_cast<SkFilterMode>(
+          object.getProperty(runtime, "filter").asNumber());
+      if (object.hasProperty(runtime, "mipmap")) {
+        auto mipmap = static_cast<SkMipmapMode>(
+            object.getProperty(runtime, "mipmap").asNumber());
+        samplingOptions = SkSamplingOptions(filter, mipmap);
+      } else {
+        samplingOptions = SkSamplingOptions(filter);
+      }
+    }
+  }
+  return samplingOptions;
+}
+
 class JsiSkImage : public JsiSkWrappingSkPtrHostObject<SkImage> {
 public:
   // TODO-API: Properties?

package/cpp/api/JsiSkPaint.h

@@ -28,7 +28,7 @@ public:
   EXPORT_JSI_API_TYPENAME(JsiSkPaint, Paint)
 
   JSI_HOST_FUNCTION(assign) {
-    SkPaint* paint = JsiSkPaint::fromValue(runtime, arguments[0]).get();
+    SkPaint *paint = JsiSkPaint::fromValue(runtime, arguments[0]).get();
     *getObject() = *paint;
     return jsi::Value::undefined();
   }

package/cpp/rnskia/dom/nodes/JsiAtlasNode.h

@@ -3,6 +3,7 @@
 #include "JsiDomDrawingNode.h"
 #include "RSXformProp.h"
 #include "RectProp.h"
+#include "SamplingProp.h"
 #include "SkImageProps.h"
 
 #include <memory>
@@ -28,7 +29,8 @@ protected:
                                  ? *_blendModeProp->getDerivedValue()
                                  : SkBlendMode::kDstOver;
       auto paint = *context->getPaint();
-      SkSamplingOptions sampling(SkFilterMode::kLinear, SkMipmapMode::kNone);
+      auto sampling = _samplingProp->isSet() ? *_samplingProp->getDerivedValue()
+                                             : SkSamplingOptions(SkFilterMode::kLinear);
       context->getCanvas()->drawAtlas(
           image.get(), transforms->data(), sprites->data(),
           colors == nullptr ? nullptr : colors->data(), sprites->size(),
@@ -43,6 +45,7 @@ protected:
     _imageProp = container->defineProperty<ImageProp>("image");
     _colorsProp = container->defineProperty<ColorsProp>("colors");
     _blendModeProp = container->defineProperty<BlendModeProp>("blendMode");
+    _samplingProp = container->defineProperty<SamplingProp>("sampling");
 
     _rectsProp->require();
     _rsxFormsProp->require();
@@ -54,6 +57,7 @@ private:
   RSXFormsProp *_rsxFormsProp;
   ColorsProp *_colorsProp;
   BlendModeProp *_blendModeProp;
+  SamplingProp *_samplingProp;
 };
 
 } // namespace RNSkia

package/cpp/rnskia/dom/nodes/JsiImageNode.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "JsiDomDrawingNode.h"
+#include "SamplingProp.h"
 #include "SkImageProps.h"
 
 #include <memory>
@@ -20,19 +21,22 @@ protected:
     if (image == nullptr) {
       return;
     }
-
-    context->getCanvas()->drawImageRect(
-        image, rects->src, rects->dst, SkSamplingOptions(),
-        context->getPaint().get(), SkCanvas::kStrict_SrcRectConstraint);
+    auto sampling = _samplingProp->isSet() ? *_samplingProp->getDerivedValue()
+                                           : SkSamplingOptions(SkFilterMode::kLinear);
+    context->getCanvas()->drawImageRect(image, rects->src, rects->dst, sampling,
+                                        context->getPaint().get(),
+                                        SkCanvas::kStrict_SrcRectConstraint);
   }
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
     _imageProps = container->defineProperty<ImageProps>();
+    _samplingProp = container->defineProperty<SamplingProp>("sampling");
   }
 
 private:
   ImageProps *_imageProps;
+  SamplingProp *_samplingProp;
 };
 
 } // namespace RNSkia

package/cpp/rnskia/dom/nodes/JsiShaderNodes.h

@@ -6,6 +6,7 @@
 #include "ColorProp.h"
 #include "NodeProp.h"
 #include "NumbersProp.h"
+#include "SamplingProp.h"
 #include "TileModeProp.h"
 #include "TransformsProps.h"
 #include "UniformsProp.h"
@@ -120,12 +121,12 @@ public:
       }
     }
 
-    context->getShaders()->push(image->makeShader(
-        *_txProp->getDerivedValue(), *_tyProp->getDerivedValue(),
-        SkSamplingOptions(
-            getFilterModeFromString(_filterModeProp->value().getAsString()),
-            getMipmapModeFromString(_mipmapModeProp->value().getAsString())),
-        &_matrix));
+    auto samplingOptions = _samplingProp->isSet()
+                               ? *_samplingProp->getDerivedValue()
+                               : SkSamplingOptions(SkFilterMode::kLinear);
+    context->getShaders()->push(image->makeShader(*_txProp->getDerivedValue(),
+                                                  *_tyProp->getDerivedValue(),
+                                                  samplingOptions, &_matrix));
   }
 
 protected:
@@ -133,17 +134,14 @@ protected:
     JsiDomDeclarationNode::defineProperties(container);
     _txProp = container->defineProperty<TileModeProp>("tx");
     _tyProp = container->defineProperty<TileModeProp>("ty");
-    _filterModeProp = container->defineProperty<NodeProp>("fm");
-    _mipmapModeProp = container->defineProperty<NodeProp>("mm");
 
+    _samplingProp = container->defineProperty<SamplingProp>("sampling");
     _imageProps = container->defineProperty<ImageProps>();
     _transformProp = container->defineProperty<TransformProp>("transform");
     _originProp = container->defineProperty<PointProp>("origin");
 
     _txProp->require();
     _tyProp->require();
-    _filterModeProp->require();
-    _mipmapModeProp->require();
 
     _transformProp->require();
 
@@ -152,41 +150,14 @@ protected:
   }
 
 private:
-  SkFilterMode getFilterModeFromString(const std::string &value) {
-    if (value == "last") {
-      return SkFilterMode::kLast;
-    } else if (value == "linear") {
-      return SkFilterMode::kLinear;
-    } else if (value == "nearest") {
-      return SkFilterMode::kNearest;
-    }
-    throw std::runtime_error("The value \"" + value +
-                             "\" is not a valid Filter Mode.");
-  }
-
-  SkMipmapMode getMipmapModeFromString(const std::string &value) {
-    if (value == "last") {
-      return SkMipmapMode::kLast;
-    } else if (value == "last") {
-      return SkMipmapMode::kLast;
-    } else if (value == "last") {
-      return SkMipmapMode::kLast;
-    } else if (value == "none") {
-      return SkMipmapMode::kNone;
-    }
-    throw std::runtime_error("The value \"" + value +
-                             "\" is not a valid Mipmap Mode.");
-  }
-
   SkMatrix _matrix;
 
   TileModeProp *_txProp;
   TileModeProp *_tyProp;
-  NodeProp *_filterModeProp;
-  NodeProp *_mipmapModeProp;
   ImageProps *_imageProps;
   TransformProp *_transformProp;
   PointProp *_originProp;
+  SamplingProp *_samplingProp;
 };
 
 class JsiColorShaderNode : public JsiDomDeclarationNode,

package/cpp/rnskia/dom/props/SamplingProp.h

@@ -0,0 +1,54 @@
+#pragma once
+
+#include "include/core/SkSamplingOptions.h"
+
+namespace RNSkia {
+
+static PropId PropNameCubicB = JsiPropId::get("B");
+static PropId PropNameCubicC = JsiPropId::get("C");
+static PropId PropNameFilter = JsiPropId::get("filter");
+static PropId PropNameMipmap = JsiPropId::get("mipmap");
+
+class SamplingProp : public DerivedProp<SkSamplingOptions> {
+public:
+  explicit SamplingProp(PropId name,
+                        const std::function<void(BaseNodeProp *)> &onChange)
+      : DerivedProp(onChange) {
+    _prop = defineProperty<NodeProp>(name);
+  }
+
+  static SkSamplingOptions processSamplingOptions(const JsiValue &value) {
+    SkSamplingOptions samplingOptions(SkFilterMode::kLinear);
+    if (value.getType() == PropType::Object) {
+      if (value.hasValue(PropNameCubicB) && value.hasValue(PropNameCubicC)) {
+        auto B =
+            static_cast<float>(value.getValue(PropNameCubicB).getAsNumber());
+        auto C =
+            static_cast<float>(value.getValue(PropNameCubicC).getAsNumber());
+        samplingOptions = SkSamplingOptions({B, C});
+      } else if (value.hasValue(PropNameFilter)) {
+        auto filter = static_cast<SkFilterMode>(
+            value.getValue(PropNameFilter).getAsNumber());
+        if (value.hasValue(PropNameMipmap)) {
+          auto mipmap = static_cast<SkMipmapMode>(
+              value.getValue(PropNameMipmap).getAsNumber());
+          samplingOptions = SkSamplingOptions(filter, mipmap);
+        } else {
+          samplingOptions = SkSamplingOptions(filter);
+        }
+      }
+    }
+
+    return samplingOptions;
+  }
+
+  void updateDerivedValue() override {
+    if (_prop->isSet()) {
+      setDerivedValue(SamplingProp::processSamplingOptions(_prop->value()));
+    }
+  }
+
+private:
+  NodeProp *_prop;
+};
+} // namespace RNSkia

package/ios/RNSkia-iOS/SkiaManager.mm

@@ -47,14 +47,12 @@ static __weak SkiaManager *sharedInstance = nil;
   return self;
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
   sharedInstance = nil;
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
-+ (std::shared_ptr<RNSkia::RNSkManager>)latestActiveSkManager
-{
++ (std::shared_ptr<RNSkia::RNSkManager>)latestActiveSkManager {
   if (sharedInstance != nil) {
     return [sharedInstance skManager];
   }

package/lib/commonjs/dom/types/Drawings.d.ts

@@ -1,4 +1,4 @@
-import type { FillType, SkImage, StrokeOpts, Vector, Color, SkPoint, BlendMode, PointMode, VertexMode, SkFont, SkRRect, SkTextBlob, SkPicture, SkSVG, SkPaint, SkRect, SkRSXform, SkColor } from "../../skia/types";
+import type { FillType, SkImage, StrokeOpts, Vector, Color, SkPoint, BlendMode, PointMode, VertexMode, SkFont, SkRRect, SkTextBlob, SkPicture, SkSVG, SkPaint, SkRect, SkRSXform, SkColor, SamplingOptions } from "../../skia/types";
 import type { CircleDef, Fit, GroupProps, PathDef, RectDef, RRectDef, SkEnum } from "./Common";
 export interface DrawingNodeProps extends GroupProps {
     paint?: SkPaint;
@@ -6,6 +6,7 @@ export interface DrawingNodeProps extends GroupProps {
 export type ImageProps = DrawingNodeProps & RectDef & {
     fit?: Fit;
     image: SkImage | null;
+    sampling?: SamplingOptions;
 };
 export type CircleProps = CircleDef & DrawingNodeProps;
 export interface PathProps extends DrawingNodeProps {
@@ -27,6 +28,7 @@ export interface AtlasProps extends DrawingNodeProps {
     sprites: SkRect[];
     transforms: SkRSXform[];
     colors?: SkColor[];
+    sampling?: SamplingOptions;
 }
 export interface CubicBezierHandle {
     pos: Vector;

package/lib/commonjs/dom/types/Drawings.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["Drawings.ts"],"sourcesContent":["import type {\n  FillType,\n  SkImage,\n  StrokeOpts,\n  Vector,\n  Color,\n  SkPoint,\n  BlendMode,\n  PointMode,\n  VertexMode,\n  SkFont,\n  SkRRect,\n  SkTextBlob,\n  SkPicture,\n  SkSVG,\n  SkPaint,\n  SkRect,\n  SkRSXform,\n  SkColor,\n} from \"../../skia/types\";\n\nimport type {\n  CircleDef,\n  Fit,\n  GroupProps,\n  PathDef,\n  RectDef,\n  RRectDef,\n  SkEnum,\n} from \"./Common\";\n\nexport interface DrawingNodeProps extends GroupProps {\n  paint?: SkPaint;\n}\n\nexport type ImageProps = DrawingNodeProps &\n  RectDef & {\n    fit?: Fit;\n    image: SkImage | null;\n  };\n\nexport type CircleProps = CircleDef & DrawingNodeProps;\n\nexport interface PathProps extends DrawingNodeProps {\n  path: PathDef;\n  start: number;\n  end: number;\n  stroke?: StrokeOpts;\n  fillType?: SkEnum<typeof FillType>;\n}\n\nexport interface LineProps extends DrawingNodeProps {\n  p1: Vector;\n  p2: Vector;\n}\n\nexport type OvalProps = RectDef & DrawingNodeProps;\n\nexport type RectProps = RectDef & DrawingNodeProps;\n\nexport type RoundedRectProps = RRectDef & DrawingNodeProps;\n\nexport interface AtlasProps extends DrawingNodeProps {\n  image: SkImage | null;\n  sprites: SkRect[];\n  transforms: SkRSXform[];\n  colors?: SkColor[];\n}\n\nexport interface CubicBezierHandle {\n  pos: Vector;\n  c1: Vector;\n  c2: Vector;\n}\n\nexport interface PatchProps extends DrawingNodeProps {\n  colors?: Color[];\n  patch: [\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle\n  ];\n  texture?: readonly [SkPoint, SkPoint, SkPoint, SkPoint];\n  blendMode?: SkEnum<typeof BlendMode>;\n}\n\nexport interface VerticesProps extends DrawingNodeProps {\n  colors?: string[];\n  vertices: SkPoint[];\n  textures?: SkPoint[];\n  mode: SkEnum<typeof VertexMode>;\n  blendMode?: SkEnum<typeof BlendMode>;\n  indices?: number[];\n}\n\nexport interface ImageSVGProps extends DrawingNodeProps {\n  svg: SkSVG | null;\n  x?: number;\n  y?: number;\n  width?: number;\n  height?: number;\n  rect?: SkRect;\n}\n\nexport interface PictureProps extends DrawingNodeProps {\n  picture: SkPicture;\n}\n\nexport interface PointsProps extends DrawingNodeProps {\n  points: SkPoint[];\n  mode: SkEnum<typeof PointMode>;\n}\n\nexport interface DiffRectProps extends DrawingNodeProps {\n  inner: SkRRect;\n  outer: SkRRect;\n}\n\nexport interface TextProps extends DrawingNodeProps {\n  font: SkFont | null;\n  text: string;\n  x: number;\n  y: number;\n}\n\nexport interface TextPathProps extends DrawingNodeProps {\n  font: SkFont | null;\n  text: string;\n  path: PathDef;\n  initialOffset: number;\n}\n\nexport interface TextBlobProps extends DrawingNodeProps {\n  blob: SkTextBlob;\n  x: number;\n  y: number;\n}\n\nexport interface Glyph {\n  id: number;\n  pos: SkPoint;\n}\n\nexport interface GlyphsProps extends DrawingNodeProps {\n  font: SkFont | null;\n  x: number;\n  y: number;\n  glyphs: Glyph[];\n}\n\nexport interface BoxProps extends DrawingNodeProps {\n  box: SkRRect | SkRect;\n}\n\nexport interface BoxShadowProps {\n  dx?: number;\n  dy?: number;\n  spread?: number;\n  blur: number;\n  color?: Color;\n  inner?: boolean;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["Drawings.ts"],"sourcesContent":["import type {\n  FillType,\n  SkImage,\n  StrokeOpts,\n  Vector,\n  Color,\n  SkPoint,\n  BlendMode,\n  PointMode,\n  VertexMode,\n  SkFont,\n  SkRRect,\n  SkTextBlob,\n  SkPicture,\n  SkSVG,\n  SkPaint,\n  SkRect,\n  SkRSXform,\n  SkColor,\n  SamplingOptions,\n} from \"../../skia/types\";\n\nimport type {\n  CircleDef,\n  Fit,\n  GroupProps,\n  PathDef,\n  RectDef,\n  RRectDef,\n  SkEnum,\n} from \"./Common\";\n\nexport interface DrawingNodeProps extends GroupProps {\n  paint?: SkPaint;\n}\n\nexport type ImageProps = DrawingNodeProps &\n  RectDef & {\n    fit?: Fit;\n    image: SkImage | null;\n    sampling?: SamplingOptions;\n  };\n\nexport type CircleProps = CircleDef & DrawingNodeProps;\n\nexport interface PathProps extends DrawingNodeProps {\n  path: PathDef;\n  start: number;\n  end: number;\n  stroke?: StrokeOpts;\n  fillType?: SkEnum<typeof FillType>;\n}\n\nexport interface LineProps extends DrawingNodeProps {\n  p1: Vector;\n  p2: Vector;\n}\n\nexport type OvalProps = RectDef & DrawingNodeProps;\n\nexport type RectProps = RectDef & DrawingNodeProps;\n\nexport type RoundedRectProps = RRectDef & DrawingNodeProps;\n\nexport interface AtlasProps extends DrawingNodeProps {\n  image: SkImage | null;\n  sprites: SkRect[];\n  transforms: SkRSXform[];\n  colors?: SkColor[];\n  sampling?: SamplingOptions;\n}\n\nexport interface CubicBezierHandle {\n  pos: Vector;\n  c1: Vector;\n  c2: Vector;\n}\n\nexport interface PatchProps extends DrawingNodeProps {\n  colors?: Color[];\n  patch: [\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle\n  ];\n  texture?: readonly [SkPoint, SkPoint, SkPoint, SkPoint];\n  blendMode?: SkEnum<typeof BlendMode>;\n}\n\nexport interface VerticesProps extends DrawingNodeProps {\n  colors?: string[];\n  vertices: SkPoint[];\n  textures?: SkPoint[];\n  mode: SkEnum<typeof VertexMode>;\n  blendMode?: SkEnum<typeof BlendMode>;\n  indices?: number[];\n}\n\nexport interface ImageSVGProps extends DrawingNodeProps {\n  svg: SkSVG | null;\n  x?: number;\n  y?: number;\n  width?: number;\n  height?: number;\n  rect?: SkRect;\n}\n\nexport interface PictureProps extends DrawingNodeProps {\n  picture: SkPicture;\n}\n\nexport interface PointsProps extends DrawingNodeProps {\n  points: SkPoint[];\n  mode: SkEnum<typeof PointMode>;\n}\n\nexport interface DiffRectProps extends DrawingNodeProps {\n  inner: SkRRect;\n  outer: SkRRect;\n}\n\nexport interface TextProps extends DrawingNodeProps {\n  font: SkFont | null;\n  text: string;\n  x: number;\n  y: number;\n}\n\nexport interface TextPathProps extends DrawingNodeProps {\n  font: SkFont | null;\n  text: string;\n  path: PathDef;\n  initialOffset: number;\n}\n\nexport interface TextBlobProps extends DrawingNodeProps {\n  blob: SkTextBlob;\n  x: number;\n  y: number;\n}\n\nexport interface Glyph {\n  id: number;\n  pos: SkPoint;\n}\n\nexport interface GlyphsProps extends DrawingNodeProps {\n  font: SkFont | null;\n  x: number;\n  y: number;\n  glyphs: Glyph[];\n}\n\nexport interface BoxProps extends DrawingNodeProps {\n  box: SkRRect | SkRect;\n}\n\nexport interface BoxShadowProps {\n  dx?: number;\n  dy?: number;\n  spread?: number;\n  blur: number;\n  color?: Color;\n  inner?: boolean;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/commonjs/dom/types/Shaders.d.ts

@@ -1,4 +1,4 @@
-import type { Color, FilterMode, MipmapMode, SkImage, SkRect, SkRuntimeEffect, TileMode, Uniforms, Vector } from "../../skia/types";
+import type { Color, SamplingOptions, SkImage, SkRect, SkRuntimeEffect, TileMode, Uniforms, Vector } from "../../skia/types";
 import type { SkEnum, TransformProps, ChildrenProps, RectCtor, Fit } from "./Common";
 export interface ShaderProps extends TransformProps, ChildrenProps {
     source: SkRuntimeEffect;
@@ -7,11 +7,10 @@ export interface ShaderProps extends TransformProps, ChildrenProps {
 export interface ImageShaderProps extends TransformProps, Partial<RectCtor> {
     tx: SkEnum<typeof TileMode>;
     ty: SkEnum<typeof TileMode>;
-    fm: SkEnum<typeof FilterMode>;
-    mm: SkEnum<typeof MipmapMode>;
     fit: Fit;
     rect?: SkRect;
     image: SkImage | null;
+    sampling?: SamplingOptions;
 }
 export interface ColorProps {
     color: Color;

package/lib/commonjs/dom/types/Shaders.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["Shaders.ts"],"sourcesContent":["import type {\n  Color,\n  FilterMode,\n  MipmapMode,\n  SkImage,\n  SkRect,\n  SkRuntimeEffect,\n  TileMode,\n  Uniforms,\n  Vector,\n} from \"../../skia/types\";\n\nimport type {\n  SkEnum,\n  TransformProps,\n  ChildrenProps,\n  RectCtor,\n  Fit,\n} from \"./Common\";\n\nexport interface ShaderProps extends TransformProps, ChildrenProps {\n  source: SkRuntimeEffect;\n  uniforms: Uniforms;\n}\n\nexport interface ImageShaderProps extends TransformProps, Partial<RectCtor> {\n  tx: SkEnum<typeof TileMode>;\n  ty: SkEnum<typeof TileMode>;\n  fm: SkEnum<typeof FilterMode>;\n  mm: SkEnum<typeof MipmapMode>;\n  fit: Fit;\n  rect?: SkRect;\n  image: SkImage | null;\n}\n\nexport interface ColorProps {\n  color: Color;\n}\n\nexport interface TurbulenceProps {\n  freqX: number;\n  freqY: number;\n  octaves: number;\n  seed: number;\n  tileWidth: number;\n  tileHeight: number;\n}\n\nexport interface FractalNoiseProps {\n  freqX: number;\n  freqY: number;\n  octaves: number;\n  seed: number;\n  tileWidth: number;\n  tileHeight: number;\n}\n\nexport interface GradientProps extends TransformProps {\n  colors: Color[];\n  positions?: number[];\n  mode?: SkEnum<typeof TileMode>;\n  flags?: number;\n}\n\nexport interface LinearGradientProps extends GradientProps {\n  start: Vector;\n  end: Vector;\n}\n\nexport interface RadialGradientProps extends GradientProps {\n  c: Vector;\n  r: number;\n}\n\nexport interface SweepGradientProps extends GradientProps {\n  c: Vector;\n  start?: number;\n  end?: number;\n}\n\nexport interface TwoPointConicalGradientProps extends GradientProps {\n  start: Vector;\n  startR: number;\n  end: Vector;\n  endR: number;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["Shaders.ts"],"sourcesContent":["import type {\n  Color,\n  SamplingOptions,\n  SkImage,\n  SkRect,\n  SkRuntimeEffect,\n  TileMode,\n  Uniforms,\n  Vector,\n} from \"../../skia/types\";\n\nimport type {\n  SkEnum,\n  TransformProps,\n  ChildrenProps,\n  RectCtor,\n  Fit,\n} from \"./Common\";\n\nexport interface ShaderProps extends TransformProps, ChildrenProps {\n  source: SkRuntimeEffect;\n  uniforms: Uniforms;\n}\n\nexport interface ImageShaderProps extends TransformProps, Partial<RectCtor> {\n  tx: SkEnum<typeof TileMode>;\n  ty: SkEnum<typeof TileMode>;\n  fit: Fit;\n  rect?: SkRect;\n  image: SkImage | null;\n  sampling?: SamplingOptions;\n}\n\nexport interface ColorProps {\n  color: Color;\n}\n\nexport interface TurbulenceProps {\n  freqX: number;\n  freqY: number;\n  octaves: number;\n  seed: number;\n  tileWidth: number;\n  tileHeight: number;\n}\n\nexport interface FractalNoiseProps {\n  freqX: number;\n  freqY: number;\n  octaves: number;\n  seed: number;\n  tileWidth: number;\n  tileHeight: number;\n}\n\nexport interface GradientProps extends TransformProps {\n  colors: Color[];\n  positions?: number[];\n  mode?: SkEnum<typeof TileMode>;\n  flags?: number;\n}\n\nexport interface LinearGradientProps extends GradientProps {\n  start: Vector;\n  end: Vector;\n}\n\nexport interface RadialGradientProps extends GradientProps {\n  c: Vector;\n  r: number;\n}\n\nexport interface SweepGradientProps extends GradientProps {\n  c: Vector;\n  start?: number;\n  end?: number;\n}\n\nexport interface TwoPointConicalGradientProps extends GradientProps {\n  start: Vector;\n  startR: number;\n  end: Vector;\n  endR: number;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/commonjs/external/reanimated/useAnimatedImageValue.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useAnimatedImageValue = void 0;
-var _react = require("react");
 var _AnimatedImage = require("../../skia/core/AnimatedImage");
 var _ReanimatedProxy = _interopRequireDefault(require("./ReanimatedProxy"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -17,7 +16,7 @@ const useAnimatedImageValue = (source, paused) => {
   const animatedImage = (0, _AnimatedImage.useAnimatedImage)(source, err => {
     console.error(err);
     throw new Error(`Could not load animated image - got '${err.message}'`);
-  }, false);
+  });
   const frameDuration = (animatedImage === null || animatedImage === void 0 ? void 0 : animatedImage.currentFrameDuration()) || DEFAULT_FRAME_DURATION;
   _ReanimatedProxy.default.useFrameCallback(frameInfo => {
     if (!animatedImage) {
@@ -47,12 +46,6 @@ const useAnimatedImageValue = (source, paused) => {
     // Update the last timestamp
     lastTimestamp.value = timestamp;
   });
-  (0, _react.useEffect)(() => {
-    return () => {
-      animatedImage === null || animatedImage === void 0 || animatedImage.dispose();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   return currentFrame;
 };
 exports.useAnimatedImageValue = useAnimatedImageValue;

package/lib/commonjs/external/reanimated/useAnimatedImageValue.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_AnimatedImage","_ReanimatedProxy","_interopRequireDefault","e","__esModule","default","DEFAULT_FRAME_DURATION","useAnimatedImageValue","source","paused","defaultPaused","Rea","useSharedValue","isPaused","currentFrame","lastTimestamp","animatedImage","useAnimatedImage","err","console","error","Error","message","frameDuration","currentFrameDuration","useFrameCallback","frameInfo","value","timestamp","elapsed","decodeNextFrame","dispose","getCurrentFrame","useEffect","exports"],"sources":["useAnimatedImageValue.ts"],"sourcesContent":["import { useEffect } from \"react\";\nimport type { FrameInfo, SharedValue } from \"react-native-reanimated\";\n\nimport { useAnimatedImage } from \"../../skia/core/AnimatedImage\";\nimport type { DataSourceParam, SkImage } from \"../../skia/types\";\n\nimport Rea from \"./ReanimatedProxy\";\n\nconst DEFAULT_FRAME_DURATION = 60;\n\nexport const useAnimatedImageValue = (\n  source: DataSourceParam,\n  paused?: SharedValue<boolean>\n) => {\n  const defaultPaused = Rea.useSharedValue(false);\n  const isPaused = paused ?? defaultPaused;\n  const currentFrame = Rea.useSharedValue<null | SkImage>(null);\n  const lastTimestamp = Rea.useSharedValue(-1);\n  const animatedImage = useAnimatedImage(\n    source,\n    (err) => {\n      console.error(err);\n      throw new Error(`Could not load animated image - got '${err.message}'`);\n    },\n    false\n  );\n  const frameDuration =\n    animatedImage?.currentFrameDuration() || DEFAULT_FRAME_DURATION;\n\n  Rea.useFrameCallback((frameInfo: FrameInfo) => {\n    if (!animatedImage) {\n      currentFrame.value = null;\n      return;\n    }\n    if (isPaused.value && lastTimestamp.value !== -1) {\n      return;\n    }\n    const { timestamp } = frameInfo;\n    const elapsed = timestamp - lastTimestamp.value;\n\n    // Check if it's time to switch frames based on GIF frame duration\n    if (elapsed < frameDuration) {\n      return;\n    }\n\n    // Update the current frame\n    animatedImage.decodeNextFrame();\n    if (currentFrame.value) {\n      currentFrame.value.dispose();\n    }\n    currentFrame.value = animatedImage.getCurrentFrame();\n\n    // Update the last timestamp\n    lastTimestamp.value = timestamp;\n  });\n  useEffect(() => {\n    return () => {\n      animatedImage?.dispose();\n    };\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, []);\n  return currentFrame;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAGA,IAAAC,cAAA,GAAAD,OAAA;AAGA,IAAAE,gBAAA,GAAAC,sBAAA,CAAAH,OAAA;AAAoC,SAAAG,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEpC,MAAMG,sBAAsB,GAAG,EAAE;AAE1B,MAAMC,qBAAqB,GAAGA,CACnCC,MAAuB,EACvBC,MAA6B,KAC1B;EACH,MAAMC,aAAa,GAAGC,wBAAG,CAACC,cAAc,CAAC,KAAK,CAAC;EAC/C,MAAMC,QAAQ,GAAGJ,MAAM,aAANA,MAAM,cAANA,MAAM,GAAIC,aAAa;EACxC,MAAMI,YAAY,GAAGH,wBAAG,CAACC,cAAc,CAAiB,IAAI,CAAC;EAC7D,MAAMG,aAAa,GAAGJ,wBAAG,CAACC,cAAc,CAAC,CAAC,CAAC,CAAC;EAC5C,MAAMI,aAAa,GAAG,IAAAC,+BAAgB,EACpCT,MAAM,EACLU,GAAG,IAAK;IACPC,OAAO,CAACC,KAAK,CAACF,GAAG,CAAC;IAClB,MAAM,IAAIG,KAAK,CAAC,wCAAwCH,GAAG,CAACI,OAAO,GAAG,CAAC;EACzE,CAAC,EACD,KACF,CAAC;EACD,MAAMC,aAAa,GACjB,CAAAP,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEQ,oBAAoB,CAAC,CAAC,KAAIlB,sBAAsB;EAEjEK,wBAAG,CAACc,gBAAgB,CAAEC,SAAoB,IAAK;IAC7C,IAAI,CAACV,aAAa,EAAE;MAClBF,YAAY,CAACa,KAAK,GAAG,IAAI;MACzB;IACF;IACA,IAAId,QAAQ,CAACc,KAAK,IAAIZ,aAAa,CAACY,KAAK,KAAK,CAAC,CAAC,EAAE;MAChD;IACF;IACA,MAAM;MAAEC;IAAU,CAAC,GAAGF,SAAS;IAC/B,MAAMG,OAAO,GAAGD,SAAS,GAAGb,aAAa,CAACY,KAAK;;IAE/C;IACA,IAAIE,OAAO,GAAGN,aAAa,EAAE;MAC3B;IACF;;IAEA;IACAP,aAAa,CAACc,eAAe,CAAC,CAAC;IAC/B,IAAIhB,YAAY,CAACa,KAAK,EAAE;MACtBb,YAAY,CAACa,KAAK,CAACI,OAAO,CAAC,CAAC;IAC9B;IACAjB,YAAY,CAACa,KAAK,GAAGX,aAAa,CAACgB,eAAe,CAAC,CAAC;;IAEpD;IACAjB,aAAa,CAACY,KAAK,GAAGC,SAAS;EACjC,CAAC,CAAC;EACF,IAAAK,gBAAS,EAAC,MAAM;IACd,OAAO,MAAM;MACXjB,aAAa,aAAbA,aAAa,eAAbA,aAAa,CAAEe,OAAO,CAAC,CAAC;IAC1B,CAAC;IACD;EACF,CAAC,EAAE,EAAE,CAAC;EACN,OAAOjB,YAAY;AACrB,CAAC;AAACoB,OAAA,CAAA3B,qBAAA,GAAAA,qBAAA","ignoreList":[]}
+{"version":3,"names":["_AnimatedImage","require","_ReanimatedProxy","_interopRequireDefault","e","__esModule","default","DEFAULT_FRAME_DURATION","useAnimatedImageValue","source","paused","defaultPaused","Rea","useSharedValue","isPaused","currentFrame","lastTimestamp","animatedImage","useAnimatedImage","err","console","error","Error","message","frameDuration","currentFrameDuration","useFrameCallback","frameInfo","value","timestamp","elapsed","decodeNextFrame","dispose","getCurrentFrame","exports"],"sources":["useAnimatedImageValue.ts"],"sourcesContent":["import type { FrameInfo, SharedValue } from \"react-native-reanimated\";\n\nimport { useAnimatedImage } from \"../../skia/core/AnimatedImage\";\nimport type { DataSourceParam, SkImage } from \"../../skia/types\";\n\nimport Rea from \"./ReanimatedProxy\";\n\nconst DEFAULT_FRAME_DURATION = 60;\n\nexport const useAnimatedImageValue = (\n  source: DataSourceParam,\n  paused?: SharedValue<boolean>\n) => {\n  const defaultPaused = Rea.useSharedValue(false);\n  const isPaused = paused ?? defaultPaused;\n  const currentFrame = Rea.useSharedValue<null | SkImage>(null);\n  const lastTimestamp = Rea.useSharedValue(-1);\n  const animatedImage = useAnimatedImage(source, (err) => {\n    console.error(err);\n    throw new Error(`Could not load animated image - got '${err.message}'`);\n  });\n  const frameDuration =\n    animatedImage?.currentFrameDuration() || DEFAULT_FRAME_DURATION;\n\n  Rea.useFrameCallback((frameInfo: FrameInfo) => {\n    if (!animatedImage) {\n      currentFrame.value = null;\n      return;\n    }\n    if (isPaused.value && lastTimestamp.value !== -1) {\n      return;\n    }\n    const { timestamp } = frameInfo;\n    const elapsed = timestamp - lastTimestamp.value;\n\n    // Check if it's time to switch frames based on GIF frame duration\n    if (elapsed < frameDuration) {\n      return;\n    }\n\n    // Update the current frame\n    animatedImage.decodeNextFrame();\n    if (currentFrame.value) {\n      currentFrame.value.dispose();\n    }\n    currentFrame.value = animatedImage.getCurrentFrame();\n\n    // Update the last timestamp\n    lastTimestamp.value = timestamp;\n  });\n  return currentFrame;\n};\n"],"mappings":";;;;;;AAEA,IAAAA,cAAA,GAAAC,OAAA;AAGA,IAAAC,gBAAA,GAAAC,sBAAA,CAAAF,OAAA;AAAoC,SAAAE,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEpC,MAAMG,sBAAsB,GAAG,EAAE;AAE1B,MAAMC,qBAAqB,GAAGA,CACnCC,MAAuB,EACvBC,MAA6B,KAC1B;EACH,MAAMC,aAAa,GAAGC,wBAAG,CAACC,cAAc,CAAC,KAAK,CAAC;EAC/C,MAAMC,QAAQ,GAAGJ,MAAM,aAANA,MAAM,cAANA,MAAM,GAAIC,aAAa;EACxC,MAAMI,YAAY,GAAGH,wBAAG,CAACC,cAAc,CAAiB,IAAI,CAAC;EAC7D,MAAMG,aAAa,GAAGJ,wBAAG,CAACC,cAAc,CAAC,CAAC,CAAC,CAAC;EAC5C,MAAMI,aAAa,GAAG,IAAAC,+BAAgB,EAACT,MAAM,EAAGU,GAAG,IAAK;IACtDC,OAAO,CAACC,KAAK,CAACF,GAAG,CAAC;IAClB,MAAM,IAAIG,KAAK,CAAC,wCAAwCH,GAAG,CAACI,OAAO,GAAG,CAAC;EACzE,CAAC,CAAC;EACF,MAAMC,aAAa,GACjB,CAAAP,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEQ,oBAAoB,CAAC,CAAC,KAAIlB,sBAAsB;EAEjEK,wBAAG,CAACc,gBAAgB,CAAEC,SAAoB,IAAK;IAC7C,IAAI,CAACV,aAAa,EAAE;MAClBF,YAAY,CAACa,KAAK,GAAG,IAAI;MACzB;IACF;IACA,IAAId,QAAQ,CAACc,KAAK,IAAIZ,aAAa,CAACY,KAAK,KAAK,CAAC,CAAC,EAAE;MAChD;IACF;IACA,MAAM;MAAEC;IAAU,CAAC,GAAGF,SAAS;IAC/B,MAAMG,OAAO,GAAGD,SAAS,GAAGb,aAAa,CAACY,KAAK;;IAE/C;IACA,IAAIE,OAAO,GAAGN,aAAa,EAAE;MAC3B;IACF;;IAEA;IACAP,aAAa,CAACc,eAAe,CAAC,CAAC;IAC/B,IAAIhB,YAAY,CAACa,KAAK,EAAE;MACtBb,YAAY,CAACa,KAAK,CAACI,OAAO,CAAC,CAAC;IAC9B;IACAjB,YAAY,CAACa,KAAK,GAAGX,aAAa,CAACgB,eAAe,CAAC,CAAC;;IAEpD;IACAjB,aAAa,CAACY,KAAK,GAAGC,SAAS;EACjC,CAAC,CAAC;EACF,OAAOd,YAAY;AACrB,CAAC;AAACmB,OAAA,CAAA1B,qBAAA,GAAAA,qBAAA","ignoreList":[]}

package/lib/commonjs/renderer/components/image/ImageShader.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import type { ImageShaderProps } from "../../../dom/types";
 import type { SkiaDefaultProps } from "../../processors";
-export declare const ImageShader: ({ tx, ty, fm, mm, fit, transform, ...props }: SkiaDefaultProps<ImageShaderProps, "tx" | "ty" | "fm" | "mm" | "fit" | "transform">) => React.JSX.Element;
+export declare const ImageShader: ({ tx, ty, fit, transform, ...props }: SkiaDefaultProps<ImageShaderProps, "tx" | "ty" | "fit" | "transform">) => React.JSX.Element;

package/lib/commonjs/renderer/components/image/ImageShader.js

@@ -10,8 +10,6 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 const ImageShader = ({
   tx = "decal",
   ty = "decal",
-  fm = "nearest",
-  mm = "none",
   fit = "none",
   transform = [],
   ...props
@@ -19,8 +17,6 @@ const ImageShader = ({
   return /*#__PURE__*/_react.default.createElement("skImageShader", _extends({
     tx: tx,
     ty: ty,
-    fm: fm,
-    mm: mm,
     fit: fit,
     transform: transform
   }, props));

package/lib/commonjs/renderer/components/image/ImageShader.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","e","__esModule","default","_extends","Object","assign","bind","n","arguments","length","t","r","hasOwnProperty","call","apply","ImageShader","tx","ty","fm","mm","fit","transform","props","createElement","exports"],"sources":["ImageShader.tsx"],"sourcesContent":["import React from \"react\";\n\nimport type { ImageShaderProps } from \"../../../dom/types\";\nimport type { SkiaDefaultProps } from \"../../processors\";\n\nexport const ImageShader = ({\n  tx = \"decal\",\n  ty = \"decal\",\n  fm = \"nearest\",\n  mm = \"none\",\n  fit = \"none\",\n  transform = [],\n  ...props\n}: SkiaDefaultProps<\n  ImageShaderProps,\n  \"tx\" | \"ty\" | \"fm\" | \"mm\" | \"fit\" | \"transform\"\n>) => {\n  return (\n    <skImageShader\n      tx={tx}\n      ty={ty}\n      fm={fm}\n      mm={mm}\n      fit={fit}\n      transform={transform}\n      {...props}\n    />\n  );\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA0B,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,SAAA,WAAAA,QAAA,GAAAC,MAAA,CAAAC,MAAA,GAAAD,MAAA,CAAAC,MAAA,CAAAC,IAAA,eAAAC,CAAA,aAAAP,CAAA,MAAAA,CAAA,GAAAQ,SAAA,CAAAC,MAAA,EAAAT,CAAA,UAAAU,CAAA,GAAAF,SAAA,CAAAR,CAAA,YAAAW,CAAA,IAAAD,CAAA,OAAAE,cAAA,CAAAC,IAAA,CAAAH,CAAA,EAAAC,CAAA,MAAAJ,CAAA,CAAAI,CAAA,IAAAD,CAAA,CAAAC,CAAA,aAAAJ,CAAA,KAAAJ,QAAA,CAAAW,KAAA,OAAAN,SAAA;AAKnB,MAAMO,WAAW,GAAGA,CAAC;EAC1BC,EAAE,GAAG,OAAO;EACZC,EAAE,GAAG,OAAO;EACZC,EAAE,GAAG,SAAS;EACdC,EAAE,GAAG,MAAM;EACXC,GAAG,GAAG,MAAM;EACZC,SAAS,GAAG,EAAE;EACd,GAAGC;AAIL,CAAC,KAAK;EACJ,oBACEzB,MAAA,CAAAK,OAAA,CAAAqB,aAAA,kBAAApB,QAAA;IACEa,EAAE,EAAEA,EAAG;IACPC,EAAE,EAAEA,EAAG;IACPC,EAAE,EAAEA,EAAG;IACPC,EAAE,EAAEA,EAAG;IACPC,GAAG,EAAEA,GAAI;IACTC,SAAS,EAAEA;EAAU,GACjBC,KAAK,CACV,CAAC;AAEN,CAAC;AAACE,OAAA,CAAAT,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","e","__esModule","default","_extends","Object","assign","bind","n","arguments","length","t","r","hasOwnProperty","call","apply","ImageShader","tx","ty","fit","transform","props","createElement","exports"],"sources":["ImageShader.tsx"],"sourcesContent":["import React from \"react\";\n\nimport type { ImageShaderProps } from \"../../../dom/types\";\nimport type { SkiaDefaultProps } from \"../../processors\";\n\nexport const ImageShader = ({\n  tx = \"decal\",\n  ty = \"decal\",\n  fit = \"none\",\n  transform = [],\n  ...props\n}: SkiaDefaultProps<ImageShaderProps, \"tx\" | \"ty\" | \"fit\" | \"transform\">) => {\n  return (\n    <skImageShader tx={tx} ty={ty} fit={fit} transform={transform} {...props} />\n  );\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA0B,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,SAAA,WAAAA,QAAA,GAAAC,MAAA,CAAAC,MAAA,GAAAD,MAAA,CAAAC,MAAA,CAAAC,IAAA,eAAAC,CAAA,aAAAP,CAAA,MAAAA,CAAA,GAAAQ,SAAA,CAAAC,MAAA,EAAAT,CAAA,UAAAU,CAAA,GAAAF,SAAA,CAAAR,CAAA,YAAAW,CAAA,IAAAD,CAAA,OAAAE,cAAA,CAAAC,IAAA,CAAAH,CAAA,EAAAC,CAAA,MAAAJ,CAAA,CAAAI,CAAA,IAAAD,CAAA,CAAAC,CAAA,aAAAJ,CAAA,KAAAJ,QAAA,CAAAW,KAAA,OAAAN,SAAA;AAKnB,MAAMO,WAAW,GAAGA,CAAC;EAC1BC,EAAE,GAAG,OAAO;EACZC,EAAE,GAAG,OAAO;EACZC,GAAG,GAAG,MAAM;EACZC,SAAS,GAAG,EAAE;EACd,GAAGC;AACkE,CAAC,KAAK;EAC3E,oBACEvB,MAAA,CAAAK,OAAA,CAAAmB,aAAA,kBAAAlB,QAAA;IAAea,EAAE,EAAEA,EAAG;IAACC,EAAE,EAAEA,EAAG;IAACC,GAAG,EAAEA,GAAI;IAACC,SAAS,EAAEA;EAAU,GAAKC,KAAK,CAAG,CAAC;AAEhF,CAAC;AAACE,OAAA,CAAAP,WAAA,GAAAA,WAAA","ignoreList":[]}

package/lib/commonjs/skia/core/AnimatedImage.d.ts

@@ -2,4 +2,4 @@ import type { DataSourceParam } from "../types";
 /**
  * Returns a Skia Animated Image object
  * */
-export declare const useAnimatedImage: (source: DataSourceParam, onError?: (err: Error) => void, managed?: boolean) => import("../types").SkAnimatedImage | null;
+export declare const useAnimatedImage: (source: DataSourceParam, onError?: (err: Error) => void) => import("../types").SkAnimatedImage | null;

package/lib/commonjs/skia/core/AnimatedImage.js

@@ -11,6 +11,6 @@ const animatedImgFactory = _Skia.Skia.AnimatedImage.MakeAnimatedImageFromEncoded
 /**
  * Returns a Skia Animated Image object
  * */
-const useAnimatedImage = (source, onError, managed = true) => (0, _Data.useRawData)(source, animatedImgFactory, onError, managed);
+const useAnimatedImage = (source, onError) => (0, _Data.useRawData)(source, animatedImgFactory, onError);
 exports.useAnimatedImage = useAnimatedImage;
 //# sourceMappingURL=AnimatedImage.js.map

package/lib/commonjs/skia/core/AnimatedImage.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Skia","require","_Data","animatedImgFactory","Skia","AnimatedImage","MakeAnimatedImageFromEncoded","bind","useAnimatedImage","source","onError","managed","useRawData","exports"],"sources":["AnimatedImage.ts"],"sourcesContent":["import { Skia } from \"../Skia\";\nimport type { DataSourceParam } from \"../types\";\n\nimport { useRawData } from \"./Data\";\n\nconst animatedImgFactory = Skia.AnimatedImage.MakeAnimatedImageFromEncoded.bind(\n  Skia.AnimatedImage\n);\n\n/**\n * Returns a Skia Animated Image object\n * */\nexport const useAnimatedImage = (\n  source: DataSourceParam,\n  onError?: (err: Error) => void,\n  managed = true\n) => useRawData(source, animatedImgFactory, onError, managed);\n"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAGA,IAAAC,KAAA,GAAAD,OAAA;AAEA,MAAME,kBAAkB,GAAGC,UAAI,CAACC,aAAa,CAACC,4BAA4B,CAACC,IAAI,CAC7EH,UAAI,CAACC,aACP,CAAC;;AAED;AACA;AACA;AACO,MAAMG,gBAAgB,GAAGA,CAC9BC,MAAuB,EACvBC,OAA8B,EAC9BC,OAAO,GAAG,IAAI,KACX,IAAAC,gBAAU,EAACH,MAAM,EAAEN,kBAAkB,EAAEO,OAAO,EAAEC,OAAO,CAAC;AAACE,OAAA,CAAAL,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_Skia","require","_Data","animatedImgFactory","Skia","AnimatedImage","MakeAnimatedImageFromEncoded","bind","useAnimatedImage","source","onError","useRawData","exports"],"sources":["AnimatedImage.ts"],"sourcesContent":["import { Skia } from \"../Skia\";\nimport type { DataSourceParam } from \"../types\";\n\nimport { useRawData } from \"./Data\";\n\nconst animatedImgFactory = Skia.AnimatedImage.MakeAnimatedImageFromEncoded.bind(\n  Skia.AnimatedImage\n);\n\n/**\n * Returns a Skia Animated Image object\n * */\nexport const useAnimatedImage = (\n  source: DataSourceParam,\n  onError?: (err: Error) => void\n) => useRawData(source, animatedImgFactory, onError);\n"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAGA,IAAAC,KAAA,GAAAD,OAAA;AAEA,MAAME,kBAAkB,GAAGC,UAAI,CAACC,aAAa,CAACC,4BAA4B,CAACC,IAAI,CAC7EH,UAAI,CAACC,aACP,CAAC;;AAED;AACA;AACA;AACO,MAAMG,gBAAgB,GAAGA,CAC9BC,MAAuB,EACvBC,OAA8B,KAC3B,IAAAC,gBAAU,EAACF,MAAM,EAAEN,kBAAkB,EAAEO,OAAO,CAAC;AAACE,OAAA,CAAAJ,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/skia/core/Data.d.ts

@@ -1,5 +1,5 @@
 import type { SkData, DataSourceParam, SkJSIInstance } from "../types";
 export declare const loadData: <T>(source: DataSourceParam, factory: (data: SkData) => T | null, onError?: (err: Error) => void) => Promise<T | null>;
 export declare const useCollectionLoading: <T extends SkJSIInstance<string>>(source: DataSourceParam[], loader: () => Promise<(T | null)[]>) => T[] | null;
-export declare const useRawData: <T extends SkJSIInstance<string>>(source: DataSourceParam, factory: (data: SkData) => T | null, onError?: (err: Error) => void, manage?: boolean) => T | null;
+export declare const useRawData: <T extends SkJSIInstance<string>>(source: DataSourceParam, factory: (data: SkData) => T | null, onError?: (err: Error) => void) => T | null;
 export declare const useData: (source: DataSourceParam, onError?: (err: Error) => void) => SkData | null;

package/lib/commonjs/skia/core/Data.js

@@ -27,7 +27,7 @@ const loadData = (source, factory, onError) => {
   }
 };
 exports.loadData = loadData;
-const useLoading = (source, loader, manage = true) => {
+const useLoading = (source, loader) => {
   const mounted = (0, _react.useRef)(false);
   const [data, setData] = (0, _react.useState)(null);
   const dataRef = (0, _react.useRef)(null);
@@ -40,10 +40,6 @@ const useLoading = (source, loader, manage = true) => {
       }
     });
     return () => {
-      if (manage) {
-        var _dataRef$current;
-        (_dataRef$current = dataRef.current) === null || _dataRef$current === void 0 || _dataRef$current.dispose();
-      }
       mounted.current = false;
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -64,8 +60,6 @@ const useCollectionLoading = (source, loader) => {
       }
     });
     return () => {
-      var _dataRef$current2;
-      (_dataRef$current2 = dataRef.current) === null || _dataRef$current2 === void 0 || _dataRef$current2.forEach(instance => instance === null || instance === void 0 ? void 0 : instance.dispose());
       mounted.current = false;
     };
 
@@ -74,7 +68,7 @@ const useCollectionLoading = (source, loader) => {
   return data;
 };
 exports.useCollectionLoading = useCollectionLoading;
-const useRawData = (source, factory, onError, manage = true) => useLoading(source, () => loadData(source, factory, onError), manage);
+const useRawData = (source, factory, onError) => useLoading(source, () => loadData(source, factory, onError));
 exports.useRawData = useRawData;
 const identity = data => data;
 const useData = (source, onError) => useRawData(source, identity, onError);