@shopify/react-native-skia 2.1.1 → 2.2.1

package/android/CMakeLists.txt

@@ -85,7 +85,7 @@ if(SK_GRAPHITE)
     add_definitions(-DSK_GRAPHITE)
     set(BACKEND_SOURCES
     #TODO: is this source needed to be added?
-        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/DawnWindowContext.cpp"
+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNDawnWindowContext.cpp"
     )
 else()
     add_definitions(-DSK_GL -DSK_GANESH)

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

@@ -13,7 +13,7 @@
 #include <thread>
 #include <unordered_map>
 
-#include "WindowContext.h"
+#include "RNWindowContext.h"
 #include "gl/Display.h"
 
 #pragma clang diagnostic push

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

@@ -9,7 +9,7 @@
 #include <string>
 
 #if defined(SK_GRAPHITE)
-#include "DawnContext.h"
+#include "RNDawnContext.h"
 #else
 #include "OpenGLContext.h"
 #endif

package/android/cpp/rnskia-android/RNSkAndroidVideo.cpp

@@ -8,7 +8,7 @@
 #include "RNSkLog.h"
 
 #if defined(SK_GRAPHITE)
-#include "DawnContext.h"
+#include "RNDawnContext.h"
 #else
 #include "OpenGLContext.h"
 #endif

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

@@ -8,7 +8,7 @@
 #include "RNSkLog.h"
 
 #if defined(SK_GRAPHITE)
-#include "DawnContext.h"
+#include "RNDawnContext.h"
 #else
 #include "OpenGLContext.h"
 #endif

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

@@ -5,7 +5,7 @@
 #include <memory>
 
 #include "RNSkView.h"
-#include "WindowContext.h"
+#include "RNWindowContext.h"
 
 #include <android/native_window.h>
 

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

@@ -5,6 +5,7 @@ import com.facebook.react.viewmanagers.SkiaPictureViewManagerDelegate;
 import com.facebook.react.viewmanagers.SkiaPictureViewManagerInterface;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class SkiaPictureViewManager extends SkiaBaseViewManager<SkiaPictureView> implements SkiaPictureViewManagerInterface<SkiaPictureView> {
 
@@ -30,4 +31,9 @@ public class SkiaPictureViewManager extends SkiaBaseViewManager<SkiaPictureView>
     public SkiaPictureView createViewInstance(@NonNull ThemedReactContext reactContext) {
         return new SkiaPictureView(reactContext);
     }
+
+    @Override
+    public void setColorSpace(SkiaPictureView view, @Nullable String value) {
+        // nothing to do here at the moment
+    }
 }

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerInterface.java

@@ -15,4 +15,5 @@ import androidx.annotation.Nullable;
 public interface SkiaPictureViewManagerInterface<T extends View> {
   void setDebug(T view, boolean value);
   void setOpaque(T view, boolean value);
+  void setColorSpace(SkiaPictureView view, @Nullable String value);
 }

package/apple/MetalContext.h

@@ -113,10 +113,10 @@ public:
   }
 
   std::unique_ptr<RNSkia::WindowContext> MakeWindow(CALayer *window, int width,
-                                                    int height) {
+                                                    int height, bool useP3ColorSpace = true) {
     auto device = MetalSharedContext::getInstance().getDevice();
     return std::make_unique<MetalWindowContext>(
-        _directContext.get(), device, _commandQueue, window, width, height);
+        _directContext.get(), device, _commandQueue, window, width, height, useP3ColorSpace);
   }
 
   GrDirectContext *getDirectContext() { return _directContext.get(); }

package/apple/MetalWindowContext.h

@@ -2,7 +2,7 @@
 
 #import <MetalKit/MetalKit.h>
 
-#include "WindowContext.h"
+#include "RNWindowContext.h"
 
 class SkiaMetalContext;
 
@@ -10,7 +10,7 @@ class MetalWindowContext : public RNSkia::WindowContext {
 public:
   MetalWindowContext(GrDirectContext *directContext, id<MTLDevice> device,
                      id<MTLCommandQueue> commandQueue, CALayer *layer,
-                     int width, int height);
+                     int width, int height, bool useP3ColorSpace = true);
   ~MetalWindowContext() = default;
 
   sk_sp<SkSurface> getSurface() override;

