@shopify/react-native-skia 1.11.11 → 1.12.0

package/lib/module/specs/NativeSkiaModule.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["global","SkiaViewApi","views","web","registerView","nativeId","view","setJsiProperty","name","value","setPicture","requestRedraw","redraw","makeImageSnapshot","rect","makeImageSnapshotAsync","Promise","resolve","reject","result","Error"],"sources":["NativeSkiaModule.web.ts"],"sourcesContent":["/* eslint-disable import/no-anonymous-default-export */\nimport type { SkRect } from \"../skia/types\";\nimport type { ISkiaViewApi } from \"../views/types\";\nimport type { SkiaPictureView } from \"../views/SkiaPictureView.web\";\n\nexport type ISkiaViewApiWeb = ISkiaViewApi & {\n  views: Record<string, SkiaPictureView>;\n  registerView(nativeId: string, view: SkiaPictureView): void;\n};\n\nglobal.SkiaViewApi = {\n  views: {},\n  web: true,\n  registerView(nativeId: string, view: SkiaPictureView) {\n    this.views[nativeId] = view;\n  },\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  setJsiProperty(nativeId: number, name: string, value: any) {\n    if (name === \"picture\") {\n      this.views[`${nativeId}`].setPicture(value);\n    }\n  },\n  requestRedraw(nativeId: number) {\n    this.views[`${nativeId}`].redraw();\n  },\n  makeImageSnapshot(nativeId: number, rect?: SkRect) {\n    return this.views[`${nativeId}`].makeImageSnapshot(rect);\n  },\n  makeImageSnapshotAsync(nativeId: number, rect?: SkRect) {\n    return new Promise((resolve, reject) => {\n      const result = this.views[`${nativeId}`].makeImageSnapshot(rect);\n      if (result) {\n        resolve(result);\n      } else {\n        reject(new Error(\"Failed to make image snapshot\"));\n      }\n    });\n  },\n} as ISkiaViewApiWeb;\n\n// eslint-disable-next-line import/no-default-export\nexport default {};\n"],"mappings":"AAAA;;AAUAA,MAAM,CAACC,WAAW,GAAG;EACnBC,KAAK,EAAE,CAAC,CAAC;EACTC,GAAG,EAAE,IAAI;EACTC,YAAYA,CAACC,QAAgB,EAAEC,IAAqB,EAAE;IACpD,IAAI,CAACJ,KAAK,CAACG,QAAQ,CAAC,GAAGC,IAAI;EAC7B,CAAC;EACD;EACAC,cAAcA,CAACF,QAAgB,EAAEG,IAAY,EAAEC,KAAU,EAAE;IACzD,IAAID,IAAI,KAAK,SAAS,EAAE;MACtB,IAAI,CAACN,KAAK,CAAC,GAAGG,QAAQ,EAAE,CAAC,CAACK,UAAU,CAACD,KAAK,CAAC;IAC7C;EACF,CAAC;EACDE,aAAaA,CAACN,QAAgB,EAAE;IAC9B,IAAI,CAACH,KAAK,CAAC,GAAGG,QAAQ,EAAE,CAAC,CAACO,MAAM,CAAC,CAAC;EACpC,CAAC;EACDC,iBAAiBA,CAACR,QAAgB,EAAES,IAAa,EAAE;IACjD,OAAO,IAAI,CAACZ,KAAK,CAAC,GAAGG,QAAQ,EAAE,CAAC,CAACQ,iBAAiB,CAACC,IAAI,CAAC;EAC1D,CAAC;EACDC,sBAAsBA,CAACV,QAAgB,EAAES,IAAa,EAAE;IACtD,OAAO,IAAIE,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACtC,MAAMC,MAAM,GAAG,IAAI,CAACjB,KAAK,CAAC,GAAGG,QAAQ,EAAE,CAAC,CAACQ,iBAAiB,CAACC,IAAI,CAAC;MAChE,IAAIK,MAAM,EAAE;QACVF,OAAO,CAACE,MAAM,CAAC;MACjB,CAAC,MAAM;QACLD,MAAM,CAAC,IAAIE,KAAK,CAAC,+BAA+B,CAAC,CAAC;MACpD;IACF,CAAC,CAAC;EACJ;AACF,CAAoB;;AAEpB;AACA,eAAe,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["global","SkiaViewApi","views","deferedPictures","web","registerView","nativeId","view","setPicture","setJsiProperty","name","value","requestRedraw","redraw","makeImageSnapshot","rect","makeImageSnapshotAsync","Promise","resolve","reject","result","Error"],"sources":["NativeSkiaModule.web.ts"],"sourcesContent":["/* eslint-disable import/no-anonymous-default-export */\nimport type { SkPicture, SkRect } from \"../skia/types\";\nimport type { ISkiaViewApi } from \"../views/types\";\nimport type { SkiaPictureView } from \"../views/SkiaPictureView.web\";\n\nexport type ISkiaViewApiWeb = ISkiaViewApi & {\n  views: Record<string, SkiaPictureView>;\n  deferedPictures: Record<string, SkPicture>;\n  registerView(nativeId: string, view: SkiaPictureView): void;\n};\n\nglobal.SkiaViewApi = {\n  views: {},\n  deferedPictures: {},\n  web: true,\n  registerView(nativeId: string, view: SkiaPictureView) {\n    // Maybe a picture for this view was already set\n    if (this.deferedPictures[nativeId]) {\n      view.setPicture(this.deferedPictures[nativeId] as SkPicture);\n    }\n    this.views[nativeId] = view;\n  },\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  setJsiProperty(nativeId: number, name: string, value: any) {\n    if (name === \"picture\") {\n      if (!this.views[`${nativeId}`]) {\n        this.deferedPictures[`${nativeId}`] = value;\n      } else {\n        this.views[`${nativeId}`].setPicture(value);\n      }\n    }\n  },\n  requestRedraw(nativeId: number) {\n    this.views[`${nativeId}`].redraw();\n  },\n  makeImageSnapshot(nativeId: number, rect?: SkRect) {\n    return this.views[`${nativeId}`].makeImageSnapshot(rect);\n  },\n  makeImageSnapshotAsync(nativeId: number, rect?: SkRect) {\n    return new Promise((resolve, reject) => {\n      const result = this.views[`${nativeId}`].makeImageSnapshot(rect);\n      if (result) {\n        resolve(result);\n      } else {\n        reject(new Error(\"Failed to make image snapshot\"));\n      }\n    });\n  },\n} as ISkiaViewApiWeb;\n\n// eslint-disable-next-line import/no-default-export\nexport default {};\n"],"mappings":"AAAA;;AAWAA,MAAM,CAACC,WAAW,GAAG;EACnBC,KAAK,EAAE,CAAC,CAAC;EACTC,eAAe,EAAE,CAAC,CAAC;EACnBC,GAAG,EAAE,IAAI;EACTC,YAAYA,CAACC,QAAgB,EAAEC,IAAqB,EAAE;IACpD;IACA,IAAI,IAAI,CAACJ,eAAe,CAACG,QAAQ,CAAC,EAAE;MAClCC,IAAI,CAACC,UAAU,CAAC,IAAI,CAACL,eAAe,CAACG,QAAQ,CAAc,CAAC;IAC9D;IACA,IAAI,CAACJ,KAAK,CAACI,QAAQ,CAAC,GAAGC,IAAI;EAC7B,CAAC;EACD;EACAE,cAAcA,CAACH,QAAgB,EAAEI,IAAY,EAAEC,KAAU,EAAE;IACzD,IAAID,IAAI,KAAK,SAAS,EAAE;MACtB,IAAI,CAAC,IAAI,CAACR,KAAK,CAAC,GAAGI,QAAQ,EAAE,CAAC,EAAE;QAC9B,IAAI,CAACH,eAAe,CAAC,GAAGG,QAAQ,EAAE,CAAC,GAAGK,KAAK;MAC7C,CAAC,MAAM;QACL,IAAI,CAACT,KAAK,CAAC,GAAGI,QAAQ,EAAE,CAAC,CAACE,UAAU,CAACG,KAAK,CAAC;MAC7C;IACF;EACF,CAAC;EACDC,aAAaA,CAACN,QAAgB,EAAE;IAC9B,IAAI,CAACJ,KAAK,CAAC,GAAGI,QAAQ,EAAE,CAAC,CAACO,MAAM,CAAC,CAAC;EACpC,CAAC;EACDC,iBAAiBA,CAACR,QAAgB,EAAES,IAAa,EAAE;IACjD,OAAO,IAAI,CAACb,KAAK,CAAC,GAAGI,QAAQ,EAAE,CAAC,CAACQ,iBAAiB,CAACC,IAAI,CAAC;EAC1D,CAAC;EACDC,sBAAsBA,CAACV,QAAgB,EAAES,IAAa,EAAE;IACtD,OAAO,IAAIE,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACtC,MAAMC,MAAM,GAAG,IAAI,CAAClB,KAAK,CAAC,GAAGI,QAAQ,EAAE,CAAC,CAACQ,iBAAiB,CAACC,IAAI,CAAC;MAChE,IAAIK,MAAM,EAAE;QACVF,OAAO,CAACE,MAAM,CAAC;MACjB,CAAC,MAAM;QACLD,MAAM,CAAC,IAAIE,KAAK,CAAC,+BAA+B,CAAC,CAAC;MACpD;IACF,CAAC,CAAC;EACJ;AACF,CAAoB;;AAEpB;AACA,eAAe,CAAC,CAAC","ignoreList":[]}

