@shopify/react-native-skia 1.3.9 → 1.3.11

package/android/CMakeLists.txt

@@ -220,6 +220,8 @@ else()
 endif()
 message("-- TURBO   : " ${TURBOMODULES_LIB})
 
+add_definitions(-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION})
+
 # Link
 target_link_libraries(
         ${PACKAGE_NAME}

package/android/build.gradle

@@ -172,13 +172,15 @@ android {
                 ]
             }
 
-            if (REACT_NATIVE_VERSION >= 74) {
+            if (REACT_NATIVE_VERSION == 74) {
                 srcDirs += [
                     "src/reactnative74/java"
                 ]
             } else {
+                // the name latest here might be confusing as it applies for versions
+                // below 74 as well
                 srcDirs += [
-                    "src/reactnative69/java"
+                    "src/latest/java"
                 ]
             }
         }

package/android/cpp/jni/JniSkiaManager.cpp

@@ -20,12 +20,17 @@ public:
       facebook::react::RuntimeExecutor runtimeExecutor)
       : runtimeExecutor_(std::move(runtimeExecutor)) {}
 
-  void invokeAsync(std::function<void()> &&func) noexcept override {
-    runtimeExecutor_(
-        [func = std::move(func)](facebook::jsi::Runtime &runtime) { func(); });
+  void invokeAsync(facebook::react::CallFunc &&func) noexcept override {
+    runtimeExecutor_([func = std::move(func)](facebook::jsi::Runtime &runtime) {
+#if REACT_NATIVE_VERSION >= 75
+      func(runtime);
+#else
+      func();
+#endif
+    });
   }
 
-  void invokeSync(std::function<void()> &&func) override {
+  void invokeSync(facebook::react::CallFunc &&func) override {
     throw std::runtime_error(
         "Synchronous native -> JS calls are currently not supported.");
   }

package/cpp/api/JsiSkAnimatedImage.h

@@ -35,6 +35,10 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
   }
 
+  JSI_HOST_FUNCTION(getFrameCount) {
+    return static_cast<int>(getObject()->getFrameCount());
+  }
+
   JSI_HOST_FUNCTION(currentFrameDuration) {
     return static_cast<int>(getObject()->currentFrameDuration());
   }
@@ -43,9 +47,10 @@ public:
     return static_cast<int>(getObject()->decodeNextFrame());
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkAnimatedImage, "AnimatedImage")
+  EXPORT_JSI_API_TYPENAME(JsiSkAnimatedImage, AnimatedImage)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkAnimatedImage, dispose),
+                       JSI_EXPORT_FUNC(JsiSkAnimatedImage, getFrameCount),
                        JSI_EXPORT_FUNC(JsiSkAnimatedImage, getCurrentFrame),
                        JSI_EXPORT_FUNC(JsiSkAnimatedImage,
                                        currentFrameDuration),

package/cpp/api/JsiSkParagraph.h

@@ -32,6 +32,8 @@ namespace para = skia::textlayout;
  */
 class JsiSkParagraph : public JsiSkHostObject {
 public:
+  EXPORT_JSI_API_TYPENAME(JsiSkParagraph, Paragraph)
+
   JSI_HOST_FUNCTION(layout) {
     auto width = getArgumentAsNumber(runtime, arguments, count, 0);
     _paragraph->layout(width);
@@ -122,6 +124,12 @@ public:
     return returnValue;
   }
 
+  JSI_HOST_FUNCTION(dispose) {
+    _paragraph = nullptr;
+
+    return jsi::Value::undefined();
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkParagraph, layout),
                        JSI_EXPORT_FUNC(JsiSkParagraph, paint),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getMaxWidth),
@@ -133,7 +141,8 @@ public:
                        JSI_EXPORT_FUNC(JsiSkParagraph,
                                        getGlyphPositionAtCoordinate),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getRectsForRange),
