@shopify/react-native-skia 1.5.9 → 1.6.0

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

@@ -0,0 +1,42 @@
+package com.shopify.reactnative.skia;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import androidx.annotation.NonNull;
+
+@SuppressLint("ViewConstructor")
+public class SkiaSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
+
+    SkiaViewAPI mApi;
+    boolean mDebug;
+
+    public SkiaSurfaceView(Context context, SkiaViewAPI api, boolean debug) {
+        super(context);
+        mApi = api;
+        mDebug = debug;
+        getHolder().addCallback(this);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mApi.onSurfaceDestroyed();
+    }
+
+    @Override
+    public void surfaceCreated(@NonNull SurfaceHolder holder) {
+        mApi.onSurfaceCreated(holder.getSurface(), getWidth(), getHeight());
+    }
+
+    @Override
+    public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int width, int height) {
+        mApi.onSurfaceChanged(holder.getSurface(), getWidth(), getHeight());
+    }
+
+    @Override
+    public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
+        mApi.onSurfaceDestroyed();
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.shopify.reactnative.skia;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.util.Log;
+import android.view.Surface;
+import android.view.TextureView;
+import androidx.annotation.NonNull;
+
+@SuppressLint("ViewConstructor")
+public class SkiaTextureView extends TextureView implements TextureView.SurfaceTextureListener {
+
+    private String tag = "SkiaTextureView";
+
+    SkiaViewAPI mApi;
+    boolean mDebug;
+    boolean pristine = true;
+
+    public boolean isDropped = false;
+
+    public SkiaTextureView(Context context, SkiaViewAPI api, boolean debug) {
+        super(context);
+        mApi = api;
+        mDebug = debug;
+        setOpaque(false);
+        setSurfaceTextureListener(this);
+    }
+
+    public void createSurfaceTexture() {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            Log.i(tag, "Create SurfaceTexture");
+            SurfaceTexture surfaceTexture = new SurfaceTexture(false);
+            setSurfaceTexture(surfaceTexture);
+            onSurfaceTextureAvailable(surfaceTexture, getWidth(), getHeight());
+        }
+    }
+
+    private void reCreateSurfaceTexture() {
+        boolean surfaceIsAlreadyAvailable = getSurfaceTexture() != null;
+        if (surfaceIsAlreadyAvailable) {
+            createSurfaceTexture();
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+    }
+
+    @Override
+    public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surfaceTexture, int width, int height) {
+        Log.i(tag, "onSurfaceTextureAvailable:  " + width + "x" + height);
+        mApi.onSurfaceTextureCreated(surfaceTexture, width, height);
+    }
+
+    @Override
+    public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surfaceTexture, int width, int height) {
+        Log.i(tag, "onSurfaceTextureSizeChanged:  " + width + "x" + height);
+        if (isDropped) {
+            return;
+        }
+        mApi.onSurfaceTextureCreated(surfaceTexture, width, height);
+    }
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surfaceTexture) {
+        mApi.onSurfaceDestroyed();
+        // Because of React Native Screens (which dettach the view), we always keep the surface alive.
+        // If not, Texture view will recreate the texture surface by itself and
+        // we will lose the fast first time to frame.
+        // We only delete the surface when the view is dropped (destroySurface invoked by SkiaBaseViewManager);
+        if (!isDropped) {
+            reCreateSurfaceTexture();
+        }
+        return false;
+    }
+
+    private long _prevTimestamp = 0;
+    @Override
+    public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface) {
+        if (!mDebug) {
+            return;
+        }
+        long timestamp = surface.getTimestamp();
+        long frameDuration = (timestamp - _prevTimestamp)/1000000;
+        Log.i("SkiaTextureView", "onSurfaceTextureUpdated "+frameDuration+"ms");
+        _prevTimestamp = timestamp;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.shopify.reactnative.skia;
+
+import android.graphics.SurfaceTexture;
+import android.view.Surface;
+
+public interface SkiaViewAPI {
+    void onSurfaceCreated(Surface surface, int width, int height);
+
+    void onSurfaceChanged(Surface surface, int width, int height);
+
+    void onSurfaceTextureCreated(SurfaceTexture surface, int width, int height);
+
+    void onSurfaceTextureChanged(SurfaceTexture surface, int width, int height);
+
+    void onSurfaceDestroyed();
+}

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

@@ -21,6 +21,9 @@ public class SkiaDomViewManagerDelegate<T extends View, U extends BaseViewManage
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "opaque":
+        mViewManager.setOpaque(view, value != null && (boolean) value);
+        break;
       case "debug":
         mViewManager.setDebug(view, value != null && (boolean) value);
         break;

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

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

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

@@ -24,8 +24,10 @@ public class SkiaPictureViewManagerDelegate<T extends View, U extends BaseViewMa
       case "mode":
         mViewManager.setMode(view, value == null ? null : (String) value);
         break;
+      case "opaque":
+        mViewManager.setOpaque(view, value != null && (boolean) value);
       case "debug":
-        mViewManager.setDebug(view, value == null ? false : (boolean) value);
+        mViewManager.setDebug(view, value != null && (boolean) value);
         break;
       default:
         super.setProperty(view, propName, value);

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 setMode(T view, @Nullable String value);
   void setDebug(T view, boolean value);
+  void setOpaque(T view, boolean value);
 }