package/apple/MetalWindowContext.mm

@@ -6,7 +6,8 @@
 MetalWindowContext::MetalWindowContext(GrDirectContext *directContext,
                                        id<MTLDevice> device,
                                        id<MTLCommandQueue> commandQueue,
-                                       CALayer *layer, int width, int height)
+                                       CALayer *layer, int width, int height,
+                                       bool useP3ColorSpace)
     : _directContext(directContext), _commandQueue(commandQueue) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
@@ -24,9 +25,11 @@ MetalWindowContext::MetalWindowContext(GrDirectContext *directContext,
   _layer.contentsGravity = kCAGravityBottomLeft;
   _layer.drawableSize = CGSizeMake(width, height);
   BOOL supportsWideColor = NO;
-  if (@available(iOS 10.0, *)) {
-    supportsWideColor =
-        [UIScreen mainScreen].traitCollection.displayGamut == UIDisplayGamutP3;
+  if (useP3ColorSpace) {
+    if (@available(iOS 10.0, *)) {
+      supportsWideColor =
+          [UIScreen mainScreen].traitCollection.displayGamut == UIDisplayGamutP3;
+    }
   }
   if (supportsWideColor) {
     CGColorSpaceRef colorSpace =

package/apple/RNSkApplePlatformContext.mm

@@ -7,7 +7,7 @@
 #include <utility>
 
 #if defined(SK_GRAPHITE)
-#include "DawnContext.h"
+#include "RNDawnContext.h"
 #else
 #include "MetalContext.h"
 #endif

package/apple/RNSkAppleView.h

@@ -10,6 +10,7 @@ class RNSkBaseAppleView {
 public:
   virtual CALayer *getLayer() = 0;
   virtual void setSize(int width, int height) = 0;
+  virtual void setUseP3ColorSpace(bool useP3ColorSpace) = 0;
   virtual std::shared_ptr<RNSkia::RNSkView> getDrawView() = 0;
 };
 
@@ -18,7 +19,7 @@ public:
   RNSkAppleView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
       : T(context,
           std::make_shared<RNSkMetalCanvasProvider>(
-              std::bind(&RNSkia::RNSkView::requestRedraw, this), context)) {}
+              std::bind(&RNSkia::RNSkView::requestRedraw, this), context, true)) {}
 
   CALayer *getLayer() override {
     return std::static_pointer_cast<RNSkMetalCanvasProvider>(
@@ -31,6 +32,11 @@ public:
         ->setSize(width, height);
   }
 
+  void setUseP3ColorSpace(bool useP3ColorSpace) override {
+    std::static_pointer_cast<RNSkMetalCanvasProvider>(this->getCanvasProvider())
+        ->setUseP3ColorSpace(useP3ColorSpace);
+  }
+
   std::shared_ptr<RNSkia::RNSkView> getDrawView() override {
     return this->shared_from_this();
   }

package/apple/RNSkMetalCanvasProvider.h

@@ -16,7 +16,8 @@
 class RNSkMetalCanvasProvider : public RNSkia::RNSkCanvasProvider {
 public:
   RNSkMetalCanvasProvider(std::function<void()> requestRedraw,
-                          std::shared_ptr<RNSkia::RNSkPlatformContext> context);
+                          std::shared_ptr<RNSkia::RNSkPlatformContext> context,
+                          bool useP3ColorSpace = true);
 
   ~RNSkMetalCanvasProvider();
 
@@ -26,6 +27,7 @@ public:
   bool renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
 
   void setSize(int width, int height);
+  void setUseP3ColorSpace(bool useP3ColorSpace);
   CALayer *getLayer();
 
 private:
@@ -35,4 +37,5 @@ private:
 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
   CAMetalLayer *_layer;
 #pragma clang diagnostic pop
+  bool _useP3ColorSpace = true;
 };

package/apple/RNSkMetalCanvasProvider.mm

@@ -3,7 +3,7 @@
 #import "RNSkLog.h"
 
 #if defined(SK_GRAPHITE)
-#import "DawnContext.h"
+#import "RNDawnContext.h"
 #else
 #import "MetalContext.h"
 #endif
@@ -23,8 +23,9 @@
 
 RNSkMetalCanvasProvider::RNSkMetalCanvasProvider(
     std::function<void()> requestRedraw,
-    std::shared_ptr<RNSkia::RNSkPlatformContext> context)
-    : RNSkCanvasProvider(requestRedraw), _context(context) {
+    std::shared_ptr<RNSkia::RNSkPlatformContext> context,
+    bool useP3ColorSpace)
+    : RNSkCanvasProvider(requestRedraw), _context(context), _useP3ColorSpace(useP3ColorSpace) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
   _layer = [CAMetalLayer layer];
@@ -100,9 +101,13 @@ void RNSkMetalCanvasProvider::setSize(int width, int height) {
   _ctx = RNSkia::DawnContext::getInstance().MakeWindow((__bridge void *)_layer,
                                                        w, h);
 #else
-  _ctx = MetalContext::getInstance().MakeWindow(_layer, w, h);
+  _ctx = MetalContext::getInstance().MakeWindow(_layer, w, h, _useP3ColorSpace);
 #endif
   _requestRedraw();
 }
 
 CALayer *RNSkMetalCanvasProvider::getLayer() { return _layer; }
+
+void RNSkMetalCanvasProvider::setUseP3ColorSpace(bool useP3ColorSpace) {
+  _useP3ColorSpace = useP3ColorSpace;
+}

package/apple/SkiaPictureView.mm

@@ -55,6 +55,10 @@ using namespace facebook::react;
   [self setNativeId:nativeId];
   [self setDebugMode:newProps.debug];
   [self setOpaque:newProps.opaque];
+  if (newProps.colorSpace == "" || newProps.colorSpace == "srgb") {
+    bool useP3 = false;
+    [self setUseP3ColorSpace:useP3];
+  }
 }
 
 @end