-                       JSI_EXPORT_FUNC(JsiSkParagraph, getLineMetrics))
+                       JSI_EXPORT_FUNC(JsiSkParagraph, getLineMetrics),
+                       JSI_EXPORT_FUNC(JsiSkParagraph, dispose))
 
   explicit JsiSkParagraph(std::shared_ptr<RNSkPlatformContext> context,
                           para::ParagraphBuilder *paragraphBuilder)

package/ios/RNSkiaModule.mm

@@ -9,6 +9,7 @@
 }
 
 RCT_EXPORT_MODULE()
+@synthesize bridge = _bridge;
 
 #pragma Accessors
 
@@ -34,11 +35,12 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
     // Already initialized, ignore call.
     return @true;
   }
-  RCTBridge *bridge = [RCTBridge currentBridge];
+  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
   if (!jsInvoker) {
-    jsInvoker = bridge.jsCallInvoker;
+    jsInvoker = cxxBridge.jsCallInvoker;
   }
-  skiaManager = [[SkiaManager alloc] initWithBridge:bridge jsInvoker:jsInvoker];
+  skiaManager = [[SkiaManager alloc] initWithBridge:cxxBridge
+                                          jsInvoker:jsInvoker];
   return @true;
 }
 

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

@@ -21,4 +21,9 @@ export interface SkAnimatedImage extends SkJSIInstance<"AnimatedImage"> {
      *  internally.
      */
     currentFrameDuration(): number;
+    /**
+     *  Returns the number of frames in the animation.
+     *
+     */
+    getFrameCount(): number;
 }

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["AnimatedImage.ts"],"sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkImage } from \"../Image\";\n\nexport interface SkAnimatedImage extends SkJSIInstance<\"AnimatedImage\"> {\n  /**\n   *  Decode the next frame.\n   *\n   *  If the animation is on the last frame or has hit an error, returns\n   *  kFinished (-1).\n   */\n  decodeNextFrame(): number;\n\n  /**\n   *  Returns the current frame as an SkImage. The SkImage will not change\n   *  after it has been returned.\n   *  If there is no current frame, null will be returned.\n   */\n  getCurrentFrame(): SkImage | null;\n\n  /**\n   *  How long to display the current frame.\n   *\n   *  Useful for the first frame, for which decodeNextFrame is called\n   *  internally.\n   */\n  currentFrameDuration(): number;\n\n  // TODO - add the rest of the methods from the Skia API (see SkAnimatedImage.h)\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["AnimatedImage.ts"],"sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkImage } from \"../Image\";\n\nexport interface SkAnimatedImage extends SkJSIInstance<\"AnimatedImage\"> {\n  /**\n   *  Decode the next frame.\n   *\n   *  If the animation is on the last frame or has hit an error, returns\n   *  kFinished (-1).\n   */\n  decodeNextFrame(): number;\n\n  /**\n   *  Returns the current frame as an SkImage. The SkImage will not change\n   *  after it has been returned.\n   *  If there is no current frame, null will be returned.\n   */\n  getCurrentFrame(): SkImage | null;\n\n  /**\n   *  How long to display the current frame.\n   *\n   *  Useful for the first frame, for which decodeNextFrame is called\n   *  internally.\n   */\n  currentFrameDuration(): number;\n\n  /**\n   *  Returns the number of frames in the animation.\n   *\n   */\n  getFrameCount(): number;\n\n  // TODO - add the rest of the methods from the Skia API (see SkAnimatedImage.h)\n}\n"],"mappings":""}

package/lib/commonjs/skia/types/Vertices/Vertices.d.ts