package/cpp/rnskia/RNSkDomView.cpp

@@ -26,26 +26,6 @@ RNSkDomRenderer::~RNSkDomRenderer() {
   }
 }
 
-bool RNSkDomRenderer::tryRender(
-    std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
-
-  // We render on the main thread
-  if (_renderLock->try_lock()) {
-    bool result = false;
-    // If we have a Dom Node we can render directly on the main thread
-    if (_root != nullptr) {
-      result = canvasProvider->renderToCanvas(std::bind(
-          &RNSkDomRenderer::renderCanvas, this, std::placeholders::_1,
-          canvasProvider->getScaledWidth(), canvasProvider->getScaledHeight()));
-    }
-
-    _renderLock->unlock();
-    return result;
-  } else {
-    return false;
-  }
-}
-
 void RNSkDomRenderer::renderImmediate(
     std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
   auto prevDebugOverlay = getShowDebugOverlays();

package/cpp/rnskia/RNSkDomView.h

@@ -42,8 +42,6 @@ public:
 
   ~RNSkDomRenderer();
 
-  bool tryRender(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override;
-
   void
   renderImmediate(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override;
 

package/cpp/rnskia/RNSkPictureView.h

@@ -40,11 +40,7 @@ class RNSkPictureRenderer
 public:
   RNSkPictureRenderer(std::function<void()> requestRedraw,
                       std::shared_ptr<RNSkPlatformContext> context)
-      : RNSkRenderer(requestRedraw), _platformContext(context) {}
-
-  bool tryRender(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override {
-    return performDraw(canvasProvider);
-  }
+      : RNSkRenderer(std::move(requestRedraw)), _platformContext(std::move(context)) {}
 
   void
   renderImmediate(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override {
@@ -55,31 +51,28 @@ public:
     if (picture == nullptr) {
       _picture = nullptr;
     } else {
-      _picture = std::dynamic_pointer_cast<JsiSkPicture>(picture);
+      _picture = std::dynamic_pointer_cast<JsiSkPicture>(picture)->getObject();
     }
     _requestRedraw();
   }
 
 private:
   bool performDraw(std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
-    canvasProvider->renderToCanvas([=](SkCanvas *canvas) {
+    return canvasProvider->renderToCanvas([=](SkCanvas *canvas) {
       // Make sure to scale correctly
       auto pd = _platformContext->getPixelDensity();
       canvas->clear(SK_ColorTRANSPARENT);
       canvas->save();
       canvas->scale(pd, pd);
-
       if (_picture != nullptr) {
-        canvas->drawPicture(_picture->getObject());
+        canvas->drawPicture(_picture);
       }
-
       canvas->restore();
     });
-    return true;
   }
 
   std::shared_ptr<RNSkPlatformContext> _platformContext;
-  std::shared_ptr<JsiSkPicture> _picture;
+  sk_sp<SkPicture> _picture;
 };
 
 class RNSkPictureView : public RNSkView {

package/cpp/rnskia/RNSkPlatformContext.h

@@ -41,8 +41,7 @@ public:
                       std::shared_ptr<react::CallInvoker> callInvoker,
                       float pixelDensity)
       : _pixelDensity(pixelDensity), _jsRuntime(runtime),
-        _callInvoker(callInvoker) {
-  }
+        _callInvoker(callInvoker) {}
 
   virtual ~RNSkPlatformContext() = default;
 

package/cpp/rnskia/RNSkView.h

@@ -52,33 +52,15 @@ protected:
 class RNSkRenderer {
 public:
   explicit RNSkRenderer(std::function<void()> requestRedraw)
-      : _requestRedraw(requestRedraw) {}
-
-  /**
-   Tries to render the current set of drawing operations. If we're busy we'll
-   return false so that the calling RNSkBaseDrawView can request a new render
-   next frame. The tryRender method is typically called on each frame if there
-   are any redraw requests. The method will be called from the main thread, so
-   the implementor must make sure any thread requirements are met before
-   rendering. This method will also allow the rendering to be dispatched to
-   another thread.
-   */
-  virtual bool
-  tryRender(std::shared_ptr<RNSkCanvasProvider> canvasProvider) = 0;
+      : _requestRedraw(std::move(requestRedraw)), _showDebugOverlays(false) {}
 
-  /**
-   Renders directly to the canvas in the canvas provider. This method is called
-   from a Javascript call to render a snapshot of the SkiaView to an image, and
-   can therefore run outside the tryRender loop and directly in the javascript
-   thread.
-   */
   virtual void
   renderImmediate(std::shared_ptr<RNSkCanvasProvider> canvasProvider) = 0;
 
   void setShowDebugOverlays(bool showDebugOverlays) {
     _showDebugOverlays = showDebugOverlays;
   }
-  bool getShowDebugOverlays() { return _showDebugOverlays; }
+  bool getShowDebugOverlays() const { return _showDebugOverlays; }
 
 protected:
   std::function<void()> _requestRedraw;
@@ -173,10 +155,17 @@ public:
   void requestRedraw() {
     if (!_redrawRequested) {
       _redrawRequested = true;
-      _platformContext->runOnMainThread([this]() {
-        if (_renderer) {
-          _renderer->renderImmediate(_canvasProvider);
-          _redrawRequested = false;
+      // Capture a weak pointer to this
+      auto weakThis = std::weak_ptr<RNSkView>(shared_from_this());
+
+      _platformContext->runOnMainThread([weakThis]() {
+        // Try to lock the weak pointer
+        if (auto strongThis = weakThis.lock()) {
+          // Only proceed if the object still exists
+          if (strongThis->_renderer && strongThis->_redrawRequested) {
+            strongThis->_renderer->renderImmediate(strongThis->_canvasProvider);
+            strongThis->_redrawRequested = false;
+          }
         }
       });
     }

package/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.mm

@@ -23,16 +23,12 @@
 #include <TargetConditionals.h>
 #if TARGET_RT_BIG_ENDIAN
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2),    \
-        *(((char *)&fourcc) + 3), 0                                            \
-  }
+  (const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1),                 \
+                 *(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
 #else
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]) {                                                             \
-    *(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),                        \
-        *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0                  \
-  }
+  (const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),           \
+                 *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
 #endif
 
 // pragma MARK: TextureHolder

package/ios/RNSkia-iOS/SkiaDomViewManager.mm

@@ -31,6 +31,11 @@ RCT_CUSTOM_VIEW_PROPERTY(debug, BOOL, SkiaUIView) {
   [(SkiaUIView *)view setDebugMode:debug];
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(opaque, BOOL, SkiaUIView) {
+  bool debug = json != NULL ? [RCTConvert BOOL:json] : false;
+  [(SkiaUIView *)view setOpaque:debug];
+}
+
 - (UIView *)view {
   auto skManager = [[self skiaManager] skManager];
   // Pass SkManager as a raw pointer to avoid circular dependenciesr

package/ios/RNSkia-iOS/SkiaPictureView.mm

@@ -54,6 +54,7 @@ using namespace facebook::react;
       [[RCTConvert NSString:RCTNSStringFromString(newProps.nativeId)] intValue];
   [self setNativeId:nativeId];
   [self setDebugMode:newProps.debug];
+  [self setOpaque:newProps.opaque];
 }
 
 @end

package/ios/RNSkia-iOS/SkiaPictureViewManager.mm

@@ -31,6 +31,11 @@ RCT_CUSTOM_VIEW_PROPERTY(debug, BOOL, SkiaUIView) {
   [(SkiaUIView *)view setDebugMode:debug];
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(opaque, BOOL, SkiaUIView) {
+  bool opaque = json != NULL ? [RCTConvert BOOL:json] : false;
+  [(SkiaUIView *)view setOpaque:opaque];
+}
+
 - (UIView *)view {
   auto skManager = [[self skiaManager] skManager];
   // Pass SkManager as a raw pointer to avoid circular dependenciesr

package/ios/RNSkia-iOS/SkiaUIView.h

@@ -32,6 +32,7 @@
 - (SkiaManager *)skiaManager;
 
 - (void)setDebugMode:(bool)debugMode;
+- (void)setOpaque:(bool)opaque;
 - (void)setNativeId:(size_t)nativeId;
 
 @end

package/ios/RNSkia-iOS/SkiaUIView.mm

@@ -15,6 +15,7 @@
       std::shared_ptr<RNSkia::RNSkPlatformContext>)>
       _factory;
   bool _debugMode;
+  bool _opaque;
   size_t _nativeId;
 }
 
@@ -150,6 +151,10 @@
   }
 }
 
+- (void)setOpaque:(bool)opaque {
+    _opaque = opaque;
+}
+
 - (void)setNativeId:(size_t)nativeId {
   _nativeId = nativeId;
 

package/lib/commonjs/skia/types/Image/ColorType.d.ts

@@ -0,0 +1,21 @@
+export declare enum ColorType {
+    Unknown = 0,// uninitialized
+    Alpha_8 = 1,// pixel with alpha in 8-bit byte
+    RGB_565 = 2,// pixel with 5 bits red, 6 bits green, 5 bits blue, in 16-bit word
+    ARGB_4444 = 3,// pixel with 4 bits for alpha, red, green, blue; in 16-bit word
+    RGBA_8888 = 4,// pixel with 8 bits for red, green, blue, alpha; in 32-bit word
+    RGB_888x = 5,// pixel with 8 bits each for red, green, blue; in 32-bit word
+    BGRA_8888 = 6,// pixel with 8 bits for blue, green, red, alpha; in 32-bit word
+    RGBA_1010102 = 7,// 10 bits for red, green, blue; 2 bits for alpha; in 32-bit word
+    BGRA_1010102 = 8,// 10 bits for blue, green, red; 2 bits for alpha; in 32-bit word
+    RGB_101010x = 9,// pixel with 10 bits each for red, green, blue; in 32-bit word
+    BGR_101010x = 10,// pixel with 10 bits each for blue, green, red; in 32-bit word
+    BGR_101010x_XR = 11,// pixel with 10 bits each for blue, green, red; in 32-bit word, extended range
+    BGRA_10101010_XR = 12,// pixel with 10 bits each for blue, green, red, alpha; in 64-bit word, extended range
+    RGBA_10x6 = 13,// pixel with 10 used bits (most significant) followed by 6 unused
+    Gray_8 = 14,// pixel with grayscale level in 8-bit byte
+    RGBA_F16Norm = 15,// pixel with half floats in [0,1] for red, green, blue, alpha; in 64-bit word
+    RGBA_F16 = 16,// pixel with half floats for red, green, blue, alpha; in 64-bit word
+    RGB_F16F16F16x = 17,// pixel with half floats for red, green, blue; in 64-bit word
+    RGBA_F32 = 18
+}

package/lib/commonjs/skia/types/Image/ColorType.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ColorType = void 0;
+let ColorType = exports.ColorType = /*#__PURE__*/function (ColorType) {
+  ColorType[ColorType["Unknown"] = 0] = "Unknown";
+  ColorType[ColorType["Alpha_8"] = 1] = "Alpha_8";
+  ColorType[ColorType["RGB_565"] = 2] = "RGB_565";
+  ColorType[ColorType["ARGB_4444"] = 3] = "ARGB_4444";
+  ColorType[ColorType["RGBA_8888"] = 4] = "RGBA_8888";
+  ColorType[ColorType["RGB_888x"] = 5] = "RGB_888x";
+  ColorType[ColorType["BGRA_8888"] = 6] = "BGRA_8888";
+  ColorType[ColorType["RGBA_1010102"] = 7] = "RGBA_1010102";
+  ColorType[ColorType["BGRA_1010102"] = 8] = "BGRA_1010102";
+  ColorType[ColorType["RGB_101010x"] = 9] = "RGB_101010x";
+  ColorType[ColorType["BGR_101010x"] = 10] = "BGR_101010x";
+  ColorType[ColorType["BGR_101010x_XR"] = 11] = "BGR_101010x_XR";
+  ColorType[ColorType["BGRA_10101010_XR"] = 12] = "BGRA_10101010_XR";
+  ColorType[ColorType["RGBA_10x6"] = 13] = "RGBA_10x6";
+  ColorType[ColorType["Gray_8"] = 14] = "Gray_8";
+  ColorType[ColorType["RGBA_F16Norm"] = 15] = "RGBA_F16Norm";
+  ColorType[ColorType["RGBA_F16"] = 16] = "RGBA_F16";
+  ColorType[ColorType["RGB_F16F16F16x"] = 17] = "RGB_F16F16F16x";
+  ColorType[ColorType["RGBA_F32"] = 18] = "RGBA_F32";
+  return ColorType;
+}({}); // pixel using C float for red, green, blue, alpha; in 128-bit word
+//# sourceMappingURL=ColorType.js.map

package/lib/commonjs/skia/types/Image/ColorType.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ColorType","exports"],"sources":["ColorType.ts"],"sourcesContent":["export enum ColorType {\n  Unknown, // uninitialized\n  Alpha_8, // pixel with alpha in 8-bit byte\n  RGB_565, // pixel with 5 bits red, 6 bits green, 5 bits blue, in 16-bit word\n  ARGB_4444, // pixel with 4 bits for alpha, red, green, blue; in 16-bit word\n  RGBA_8888, // pixel with 8 bits for red, green, blue, alpha; in 32-bit word\n  RGB_888x, // pixel with 8 bits each for red, green, blue; in 32-bit word\n  BGRA_8888, // pixel with 8 bits for blue, green, red, alpha; in 32-bit word\n  RGBA_1010102, // 10 bits for red, green, blue; 2 bits for alpha; in 32-bit word\n  BGRA_1010102, // 10 bits for blue, green, red; 2 bits for alpha; in 32-bit word\n  RGB_101010x, // pixel with 10 bits each for red, green, blue; in 32-bit word\n  BGR_101010x, // pixel with 10 bits each for blue, green, red; in 32-bit word\n  BGR_101010x_XR, // pixel with 10 bits each for blue, green, red; in 32-bit word, extended range\n  BGRA_10101010_XR, // pixel with 10 bits each for blue, green, red, alpha; in 64-bit word, extended range\n  RGBA_10x6, // pixel with 10 used bits (most significant) followed by 6 unused\n  Gray_8, // pixel with grayscale level in 8-bit byte\n  RGBA_F16Norm, // pixel with half floats in [0,1] for red, green, blue, alpha; in 64-bit word\n  RGBA_F16, // pixel with half floats for red, green, blue, alpha; in 64-bit word\n  RGB_F16F16F16x, // pixel with half floats for red, green, blue; in 64-bit word\n  RGBA_F32, // pixel using C float for red, green, blue, alpha; in 128-bit word\n}\n"],"mappings":";;;;;;IAAYA,SAAS,GAAAC,OAAA,CAAAD,SAAA,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA,OAmBT","ignoreList":[]}

package/lib/commonjs/skia/types/Image/ColorType.web.d.ts

@@ -0,0 +1,19 @@
+export declare enum ColorTypeCanvasKit {
+    Unknown = 0,// uninitialized
+    Alpha_8 = 1,// pixel with alpha in 8-bit byte
+    RGB_565 = 2,// pixel with 5 bits red, 6 bits green, 5 bits blue, in 16-bit word
+    ARGB_4444 = 3,// pixel with 4 bits for alpha, red, green, blue; in 16-bit word
+    RGBA_8888 = 4,// pixel with 8 bits for red, green, blue, alpha; in 32-bit word
+    RGB_888x = 5,// pixel with 8 bits each for red, green, blue; in 32-bit word
+    BGRA_8888 = 6,// pixel with 8 bits for blue, green, red, alpha; in 32-bit word
+    RGBA_1010102 = 7,// 10 bits for red, green, blue; 2 bits for alpha; in 32-bit word
+    BGRA_1010102 = 8,// 10 bits for blue, green, red; 2 bits for alpha; in 32-bit word
+    RGB_101010x = 9,// pixel with 10 bits each for red, green, blue; in 32-bit word
+    BGR_101010x = 10,// pixel with 10 bits each for blue, green, red; in 32-bit word
+    BGR_101010x_XR = 11,// pixel with 10 bits each for blue, green, red; in 32-bit word, extended range
+    RGBA_10x6 = 12,// pixel with 10 used bits (most significant) followed by 6 unused
+    Gray_8 = 13,// pixel with grayscale level in 8-bit byte
+    RGBA_F16Norm = 14,// pixel with half floats in [0,1] for red, green, blue, alpha; in 64-bit word
+    RGBA_F16 = 15,// pixel with half floats for red, green, blue, alpha; in 64-bit word
+    RGBA_F32 = 16
+}

package/lib/commonjs/skia/types/Image/ColorType.web.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ColorTypeCanvasKit = void 0;
+let ColorTypeCanvasKit = exports.ColorTypeCanvasKit = /*#__PURE__*/function (ColorTypeCanvasKit) {
+  ColorTypeCanvasKit[ColorTypeCanvasKit["Unknown"] = 0] = "Unknown";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["Alpha_8"] = 1] = "Alpha_8";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGB_565"] = 2] = "RGB_565";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["ARGB_4444"] = 3] = "ARGB_4444";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGBA_8888"] = 4] = "RGBA_8888";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGB_888x"] = 5] = "RGB_888x";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["BGRA_8888"] = 6] = "BGRA_8888";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGBA_1010102"] = 7] = "RGBA_1010102";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["BGRA_1010102"] = 8] = "BGRA_1010102";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGB_101010x"] = 9] = "RGB_101010x";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["BGR_101010x"] = 10] = "BGR_101010x";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["BGR_101010x_XR"] = 11] = "BGR_101010x_XR";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGBA_10x6"] = 12] = "RGBA_10x6";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["Gray_8"] = 13] = "Gray_8";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGBA_F16Norm"] = 14] = "RGBA_F16Norm";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGBA_F16"] = 15] = "RGBA_F16";
+  ColorTypeCanvasKit[ColorTypeCanvasKit["RGBA_F32"] = 16] = "RGBA_F32";
+  return ColorTypeCanvasKit;
+}({}); // pixel using C float for red, green, blue, alpha; in 128-bit word
+//# sourceMappingURL=ColorType.web.js.map