package/lib/typescript/lib/commonjs/sksg/Recorder/Core.d.ts

@@ -1,6 +1,6 @@
 export const __esModule: boolean;
 export const CommandType: {};
-export function materializeProps(command: any): void;
+export function materializeCommand(command: any): any;
 export function isCommand(command: any, type: any): boolean;
 export function isGroup(command: any): boolean;
 export function isDrawCommand(command: any, type: any): boolean;

package/lib/typescript/lib/module/sksg/Recorder/Core.d.ts

@@ -1,5 +1,5 @@
 export let CommandType: {};
-export function materializeProps(command: any): void;
+export function materializeCommand(command: any): any;
 export function isCommand(command: any, type: any): boolean;
 export function isGroup(command: any): boolean;
 export function isDrawCommand(command: any, type: any): boolean;

package/lib/typescript/src/sksg/Recorder/Core.d.ts

@@ -1,4 +1,3 @@
-import type { SharedValue } from "react-native-reanimated";
 import type { BlurMaskFilterProps, CircleProps, CTMProps, ImageProps, PointsProps, PathProps, RectProps, RoundedRectProps, OvalProps, LineProps, PatchProps, VerticesProps, DiffRectProps, TextProps, TextPathProps, TextBlobProps, GlyphsProps, PictureProps, ImageSVGProps, ParagraphProps, AtlasProps, DrawingNodeProps } from "../../dom/types";
 export declare enum CommandType {
     Group = 0,
@@ -44,10 +43,7 @@ export type Command<T extends CommandType = CommandType> = {
     type: T;
     [key: string]: unknown;
 };
-export declare const materializeProps: (command: {
-    props: Record<string, unknown>;
-    animatedProps?: Record<string, SharedValue<unknown>>;
-}) => void;
+export declare const materializeCommand: (command: any) => any;
 export declare const isCommand: <T extends CommandType>(command: Command, type: T) => command is Command<T>;
 interface GroupCommand extends Command<CommandType.Group> {
     children: Command[];

package/lib/typescript/src/specs/NativeSkiaModule.web.d.ts

@@ -1,7 +1,9 @@
+import type { SkPicture } from "../skia/types";
 import type { ISkiaViewApi } from "../views/types";
 import type { SkiaPictureView } from "../views/SkiaPictureView.web";
 export type ISkiaViewApiWeb = ISkiaViewApi & {
     views: Record<string, SkiaPictureView>;
+    deferedPictures: Record<string, SkPicture>;
     registerView(nativeId: string, view: SkiaPictureView): void;
 };
 declare const _default: {};

package/package.json

@@ -5,10 +5,10 @@
     "provenance": true
   },
   "bin": {
-    "setup-skia-web": "./scripts/setup-canvaskit.js"
+    "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.11.11",
+  "version": "1.12.0",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -76,8 +76,8 @@
   "licenseFilename": "LICENSE.md",
   "readmeFilename": "README.md",
   "peerDependencies": {
-    "react": ">=18.0",
-    "react-native": ">=0.64",
+    "react": ">=18.0 <19.0.0",
+    "react-native": ">=0.64 <0.78.0",
     "react-native-reanimated": ">=2.0.0"
   },
   "peerDependenciesMeta": {
@@ -91,6 +91,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
     "@semantic-release/commit-analyzer": "^13.0.0",
+    "@semantic-release/exec": "^7.0.3",
     "@semantic-release/github": "^10.3.3",
     "@semantic-release/release-notes-generator": "^14.0.1",
     "@types/jest": "29.5.6",

package/react-native-skia.podspec

@@ -41,7 +41,7 @@ Pod::Spec.new do |s|
     "Christian Falch" => "christian.falch@gmail.com",
     "William Candillon" => "wcandillon@gmail.com"
   }
-  s.platforms    = { :ios => "13.0", :tvos => "13.0" }
+  s.platforms    = { :ios => "13.0", :tvos => "13.0", :osx => "11" }
   s.source       = { :git => "https://github.com/shopify/react-native-skia/react-native-skia.git", :tag => "#{s.version}" }
 
   s.requires_arc = true
@@ -54,13 +54,13 @@ Pod::Spec.new do |s|
 
   s.frameworks = ['MetalKit', 'AVFoundation', 'AVKit', 'CoreMedia']
 
-  s.vendored_frameworks = use_graphite ?
+  s.vendored_frameworks = use_graphite ? 
   base_frameworks + graphite_frameworks :
   base_frameworks
 
   # All iOS cpp/h files
   s.source_files = [
-    "ios/**/*.{h,c,cc,cpp,m,mm,swift}",  
+    "apple/**/*.{h,c,cc,cpp,m,mm,swift}",  
     "cpp/**/*.{h,cpp}"
   ]
 

package/src/sksg/Recorder/Core.ts

@@ -1,5 +1,3 @@
-import type { SharedValue } from "react-native-reanimated";
-
 import type {
   BlurMaskFilterProps,
   CircleProps,
@@ -115,16 +113,16 @@ export type Command<T extends CommandType = CommandType> = {
   [key: string]: unknown;
 };
 
-export const materializeProps = (command: {
-  props: Record<string, unknown>;
-  animatedProps?: Record<string, SharedValue<unknown>>;
-}) => {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const materializeCommand = (command: any) => {
   "worklet";
+  const newProps = { ...command.props };
   if (command.animatedProps) {
     for (const key in command.animatedProps) {
-      command.props[key] = command.animatedProps[key].value;
+      newProps[key] = command.animatedProps[key].value;
     }
   }
+  return { ...command, props: newProps };
 };
 
 export const isCommand = <T extends CommandType>(

package/src/sksg/Recorder/Player.ts

@@ -44,19 +44,18 @@ import {
   isCommand,
   isDrawCommand,
   isGroup,
-  materializeProps,
+  materializeCommand,
   type Command,
 } from "./Core";
 import type { DrawingContext } from "./DrawingContext";
 
-function play(ctx: DrawingContext, command: Command) {
+function play(ctx: DrawingContext, _command: Command) {
   "worklet";
-  if (isGroup(command)) {
-    command.children.forEach((child) => play(ctx, child));
+  if (isGroup(_command)) {
+    _command.children.forEach((child) => play(ctx, child));
     return;
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  materializeProps(command as any);
+  const command = materializeCommand(_command);
   if (isCommand(command, CommandType.SaveBackdropFilter)) {
     ctx.saveBackdropFilter();
   } else if (isCommand(command, CommandType.SaveLayer)) {

package/src/sksg/Recorder/commands/Box.ts

@@ -2,7 +2,7 @@ import { deflate, inflate, processColor } from "../../../dom/nodes";
 import type { BoxProps, BoxShadowProps } from "../../../dom/types";
 import { BlurStyle, ClipOp, isRRect } from "../../../skia/types";
 import type { Command } from "../Core";
-import { CommandType, materializeProps } from "../Core";
+import { CommandType, materializeCommand } from "../Core";
 import type { DrawingContext } from "../DrawingContext";
 
 interface BoxCommand extends Command<CommandType.DrawBox> {
@@ -17,11 +17,9 @@ export const isBoxCommand = (command: Command): command is BoxCommand => {
 
 export const drawBox = (ctx: DrawingContext, command: BoxCommand) => {
   "worklet";
-  command.shadows.forEach((shadow) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    materializeProps(shadow as any);
+  const shadows = command.shadows.map((shadow) => {
+    return materializeCommand(shadow).props;
   });
-  const shadows = command.shadows.map((shadow) => shadow.props);
   const { paint, Skia, canvas } = ctx;
   const { box: defaultBox } = command.props;
   const opacity = paint.getAlphaf();

package/src/specs/NativeSkiaModule.web.ts

@@ -1,23 +1,33 @@
 /* eslint-disable import/no-anonymous-default-export */
-import type { SkRect } from "../skia/types";
+import type { SkPicture, SkRect } from "../skia/types";
 import type { ISkiaViewApi } from "../views/types";
 import type { SkiaPictureView } from "../views/SkiaPictureView.web";
 
 export type ISkiaViewApiWeb = ISkiaViewApi & {
   views: Record<string, SkiaPictureView>;
+  deferedPictures: Record<string, SkPicture>;
   registerView(nativeId: string, view: SkiaPictureView): void;
 };
 
 global.SkiaViewApi = {
   views: {},
+  deferedPictures: {},
   web: true,
   registerView(nativeId: string, view: SkiaPictureView) {
+    // Maybe a picture for this view was already set
+    if (this.deferedPictures[nativeId]) {
+      view.setPicture(this.deferedPictures[nativeId] as SkPicture);
+    }
     this.views[nativeId] = view;
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   setJsiProperty(nativeId: number, name: string, value: any) {
     if (name === "picture") {
-      this.views[`${nativeId}`].setPicture(value);
+      if (!this.views[`${nativeId}`]) {
+        this.deferedPictures[`${nativeId}`] = value;
+      } else {
+        this.views[`${nativeId}`].setPicture(value);
+      }
     }
   },
   requestRedraw(nativeId: number) {

package/ios/RNSkia-iOS/MetalContext.h

@@ -1,134 +0,0 @@
-#pragma once
-
-#include "MetalWindowContext.h"
-#include "SkiaCVPixelBufferUtils.h"
-
-#include "include/core/SkSurface.h"
-
-#import <include/gpu/ganesh/GrBackendSurface.h>
-#import <include/gpu/ganesh/GrDirectContext.h>
-#import <include/gpu/ganesh/SkImageGanesh.h>
-#import <include/gpu/ganesh/SkSurfaceGanesh.h>
-#import <include/gpu/ganesh/mtl/GrMtlBackendContext.h>
-#import <include/gpu/ganesh/mtl/GrMtlBackendSurface.h>
-#import <include/gpu/ganesh/mtl/GrMtlDirectContext.h>
-#import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
-
-// namespace RNSkia {
-// class RNSkiOSPlatformContext;
-// }
-
-class MetalSharedContext {
-public:
-  static MetalSharedContext &getInstance() {
-    static MetalSharedContext instance;
-    return instance;
-  }
-
-  id<MTLDevice> getDevice() { return _device; }
-
-private:
-  MetalSharedContext() {
-    _device = MTLCreateSystemDefaultDevice();
-    if (!_device) {
-      throw std::runtime_error("Failed to create Metal device");
-    }
-  }
-
-  MetalSharedContext(const MetalSharedContext &) = delete;
-  MetalSharedContext &operator=(const MetalSharedContext &) = delete;
-
-  id<MTLDevice> _device;
-};
-
-struct OffscreenRenderContext {
-  id<MTLTexture> texture;
-
-  OffscreenRenderContext(id<MTLDevice> device,
-                         sk_sp<GrDirectContext> skiaContext,
-                         id<MTLCommandQueue> commandQueue, int width,
-                         int height) {
-    // Create a Metal texture descriptor
-    MTLTextureDescriptor *textureDescriptor = [MTLTextureDescriptor
-        texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm
-                                     width:width
-                                    height:height
-                                 mipmapped:NO];
-    textureDescriptor.usage =
-        MTLTextureUsageRenderTarget | MTLTextureUsageShaderRead;
-    texture = [device newTextureWithDescriptor:textureDescriptor];
-  }
-};
-
-class MetalContext {
-
-public:
-  MetalContext(const MetalContext &) = delete;
-  MetalContext &operator=(const MetalContext &) = delete;
-
-  static MetalContext &getInstance() {
-    static thread_local MetalContext instance;
-    return instance;
-  }
-
-  sk_sp<SkSurface> MakeOffscreen(int width, int height) {
-    auto device = MetalSharedContext::getInstance().getDevice();
-    auto ctx = new OffscreenRenderContext(device, _directContext, _commandQueue,
-                                          width, height);
-
-    // Create a GrBackendTexture from the Metal texture
-    GrMtlTextureInfo info;
-    info.fTexture.retain((__bridge void *)ctx->texture);
-    GrBackendTexture backendTexture =
-        GrBackendTextures::MakeMtl(width, height, skgpu::Mipmapped::kNo, info);
-
-    // Create a SkSurface from the GrBackendTexture
-    auto surface = SkSurfaces::WrapBackendTexture(
-        _directContext.get(), backendTexture, kTopLeft_GrSurfaceOrigin, 0,
-        kBGRA_8888_SkColorType, nullptr, nullptr,
-        [](void *addr) { delete (OffscreenRenderContext *)addr; }, ctx);
-
-    return surface;
-  }
-
-  sk_sp<SkImage> MakeImageFromBuffer(void *buffer) {
-
-    CVPixelBufferRef sampleBuffer = (CVPixelBufferRef)buffer;
-    SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat format =
-        SkiaCVPixelBufferUtils::getCVPixelBufferBaseFormat(sampleBuffer);
-    switch (format) {
-    case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::rgb: {
-      // CVPixelBuffer is in any RGB format, single-plane
-      return SkiaCVPixelBufferUtils::RGB::makeSkImageFromCVPixelBuffer(
-          _directContext.get(), sampleBuffer);
-    }
-    case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::yuv: {
-      // CVPixelBuffer is in any YUV format, multi-plane
-      return SkiaCVPixelBufferUtils::YUV::makeSkImageFromCVPixelBuffer(
-          _directContext.get(), sampleBuffer);
-    }
-    default:
-      [[unlikely]] {
-        throw std::runtime_error("Failed to convert NativeBuffer to SkImage - "
-                                 "NativeBuffer has unsupported PixelFormat! " +
-                                 std::to_string(static_cast<int>(format)));
-      }
-    }
-  }
-
-  std::unique_ptr<RNSkia::WindowContext> MakeWindow(CALayer *window, int width,
-                                                    int height) {
-    auto device = MetalSharedContext::getInstance().getDevice();
-    return std::make_unique<MetalWindowContext>(
-        _directContext.get(), device, _commandQueue, window, width, height);
-  }
-
-  GrDirectContext *getDirectContext() { return _directContext.get(); }
-
-private:
-  // friend class RNSkia::RNSkiOSPlatformContext;
-  id<MTLCommandQueue> _commandQueue = nullptr;
-  sk_sp<GrDirectContext> _directContext = nullptr;
-
-  MetalContext();
-};

package/ios/RNSkia-iOS/MetalContext.mm

@@ -1,34 +0,0 @@
-#include "MetalContext.h"
-
-#include "RNSkLog.h"
-
-#import <MetalKit/MetalKit.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#import <include/gpu/ganesh/GrBackendSurface.h>
-#import <include/gpu/ganesh/SkImageGanesh.h>
-#import <include/gpu/ganesh/mtl/GrMtlBackendContext.h>
-#import <include/gpu/ganesh/mtl/GrMtlBackendSurface.h>
-#import <include/gpu/ganesh/mtl/GrMtlDirectContext.h>
-#import <include/gpu/ganesh/mtl/GrMtlTypes.h>
-#import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
-
-#pragma clang diagnostic pop
-
-MetalContext::MetalContext() {
-  auto device = MetalSharedContext::getInstance().getDevice();
-  _commandQueue =
-      id<MTLCommandQueue>(CFRetain((GrMTLHandle)[device newCommandQueue]));
-  GrMtlBackendContext backendContext = {};
-  backendContext.fDevice.reset((__bridge void *)device);
-  backendContext.fQueue.reset((__bridge void *)_commandQueue);
-  GrContextOptions grContextOptions; // set different options here.
-
-  // Create the Skia Direct Context
-  _directContext = GrDirectContexts::MakeMetal(backendContext);
-  if (_directContext == nullptr) {
-    RNSkia::RNSkLogger::logToConsole("Couldn't create a Skia Metal Context");
-  }
-}

package/ios/RNSkia-iOS/MetalWindowContext.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#import <MetalKit/MetalKit.h>
-
-#include "WindowContext.h"
-
-class SkiaMetalContext;
-
-class MetalWindowContext : public RNSkia::WindowContext {
-public:
-  MetalWindowContext(GrDirectContext *directContext, id<MTLDevice> device,
-                     id<MTLCommandQueue> commandQueue, CALayer *layer,
-                     int width, int height);
-  ~MetalWindowContext() = default;
-
-  sk_sp<SkSurface> getSurface() override;
-
-  void present() override;
-
-  int getWidth() override {
-    return _layer.frame.size.width * _layer.contentsScale;
-  };
-
-  int getHeight() override {
-    return _layer.frame.size.height * _layer.contentsScale;
-  };
-
-  void resize(int width, int height) override { _skSurface = nullptr; }
-
-private:
-  GrDirectContext *_directContext;
-  id<MTLCommandQueue> _commandQueue;
-  sk_sp<SkSurface> _skSurface = nullptr;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-  CAMetalLayer *_layer;
-#pragma clang diagnostic pop
-  id<CAMetalDrawable> _currentDrawable = nil;
-};

package/ios/RNSkia-iOS/MetalWindowContext.mm

@@ -1,60 +0,0 @@
-#include "MetalWindowContext.h"
-
-#include "MetalContext.h"
-#include "RNSkLog.h"
-
-MetalWindowContext::MetalWindowContext(GrDirectContext *directContext,
-                                       id<MTLDevice> device,
-                                       id<MTLCommandQueue> commandQueue,
-                                       CALayer *layer, int width, int height)
-    : _directContext(directContext), _commandQueue(commandQueue) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-  _layer = (CAMetalLayer *)layer;
-#pragma clang diagnostic pop
-  _layer.framebufferOnly = NO;
-  _layer.device = device;
-  _layer.opaque = false;
-  _layer.contentsScale = [UIScreen mainScreen].scale;
-  _layer.pixelFormat = MTLPixelFormatBGRA8Unorm;
-  _layer.contentsGravity = kCAGravityBottomLeft;
-  _layer.drawableSize = CGSizeMake(width, height);
-}
-
-sk_sp<SkSurface> MetalWindowContext::getSurface() {
-  if (_skSurface) {
-    return _skSurface;
-  }
-
-  // Get the next drawable from the CAMetalLayer
-  _currentDrawable = [_layer nextDrawable];
-  if (!_currentDrawable) {
-    RNSkia::RNSkLogger::logToConsole(
-        "Could not retrieve drawable from CAMetalLayer");
-    return nullptr;
-  }
-
-  // Get the texture from the drawable
-  GrMtlTextureInfo fbInfo;
-  fbInfo.fTexture.retain((__bridge void *)_currentDrawable.texture);
-
-  GrBackendRenderTarget backendRT = GrBackendRenderTargets::MakeMtl(
-      _layer.drawableSize.width, _layer.drawableSize.height, fbInfo);
-
-  _skSurface = SkSurfaces::WrapBackendRenderTarget(
-      _directContext, backendRT, kTopLeft_GrSurfaceOrigin,
-      kBGRA_8888_SkColorType, nullptr, nullptr);
-
-  return _skSurface;
-}
-
-void MetalWindowContext::present() {
-  if (auto dContext = GrAsDirectContext(_skSurface->recordingContext())) {
-    dContext->flushAndSubmit();
-  }
-
-  id<MTLCommandBuffer> commandBuffer([_commandQueue commandBuffer]);
-  [commandBuffer presentDrawable:_currentDrawable];
-  [commandBuffer commit];
-  _skSurface = nullptr;
-}

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#import "RNSkPlatformContext.h"
-#import "RNSkView.h"
-
-#import <MetalKit/MetalKit.h>
-#import <QuartzCore/CAMetalLayer.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#import <include/gpu/ganesh/GrDirectContext.h>
-
-#pragma clang diagnostic pop
-
-class RNSkMetalCanvasProvider : public RNSkia::RNSkCanvasProvider {
-public:
-  RNSkMetalCanvasProvider(std::function<void()> requestRedraw,
-                          std::shared_ptr<RNSkia::RNSkPlatformContext> context);
-
-  ~RNSkMetalCanvasProvider();
-
-  int getScaledWidth() override;
-  int getScaledHeight() override;
-
-  bool renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
-
-  void setSize(int width, int height);
-  CALayer *getLayer();
-
-private:
-  std::shared_ptr<RNSkia::RNSkPlatformContext> _context;
-  std::unique_ptr<RNSkia::WindowContext> _ctx = nullptr;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-  CAMetalLayer *_layer;
-#pragma clang diagnostic pop
-};

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -1,103 +0,0 @@
-#import "RNSkMetalCanvasProvider.h"
-
-#import "RNSkLog.h"
-
-#if defined(SK_GRAPHITE)
-#import "DawnContext.h"
-#else
-#import "MetalContext.h"
-#endif
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#import "include/core/SkCanvas.h"
-#import "include/core/SkColorSpace.h"
-#import "include/core/SkSurface.h"
-
-#import <include/gpu/ganesh/GrBackendSurface.h>
-#import <include/gpu/ganesh/GrDirectContext.h>
-#import <include/gpu/ganesh/SkSurfaceGanesh.h>
-
-#pragma clang diagnostic pop
-
-RNSkMetalCanvasProvider::RNSkMetalCanvasProvider(
-    std::function<void()> requestRedraw,
-    std::shared_ptr<RNSkia::RNSkPlatformContext> context)
-    : RNSkCanvasProvider(requestRedraw), _context(context) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-  _layer = [CAMetalLayer layer];
-#pragma clang diagnostic pop
-}
-
-RNSkMetalCanvasProvider::~RNSkMetalCanvasProvider() {}
-
-/**
- Returns the scaled width of the view
- */
-int RNSkMetalCanvasProvider::getScaledWidth() {
-  return _ctx ? _ctx->getWidth() : -1;
-};
-
-/**
- Returns the scaled height of the view
- */
-int RNSkMetalCanvasProvider::getScaledHeight() {
-  return _ctx ? _ctx->getHeight() : -1;
-};
-
-/**
- Render to a canvas
- */
-bool RNSkMetalCanvasProvider::renderToCanvas(
-    const std::function<void(SkCanvas *)> &cb) {
-  if (!_ctx) {
-    return false;
-  }
-
-  // Make sure to NOT render or try any render operations while we're in the
-  // background or inactive. This will cause an error that might clear the
-  // CAMetalLayer so that the canvas is empty when the app receives focus again.
-  // Reference: https://github.com/Shopify/react-native-skia/issues/1257
-  // NOTE: UIApplication.sharedApplication.applicationState can only be
-  // accessed from the main thread so we need to check here.
-  if ([[NSThread currentThread] isMainThread]) {
-    auto state = UIApplication.sharedApplication.applicationState;
-    if (state == UIApplicationStateBackground) {
-      // Request a redraw in the next run loop callback
-      _requestRedraw();
-      // and don't draw now since it might cause errors in the metal renderer if
-      // we try to render while in the background. (see above issue)
-      return false;
-    }
-  }
-  // Wrap in auto release pool since we want the system to clean up after
-  // rendering and not wait until later - we've seen some example of memory
-  // usage growing very fast in the simulator without this.
-  @autoreleasepool {
-    auto surface = _ctx->getSurface();
-    if (!surface) {
-      return false;
-    }
-    auto canvas = surface->getCanvas();
-    cb(canvas);
-    _ctx->present();
-  }
-  return true;
-};
-
-void RNSkMetalCanvasProvider::setSize(int width, int height) {
-  _layer.frame = CGRectMake(0, 0, width, height);
-  auto w = width * _context->getPixelDensity();
-  auto h = height * _context->getPixelDensity();
-#if defined(SK_GRAPHITE)
-  _ctx = RNSkia::DawnContext::getInstance().MakeWindow((__bridge void *)_layer,
-                                                       w, h);
-#else
-  _ctx = MetalContext::getInstance().MakeWindow(_layer, w, h);
-#endif
-  _requestRedraw();
-}
-
-CALayer *RNSkMetalCanvasProvider::getLayer() { return _layer; }