@@ -2,7 +2,7 @@ import type { SkRect } from "../Rect";
 import type { SkJSIInstance } from "../JsiInstance";
 export declare enum VertexMode {
     Triangles = 0,
-    TrianglesStrip = 1,
+    TriangleStrip = 1,
     TriangleFan = 2
 }
 export interface SkVertices extends SkJSIInstance<"Vertices"> {

package/lib/commonjs/skia/types/Vertices/Vertices.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.VertexMode = void 0;
 let VertexMode = exports.VertexMode = /*#__PURE__*/function (VertexMode) {
   VertexMode[VertexMode["Triangles"] = 0] = "Triangles";
-  VertexMode[VertexMode["TrianglesStrip"] = 1] = "TrianglesStrip";
+  VertexMode[VertexMode["TriangleStrip"] = 1] = "TriangleStrip";
   VertexMode[VertexMode["TriangleFan"] = 2] = "TriangleFan";
   return VertexMode;
 }({});

package/lib/commonjs/skia/types/Vertices/Vertices.js.map

@@ -1 +1 @@
-{"version":3,"names":["VertexMode","exports"],"sources":["Vertices.tsx"],"sourcesContent":["import type { SkRect } from \"../Rect\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\n\nexport enum VertexMode {\n  Triangles,\n  TrianglesStrip,\n  TriangleFan,\n}\n\nexport interface SkVertices extends SkJSIInstance<\"Vertices\"> {\n  /**\n   * Return the bounding area for the vertices.\n   */\n  bounds(): SkRect;\n\n  /**\n   * Return a unique ID for this vertices object.\n   */\n  uniqueID(): number;\n}\n"],"mappings":";;;;;;IAGYA,UAAU,GAAAC,OAAA,CAAAD,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA"}
+{"version":3,"names":["VertexMode","exports"],"sources":["Vertices.tsx"],"sourcesContent":["import type { SkRect } from \"../Rect\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\n\nexport enum VertexMode {\n  Triangles,\n  TriangleStrip,\n  TriangleFan,\n}\n\nexport interface SkVertices extends SkJSIInstance<\"Vertices\"> {\n  /**\n   * Return the bounding area for the vertices.\n   */\n  bounds(): SkRect;\n\n  /**\n   * Return a unique ID for this vertices object.\n   */\n  uniqueID(): number;\n}\n"],"mappings":";;;;;;IAGYA,UAAU,GAAAC,OAAA,CAAAD,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA"}

package/lib/commonjs/skia/web/JsiSkAnimatedImage.d.ts

@@ -6,6 +6,7 @@ export declare class JsiSkAnimatedImage extends HostObject<AnimatedImage, "Anima
     constructor(CanvasKit: CanvasKit, ref: AnimatedImage);
     decodeNextFrame(): number;
     currentFrameDuration(): number;
+    getFrameCount(): number;
     getCurrentFrame(): JsiSkImage | null;
     dispose: () => void;
 }

package/lib/commonjs/skia/web/JsiSkAnimatedImage.js