package/apple/SkiaUIView.h

@@ -41,5 +41,6 @@
 - (void)setDebugMode:(bool)debugMode;
 - (void)setOpaque:(bool)opaque;
 - (void)setNativeId:(size_t)nativeId;
+- (void)setUseP3ColorSpace:(bool)useP3ColorSpace;
 
 @end

package/apple/SkiaUIView.mm

@@ -16,6 +16,7 @@
       _factory;
   bool _debugMode;
   bool _opaque;
+  bool _useP3ColorSpace;
   size_t _nativeId;
 }
 
@@ -73,6 +74,7 @@
         _manager->setSkiaView(_nativeId, _impl->getDrawView());
       }
       _impl->getDrawView()->setShowDebugOverlays(_debugMode);
+      _impl->setUseP3ColorSpace(_useP3ColorSpace);
     }
   }
 }
@@ -163,6 +165,13 @@
   }
 }
 
+- (void)setUseP3ColorSpace:(bool)useP3ColorSpace {
+  _useP3ColorSpace = useP3ColorSpace;
+  if (_impl != nullptr) {
+    _impl->setUseP3ColorSpace(_useP3ColorSpace);
+  }
+}
+
 #pragma mark External API
 
 - (std::shared_ptr<RNSkBaseAppleView>)impl {

package/cpp/api/JsiSkImage.h

@@ -14,7 +14,7 @@
 #include "RNSkTypedArray.h"
 
 #if defined(SK_GRAPHITE)
-#include "DawnContext.h"
+#include "RNDawnContext.h"
 #include "include/gpu/graphite/Context.h"
 #endif
 

package/cpp/api/JsiSkSurface.h

@@ -12,7 +12,7 @@
 #include "JsiSkImage.h"
 
 #if defined(SK_GRAPHITE)
-#include "DawnContext.h"
+#include "RNDawnContext.h"
 #endif
 
 #pragma clang diagnostic push

package/cpp/api/JsiSkiaContext.h

@@ -14,7 +14,7 @@
 #include "JsiSkRect.h"
 #include "JsiSkTypeface.h"
 
-#include "WindowContext.h"
+#include "RNWindowContext.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/api/recorder/ImageFilters.h

@@ -290,7 +290,7 @@ public:
 };
 
 struct ImageFilterCmdProps {
-  sk_sp<SkImageFilter> imageFilter;
+  sk_sp<SkImageFilter> filter;
 };
 
 class ImageFilterCmd : public Command {
@@ -301,11 +301,11 @@ public:
   ImageFilterCmd(jsi::Runtime &runtime, const jsi::Object &object,
                  Variables &variables)
       : Command(CommandType::PushImageFilter, "skImageFilter") {
-    convertProperty(runtime, object, "imageFilter", props.imageFilter, variables);
+    convertProperty(runtime, object, "filter", props.filter, variables);
   }
 
   void pushImageFilter(DrawingCtx *ctx) {
-    ctx->imageFilters.push_back(props.imageFilter);
+    ctx->imageFilters.push_back(props.filter);
   }
 };
 

