@shopify/react-native-skia 2.4.20 → 2.5.0

package/lib/module/renderer/Offscreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["Skia","Platform","SkiaSGRoot","isOnMainThread","_WORKLET","OS","drawAsPicture","element","bounds","recorder","PictureRecorder","canvas","beginRecording","root","render","drawOnCanvas","picture","finishRecordingAsPicture","dispose","unmount","drawAsImage","size","drawAsImageFromPicture","surface","Surface","MakeOffscreen","width","height","getCanvas","drawPicture","flush","image","makeImageSnapshot","makeNonTextureImage"],"sources":["Offscreen.tsx"],"sourcesContent":["import type { ReactElement } from \"react\";\n\nimport type { SkPicture, SkRect, SkSize } from \"../skia/types\";\nimport { Skia } from \"../skia\";\nimport { Platform } from \"../Platform\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\n\nexport const isOnMainThread = () => {\n  \"worklet\";\n  return (\n    (typeof _WORKLET !== \"undefined\" && _WORKLET === true) ||\n    Platform.OS === \"web\"\n  );\n};\n\nexport const drawAsPicture = async (element: ReactElement, bounds?: SkRect) => {\n  const recorder = Skia.PictureRecorder();\n  const canvas = recorder.beginRecording(bounds);\n  const root = new SkiaSGRoot(Skia);\n  await root.render(element);\n  root.drawOnCanvas(canvas);\n  const picture = recorder.finishRecordingAsPicture();\n  recorder.dispose();\n  root.unmount();\n  return picture;\n};\n\nexport const drawAsImage = async (element: ReactElement, size: SkSize) => {\n  return drawAsImageFromPicture(await drawAsPicture(element), size);\n};\n\nexport const drawAsImageFromPicture = (picture: SkPicture, size: SkSize) => {\n  \"worklet\";\n  const surface = Skia.Surface.MakeOffscreen(size.width, size.height)!;\n  const canvas = surface.getCanvas();\n  canvas.drawPicture(picture);\n  surface.flush();\n  const image = surface.makeImageSnapshot();\n  return image.makeNonTextureImage();\n};\n"],"mappings":"AAGA,SAASA,IAAI,QAAQ,SAAS;AAC9B,SAASC,QAAQ,QAAQ,aAAa;AACtC,SAASC,UAAU,QAAQ,oBAAoB;AAE/C,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAM;EAClC,SAAS;;EACT,OACG,OAAOC,QAAQ,KAAK,WAAW,IAAIA,QAAQ,KAAK,IAAI,IACrDH,QAAQ,CAACI,EAAE,KAAK,KAAK;AAEzB,CAAC;AAED,OAAO,MAAMC,aAAa,GAAG,MAAAA,CAAOC,OAAqB,EAAEC,MAAe,KAAK;EAC7E,MAAMC,QAAQ,GAAGT,IAAI,CAACU,eAAe,CAAC,CAAC;EACvC,MAAMC,MAAM,GAAGF,QAAQ,CAACG,cAAc,CAACJ,MAAM,CAAC;EAC9C,MAAMK,IAAI,GAAG,IAAIX,UAAU,CAACF,IAAI,CAAC;EACjC,MAAMa,IAAI,CAACC,MAAM,CAACP,OAAO,CAAC;EAC1BM,IAAI,CAACE,YAAY,CAACJ,MAAM,CAAC;EACzB,MAAMK,OAAO,GAAGP,QAAQ,CAACQ,wBAAwB,CAAC,CAAC;EACnDR,QAAQ,CAACS,OAAO,CAAC,CAAC;EAClBL,IAAI,CAACM,OAAO,CAAC,CAAC;EACd,OAAOH,OAAO;AAChB,CAAC;AAED,OAAO,MAAMI,WAAW,GAAG,MAAAA,CAAOb,OAAqB,EAAEc,IAAY,KAAK;EACxE,OAAOC,sBAAsB,CAAC,MAAMhB,aAAa,CAACC,OAAO,CAAC,EAAEc,IAAI,CAAC;AACnE,CAAC;AAED,OAAO,MAAMC,sBAAsB,GAAGA,CAACN,OAAkB,EAAEK,IAAY,KAAK;EAC1E,SAAS;;EACT,MAAME,OAAO,GAAGvB,IAAI,CAACwB,OAAO,CAACC,aAAa,CAACJ,IAAI,CAACK,KAAK,EAAEL,IAAI,CAACM,MAAM,CAAE;EACpE,MAAMhB,MAAM,GAAGY,OAAO,CAACK,SAAS,CAAC,CAAC;EAClCjB,MAAM,CAACkB,WAAW,CAACb,OAAO,CAAC;EAC3BO,OAAO,CAACO,KAAK,CAAC,CAAC;EACf,MAAMC,KAAK,GAAGR,OAAO,CAACS,iBAAiB,CAAC,CAAC;EACzC,OAAOD,KAAK,CAACE,mBAAmB,CAAC,CAAC;AACpC,CAAC","ignoreList":[]}
+{"version":3,"names":["Skia","Platform","SkiaSGRoot","isOnMainThread","_WORKLET","OS","drawAsPicture","element","bounds","recorder","PictureRecorder","canvas","beginRecording","root","render","drawOnCanvas","picture","finishRecordingAsPicture","dispose","unmount","drawAsImage","size","drawAsImageFromPicture","surface","Surface","MakeOffscreen","width","height","getCanvas","drawPicture","flush","image","makeImageSnapshot","makeNonTextureImage"],"sources":["Offscreen.tsx"],"sourcesContent":["import type { ReactElement } from \"react\";\n\nimport type { SkImage, SkPicture, SkRect, SkSize } from \"../skia/types\";\nimport { Skia } from \"../skia\";\nimport { Platform } from \"../Platform\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\n\nexport const isOnMainThread = () => {\n  \"worklet\";\n  return (\n    (typeof _WORKLET !== \"undefined\" && _WORKLET === true) ||\n    Platform.OS === \"web\"\n  );\n};\n\nexport const drawAsPicture = async (element: ReactElement, bounds?: SkRect) => {\n  const recorder = Skia.PictureRecorder();\n  const canvas = recorder.beginRecording(bounds);\n  const root = new SkiaSGRoot(Skia);\n  await root.render(element);\n  root.drawOnCanvas(canvas);\n  const picture = recorder.finishRecordingAsPicture();\n  recorder.dispose();\n  root.unmount();\n  return picture;\n};\n\nexport const drawAsImage = async (\n  element: ReactElement,\n  size: SkSize\n): Promise<SkImage | null> => {\n  return drawAsImageFromPicture(await drawAsPicture(element), size);\n};\n\nexport const drawAsImageFromPicture = (\n  picture: SkPicture,\n  size: SkSize\n): SkImage | null => {\n  \"worklet\";\n  const surface = Skia.Surface.MakeOffscreen(size.width, size.height)!;\n  const canvas = surface.getCanvas();\n  canvas.drawPicture(picture);\n  surface.flush();\n  const image = surface.makeImageSnapshot();\n  return image.makeNonTextureImage();\n};\n"],"mappings":"AAGA,SAASA,IAAI,QAAQ,SAAS;AAC9B,SAASC,QAAQ,QAAQ,aAAa;AACtC,SAASC,UAAU,QAAQ,oBAAoB;AAE/C,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAM;EAClC,SAAS;;EACT,OACG,OAAOC,QAAQ,KAAK,WAAW,IAAIA,QAAQ,KAAK,IAAI,IACrDH,QAAQ,CAACI,EAAE,KAAK,KAAK;AAEzB,CAAC;AAED,OAAO,MAAMC,aAAa,GAAG,MAAAA,CAAOC,OAAqB,EAAEC,MAAe,KAAK;EAC7E,MAAMC,QAAQ,GAAGT,IAAI,CAACU,eAAe,CAAC,CAAC;EACvC,MAAMC,MAAM,GAAGF,QAAQ,CAACG,cAAc,CAACJ,MAAM,CAAC;EAC9C,MAAMK,IAAI,GAAG,IAAIX,UAAU,CAACF,IAAI,CAAC;EACjC,MAAMa,IAAI,CAACC,MAAM,CAACP,OAAO,CAAC;EAC1BM,IAAI,CAACE,YAAY,CAACJ,MAAM,CAAC;EACzB,MAAMK,OAAO,GAAGP,QAAQ,CAACQ,wBAAwB,CAAC,CAAC;EACnDR,QAAQ,CAACS,OAAO,CAAC,CAAC;EAClBL,IAAI,CAACM,OAAO,CAAC,CAAC;EACd,OAAOH,OAAO;AAChB,CAAC;AAED,OAAO,MAAMI,WAAW,GAAG,MAAAA,CACzBb,OAAqB,EACrBc,IAAY,KACgB;EAC5B,OAAOC,sBAAsB,CAAC,MAAMhB,aAAa,CAACC,OAAO,CAAC,EAAEc,IAAI,CAAC;AACnE,CAAC;AAED,OAAO,MAAMC,sBAAsB,GAAGA,CACpCN,OAAkB,EAClBK,IAAY,KACO;EACnB,SAAS;;EACT,MAAME,OAAO,GAAGvB,IAAI,CAACwB,OAAO,CAACC,aAAa,CAACJ,IAAI,CAACK,KAAK,EAAEL,IAAI,CAACM,MAAM,CAAE;EACpE,MAAMhB,MAAM,GAAGY,OAAO,CAACK,SAAS,CAAC,CAAC;EAClCjB,MAAM,CAACkB,WAAW,CAACb,OAAO,CAAC;EAC3BO,OAAO,CAACO,KAAK,CAAC,CAAC;EACf,MAAMC,KAAK,GAAGR,OAAO,CAACS,iBAAiB,CAAC,CAAC;EACzC,OAAOD,KAAK,CAACE,mBAAmB,CAAC,CAAC;AACpC,CAAC","ignoreList":[]}

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