@@ -22,6 +22,9 @@ class JsiSkAnimatedImage extends _Host.HostObject {
   currentFrameDuration() {
     return this.ref.currentFrameDuration();
   }
+  getFrameCount() {
+    return this.ref.getFrameCount();
+  }
   getCurrentFrame() {
     const image = this.ref.makeImageAtCurrentFrame();
     if (image === null) {

package/lib/commonjs/skia/web/JsiSkAnimatedImage.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Host","require","_JsiSkImage","_defineProperty","obj","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","JsiSkAnimatedImage","HostObject","constructor","CanvasKit","ref","delete","decodeNextFrame","currentFrameDuration","getCurrentFrame","image","makeImageAtCurrentFrame","JsiSkImage","exports"],"sources":["JsiSkAnimatedImage.ts"],"sourcesContent":["import type { AnimatedImage, CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkAnimatedImage } from \"../types/AnimatedImage\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkImage } from \"./JsiSkImage\";\n\nexport class JsiSkAnimatedImage\n  extends HostObject<AnimatedImage, \"AnimatedImage\">\n  implements SkAnimatedImage\n{\n  constructor(CanvasKit: CanvasKit, ref: AnimatedImage) {\n    super(CanvasKit, ref, \"AnimatedImage\");\n  }\n\n  decodeNextFrame() {\n    return this.ref.decodeNextFrame();\n  }\n\n  currentFrameDuration() {\n    return this.ref.currentFrameDuration();\n  }\n\n  getCurrentFrame() {\n    const image = this.ref.makeImageAtCurrentFrame();\n    if (image === null) {\n      return null;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  dispose = () => {\n    this.ref.delete();\n  };\n}\n"],"mappings":";;;;;;AAIA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAA0C,SAAAE,gBAAAC,GAAA,EAAAC,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAD,GAAA,IAAAI,MAAA,CAAAC,cAAA,CAAAL,GAAA,EAAAC,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAR,GAAA,CAAAC,GAAA,IAAAC,KAAA,WAAAF,GAAA;AAAA,SAAAG,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAEnC,MAAMW,kBAAkB,SACrBC,gBAAU,CAEpB;EACEC,WAAWA,CAACC,SAAoB,EAAEC,GAAkB,EAAE;IACpD,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,eAAe,CAAC;IAACzB,eAAA,kBAmB/B,MAAM;MACd,IAAI,CAACyB,GAAG,CAACC,MAAM,CAAC,CAAC;IACnB,CAAC;EApBD;EAEAC,eAAeA,CAAA,EAAG;IAChB,OAAO,IAAI,CAACF,GAAG,CAACE,eAAe,CAAC,CAAC;EACnC;EAEAC,oBAAoBA,CAAA,EAAG;IACrB,OAAO,IAAI,CAACH,GAAG,CAACG,oBAAoB,CAAC,CAAC;EACxC;EAEAC,eAAeA,CAAA,EAAG;IAChB,MAAMC,KAAK,GAAG,IAAI,CAACL,GAAG,CAACM,uBAAuB,CAAC,CAAC;IAChD,IAAID,KAAK,KAAK,IAAI,EAAE;MAClB,OAAO,IAAI;IACb;IACA,OAAO,IAAIE,sBAAU,CAAC,IAAI,CAACR,SAAS,EAAEM,KAAK,CAAC;EAC9C;AAKF;AAACG,OAAA,CAAAZ,kBAAA,GAAAA,kBAAA"}
+{"version":3,"names":["_Host","require","_JsiSkImage","_defineProperty","obj","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","JsiSkAnimatedImage","HostObject","constructor","CanvasKit","ref","delete","decodeNextFrame","currentFrameDuration","getFrameCount","getCurrentFrame","image","makeImageAtCurrentFrame","JsiSkImage","exports"],"sources":["JsiSkAnimatedImage.ts"],"sourcesContent":["import type { AnimatedImage, CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkAnimatedImage } from \"../types/AnimatedImage\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkImage } from \"./JsiSkImage\";\n\nexport class JsiSkAnimatedImage\n  extends HostObject<AnimatedImage, \"AnimatedImage\">\n  implements SkAnimatedImage\n{\n  constructor(CanvasKit: CanvasKit, ref: AnimatedImage) {\n    super(CanvasKit, ref, \"AnimatedImage\");\n  }\n\n  decodeNextFrame() {\n    return this.ref.decodeNextFrame();\n  }\n\n  currentFrameDuration() {\n    return this.ref.currentFrameDuration();\n  }\n\n  getFrameCount() {\n    return this.ref.getFrameCount();\n  }\n\n  getCurrentFrame() {\n    const image = this.ref.makeImageAtCurrentFrame();\n    if (image === null) {\n      return null;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  dispose = () => {\n    this.ref.delete();\n  };\n}\n"],"mappings":";;;;;;AAIA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAA0C,SAAAE,gBAAAC,GAAA,EAAAC,GAAA,EAAAC,KAAA,IAAAD,GAAA,GAAAE,cAAA,CAAAF,GAAA,OAAAA,GAAA,IAAAD,GAAA,IAAAI,MAAA,CAAAC,cAAA,CAAAL,GAAA,EAAAC,GAAA,IAAAC,KAAA,EAAAA,KAAA,EAAAI,UAAA,QAAAC,YAAA,QAAAC,QAAA,oBAAAR,GAAA,CAAAC,GAAA,IAAAC,KAAA,WAAAF,GAAA;AAAA,SAAAG,eAAAM,CAAA,QAAAC,CAAA,GAAAC,YAAA,CAAAF,CAAA,uCAAAC,CAAA,GAAAA,CAAA,GAAAE,MAAA,CAAAF,CAAA;AAAA,SAAAC,aAAAF,CAAA,EAAAI,CAAA,2BAAAJ,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAK,CAAA,GAAAL,CAAA,CAAAM,MAAA,CAAAC,WAAA,kBAAAF,CAAA,QAAAJ,CAAA,GAAAI,CAAA,CAAAG,IAAA,CAAAR,CAAA,EAAAI,CAAA,uCAAAH,CAAA,SAAAA,CAAA,YAAAQ,SAAA,yEAAAL,CAAA,GAAAD,MAAA,GAAAO,MAAA,EAAAV,CAAA;AAEnC,MAAMW,kBAAkB,SACrBC,gBAAU,CAEpB;EACEC,WAAWA,CAACC,SAAoB,EAAEC,GAAkB,EAAE;IACpD,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,eAAe,CAAC;IAACzB,eAAA,kBAuB/B,MAAM;MACd,IAAI,CAACyB,GAAG,CAACC,MAAM,CAAC,CAAC;IACnB,CAAC;EAxBD;EAEAC,eAAeA,CAAA,EAAG;IAChB,OAAO,IAAI,CAACF,GAAG,CAACE,eAAe,CAAC,CAAC;EACnC;EAEAC,oBAAoBA,CAAA,EAAG;IACrB,OAAO,IAAI,CAACH,GAAG,CAACG,oBAAoB,CAAC,CAAC;EACxC;EAEAC,aAAaA,CAAA,EAAG;IACd,OAAO,IAAI,CAACJ,GAAG,CAACI,aAAa,CAAC,CAAC;EACjC;EAEAC,eAAeA,CAAA,EAAG;IAChB,MAAMC,KAAK,GAAG,IAAI,CAACN,GAAG,CAACO,uBAAuB,CAAC,CAAC;IAChD,IAAID,KAAK,KAAK,IAAI,EAAE;MAClB,OAAO,IAAI;IACb;IACA,OAAO,IAAIE,sBAAU,CAAC,IAAI,CAACT,SAAS,EAAEO,KAAK,CAAC;EAC9C;AAKF;AAACG,OAAA,CAAAb,kBAAA,GAAAA,kBAAA"}

package/lib/module/skia/types/AnimatedImage/AnimatedImage.d.ts

@@ -21,4 +21,9 @@ export interface SkAnimatedImage extends SkJSIInstance<"AnimatedImage"> {
      *  internally.
      */
     currentFrameDuration(): number;
+    /**
+     *  Returns the number of frames in the animation.
+     *
+     */
+    getFrameCount(): number;
 }

package/lib/module/skia/types/AnimatedImage/AnimatedImage.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["AnimatedImage.ts"],"sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkImage } from \"../Image\";\n\nexport interface SkAnimatedImage extends SkJSIInstance<\"AnimatedImage\"> {\n  /**\n   *  Decode the next frame.\n   *\n   *  If the animation is on the last frame or has hit an error, returns\n   *  kFinished (-1).\n   */\n  decodeNextFrame(): number;\n\n  /**\n   *  Returns the current frame as an SkImage. The SkImage will not change\n   *  after it has been returned.\n   *  If there is no current frame, null will be returned.\n   */\n  getCurrentFrame(): SkImage | null;\n\n  /**\n   *  How long to display the current frame.\n   *\n   *  Useful for the first frame, for which decodeNextFrame is called\n   *  internally.\n   */\n  currentFrameDuration(): number;\n\n  // TODO - add the rest of the methods from the Skia API (see SkAnimatedImage.h)\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["AnimatedImage.ts"],"sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkImage } from \"../Image\";\n\nexport interface SkAnimatedImage extends SkJSIInstance<\"AnimatedImage\"> {\n  /**\n   *  Decode the next frame.\n   *\n   *  If the animation is on the last frame or has hit an error, returns\n   *  kFinished (-1).\n   */\n  decodeNextFrame(): number;\n\n  /**\n   *  Returns the current frame as an SkImage. The SkImage will not change\n   *  after it has been returned.\n   *  If there is no current frame, null will be returned.\n   */\n  getCurrentFrame(): SkImage | null;\n\n  /**\n   *  How long to display the current frame.\n   *\n   *  Useful for the first frame, for which decodeNextFrame is called\n   *  internally.\n   */\n  currentFrameDuration(): number;\n\n  /**\n   *  Returns the number of frames in the animation.\n   *\n   */\n  getFrameCount(): number;\n\n  // TODO - add the rest of the methods from the Skia API (see SkAnimatedImage.h)\n}\n"],"mappings":""}