package/cpp/api/recorder/Paint.h

@@ -152,6 +152,10 @@ public:
       return;
     }
     ctx->savePaint();
+    if (standalone) {
+      SkPaint freshPaint;
+      ctx->pushPaint(freshPaint);
+    }
     auto &paint = ctx->getPaint();
     if (props.opacity.has_value()) {
       if (standalone) {

package/cpp/rnskia/{DawnContext.h → RNDawnContext.h}

@@ -3,9 +3,9 @@
 #include <memory>
 #include <mutex>
 
-#include "DawnUtils.h"
-#include "DawnWindowContext.h"
-#include "ImageProvider.h"
+#include "RNDawnWindowContext.h"
+#include "RNImageProvider.h"
+#include "RNDawnUtils.h"
 
 #include "include/core/SkData.h"
 #include "include/gpu/graphite/BackendTexture.h"

package/cpp/rnskia/{DawnWindowContext.cpp → RNDawnWindowContext.cpp}

@@ -1,6 +1,6 @@
-#include "DawnWindowContext.h"
+#include "RNDawnWindowContext.h"
 
-#include "DawnContext.h"
+#include "RNDawnContext.h"
 
 namespace RNSkia {
 
@@ -16,4 +16,4 @@ void DawnWindowContext::present() {
   _surface.Present();
 }
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/rnskia/{DawnWindowContext.h → RNDawnWindowContext.h}

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "DawnUtils.h"
-#include "WindowContext.h"
+#include "RNDawnUtils.h"
+#include "RNWindowContext.h"
 
 #include "dawn/native/MetalBackend.h"
 #include "webgpu/webgpu_cpp.h"

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -232,10 +232,45 @@ public:
         });
   }
 
+  JSI_HOST_FUNCTION(size) {
+    if (count != 1) {
+      _platformContext->raiseError(
+          std::string("size: Expected 1 argument, got " +
+                      std::to_string(count) + "."));
+      return jsi::Value::undefined();
+    }
+
+    if (!arguments[0].isNumber()) {
+      _platformContext->raiseError(
+          "size: First argument must be a number");
+      return jsi::Value::undefined();
+    }
+
+    // find Skia View
+    int nativeId = arguments[0].asNumber();
+    std::shared_ptr<RNSkView> view = ViewRegistry::getInstance().withViewInfo(
+        nativeId,
+        [](std::shared_ptr<RNSkViewInfo> info) { return info->view; });
+    if (view != nullptr) {
+      auto pixelDensity = _platformContext->getPixelDensity();
+      auto sizeObj = jsi::Object(runtime);
+      sizeObj.setProperty(runtime, "width", view->getScaledWidth() / pixelDensity);
+      sizeObj.setProperty(runtime, "height", view->getScaledHeight() / pixelDensity);
+      return sizeObj;
+    }
+    
+    // Return default size if view not found
+    auto sizeObj = jsi::Object(runtime);
+    sizeObj.setProperty(runtime, "width", 0);
+    sizeObj.setProperty(runtime, "height", 0);
+    return sizeObj;
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkJsiViewApi, setJsiProperty),
                        JSI_EXPORT_FUNC(RNSkJsiViewApi, requestRedraw),
                        JSI_EXPORT_FUNC(RNSkJsiViewApi, makeImageSnapshotAsync),