@@ -125,6 +125,7 @@ export interface SkImage extends SkJSIInstance<"Image"> {
      * Returns raster image or lazy image. Copies SkImage backed by GPU texture
      * into CPU memory if needed. Returns original SkImage if decoded in raster
      * bitmap, or if encoded in a stream.
+     * Returns null if the conversion fails.
      */
-    makeNonTextureImage(): SkImage;
+    makeNonTextureImage(): SkImage | null;
 }

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

@@ -1 +1 @@
-{"version":3,"names":["FilterMode","MipmapMode","ImageFormat","isCubicSampling","sampling","MitchellCubicSampling","B","C","CatmullRomCubicSampling","CubicSampling","MakeCubic"],"sources":["Image.ts"],"sourcesContent":["import type { SkMatrix } from \"../Matrix\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { TileMode } from \"../ImageFilter\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { ImageInfo } from \"./ImageFactory\";\n\nexport interface CubicResampler {\n  B: number;\n  C: number;\n}\n\nexport interface FilterOptions {\n  filter: FilterMode;\n  mipmap?: MipmapMode;\n}\n\nexport enum FilterMode {\n  Nearest,\n  Linear,\n}\n\nexport enum MipmapMode {\n  None,\n  Nearest,\n  Linear,\n}\n\nexport enum ImageFormat {\n  JPEG = 3,\n  PNG = 4,\n  WEBP = 6,\n}\n\nexport type SamplingOptions = CubicResampler | FilterOptions;\n\nexport const isCubicSampling = (\n  sampling: SamplingOptions\n): sampling is CubicResampler => {\n  \"worklet\";\n  return \"B\" in sampling && \"C\" in sampling;\n};\n\nexport const MitchellCubicSampling = { B: 1 / 3.0, C: 1 / 3.0 };\nexport const CatmullRomCubicSampling = { B: 0, C: 1 / 2.0 };\nexport const CubicSampling = { B: 0, C: 0 };\nexport const MakeCubic = (B: number, C: number) => ({ B, C });\n\nexport interface SkImage extends SkJSIInstance<\"Image\"> {\n  /**\n   * Returns the possibly scaled height of the image.\n   */\n  height(): number;\n\n  /**\n   * Returns the possibly scaled width of the image.\n   */\n  width(): number;\n\n  /**\n   * Returns the ImageInfo describing the image.\n   */\n  getImageInfo(): ImageInfo;\n\n  /**\n   * Returns the backend texture of the image.\n   * The returned object can be used to create a Skia Image object.\n   * The returned object is backend specific and should be used with caution.\n   * It is the caller's responsibility to ensure that the texture is not used after the image is deleted.\n   * The returned object may be null if the image does not have a backend texture.\n   *\n   * @return backend texture of the image or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param fm - The filter mode. (default nearest)\n   * @param mm - The mipmap mode. Note: for settings other than None, the image must have mipmaps (default none)\n   *             calculated with makeCopyWithDefaultMipmaps;\n   * @param localMatrix\n   */\n  makeShaderOptions(\n    tx: TileMode,\n    ty: TileMode,\n    fm: FilterMode,\n    mm: MipmapMode,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param B - See CubicResampler in SkSamplingOptions.h for more information\n   * @param C - See CubicResampler in SkSamplingOptions.h for more information\n   * @param localMatrix\n   */\n  makeShaderCubic(\n    tx: TileMode,\n    ty: TileMode,\n    B: number,\n    C: number,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /** Encodes Image pixels, returning result as UInt8Array. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  Uint8Array with data\n  */\n  encodeToBytes(fmt?: ImageFormat, quality?: number): Uint8Array;\n\n  /** Encodes Image pixels, returning result as a base64 encoded string. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  base64 encoded string of data\n  */\n  encodeToBase64(fmt?: ImageFormat, quality?: number): string;\n\n  /** Read Image pixels\n   *\n   * @param srcX - optional x-axis upper left corner of the rectangle to read from\n   * @param srcY - optional y-axis upper left corner of the rectangle to read from\n   * @param imageInfo - optional describes the pixel format and dimensions of the data to read into\n   * @return Float32Array or Uint8Array with data or null if the read failed.\n   */\n  readPixels(\n    srcX?: number,\n    srcY?: number,\n    imageInfo?: ImageInfo\n  ): Float32Array | Uint8Array | null;\n\n  /**\n   * Returns raster image or lazy image. Copies SkImage backed by GPU texture\n   * into CPU memory if needed. Returns original SkImage if decoded in raster\n   * bitmap, or if encoded in a stream.\n   */\n  makeNonTextureImage(): SkImage;\n}\n"],"mappings":"AAiBA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAKtB,WAAYC,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAMtB,WAAYC,WAAW,0BAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAQvB,OAAO,MAAMC,eAAe,GAC1BC,QAAyB,IACM;EAC/B,SAAS;;EACT,OAAO,GAAG,IAAIA,QAAQ,IAAI,GAAG,IAAIA,QAAQ;AAC3C,CAAC;AAED,OAAO,MAAMC,qBAAqB,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AAC/D,OAAO,MAAMC,uBAAuB,GAAG;EAAEF,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AAC3D,OAAO,MAAME,aAAa,GAAG;EAAEH,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE;AAAE,CAAC;AAC3C,OAAO,MAAMG,SAAS,GAAGA,CAACJ,CAAS,EAAEC,CAAS,MAAM;EAAED,CAAC;EAAEC;AAAE,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["FilterMode","MipmapMode","ImageFormat","isCubicSampling","sampling","MitchellCubicSampling","B","C","CatmullRomCubicSampling","CubicSampling","MakeCubic"],"sources":["Image.ts"],"sourcesContent":["import type { SkMatrix } from \"../Matrix\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { TileMode } from \"../ImageFilter\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { ImageInfo } from \"./ImageFactory\";\n\nexport interface CubicResampler {\n  B: number;\n  C: number;\n}\n\nexport interface FilterOptions {\n  filter: FilterMode;\n  mipmap?: MipmapMode;\n}\n\nexport enum FilterMode {\n  Nearest,\n  Linear,\n}\n\nexport enum MipmapMode {\n  None,\n  Nearest,\n  Linear,\n}\n\nexport enum ImageFormat {\n  JPEG = 3,\n  PNG = 4,\n  WEBP = 6,\n}\n\nexport type SamplingOptions = CubicResampler | FilterOptions;\n\nexport const isCubicSampling = (\n  sampling: SamplingOptions\n): sampling is CubicResampler => {\n  \"worklet\";\n  return \"B\" in sampling && \"C\" in sampling;\n};\n\nexport const MitchellCubicSampling = { B: 1 / 3.0, C: 1 / 3.0 };\nexport const CatmullRomCubicSampling = { B: 0, C: 1 / 2.0 };\nexport const CubicSampling = { B: 0, C: 0 };\nexport const MakeCubic = (B: number, C: number) => ({ B, C });\n\nexport interface SkImage extends SkJSIInstance<\"Image\"> {\n  /**\n   * Returns the possibly scaled height of the image.\n   */\n  height(): number;\n\n  /**\n   * Returns the possibly scaled width of the image.\n   */\n  width(): number;\n\n  /**\n   * Returns the ImageInfo describing the image.\n   */\n  getImageInfo(): ImageInfo;\n\n  /**\n   * Returns the backend texture of the image.\n   * The returned object can be used to create a Skia Image object.\n   * The returned object is backend specific and should be used with caution.\n   * It is the caller's responsibility to ensure that the texture is not used after the image is deleted.\n   * The returned object may be null if the image does not have a backend texture.\n   *\n   * @return backend texture of the image or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param fm - The filter mode. (default nearest)\n   * @param mm - The mipmap mode. Note: for settings other than None, the image must have mipmaps (default none)\n   *             calculated with makeCopyWithDefaultMipmaps;\n   * @param localMatrix\n   */\n  makeShaderOptions(\n    tx: TileMode,\n    ty: TileMode,\n    fm: FilterMode,\n    mm: MipmapMode,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param B - See CubicResampler in SkSamplingOptions.h for more information\n   * @param C - See CubicResampler in SkSamplingOptions.h for more information\n   * @param localMatrix\n   */\n  makeShaderCubic(\n    tx: TileMode,\n    ty: TileMode,\n    B: number,\n    C: number,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /** Encodes Image pixels, returning result as UInt8Array. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  Uint8Array with data\n  */\n  encodeToBytes(fmt?: ImageFormat, quality?: number): Uint8Array;\n\n  /** Encodes Image pixels, returning result as a base64 encoded string. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  base64 encoded string of data\n  */\n  encodeToBase64(fmt?: ImageFormat, quality?: number): string;\n\n  /** Read Image pixels\n   *\n   * @param srcX - optional x-axis upper left corner of the rectangle to read from\n   * @param srcY - optional y-axis upper left corner of the rectangle to read from\n   * @param imageInfo - optional describes the pixel format and dimensions of the data to read into\n   * @return Float32Array or Uint8Array with data or null if the read failed.\n   */\n  readPixels(\n    srcX?: number,\n    srcY?: number,\n    imageInfo?: ImageInfo\n  ): Float32Array | Uint8Array | null;\n\n  /**\n   * Returns raster image or lazy image. Copies SkImage backed by GPU texture\n   * into CPU memory if needed. Returns original SkImage if decoded in raster\n   * bitmap, or if encoded in a stream.\n   * Returns null if the conversion fails.\n   */\n  makeNonTextureImage(): SkImage | null;\n}\n"],"mappings":"AAiBA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAKtB,WAAYC,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAMtB,WAAYC,WAAW,0BAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAQvB,OAAO,MAAMC,eAAe,GAC1BC,QAAyB,IACM;EAC/B,SAAS;;EACT,OAAO,GAAG,IAAIA,QAAQ,IAAI,GAAG,IAAIA,QAAQ;AAC3C,CAAC;AAED,OAAO,MAAMC,qBAAqB,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AAC/D,OAAO,MAAMC,uBAAuB,GAAG;EAAEF,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AAC3D,OAAO,MAAME,aAAa,GAAG;EAAEH,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE;AAAE,CAAC;AAC3C,OAAO,MAAMG,SAAS,GAAGA,CAACJ,CAAS,EAAEC,CAAS,MAAM;EAAED,CAAC;EAAEC;AAAE,CAAC,CAAC","ignoreList":[]}