package/lib/module/skia/types/Vertices/Vertices.d.ts

@@ -2,7 +2,7 @@ import type { SkRect } from "../Rect";
 import type { SkJSIInstance } from "../JsiInstance";
 export declare enum VertexMode {
     Triangles = 0,
-    TrianglesStrip = 1,
+    TriangleStrip = 1,
     TriangleFan = 2
 }
 export interface SkVertices extends SkJSIInstance<"Vertices"> {

package/lib/module/skia/types/Vertices/Vertices.js

@@ -1,6 +1,6 @@
 export let VertexMode = /*#__PURE__*/function (VertexMode) {
   VertexMode[VertexMode["Triangles"] = 0] = "Triangles";
-  VertexMode[VertexMode["TrianglesStrip"] = 1] = "TrianglesStrip";
+  VertexMode[VertexMode["TriangleStrip"] = 1] = "TriangleStrip";
   VertexMode[VertexMode["TriangleFan"] = 2] = "TriangleFan";
   return VertexMode;
 }({});

package/lib/module/skia/types/Vertices/Vertices.js.map

@@ -1 +1 @@
-{"version":3,"names":["VertexMode"],"sources":["Vertices.tsx"],"sourcesContent":["import type { SkRect } from \"../Rect\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\n\nexport enum VertexMode {\n  Triangles,\n  TrianglesStrip,\n  TriangleFan,\n}\n\nexport interface SkVertices extends SkJSIInstance<\"Vertices\"> {\n  /**\n   * Return the bounding area for the vertices.\n   */\n  bounds(): SkRect;\n\n  /**\n   * Return a unique ID for this vertices object.\n   */\n  uniqueID(): number;\n}\n"],"mappings":"AAGA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA"}
+{"version":3,"names":["VertexMode"],"sources":["Vertices.tsx"],"sourcesContent":["import type { SkRect } from \"../Rect\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\n\nexport enum VertexMode {\n  Triangles,\n  TriangleStrip,\n  TriangleFan,\n}\n\nexport interface SkVertices extends SkJSIInstance<\"Vertices\"> {\n  /**\n   * Return the bounding area for the vertices.\n   */\n  bounds(): SkRect;\n\n  /**\n   * Return a unique ID for this vertices object.\n   */\n  uniqueID(): number;\n}\n"],"mappings":"AAGA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA"}

package/lib/module/skia/web/JsiSkAnimatedImage.d.ts

@@ -6,6 +6,7 @@ export declare class JsiSkAnimatedImage extends HostObject<AnimatedImage, "Anima
     constructor(CanvasKit: CanvasKit, ref: AnimatedImage);
     decodeNextFrame(): number;
     currentFrameDuration(): number;
+    getFrameCount(): number;
     getCurrentFrame(): JsiSkImage | null;
     dispose: () => void;
 }