-                       JSI_EXPORT_FUNC(RNSkJsiViewApi, makeImageSnapshot))
+                       JSI_EXPORT_FUNC(RNSkJsiViewApi, makeImageSnapshot),
+                       JSI_EXPORT_FUNC(RNSkJsiViewApi, size))
 
   /**
    * Constructor

package/cpp/rnskia/RNSkPlatformContext.h

@@ -10,7 +10,7 @@
 #include <utility>
 
 #include "RNSkVideo.h"
-#include "WindowContext.h"
+#include "RNWindowContext.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/rnskia/RNSkView.h

@@ -203,6 +203,16 @@ public:
 
   std::shared_ptr<RNSkRenderer> getRenderer() { return _renderer; }
 
+  /**
+   Returns the scaled width of the view
+   */
+  int getScaledWidth() { return _canvasProvider->getScaledWidth(); }
+
+  /**
+   Returns the scaled height of the view
+   */
+  int getScaledHeight() { return _canvasProvider->getScaledHeight(); }
+
 protected:
   std::shared_ptr<RNSkPlatformContext> getPlatformContext() {
     return _platformContext;

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

@@ -116,5 +116,5 @@ export interface BoxShadowProps {
     inner?: boolean;
 }
 export interface ImageFilterProps extends GroupProps {
-    imageFilter: SkImageFilter;
+    filter: SkImageFilter;
 }

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  SamplingOptions,\n  SkSkottieAnimation,\n  SkImageFilter,\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 SkottieProps extends DrawingNodeProps {\n  animation: SkSkottieAnimation;\n  frame: number;\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\nexport interface ImageFilterProps extends GroupProps {\n  imageFilter: SkImageFilter;\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  SkSkottieAnimation,\n  SkImageFilter,\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 SkottieProps extends DrawingNodeProps {\n  animation: SkSkottieAnimation;\n  frame: number;\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\nexport interface ImageFilterProps extends GroupProps {\n  filter: SkImageFilter;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/commonjs/renderer/Canvas.d.ts

@@ -1,19 +1,27 @@
 import type { FC } from "react";
 import React from "react";
-import type { ViewProps } from "react-native";
-import type { SharedValue } from "react-native-reanimated";
+import type { MeasureInWindowOnSuccessCallback, MeasureOnSuccessCallback, ViewProps } from "react-native";
+import { type SharedValue } from "react-native-reanimated";
 import type { SkImage, SkRect, SkSize } from "../skia/types";
 export interface CanvasRef extends FC<CanvasProps> {
     makeImageSnapshot(rect?: SkRect): SkImage;
     makeImageSnapshotAsync(rect?: SkRect): Promise<SkImage>;
     redraw(): void;
     getNativeId(): number;
+    measure(callback: MeasureOnSuccessCallback): void;
+    measureInWindow(callback: MeasureInWindowOnSuccessCallback): void;
 }
 export declare const useCanvasRef: () => React.RefObject<CanvasRef | null>;
-export interface CanvasProps extends ViewProps {
+export declare const useCanvasSize: () => {
+    ref: React.RefObject<CanvasRef | null>;
+    size: SkSize;
+};
+export declare const isFabric: boolean;
+export interface CanvasProps extends Omit<ViewProps, "onLayout"> {
     debug?: boolean;
     opaque?: boolean;
     onSize?: SharedValue<SkSize>;
+    colorSpace?: "p3" | "srgb";
     ref?: React.Ref<CanvasRef>;
 }
-export declare const Canvas: ({ debug, opaque, children, onSize, onLayout: _onLayout, ref, ...viewProps }: CanvasProps) => React.JSX.Element;
+export declare const Canvas: ({ debug, opaque, children, onSize, colorSpace, ref, onLayout, ...viewProps }: CanvasProps) => React.JSX.Element;