package/lib/module/sksg/Container.native.js

@@ -35,18 +35,16 @@ class NativeReanimatedContainer extends Container {
     const recorder = new ReanimatedRecorder(this.Skia);
     const {
       nativeId,
-      picture,
-      Skia
+      picture
     } = this;
     visit(recorder, this.root);
     const sharedValues = recorder.getSharedValues();
     const sharedRecorder = recorder.getRecorder();
     // Draw first frame
-    Rea.executeOnUIRuntimeSync(() => {
+    Rea.runOnUI(() => {
       "worklet";
 
-      const firstPicture = Skia.Picture.MakePicture(null);
-      nativeDrawOnscreen(nativeId, sharedRecorder, firstPicture);
+      nativeDrawOnscreen(nativeId, sharedRecorder, picture);
     })();
     // Animate
     if (sharedValues.length > 0) {

package/lib/module/sksg/Container.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["Rea","HAS_REANIMATED_3","ReanimatedRecorder","Container","StaticContainer","visit","nativeDrawOnscreen","nativeId","recorder","picture","play","SkiaViewApi","setJsiProperty","NativeReanimatedContainer","constructor","Skia","_defineProperty","Picture","MakePicture","redraw","mapperId","stopMapper","unmounted","root","sharedValues","getSharedValues","sharedRecorder","getRecorder","executeOnUIRuntimeSync","firstPicture","length","startMapper","applyUpdates","createContainer"],"sources":["Container.native.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia, SkPicture } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\nimport type { JsiRecorder } from \"../skia/types/Recorder\";\n\nimport { ReanimatedRecorder } from \"./Recorder/ReanimatedRecorder\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\nimport { visit } from \"./Recorder/Visitor\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\nconst nativeDrawOnscreen = (\n  nativeId: number,\n  recorder: JsiRecorder,\n  picture: SkPicture\n) => {\n  \"worklet\";\n\n  //const start = performance.now();\n  recorder.play(picture);\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass NativeReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n  private picture: SkPicture;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n    this.picture = Skia.Picture.MakePicture(null)!;\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new ReanimatedRecorder(this.Skia);\n    const { nativeId, picture, Skia } = this;\n    visit(recorder, this.root);\n    const sharedValues = recorder.getSharedValues();\n    const sharedRecorder = recorder.getRecorder();\n    // Draw first frame\n    Rea.executeOnUIRuntimeSync(() => {\n      \"worklet\";\n      const firstPicture = Skia.Picture.MakePicture(null)!;\n      nativeDrawOnscreen(nativeId, sharedRecorder, firstPicture);\n    })();\n    // Animate\n    if (sharedValues.length > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        sharedRecorder.applyUpdates(sharedValues);\n        nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n      }, sharedValues);\n    }\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new NativeReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":";;;AAAA,OAAOA,GAAG,MAAM,wCAAwC;AAExD,SAASC,gBAAgB,QAAQ,sCAAsC;AAGvE,SAASC,kBAAkB,QAAQ,+BAA+B;AAClE,SAASC,SAAS,EAAEC,eAAe,QAAQ,mBAAmB;AAC9D,SAASC,KAAK,QAAQ,oBAAoB;AAE1C,OAAO,qBAAqB;AAC5B,OAAO,cAAc;AAErB,MAAMC,kBAAkB,GAAGA,CACzBC,QAAgB,EAChBC,QAAqB,EACrBC,OAAkB,KACf;EACH,SAAS;;EAET;EACAD,QAAQ,CAACE,IAAI,CAACD,OAAO,CAAC;EACtB;EACA;EACAE,WAAW,CAACC,cAAc,CAACL,QAAQ,EAAE,SAAS,EAAEE,OAAO,CAAC;AAC1D,CAAC;AAED,MAAMI,yBAAyB,SAASV,SAAS,CAAC;EAIhDW,WAAWA,CACTC,IAAU,EACFR,QAAgB,EACxB;IACA,KAAK,CAACQ,IAAI,CAAC;IAAC,KAFJR,QAAgB,GAAhBA,QAAgB;IAAAS,eAAA,mBALQ,IAAI;IAAAA,eAAA;IAQpC,IAAI,CAACP,OAAO,GAAGM,IAAI,CAACE,OAAO,CAACC,WAAW,CAAC,IAAI,CAAE;EAChD;EAEAC,MAAMA,CAAA,EAAG;IACP,IAAI,IAAI,CAACC,QAAQ,KAAK,IAAI,EAAE;MAC1BpB,GAAG,CAACqB,UAAU,CAAC,IAAI,CAACD,QAAQ,CAAC;IAC/B;IACA,IAAI,IAAI,CAACE,SAAS,EAAE;MAClB;IACF;IACA,MAAMd,QAAQ,GAAG,IAAIN,kBAAkB,CAAC,IAAI,CAACa,IAAI,CAAC;IAClD,MAAM;MAAER,QAAQ;MAAEE,OAAO;MAAEM;IAAK,CAAC,GAAG,IAAI;IACxCV,KAAK,CAACG,QAAQ,EAAE,IAAI,CAACe,IAAI,CAAC;IAC1B,MAAMC,YAAY,GAAGhB,QAAQ,CAACiB,eAAe,CAAC,CAAC;IAC/C,MAAMC,cAAc,GAAGlB,QAAQ,CAACmB,WAAW,CAAC,CAAC;IAC7C;IACA3B,GAAG,CAAC4B,sBAAsB,CAAC,MAAM;MAC/B,SAAS;;MACT,MAAMC,YAAY,GAAGd,IAAI,CAACE,OAAO,CAACC,WAAW,CAAC,IAAI,CAAE;MACpDZ,kBAAkB,CAACC,QAAQ,EAAEmB,cAAc,EAAEG,YAAY,CAAC;IAC5D,CAAC,CAAC,CAAC,CAAC;IACJ;IACA,IAAIL,YAAY,CAACM,MAAM,GAAG,CAAC,EAAE;MAC3B,IAAI,CAACV,QAAQ,GAAGpB,GAAG,CAAC+B,WAAW,CAAC,MAAM;QACpC,SAAS;;QACTL,cAAc,CAACM,YAAY,CAACR,YAAY,CAAC;QACzClB,kBAAkB,CAACC,QAAQ,EAAEmB,cAAc,EAAEjB,OAAO,CAAC;MACvD,CAAC,EAAEe,YAAY,CAAC;IAClB;EACF;AACF;AAEA,OAAO,MAAMS,eAAe,GAAGA,CAAClB,IAAU,EAAER,QAAgB,KAAK;EAC/D,IAAIN,gBAAgB,IAAIM,QAAQ,KAAK,CAAC,CAAC,EAAE;IACvC,OAAO,IAAIM,yBAAyB,CAACE,IAAI,EAAER,QAAQ,CAAC;EACtD,CAAC,MAAM;IACL,OAAO,IAAIH,eAAe,CAACW,IAAI,EAAER,QAAQ,CAAC;EAC5C;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["Rea","HAS_REANIMATED_3","ReanimatedRecorder","Container","StaticContainer","visit","nativeDrawOnscreen","nativeId","recorder","picture","play","SkiaViewApi","setJsiProperty","NativeReanimatedContainer","constructor","Skia","_defineProperty","Picture","MakePicture","redraw","mapperId","stopMapper","unmounted","root","sharedValues","getSharedValues","sharedRecorder","getRecorder","runOnUI","length","startMapper","applyUpdates","createContainer"],"sources":["Container.native.ts"],"sourcesContent":["import Rea from \"../external/reanimated/ReanimatedProxy\";\nimport type { Skia, SkPicture } from \"../skia/types\";\nimport { HAS_REANIMATED_3 } from \"../external/reanimated/renderHelpers\";\nimport type { JsiRecorder } from \"../skia/types/Recorder\";\n\nimport { ReanimatedRecorder } from \"./Recorder/ReanimatedRecorder\";\nimport { Container, StaticContainer } from \"./StaticContainer\";\nimport { visit } from \"./Recorder/Visitor\";\n\nimport \"../skia/NativeSetup\";\nimport \"../views/api\";\n\nconst nativeDrawOnscreen = (\n  nativeId: number,\n  recorder: JsiRecorder,\n  picture: SkPicture\n) => {\n  \"worklet\";\n\n  //const start = performance.now();\n  recorder.play(picture);\n  //const end = performance.now();\n  //console.log(\"Recording time: \", end - start);\n  SkiaViewApi.setJsiProperty(nativeId, \"picture\", picture);\n};\n\nclass NativeReanimatedContainer extends Container {\n  private mapperId: number | null = null;\n  private picture: SkPicture;\n\n  constructor(\n    Skia: Skia,\n    private nativeId: number\n  ) {\n    super(Skia);\n    this.picture = Skia.Picture.MakePicture(null)!;\n  }\n\n  redraw() {\n    if (this.mapperId !== null) {\n      Rea.stopMapper(this.mapperId);\n    }\n    if (this.unmounted) {\n      return;\n    }\n    const recorder = new ReanimatedRecorder(this.Skia);\n    const { nativeId, picture } = this;\n    visit(recorder, this.root);\n    const sharedValues = recorder.getSharedValues();\n    const sharedRecorder = recorder.getRecorder();\n    // Draw first frame\n    Rea.runOnUI(() => {\n      \"worklet\";\n      nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n    })();\n    // Animate\n    if (sharedValues.length > 0) {\n      this.mapperId = Rea.startMapper(() => {\n        \"worklet\";\n        sharedRecorder.applyUpdates(sharedValues);\n        nativeDrawOnscreen(nativeId, sharedRecorder, picture);\n      }, sharedValues);\n    }\n  }\n}\n\nexport const createContainer = (Skia: Skia, nativeId: number) => {\n  if (HAS_REANIMATED_3 && nativeId !== -1) {\n    return new NativeReanimatedContainer(Skia, nativeId);\n  } else {\n    return new StaticContainer(Skia, nativeId);\n  }\n};\n"],"mappings":";;;AAAA,OAAOA,GAAG,MAAM,wCAAwC;AAExD,SAASC,gBAAgB,QAAQ,sCAAsC;AAGvE,SAASC,kBAAkB,QAAQ,+BAA+B;AAClE,SAASC,SAAS,EAAEC,eAAe,QAAQ,mBAAmB;AAC9D,SAASC,KAAK,QAAQ,oBAAoB;AAE1C,OAAO,qBAAqB;AAC5B,OAAO,cAAc;AAErB,MAAMC,kBAAkB,GAAGA,CACzBC,QAAgB,EAChBC,QAAqB,EACrBC,OAAkB,KACf;EACH,SAAS;;EAET;EACAD,QAAQ,CAACE,IAAI,CAACD,OAAO,CAAC;EACtB;EACA;EACAE,WAAW,CAACC,cAAc,CAACL,QAAQ,EAAE,SAAS,EAAEE,OAAO,CAAC;AAC1D,CAAC;AAED,MAAMI,yBAAyB,SAASV,SAAS,CAAC;EAIhDW,WAAWA,CACTC,IAAU,EACFR,QAAgB,EACxB;IACA,KAAK,CAACQ,IAAI,CAAC;IAAC,KAFJR,QAAgB,GAAhBA,QAAgB;IAAAS,eAAA,mBALQ,IAAI;IAAAA,eAAA;IAQpC,IAAI,CAACP,OAAO,GAAGM,IAAI,CAACE,OAAO,CAACC,WAAW,CAAC,IAAI,CAAE;EAChD;EAEAC,MAAMA,CAAA,EAAG;IACP,IAAI,IAAI,CAACC,QAAQ,KAAK,IAAI,EAAE;MAC1BpB,GAAG,CAACqB,UAAU,CAAC,IAAI,CAACD,QAAQ,CAAC;IAC/B;IACA,IAAI,IAAI,CAACE,SAAS,EAAE;MAClB;IACF;IACA,MAAMd,QAAQ,GAAG,IAAIN,kBAAkB,CAAC,IAAI,CAACa,IAAI,CAAC;IAClD,MAAM;MAAER,QAAQ;MAAEE;IAAQ,CAAC,GAAG,IAAI;IAClCJ,KAAK,CAACG,QAAQ,EAAE,IAAI,CAACe,IAAI,CAAC;IAC1B,MAAMC,YAAY,GAAGhB,QAAQ,CAACiB,eAAe,CAAC,CAAC;IAC/C,MAAMC,cAAc,GAAGlB,QAAQ,CAACmB,WAAW,CAAC,CAAC;IAC7C;IACA3B,GAAG,CAAC4B,OAAO,CAAC,MAAM;MAChB,SAAS;;MACTtB,kBAAkB,CAACC,QAAQ,EAAEmB,cAAc,EAAEjB,OAAO,CAAC;IACvD,CAAC,CAAC,CAAC,CAAC;IACJ;IACA,IAAIe,YAAY,CAACK,MAAM,GAAG,CAAC,EAAE;MAC3B,IAAI,CAACT,QAAQ,GAAGpB,GAAG,CAAC8B,WAAW,CAAC,MAAM;QACpC,SAAS;;QACTJ,cAAc,CAACK,YAAY,CAACP,YAAY,CAAC;QACzClB,kBAAkB,CAACC,QAAQ,EAAEmB,cAAc,EAAEjB,OAAO,CAAC;MACvD,CAAC,EAAEe,YAAY,CAAC;IAClB;EACF;AACF;AAEA,OAAO,MAAMQ,eAAe,GAAGA,CAACjB,IAAU,EAAER,QAAgB,KAAK;EAC/D,IAAIN,gBAAgB,IAAIM,QAAQ,KAAK,CAAC,CAAC,EAAE;IACvC,OAAO,IAAIM,yBAAyB,CAACE,IAAI,EAAER,QAAQ,CAAC;EACtD,CAAC,MAAM;IACL,OAAO,IAAIH,eAAe,CAACW,IAAI,EAAER,QAAQ,CAAC;EAC5C;AACF,CAAC","ignoreList":[]}

package/lib/typescript/lib/commonjs/renderer/Offscreen.d.ts

@@ -1,5 +1,5 @@
 export const __esModule: boolean;
 export function isOnMainThread(): boolean;
 export function drawAsPicture(element: any, bounds: any): Promise<import("../../..").SkPicture>;
-export function drawAsImage(element: any, size: any): Promise<import("../../..").SkImage>;
-export function drawAsImageFromPicture(picture: any, size: any): import("../../..").SkImage;
+export function drawAsImage(element: any, size: any): Promise<import("../../..").SkImage | null>;
+export function drawAsImageFromPicture(picture: any, size: any): import("../../..").SkImage | null;

package/lib/typescript/lib/module/renderer/Offscreen.d.ts

@@ -1,4 +1,4 @@
 export function isOnMainThread(): boolean;
 export function drawAsPicture(element: any, bounds: any): Promise<import("../../..").SkPicture>;
-export function drawAsImage(element: any, size: any): Promise<import("../../..").SkImage>;
-export function drawAsImageFromPicture(picture: any, size: any): import("../../..").SkImage;
+export function drawAsImage(element: any, size: any): Promise<import("../../..").SkImage | null>;
+export function drawAsImageFromPicture(picture: any, size: any): import("../../..").SkImage | null;

package/lib/typescript/src/renderer/Canvas.d.ts

@@ -19,6 +19,8 @@ export declare const useCanvasSize: (userRef?: RefObject<CanvasRef | null>) => {
 export declare const isFabric: boolean;
 export interface CanvasProps extends Omit<ViewProps, "onLayout"> {
     debug?: boolean;
+    /** @deprecated Not supported on Fabric. Use `onSize` or `useCanvasSize()` instead. */
+    onLayout?: ViewProps["onLayout"];
     opaque?: boolean;
     onSize?: SharedValue<SkSize>;
     colorSpace?: "p3" | "srgb";

package/lib/typescript/src/renderer/Offscreen.d.ts

@@ -1,6 +1,6 @@
 import type { ReactElement } from "react";
-import type { SkPicture, SkRect, SkSize } from "../skia/types";
+import type { SkImage, SkPicture, SkRect, SkSize } from "../skia/types";
 export declare const isOnMainThread: () => boolean;
 export declare const drawAsPicture: (element: ReactElement, bounds?: SkRect) => Promise<SkPicture>;
-export declare const drawAsImage: (element: ReactElement, size: SkSize) => Promise<import("../skia").SkImage>;
-export declare const drawAsImageFromPicture: (picture: SkPicture, size: SkSize) => import("../skia").SkImage;
+export declare const drawAsImage: (element: ReactElement, size: SkSize) => Promise<SkImage | null>;
+export declare const drawAsImageFromPicture: (picture: SkPicture, size: SkSize) => SkImage | null;

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

@@ -125,6 +125,7 @@ export interface SkImage extends SkJSIInstance<"Image"> {
      * Returns raster image or lazy image. Copies SkImage backed by GPU texture
      * into CPU memory if needed. Returns original SkImage if decoded in raster
      * bitmap, or if encoded in a stream.
+     * Returns null if the conversion fails.
      */
-    makeNonTextureImage(): SkImage;
+    makeNonTextureImage(): SkImage | null;
 }

package/package.json

@@ -8,37 +8,13 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.4.20",
-  "skia": {
-    "version": "m144c",
-    "checksums": {
-      "android-armeabi-v7a": "e406c3e8103a2efb6a514ac91346d7f9f81adbae14dc2d0e302e84fb8c5f80f7",
-      "android-arm64-v8a": "75069b0f7c66ad3382553e947d583265de033cc856c394110243da098306955f",
-      "android-x86": "714b93a7bdf005a23699f47e6255e4e690086c52a1998c20196a46f95b709b09",
-      "android-x86_64": "5bd2972d13293b09b35e2c0149b7d103dc4fb0f2837c3dd169ce06795b812714",
-      "apple-ios-xcframeworks": "43f62ea742c55ecc57864505ff752a517fd2c31412a19914032d044ac4f987ee",
-      "apple-tvos-xcframeworks": "0f6b5c75b4e686e72f5cc8508e60074463f757ca7a0dcbd07e095c055a537c58",
-      "apple-macos-xcframeworks": "31f57bcf6caff1c268984609b0e4a2abd966bfa8ddcf074331d94e0f988f93d3"
-    }
-  },
-  "skia-graphite": {
-    "version": "m142b",
-    "checksums": {
-      "android-armeabi-v7a": "3e40f44c804194fa0983c46903f834e8f834c6dd96534c7fa1b4ebb4f409527d",
-      "android-arm64-v8a": "d6c3035449fcf7ef13369b0d6c4ef41f3177d15074eeb195201e0ba4cfb2f527",
-      "android-x86": "6dc229847420b8a43c15098cdcb4fe45b2df20a38ad69f37e0aa91c832499c2a",
-      "android-x86_64": "ecae351d98af3b175d40d894520c2e3263034276bb0b0e9d2f9c19ba7dc046fa",
-      "apple-ios-xcframeworks": "6f60f03faaeebfb798615d09715040790ff95e75bf95028893ced6f514ab5196",
-      "apple-macos-xcframeworks": "07467cd1778053537528ed91c7a35d116e1a4644819f0aad8e06e7d884591dea"
-    }
-  },
+  "version": "2.5.0",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
   "module": "lib/module/index.js",
   "types": "lib/typescript/index.d.ts",
   "files": [
-    "scripts/install-skia.mjs",
     "scripts/setup-canvaskit.js",
     "src/**",
     "lib/**",
@@ -68,14 +44,13 @@
     "clean-skia": "yarn rimraf ./libs && yarn rimraf ../../externals/skia/out",
     "build-skia": "tsx ./scripts/build-skia.ts",
     "copy-skia-headers": "tsx ./scripts/copy-skia-headers.ts",
-    "install-skia": "node ./scripts/install-skia.mjs --force && yarn copy-skia-headers",
+    "install-skia-graphite": "tsx ./scripts/install-skia-graphite.ts",
     "clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common",
     "clang-format-ios": "find apple/ -iname '*.h' -o -iname '*.mm' -o -iname '*.cpp' | xargs clang-format -i",
     "clang-format-android": "find android/cpp/ -iname '*.h' -o -iname '*.m' -o -iname '*.cpp' | xargs clang-format -i",
     "clang-format-common": "find cpp/ \\( -path 'cpp//skia' -prune \\) -o \\( -iname '*.h' -o -iname '*.m' -o -iname '*.cpp' \\) -print | xargs clang-format -i",
     "workflow-copy-libs": "tsx ./scripts/workflow-copy-libs.ts",
-    "cpplint": "cpplint --linelength=230 --filter=-legal/copyright,-whitespace/indent,-whitespace/comments,-whitespace/ending_newline,-build/include_order,-runtime/references,-readability/todo,-whitespace/blank_line,-whitespace/todo,-runtime/int,-build/c++11,-whitespace/parens --exclude=package/cpp/skia --exclude=package/ios --exclude=package/android/build --exclude=package/node_modules --recursive package",
-    "postinstall": "node ./scripts/install-skia.mjs"
+    "cpplint": "cpplint --linelength=230 --filter=-legal/copyright,-whitespace/indent,-whitespace/comments,-whitespace/ending_newline,-build/include_order,-runtime/references,-readability/todo,-whitespace/blank_line,-whitespace/todo,-runtime/int,-build/c++11,-whitespace/parens --exclude=package/cpp/skia --exclude=package/ios --exclude=package/android/build --exclude=package/node_modules --recursive package"
   },
   "repository": {
     "type": "git",
@@ -137,11 +112,12 @@
     "react": "19.0.0",
     "react-native": "0.83.1",
     "react-native-builder-bob": "0.18.2",
-    "react-native-reanimated": "4.2.1",
-    "react-native-worklets": "0.7.1",
+    "react-native-reanimated": "^4.2.1",
+    "react-native-worklets": "^0.7.0",
     "rimraf": "3.0.2",
     "semantic-release": "^24.1.0",
     "semantic-release-yarn": "^3.0.2",
+    "tar": "^7.5.9",
     "ts-jest": "29.4.3",
     "tsx": "^4.21.0",
     "typescript": "^5.2.2",
@@ -149,6 +125,10 @@
   },
   "dependencies": {
     "canvaskit-wasm": "0.40.0",
+    "react-native-skia-android": "144.3.0",
+    "react-native-skia-apple-ios": "144.3.0",
+    "react-native-skia-apple-macos": "144.3.0",
+    "react-native-skia-apple-tvos": "144.3.0",
     "react-reconciler": "0.31.0"
   },
   "eslintIgnore": [

package/react-native-skia.podspec

@@ -4,76 +4,122 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-# Check if Skia prebuilt binaries are installed
-# The postinstall script downloads these - if missing, the user needs to run it
-skia_libs_path = File.join(__dir__, "libs/apple/ios")
-unless File.exist?(skia_libs_path) && Dir.glob(File.join(skia_libs_path, "*.xcframework")).any?
-  Pod::UI.puts "\n"
-  Pod::UI.puts "┌─────────────────────────────────────────────────────────────────────────────┐".red
-  Pod::UI.puts "│                                                                             │".red
-  Pod::UI.puts "│  ERROR: Skia prebuilt binaries not found!                                   │".red
-  Pod::UI.puts "│                                                                             │".red
-  Pod::UI.puts "│  The postinstall script has not run. This is required to download the      │".red
-  Pod::UI.puts "│  Skia binaries. Some package managers (pnpm, bun, yarn berry) require       │".red
-  Pod::UI.puts "│  explicit trust for packages with postinstall scripts.                      │".red
-  Pod::UI.puts "│                                                                             │".red
-  Pod::UI.puts "│  To fix this:                                                               │".red
-  Pod::UI.puts "│                                                                             │".red
-  Pod::UI.puts "│  • npm/yarn classic: Run 'npm rebuild @shopify/react-native-skia' or        │".red
-  Pod::UI.puts "│                       reinstall the package                                 │".red
-  Pod::UI.puts "│                                                                             │".red
-  Pod::UI.puts "│  • bun: Run 'bun add --trust @shopify/react-native-skia'                    │".red
-  Pod::UI.puts "│                                                                             │".red
-  Pod::UI.puts "│  • pnpm: Add to package.json:                                               │".red
-  Pod::UI.puts "│          \"pnpm\": { \"onlyBuiltDependencies\": [\"@shopify/react-native-skia\"] }│".red
-  Pod::UI.puts "│          Then reinstall the package                                         │".red
-  Pod::UI.puts "│                                                                             │".red
-  Pod::UI.puts "│  See: https://shopify.github.io/react-native-skia/docs/getting-started/installation │".red
-  Pod::UI.puts "│                                                                             │".red
-  Pod::UI.puts "└─────────────────────────────────────────────────────────────────────────────┘".red
-  Pod::UI.puts "\n"
-  raise "Skia prebuilt binaries not found. Please run the postinstall script."
+# Resolve npm package path using Node.js resolution (handles monorepos, pnpm, etc.)
+resolve_skia_package = lambda do |package_name, required: true|
+  begin
+    # Use node to resolve the package - this handles all edge cases:
+    # - Hoisted packages in monorepos
+    # - pnpm symlinked packages
+    # - Yarn PnP
+    # - Different node_modules structures
+    result = `node -e "console.log(require.resolve('#{package_name}/package.json'))" 2>/dev/null`.strip
+    if $?.success? && !result.empty?
+      return File.dirname(result)
+    end
+  rescue => e
+    # Node resolution failed
+  end
+
+  # Fallback: walk up directories looking for node_modules
+  current = __dir__
+  while current != "/"
+    candidate = File.join(current, "node_modules", package_name)
+    if File.exist?(File.join(candidate, "package.json"))
+      return candidate
+    end
+    current = File.dirname(current)
+  end
+
+  if required
+    Pod::UI.puts "\n"
+    Pod::UI.puts "ERROR: Could not find #{package_name}".red
+    Pod::UI.puts "Make sure you have run 'yarn install' or 'npm install'".red
+    Pod::UI.puts "\n"
+    raise "#{package_name} not found. Please install dependencies."
+  end
+
+  nil
 end
 
-# Check if Graphite is available
-# Detection method priority:
-# 1. SK_GRAPHITE environment variable (explicit override, fastest)
-# 2. Marker file in libs directory (set during Skia build)
-# 3. Default to OFF (no slow nm symbol detection)
+# Check if Graphite is enabled
 use_graphite = false
-
 if ENV['SK_GRAPHITE']
-  # Explicit override via environment variable
   use_graphite = ENV['SK_GRAPHITE'] == '1' || ENV['SK_GRAPHITE'].downcase == 'true'
-  puts "-- SK_GRAPHITE detection: using environment variable (#{use_graphite ? 'ON' : 'OFF'})"
-elsif File.exist?(File.join(__dir__, "libs/apple/graphite.enabled"))
-  # Marker file indicates Graphite-enabled build
-  use_graphite = true
-  puts "-- SK_GRAPHITE detection: marker file found"
+  puts "-- SK_GRAPHITE: using environment variable (#{use_graphite ? 'ON' : 'OFF'})"
 else
-  puts "-- SK_GRAPHITE detection: no marker file, assuming OFF"
+  puts "-- SK_GRAPHITE: OFF (set SK_GRAPHITE=1 to enable)"
 end
 
-if use_graphite
-  puts "-- SK_GRAPHITE: ON"
+# Check if xcframeworks already exist (e.g., from install-skia-graphite script)
+local_ios_libs = File.join(__dir__, "libs/ios")
+local_macos_libs = File.join(__dir__, "libs/macos")
+xcframeworks_preinstalled = File.exist?(local_ios_libs) &&
+                            Dir.glob(File.join(local_ios_libs, "*.xcframework")).any? &&
+                            File.exist?(local_macos_libs) &&
+                            Dir.glob(File.join(local_macos_libs, "*.xcframework")).any?
+
+if xcframeworks_preinstalled
+  puts "-- Using pre-installed xcframeworks from libs/"
+  ios_package = nil
+  macos_package = nil
+  tvos_package = nil
 else
-  puts "-- SK_GRAPHITE: OFF"
+  # Resolve Skia binary packages from npm
+  prefix = use_graphite ? "react-native-skia-graphite" : "react-native-skia"
+
+  ios_package = resolve_skia_package.call("#{prefix}-apple-ios")
+  macos_package = resolve_skia_package.call("#{prefix}-apple-macos")
+  tvos_package = use_graphite ? nil : resolve_skia_package.call("#{prefix}-apple-tvos", required: false)
+
+  puts "-- Skia iOS package: #{ios_package}"
+  puts "-- Skia macOS package: #{macos_package}"
+  puts "-- Skia tvOS package: #{tvos_package}" if tvos_package
+
+  # Verify the packages contain the expected files
+  ios_libs_path = File.join(ios_package, "libs")
+  unless File.exist?(ios_libs_path) && Dir.glob(File.join(ios_libs_path, "*.xcframework")).any?
+    Pod::UI.puts "\n"
+    Pod::UI.puts "┌─────────────────────────────────────────────────────────────────────────────┐".red
+    Pod::UI.puts "│                                                                             │".red
+    Pod::UI.puts "│  ERROR: Skia prebuilt binaries not found in #{prefix}-apple-ios!            │".red
+    Pod::UI.puts "│                                                                             │".red
+    Pod::UI.puts "│  The package was found but doesn't contain the expected xcframeworks.      │".red
+    Pod::UI.puts "│  Try reinstalling: yarn add #{prefix}-apple-ios                             │".red
+    Pod::UI.puts "│                                                                             │".red
+    Pod::UI.puts "└─────────────────────────────────────────────────────────────────────────────┘".red
+    Pod::UI.puts "\n"
+    raise "Skia xcframeworks not found in #{ios_libs_path}"
+  end
 end
 
 # Set preprocessor definitions based on GRAPHITE flag
-preprocessor_defs = use_graphite ? 
-  '$(inherited) SK_GRAPHITE=1 SK_IMAGE_READ_PIXELS_DISABLE_LEGACY_API=1 SK_DISABLE_LEGACY_SHAPER_FACTORY=1' : 
+preprocessor_defs = use_graphite ?
+  '$(inherited) SK_GRAPHITE=1 SK_IMAGE_READ_PIXELS_DISABLE_LEGACY_API=1 SK_DISABLE_LEGACY_SHAPER_FACTORY=1' :
   '$(inherited) SK_METAL=1 SK_GANESH=1 SK_IMAGE_READ_PIXELS_DISABLE_LEGACY_API=1 SK_DISABLE_LEGACY_SHAPER_FACTORY=1'
 
-# Define framework names (without paths)
+# Define framework names
 framework_names = ['libskia', 'libsvg', 'libskshaper', 'libskparagraph',
                    'libskunicode_core', 'libskunicode_libgrapheme',
                    'libskottie', 'libsksg']
 
-# Build platform-specific framework paths
-ios_frameworks = framework_names.map { |f| "libs/apple/ios/#{f}.xcframework" }
-tvos_frameworks = framework_names.map { |f| "libs/apple/tvos/#{f}.xcframework" }
-osx_frameworks = framework_names.map { |f| "libs/apple/macos/#{f}.xcframework" }
+# Build platform-specific framework paths (relative to pod's libs directory)
+ios_frameworks = framework_names.map { |f| "libs/ios/#{f}.xcframework" }
+osx_frameworks = framework_names.map { |f| "libs/macos/#{f}.xcframework" }
+tvos_frameworks = tvos_package ? framework_names.map { |f| "libs/tvos/#{f}.xcframework" } : []
+
+# Prepare command to copy xcframeworks from npm packages into pod directory
+# (skipped if xcframeworks are already preinstalled)
+prepare_commands = []
+unless xcframeworks_preinstalled
+  prepare_commands << "rm -rf libs/ios libs/macos libs/tvos"
+  prepare_commands << "mkdir -p libs/ios libs/macos"
+  prepare_commands << "cp -R '#{ios_package}/libs/'*.xcframework libs/ios/"
+  prepare_commands << "cp -R '#{macos_package}/libs/'*.xcframework libs/macos/"
+  if tvos_package
+    prepare_commands << "mkdir -p libs/tvos"
+    prepare_commands << "cp -R '#{tvos_package}/libs/'*.xcframework libs/tvos/"
+  end
+end
 
 Pod::Spec.new do |s|
   s.name         = "react-native-skia"
@@ -85,13 +131,16 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/shopify/react-native-skia"
   s.license      = "MIT"
   s.license    = { :type => "MIT", :file => "LICENSE.md" }
-  s.authors      = { 
+  s.authors      = {
     "Christian Falch" => "christian.falch@gmail.com",
     "William Candillon" => "wcandillon@gmail.com"
   }
   s.platforms    = { :ios => "14.0", :tvos => "13.0", :osx => "11" }
   s.source       = { :git => "https://github.com/shopify/react-native-skia/react-native-skia.git", :tag => "#{s.version}" }
 
+  # Copy xcframeworks from npm packages into pod directory structure
+  s.prepare_command = prepare_commands.join(" && ")
+
   s.requires_arc = true
   s.pod_target_xcconfig = {
     'GCC_PREPROCESSOR_DEFINITIONS' => preprocessor_defs,
@@ -102,7 +151,7 @@ Pod::Spec.new do |s|
 
   s.frameworks = ['MetalKit', 'AVFoundation', 'AVKit', 'CoreMedia']
 
-  # Platform-specific vendored frameworks
+  # Platform-specific vendored frameworks (copied into libs/)
   s.ios.vendored_frameworks = ios_frameworks
   s.osx.vendored_frameworks = osx_frameworks
 
@@ -111,9 +160,12 @@ Pod::Spec.new do |s|
     s.tvos.vendored_frameworks = tvos_frameworks
   end
 
+  # Preserve the copied libs directory
+  s.preserve_paths = ["libs/**/*"]
+
   # All iOS cpp/h files
   s.source_files = [
-    "apple/**/*.{h,c,cc,cpp,m,mm,swift}",  
+    "apple/**/*.{h,c,cc,cpp,m,mm,swift}",
     "cpp/**/*.{h,cpp}"
   ]
 
@@ -123,9 +175,10 @@ Pod::Spec.new do |s|
     'cpp/rnskia/RNDawnWindowContext.h',
     'cpp/rnskia/RNDawnWindowContext.cpp',
     'cpp/rnskia/RNImageProvider.h',
-    'cpp/rnwgpu/**/*.{h,cpp}'
+    'cpp/rnwgpu/**/*.{h,cpp}',
+    'cpp/jsi2/**/*.{h,cpp}'
   ]
-  s.exclude_files = graphite_exclusions unless use_graphite 
+  s.exclude_files = graphite_exclusions unless use_graphite
 
   if defined?(install_modules_dependencies()) != nil
     install_modules_dependencies(s)
@@ -138,4 +191,3 @@ Pod::Spec.new do |s|
     s.dependency "React-Core"
   end
 end
-

package/src/renderer/Canvas.tsx

@@ -64,6 +64,8 @@ export const isFabric = Boolean((global as any)?.nativeFabricUIManager);
 
 export interface CanvasProps extends Omit<ViewProps, "onLayout"> {
   debug?: boolean;
+  /** @deprecated Not supported on Fabric. Use `onSize` or `useCanvasSize()` instead. */
+  onLayout?: ViewProps["onLayout"];
   opaque?: boolean;
   onSize?: SharedValue<SkSize>;
   colorSpace?: "p3" | "srgb";
@@ -80,9 +82,6 @@ export const Canvas = ({
   colorSpace = "p3",
   androidWarmup = false,
   ref,
-  // Here know this is a type error but this is done on purpose to check it at runtime
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error
   onLayout,
   ...viewProps
 }: CanvasProps) => {

package/src/renderer/Offscreen.tsx

@@ -1,6 +1,6 @@
 import type { ReactElement } from "react";
 
-import type { SkPicture, SkRect, SkSize } from "../skia/types";
+import type { SkImage, SkPicture, SkRect, SkSize } from "../skia/types";
 import { Skia } from "../skia";
 import { Platform } from "../Platform";
 import { SkiaSGRoot } from "../sksg/Reconciler";
@@ -25,11 +25,17 @@ export const drawAsPicture = async (element: ReactElement, bounds?: SkRect) => {
   return picture;
 };
 
-export const drawAsImage = async (element: ReactElement, size: SkSize) => {
+export const drawAsImage = async (
+  element: ReactElement,
+  size: SkSize
+): Promise<SkImage | null> => {
   return drawAsImageFromPicture(await drawAsPicture(element), size);
 };
 
-export const drawAsImageFromPicture = (picture: SkPicture, size: SkSize) => {
+export const drawAsImageFromPicture = (
+  picture: SkPicture,
+  size: SkSize
+): SkImage | null => {
   "worklet";
   const surface = Skia.Surface.MakeOffscreen(size.width, size.height)!;
   const canvas = surface.getCanvas();

package/src/skia/types/Image/Image.ts

@@ -153,6 +153,7 @@ export interface SkImage extends SkJSIInstance<"Image"> {
    * Returns raster image or lazy image. Copies SkImage backed by GPU texture
    * into CPU memory if needed. Returns original SkImage if decoded in raster
    * bitmap, or if encoded in a stream.
+   * Returns null if the conversion fails.
    */
-  makeNonTextureImage(): SkImage;
+  makeNonTextureImage(): SkImage | null;
 }

package/src/sksg/Container.native.ts

@@ -44,15 +44,14 @@ class NativeReanimatedContainer extends Container {
       return;
     }
     const recorder = new ReanimatedRecorder(this.Skia);
-    const { nativeId, picture, Skia } = this;
+    const { nativeId, picture } = this;
     visit(recorder, this.root);
     const sharedValues = recorder.getSharedValues();
     const sharedRecorder = recorder.getRecorder();
     // Draw first frame
-    Rea.executeOnUIRuntimeSync(() => {
+    Rea.runOnUI(() => {
       "worklet";
-      const firstPicture = Skia.Picture.MakePicture(null)!;
-      nativeDrawOnscreen(nativeId, sharedRecorder, firstPicture);
+      nativeDrawOnscreen(nativeId, sharedRecorder, picture);
     })();
     // Animate
     if (sharedValues.length > 0) {