package/lib/module/skia/web/JsiSkAnimatedImage.js

@@ -16,6 +16,9 @@ export class JsiSkAnimatedImage extends HostObject {
   currentFrameDuration() {
     return this.ref.currentFrameDuration();
   }
+  getFrameCount() {
+    return this.ref.getFrameCount();
+  }
   getCurrentFrame() {
     const image = this.ref.makeImageAtCurrentFrame();
     if (image === null) {

package/lib/module/skia/web/JsiSkAnimatedImage.js.map

@@ -1 +1 @@
-{"version":3,"names":["HostObject","JsiSkImage","JsiSkAnimatedImage","constructor","CanvasKit","ref","_defineProperty","delete","decodeNextFrame","currentFrameDuration","getCurrentFrame","image","makeImageAtCurrentFrame"],"sources":["JsiSkAnimatedImage.ts"],"sourcesContent":["import type { AnimatedImage, CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkAnimatedImage } from \"../types/AnimatedImage\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkImage } from \"./JsiSkImage\";\n\nexport class JsiSkAnimatedImage\n  extends HostObject<AnimatedImage, \"AnimatedImage\">\n  implements SkAnimatedImage\n{\n  constructor(CanvasKit: CanvasKit, ref: AnimatedImage) {\n    super(CanvasKit, ref, \"AnimatedImage\");\n  }\n\n  decodeNextFrame() {\n    return this.ref.decodeNextFrame();\n  }\n\n  currentFrameDuration() {\n    return this.ref.currentFrameDuration();\n  }\n\n  getCurrentFrame() {\n    const image = this.ref.makeImageAtCurrentFrame();\n    if (image === null) {\n      return null;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  dispose = () => {\n    this.ref.delete();\n  };\n}\n"],"mappings":";;;AAIA,SAASA,UAAU,QAAQ,QAAQ;AACnC,SAASC,UAAU,QAAQ,cAAc;AAEzC,OAAO,MAAMC,kBAAkB,SACrBF,UAAU,CAEpB;EACEG,WAAWA,CAACC,SAAoB,EAAEC,GAAkB,EAAE;IACpD,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,eAAe,CAAC;IAACC,eAAA,kBAmB/B,MAAM;MACd,IAAI,CAACD,GAAG,CAACE,MAAM,CAAC,CAAC;IACnB,CAAC;EApBD;EAEAC,eAAeA,CAAA,EAAG;IAChB,OAAO,IAAI,CAACH,GAAG,CAACG,eAAe,CAAC,CAAC;EACnC;EAEAC,oBAAoBA,CAAA,EAAG;IACrB,OAAO,IAAI,CAACJ,GAAG,CAACI,oBAAoB,CAAC,CAAC;EACxC;EAEAC,eAAeA,CAAA,EAAG;IAChB,MAAMC,KAAK,GAAG,IAAI,CAACN,GAAG,CAACO,uBAAuB,CAAC,CAAC;IAChD,IAAID,KAAK,KAAK,IAAI,EAAE;MAClB,OAAO,IAAI;IACb;IACA,OAAO,IAAIV,UAAU,CAAC,IAAI,CAACG,SAAS,EAAEO,KAAK,CAAC;EAC9C;AAKF"}
+{"version":3,"names":["HostObject","JsiSkImage","JsiSkAnimatedImage","constructor","CanvasKit","ref","_defineProperty","delete","decodeNextFrame","currentFrameDuration","getFrameCount","getCurrentFrame","image","makeImageAtCurrentFrame"],"sources":["JsiSkAnimatedImage.ts"],"sourcesContent":["import type { AnimatedImage, CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkAnimatedImage } from \"../types/AnimatedImage\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkImage } from \"./JsiSkImage\";\n\nexport class JsiSkAnimatedImage\n  extends HostObject<AnimatedImage, \"AnimatedImage\">\n  implements SkAnimatedImage\n{\n  constructor(CanvasKit: CanvasKit, ref: AnimatedImage) {\n    super(CanvasKit, ref, \"AnimatedImage\");\n  }\n\n  decodeNextFrame() {\n    return this.ref.decodeNextFrame();\n  }\n\n  currentFrameDuration() {\n    return this.ref.currentFrameDuration();\n  }\n\n  getFrameCount() {\n    return this.ref.getFrameCount();\n  }\n\n  getCurrentFrame() {\n    const image = this.ref.makeImageAtCurrentFrame();\n    if (image === null) {\n      return null;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  dispose = () => {\n    this.ref.delete();\n  };\n}\n"],"mappings":";;;AAIA,SAASA,UAAU,QAAQ,QAAQ;AACnC,SAASC,UAAU,QAAQ,cAAc;AAEzC,OAAO,MAAMC,kBAAkB,SACrBF,UAAU,CAEpB;EACEG,WAAWA,CAACC,SAAoB,EAAEC,GAAkB,EAAE;IACpD,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,eAAe,CAAC;IAACC,eAAA,kBAuB/B,MAAM;MACd,IAAI,CAACD,GAAG,CAACE,MAAM,CAAC,CAAC;IACnB,CAAC;EAxBD;EAEAC,eAAeA,CAAA,EAAG;IAChB,OAAO,IAAI,CAACH,GAAG,CAACG,eAAe,CAAC,CAAC;EACnC;EAEAC,oBAAoBA,CAAA,EAAG;IACrB,OAAO,IAAI,CAACJ,GAAG,CAACI,oBAAoB,CAAC,CAAC;EACxC;EAEAC,aAAaA,CAAA,EAAG;IACd,OAAO,IAAI,CAACL,GAAG,CAACK,aAAa,CAAC,CAAC;EACjC;EAEAC,eAAeA,CAAA,EAAG;IAChB,MAAMC,KAAK,GAAG,IAAI,CAACP,GAAG,CAACQ,uBAAuB,CAAC,CAAC;IAChD,IAAID,KAAK,KAAK,IAAI,EAAE;MAClB,OAAO,IAAI;IACb;IACA,OAAO,IAAIX,UAAU,CAAC,IAAI,CAACG,SAAS,EAAEQ,KAAK,CAAC;EAC9C;AAKF"}

package/lib/typescript/src/skia/types/AnimatedImage/AnimatedImage.d.ts

@@ -21,4 +21,9 @@ export interface SkAnimatedImage extends SkJSIInstance<"AnimatedImage"> {
      *  internally.
      */
     currentFrameDuration(): number;
+    /**
+     *  Returns the number of frames in the animation.
+     *
+     */
+    getFrameCount(): number;
 }

package/lib/typescript/src/skia/types/Vertices/Vertices.d.ts

@@ -2,7 +2,7 @@ import type { SkRect } from "../Rect";
 import type { SkJSIInstance } from "../JsiInstance";
 export declare enum VertexMode {
     Triangles = 0,
-    TrianglesStrip = 1,
+    TriangleStrip = 1,
     TriangleFan = 2
 }
 export interface SkVertices extends SkJSIInstance<"Vertices"> {

package/lib/typescript/src/skia/web/JsiSkAnimatedImage.d.ts

@@ -6,6 +6,7 @@ export declare class JsiSkAnimatedImage extends HostObject<AnimatedImage, "Anima
     constructor(CanvasKit: CanvasKit, ref: AnimatedImage);
     decodeNextFrame(): number;
     currentFrameDuration(): number;
+    getFrameCount(): number;
     getCurrentFrame(): JsiSkImage | null;
     dispose: () => void;
 }

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",

package/src/skia/types/AnimatedImage/AnimatedImage.ts

@@ -25,5 +25,11 @@ export interface SkAnimatedImage extends SkJSIInstance<"AnimatedImage"> {
    */
   currentFrameDuration(): number;
 
+  /**
+   *  Returns the number of frames in the animation.
+   *
+   */
+  getFrameCount(): number;
+
   // TODO - add the rest of the methods from the Skia API (see SkAnimatedImage.h)
 }

package/src/skia/types/Vertices/Vertices.tsx

@@ -3,7 +3,7 @@ import type { SkJSIInstance } from "../JsiInstance";
 
 export enum VertexMode {
   Triangles,
-  TrianglesStrip,
+  TriangleStrip,
   TriangleFan,
 }
 

package/src/skia/web/JsiSkAnimatedImage.ts

@@ -21,6 +21,10 @@ export class JsiSkAnimatedImage
     return this.ref.currentFrameDuration();
   }
 
+  getFrameCount() {
+    return this.ref.getFrameCount();
+  }
+
   getCurrentFrame() {
     const image = this.ref.makeImageAtCurrentFrame();
     if (image === null) {