package/lib/commonjs/skia/types/Image/ColorType.web.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ColorTypeCanvasKit","exports"],"sources":["ColorType.web.ts"],"sourcesContent":["export enum ColorTypeCanvasKit {\n  Unknown, // uninitialized\n  Alpha_8, // pixel with alpha in 8-bit byte\n  RGB_565, // pixel with 5 bits red, 6 bits green, 5 bits blue, in 16-bit word\n  ARGB_4444, // pixel with 4 bits for alpha, red, green, blue; in 16-bit word\n  RGBA_8888, // pixel with 8 bits for red, green, blue, alpha; in 32-bit word\n  RGB_888x, // pixel with 8 bits each for red, green, blue; in 32-bit word\n  BGRA_8888, // pixel with 8 bits for blue, green, red, alpha; in 32-bit word\n  RGBA_1010102, // 10 bits for red, green, blue; 2 bits for alpha; in 32-bit word\n  BGRA_1010102, // 10 bits for blue, green, red; 2 bits for alpha; in 32-bit word\n  RGB_101010x, // pixel with 10 bits each for red, green, blue; in 32-bit word\n  BGR_101010x, // pixel with 10 bits each for blue, green, red; in 32-bit word\n  BGR_101010x_XR, // pixel with 10 bits each for blue, green, red; in 32-bit word, extended range\n  RGBA_10x6, // pixel with 10 used bits (most significant) followed by 6 unused\n  Gray_8, // pixel with grayscale level in 8-bit byte\n  RGBA_F16Norm, // pixel with half floats in [0,1] for red, green, blue, alpha; in 64-bit word\n  RGBA_F16, // pixel with half floats for red, green, blue, alpha; in 64-bit word\n  RGBA_F32, // pixel using C float for red, green, blue, alpha; in 128-bit word\n}\n"],"mappings":";;;;;;IAAYA,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,0BAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAlBA,kBAAkB,CAAlBA,kBAAkB;EAAA,OAAlBA,kBAAkB;AAAA,OAiBlB","ignoreList":[]}

package/lib/commonjs/skia/types/Image/ImageFactory.d.ts

@@ -1,5 +1,6 @@
 import type { SkData } from "../Data";
 import type { NativeBuffer } from "../NativeBuffer";
+import type { ColorType } from "./ColorType";
 import type { SkImage } from "./Image";
 export declare enum AlphaType {
     Unknown = 0,
@@ -7,25 +8,6 @@ export declare enum AlphaType {
     Premul = 2,
     Unpremul = 3
 }
-export declare enum ColorType {
-    Unknown = 0,// uninitialized
-    Alpha_8 = 1,// pixel with alpha in 8-bit byte
-    RGB_565 = 2,// pixel with 5 bits red, 6 bits green, 5 bits blue, in 16-bit word
-    ARGB_4444 = 3,// pixel with 4 bits for alpha, red, green, blue; in 16-bit word
-    RGBA_8888 = 4,// pixel with 8 bits for red, green, blue, alpha; in 32-bit word
-    RGB_888x = 5,// pixel with 8 bits each for red, green, blue; in 32-bit word
-    BGRA_8888 = 6,// pixel with 8 bits for blue, green, red, alpha; in 32-bit word
-    RGBA_1010102 = 7,// 10 bits for red, green, blue; 2 bits for alpha; in 32-bit word
-    BGRA_1010102 = 8,// 10 bits for blue, green, red; 2 bits for alpha; in 32-bit word
-    RGB_101010x = 9,// pixel with 10 bits each for red, green, blue; in 32-bit word
-    BGR_101010x = 10,// pixel with 10 bits each for blue, green, red; in 32-bit word
-    BGR_101010x_XR = 11,// pixel with 10 bits each for blue, green, red; in 32-bit word, extended range
-    RGBA_10x6 = 12,// pixel with 10 used bits (most significant) followed by 6 unused
-    Gray_8 = 13,// pixel with grayscale level in 8-bit byte
-    RGBA_F16Norm = 14,// pixel with half floats in [0,1] for red, green, blue, alpha; in 64-bit word
-    RGBA_F16 = 15,// pixel with half floats for red, green, blue, alpha; in 64-bit word
-    RGBA_F32 = 16
-}
 export interface ImageInfo {
     alphaType: AlphaType;
     colorType: ColorType;

package/lib/commonjs/skia/types/Image/ImageFactory.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ColorType = exports.AlphaType = void 0;
+exports.AlphaType = void 0;
 let AlphaType = exports.AlphaType = /*#__PURE__*/function (AlphaType) {
   AlphaType[AlphaType["Unknown"] = 0] = "Unknown";
   AlphaType[AlphaType["Opaque"] = 1] = "Opaque";
@@ -11,24 +11,4 @@ let AlphaType = exports.AlphaType = /*#__PURE__*/function (AlphaType) {
   AlphaType[AlphaType["Unpremul"] = 3] = "Unpremul";
   return AlphaType;
 }({});
-let ColorType = exports.ColorType = /*#__PURE__*/function (ColorType) {
-  ColorType[ColorType["Unknown"] = 0] = "Unknown";
-  ColorType[ColorType["Alpha_8"] = 1] = "Alpha_8";
-  ColorType[ColorType["RGB_565"] = 2] = "RGB_565";
-  ColorType[ColorType["ARGB_4444"] = 3] = "ARGB_4444";
-  ColorType[ColorType["RGBA_8888"] = 4] = "RGBA_8888";
-  ColorType[ColorType["RGB_888x"] = 5] = "RGB_888x";
-  ColorType[ColorType["BGRA_8888"] = 6] = "BGRA_8888";
-  ColorType[ColorType["RGBA_1010102"] = 7] = "RGBA_1010102";
-  ColorType[ColorType["BGRA_1010102"] = 8] = "BGRA_1010102";
-  ColorType[ColorType["RGB_101010x"] = 9] = "RGB_101010x";
-  ColorType[ColorType["BGR_101010x"] = 10] = "BGR_101010x";
-  ColorType[ColorType["BGR_101010x_XR"] = 11] = "BGR_101010x_XR";
-  ColorType[ColorType["RGBA_10x6"] = 12] = "RGBA_10x6";
-  ColorType[ColorType["Gray_8"] = 13] = "Gray_8";
-  ColorType[ColorType["RGBA_F16Norm"] = 14] = "RGBA_F16Norm";
-  ColorType[ColorType["RGBA_F16"] = 15] = "RGBA_F16";
-  ColorType[ColorType["RGBA_F32"] = 16] = "RGBA_F32";
-  return ColorType;
-}({}); // pixel using C float for red, green, blue, alpha; in 128-bit word
 //# sourceMappingURL=ImageFactory.js.map

package/lib/commonjs/skia/types/Image/ImageFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["AlphaType","exports","ColorType"],"sources":["ImageFactory.ts"],"sourcesContent":["import type { SkData } from \"../Data\";\nimport type { NativeBuffer } from \"../NativeBuffer\";\n\nimport type { SkImage } from \"./Image\";\n\nexport enum AlphaType {\n  Unknown,\n  Opaque,\n  Premul,\n  Unpremul,\n}\n\nexport enum ColorType {\n  Unknown, // uninitialized\n  Alpha_8, // pixel with alpha in 8-bit byte\n  RGB_565, // pixel with 5 bits red, 6 bits green, 5 bits blue, in 16-bit word\n  ARGB_4444, // pixel with 4 bits for alpha, red, green, blue; in 16-bit word\n  RGBA_8888, // pixel with 8 bits for red, green, blue, alpha; in 32-bit word\n  RGB_888x, // pixel with 8 bits each for red, green, blue; in 32-bit word\n  BGRA_8888, // pixel with 8 bits for blue, green, red, alpha; in 32-bit word\n  RGBA_1010102, // 10 bits for red, green, blue; 2 bits for alpha; in 32-bit word\n  BGRA_1010102, // 10 bits for blue, green, red; 2 bits for alpha; in 32-bit word\n  RGB_101010x, // pixel with 10 bits each for red, green, blue; in 32-bit word\n  BGR_101010x, // pixel with 10 bits each for blue, green, red; in 32-bit word\n  BGR_101010x_XR, // pixel with 10 bits each for blue, green, red; in 32-bit word, extended range\n  RGBA_10x6, // pixel with 10 used bits (most significant) followed by 6 unused\n  Gray_8, // pixel with grayscale level in 8-bit byte\n  RGBA_F16Norm, // pixel with half floats in [0,1] for red, green, blue, alpha; in 64-bit word\n  RGBA_F16, // pixel with half floats for red, green, blue, alpha; in 64-bit word\n  RGBA_F32, // pixel using C float for red, green, blue, alpha; in 128-bit word\n}\n\nexport interface ImageInfo {\n  alphaType: AlphaType;\n  // TODO: add support for color space\n  // colorSpace: ColorSpace;\n  colorType: ColorType;\n  height: number;\n  width: number;\n}\n\nexport interface ImageFactory {\n  /**\n   * Return an Image backed by the encoded data, but attempt to defer decoding until the image\n   * is actually used/drawn. This deferral allows the system to cache the result, either on the\n   * CPU or on the GPU, depending on where the image is drawn.\n   * This decoding uses the codecs that have been compiled into CanvasKit. If the bytes are\n   * invalid (or an unrecognized codec), null will be returned. See Image.h for more details.\n   * @param data - Data object with bytes of data\n   * @returns If the encoded format is not supported, or subset is outside of the bounds of the decoded\n   *  image, nullptr is returned.\n   */\n  MakeImageFromEncoded: (encoded: SkData) => SkImage | null;\n\n  /**\n   * Return an Image backed by a given native buffer.\n   * The native buffer must be a valid owning reference.\n   *\n   * For instance, this API is used by\n   * [react-native-vision-camera](https://github.com/mrousavy/react-native-vision-camera)\n   * to render a Skia Camera preview.\n   *\n   * - On Android; This is an `AHardwareBuffer*`\n   * - On iOS, this is a `CVPixelBufferRef`\n   * @param nativeBuffer A strong `uintptr_t` pointer to the native buffer\n   * @throws Throws an error if the Image could not be created, for example when the given\n   * native buffer is invalid.\n   */\n  MakeImageFromNativeBuffer: (nativeBuffer: NativeBuffer) => SkImage;\n\n  /**\n   * Returns an image that will be a screenshot of the view represented by\n   * the view tag\n   * @param viewTag - The tag of the view to make an image from.\n   * @returns Returns a valid SkImage, if the view tag is invalid, nullptr is returned.\n   */\n  MakeImageFromViewTag: (viewTag: number) => Promise<SkImage | null>;\n\n  /**\n   * Returns an image with the given pixel data and format.\n   * Note that we will always make a copy of the pixel data, because of inconsistencies in\n   * behavior between GPU and CPU (i.e. the pixel data will be turned into a GPU texture and\n   * not modifiable after creation).\n   *\n   * @param info\n   * @param data - bytes representing the pixel data.\n   * @param bytesPerRow\n   */\n  MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number): SkImage | null;\n}\n"],"mappings":";;;;;;IAKYA,SAAS,GAAAC,OAAA,CAAAD,SAAA,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA;AAAA,IAOTE,SAAS,GAAAD,OAAA,CAAAC,SAAA,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA,OAiBT","ignoreList":[]}
+{"version":3,"names":["AlphaType","exports"],"sources":["ImageFactory.ts"],"sourcesContent":["import type { SkData } from \"../Data\";\nimport type { NativeBuffer } from \"../NativeBuffer\";\n\nimport type { ColorType } from \"./ColorType\";\nimport type { SkImage } from \"./Image\";\n\nexport enum AlphaType {\n  Unknown,\n  Opaque,\n  Premul,\n  Unpremul,\n}\n\nexport interface ImageInfo {\n  alphaType: AlphaType;\n  // TODO: add support for color space\n  // colorSpace: ColorSpace;\n  colorType: ColorType;\n  height: number;\n  width: number;\n}\n\nexport interface ImageFactory {\n  /**\n   * Return an Image backed by the encoded data, but attempt to defer decoding until the image\n   * is actually used/drawn. This deferral allows the system to cache the result, either on the\n   * CPU or on the GPU, depending on where the image is drawn.\n   * This decoding uses the codecs that have been compiled into CanvasKit. If the bytes are\n   * invalid (or an unrecognized codec), null will be returned. See Image.h for more details.\n   * @param data - Data object with bytes of data\n   * @returns If the encoded format is not supported, or subset is outside of the bounds of the decoded\n   *  image, nullptr is returned.\n   */\n  MakeImageFromEncoded: (encoded: SkData) => SkImage | null;\n\n  /**\n   * Return an Image backed by a given native buffer.\n   * The native buffer must be a valid owning reference.\n   *\n   * For instance, this API is used by\n   * [react-native-vision-camera](https://github.com/mrousavy/react-native-vision-camera)\n   * to render a Skia Camera preview.\n   *\n   * - On Android; This is an `AHardwareBuffer*`\n   * - On iOS, this is a `CVPixelBufferRef`\n   * @param nativeBuffer A strong `uintptr_t` pointer to the native buffer\n   * @throws Throws an error if the Image could not be created, for example when the given\n   * native buffer is invalid.\n   */\n  MakeImageFromNativeBuffer: (nativeBuffer: NativeBuffer) => SkImage;\n\n  /**\n   * Returns an image that will be a screenshot of the view represented by\n   * the view tag\n   * @param viewTag - The tag of the view to make an image from.\n   * @returns Returns a valid SkImage, if the view tag is invalid, nullptr is returned.\n   */\n  MakeImageFromViewTag: (viewTag: number) => Promise<SkImage | null>;\n\n  /**\n   * Returns an image with the given pixel data and format.\n   * Note that we will always make a copy of the pixel data, because of inconsistencies in\n   * behavior between GPU and CPU (i.e. the pixel data will be turned into a GPU texture and\n   * not modifiable after creation).\n   *\n   * @param info\n   * @param data - bytes representing the pixel data.\n   * @param bytesPerRow\n   */\n  MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number): SkImage | null;\n}\n"],"mappings":";;;;;;IAMYA,SAAS,GAAAC,OAAA,CAAAD,SAAA,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}

package/lib/commonjs/skia/types/Image/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./Image";
 export * from "./ImageFactory";
+export * from "./ColorType";