@shopify/react-native-skia 2.0.0-next.1 → 2.0.0-next.2

package/android/build.gradle

@@ -19,7 +19,7 @@ import java.nio.file.Paths
 // the minimum React Native version supported.
 def DEFAULT_COMPILE_SDK_VERSION = 28
 def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 26
+def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 28
 
 def safeExtGet(prop, fallback) {
@@ -132,6 +132,16 @@ android {
 
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+
+    // Used to override the NDK path/version on internal CI or by allowing
+    // users to customize the NDK path/version from their root project.
+    if (rootProject.hasProperty("ndkPath")) {
+        ndkPath rootProject.ext.ndkPath
+    }
+    if (rootProject.hasProperty("ndkVersion")) {
+        ndkVersion rootProject.ext.ndkVersion
+    }
+
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
         targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)

package/android/cpp/jni/JniPlatformContext.cpp

@@ -162,6 +162,7 @@ void JniPlatformContext::performStreamOperation(
         jni::Environment::current()->GetByteArrayElements(array.get(), nullptr);
     if (!elements) {
       printf("Element Fail\n");
+      free(buffer);
       return;
     }
 

package/{ios/RNSkia-iOS → apple}/MetalContext.h

@@ -14,10 +14,6 @@
 #import <include/gpu/ganesh/mtl/GrMtlDirectContext.h>
 #import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
 
-// namespace RNSkia {
-// class RNSkiOSPlatformContext;
-// }
-
 class MetalSharedContext {
 public:
   static MetalSharedContext &getInstance() {
@@ -126,7 +122,6 @@ public:
   GrDirectContext *getDirectContext() { return _directContext.get(); }
 
 private:
-  // friend class RNSkia::RNSkiOSPlatformContext;
   id<MTLCommandQueue> _commandQueue = nullptr;
   sk_sp<GrDirectContext> _directContext = nullptr;
 

package/{ios/RNSkia-iOS → apple}/MetalWindowContext.mm

@@ -15,7 +15,11 @@ MetalWindowContext::MetalWindowContext(GrDirectContext *directContext,
   _layer.framebufferOnly = NO;
   _layer.device = device;
   _layer.opaque = false;
+#if !TARGET_OS_OSX
   _layer.contentsScale = [UIScreen mainScreen].scale;
+#else
+  _layer.contentsScale = [NSScreen mainScreen].backingScaleFactor;
+#endif // !TARGET_OS_OSX
   _layer.pixelFormat = MTLPixelFormatBGRA8Unorm;
   _layer.contentsGravity = kCAGravityBottomLeft;
   _layer.drawableSize = CGSizeMake(width, height);

package/{ios/RNSkia-iOS/RNSkiOSPlatformContext.h → apple/RNSkApplePlatformContext.h}

@@ -18,19 +18,23 @@ class CallInvoker;
 
 namespace RNSkia {
 
-class RNSkiOSPlatformContext : public RNSkPlatformContext {
+class RNSkApplePlatformContext : public RNSkPlatformContext {
 public:
-  RNSkiOSPlatformContext(
+  RNSkApplePlatformContext(
       RCTBridge *bridge,
       std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker)
+#if !TARGET_OS_OSX
       : RNSkPlatformContext(jsCallInvoker, [[UIScreen mainScreen] scale]) {
+#else
+      : RNSkPlatformContext(jsCallInvoker, [[NSScreen mainScreen] backingScaleFactor]) {
+#endif // !TARGET_OS_OSX
 
     // Create screenshot manager
     _screenshotService =
         [[ViewScreenshotService alloc] initWithUiManager:bridge.uiManager];
   }
 
-  ~RNSkiOSPlatformContext() = default;
+  ~RNSkApplePlatformContext() = default;
 
   void runOnMainThread(std::function<void()>) override;
 

package/{ios/RNSkia-iOS/RNSkiOSPlatformContext.mm → apple/RNSkApplePlatformContext.mm}

@@ -1,4 +1,4 @@
-#import "RNSkiOSPlatformContext.h"
+#import "RNSkApplePlatformContext.h"
 
 #import <CoreMedia/CMSampleBuffer.h>
 #include <Metal/Metal.h>
@@ -11,7 +11,7 @@
 #else
 #include "MetalContext.h"
 #endif
-#include "RNSkiOSVideo.h"
+#include "RNSkAppleVideo.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -26,7 +26,7 @@
 
 namespace RNSkia {
 
-void RNSkiOSPlatformContext::performStreamOperation(
+void RNSkApplePlatformContext::performStreamOperation(
     const std::string &sourceUri,
     const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) {
 
@@ -64,14 +64,14 @@ void RNSkiOSPlatformContext::performStreamOperation(
   std::thread(loader).detach();
 }
 
-void RNSkiOSPlatformContext::releaseNativeBuffer(uint64_t pointer) {
+void RNSkApplePlatformContext::releaseNativeBuffer(uint64_t pointer) {
   CVPixelBufferRef pixelBuffer = reinterpret_cast<CVPixelBufferRef>(pointer);
   if (pixelBuffer) {
     CFRelease(pixelBuffer);
   }
 }
 
-uint64_t RNSkiOSPlatformContext::makeNativeBuffer(sk_sp<SkImage> image) {
+uint64_t RNSkApplePlatformContext::makeNativeBuffer(sk_sp<SkImage> image) {
   // 0. If Image is not in BGRA, convert to BGRA as only BGRA is supported.
   if (image->colorType() != kBGRA_8888_SkColorType) {
 #if defined(SK_GRAPHITE)
@@ -156,7 +156,7 @@ uint64_t RNSkiOSPlatformContext::makeNativeBuffer(sk_sp<SkImage> image) {
   return reinterpret_cast<uint64_t>(pixelBuffer);
 }
 
-const TextureInfo RNSkiOSPlatformContext::getTexture(sk_sp<SkImage> image) {
+const TextureInfo RNSkApplePlatformContext::getTexture(sk_sp<SkImage> image) {
   GrBackendTexture texture;
   TextureInfo result;
   if (!SkImages::GetBackendTextureFromImage(image, &texture, true)) {
@@ -173,7 +173,7 @@ const TextureInfo RNSkiOSPlatformContext::getTexture(sk_sp<SkImage> image) {
   return result;
 }
 
-const TextureInfo RNSkiOSPlatformContext::getTexture(sk_sp<SkSurface> surface) {
+const TextureInfo RNSkApplePlatformContext::getTexture(sk_sp<SkSurface> surface) {
   GrBackendTexture texture = SkSurfaces::GetBackendTexture(
       surface.get(), SkSurfaces::BackendHandleAccess::kFlushRead);
   TextureInfo result;
@@ -189,12 +189,12 @@ const TextureInfo RNSkiOSPlatformContext::getTexture(sk_sp<SkSurface> surface) {
 }
 
 std::shared_ptr<RNSkVideo>
-RNSkiOSPlatformContext::createVideo(const std::string &url) {
-  return std::make_shared<RNSkiOSVideo>(url, this);
+RNSkApplePlatformContext::createVideo(const std::string &url) {
+  return std::make_shared<RNSkAppleVideo>(url, this);
 }
 
 std::shared_ptr<WindowContext>
-RNSkiOSPlatformContext::makeContextFromNativeSurface(void *surface, int width,
+RNSkApplePlatformContext::makeContextFromNativeSurface(void *surface, int width,
                                                      int height) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeWindow(surface, width, height);
@@ -204,11 +204,11 @@ RNSkiOSPlatformContext::makeContextFromNativeSurface(void *surface, int width,
 #endif
 }
 
-void RNSkiOSPlatformContext::raiseError(const std::exception &err) {
+void RNSkApplePlatformContext::raiseError(const std::exception &err) {
   RCTFatal(RCTErrorWithMessage([NSString stringWithUTF8String:err.what()]));
 }
 
-sk_sp<SkSurface> RNSkiOSPlatformContext::makeOffscreenSurface(int width,
+sk_sp<SkSurface> RNSkApplePlatformContext::makeOffscreenSurface(int width,
                                                               int height) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeOffscreen(width, height);
@@ -217,7 +217,7 @@ sk_sp<SkSurface> RNSkiOSPlatformContext::makeOffscreenSurface(int width,
 #endif
 }
 
-sk_sp<SkImage> RNSkiOSPlatformContext::makeImageFromNativeBuffer(void *buffer) {
+sk_sp<SkImage> RNSkApplePlatformContext::makeImageFromNativeBuffer(void *buffer) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeImageFromBuffer(buffer);
 #else
@@ -225,7 +225,7 @@ sk_sp<SkImage> RNSkiOSPlatformContext::makeImageFromNativeBuffer(void *buffer) {
 #endif
 }
 
-sk_sp<SkImage> RNSkiOSPlatformContext::makeImageFromNativeTexture(
+sk_sp<SkImage> RNSkApplePlatformContext::makeImageFromNativeTexture(
     const TextureInfo &texInfo, int width, int height, bool mipMapped) {
   id<MTLTexture> mtlTexture = (__bridge id<MTLTexture>)(texInfo.mtlTexture);
 
@@ -246,7 +246,7 @@ sk_sp<SkImage> RNSkiOSPlatformContext::makeImageFromNativeTexture(
                                      kPremul_SkAlphaType, nullptr);
 }
 
-SkColorType RNSkiOSPlatformContext::mtlPixelFormatToSkColorType(
+SkColorType RNSkApplePlatformContext::mtlPixelFormatToSkColorType(
     MTLPixelFormat pixelFormat) {
   switch (pixelFormat) {
   case MTLPixelFormatRGBA8Unorm:
@@ -279,23 +279,23 @@ SkColorType RNSkiOSPlatformContext::mtlPixelFormatToSkColorType(
 }
 
 #if !defined(SK_GRAPHITE)
-GrDirectContext *RNSkiOSPlatformContext::getDirectContext() {
+GrDirectContext *RNSkApplePlatformContext::getDirectContext() {
   return MetalContext::getInstance().getDirectContext();
 }
 #endif
 
-sk_sp<SkFontMgr> RNSkiOSPlatformContext::createFontMgr() {
+sk_sp<SkFontMgr> RNSkApplePlatformContext::createFontMgr() {
   return SkFontMgr_New_CoreText(nullptr);
 }
 
-void RNSkiOSPlatformContext::runOnMainThread(std::function<void()> func) {
+void RNSkApplePlatformContext::runOnMainThread(std::function<void()> func) {
   dispatch_async(dispatch_get_main_queue(), ^{
     func();
   });
 }
 
 sk_sp<SkImage>
-RNSkiOSPlatformContext::takeScreenshotFromViewTag(size_t viewTag) {
+RNSkApplePlatformContext::takeScreenshotFromViewTag(size_t viewTag) {
   return [_screenshotService
       screenshotOfViewWithTag:[NSNumber numberWithLong:viewTag]];
 }

package/{ios/RNSkia-iOS/RNSkiOSVideo.h → apple/RNSkAppleVideo.h}

@@ -18,7 +18,7 @@
 
 namespace RNSkia {
 
-class RNSkiOSVideo : public RNSkVideo {
+class RNSkAppleVideo : public RNSkVideo {
 private:
   std::string _url;
   AVPlayer *_player = nullptr;
@@ -35,8 +35,8 @@ private:
   NSDictionary *getOutputSettings();
 
 public:
-  RNSkiOSVideo(std::string url, RNSkPlatformContext *context);
-  ~RNSkiOSVideo();
+  RNSkAppleVideo(std::string url, RNSkPlatformContext *context);
+  ~RNSkAppleVideo();
   sk_sp<SkImage> nextImage(double *timeStamp = nullptr) override;
   double duration() override;
   double framerate() override;

package/{ios/RNSkia-iOS/RNSkiOSVideo.mm → apple/RNSkAppleVideo.mm}

@@ -8,24 +8,24 @@
 
 #pragma clang diagnostic pop
 
-#include "RNSkiOSVideo.h"
+#include "RNSkAppleVideo.h"
 #include <AVFoundation/AVFoundation.h>
 #include <CoreVideo/CoreVideo.h>
 
 namespace RNSkia {
 
-RNSkiOSVideo::RNSkiOSVideo(std::string url, RNSkPlatformContext *context)
+RNSkAppleVideo::RNSkAppleVideo(std::string url, RNSkPlatformContext *context)
     : _url(std::move(url)), _context(context) {
   setupPlayer();
 }
 
-RNSkiOSVideo::~RNSkiOSVideo() {
+RNSkAppleVideo::~RNSkAppleVideo() {
   if (_player) {
     [_player pause];
   }
 }
 
-void RNSkiOSVideo::setupPlayer() {
+void RNSkAppleVideo::setupPlayer() {
   NSURL *videoURL = [NSURL URLWithString:@(_url.c_str())];
   AVPlayerItem *playerItem = [AVPlayerItem playerItemWithURL:videoURL];
   _player = [AVPlayer playerWithPlayerItem:playerItem];
@@ -53,7 +53,7 @@ void RNSkiOSVideo::setupPlayer() {
   play();
 }
 
-sk_sp<SkImage> RNSkiOSVideo::nextImage(double *timeStamp) {
+sk_sp<SkImage> RNSkAppleVideo::nextImage(double *timeStamp) {
   CMTime currentTime = [_player currentTime];
   CVPixelBufferRef pixelBuffer =
       [_videoOutput copyPixelBufferForItemTime:currentTime
@@ -73,14 +73,14 @@ sk_sp<SkImage> RNSkiOSVideo::nextImage(double *timeStamp) {
   return skImage;
 }
 
-NSDictionary *RNSkiOSVideo::getOutputSettings() {
+NSDictionary *RNSkAppleVideo::getOutputSettings() {
   return @{
     (id)kCVPixelBufferPixelFormatTypeKey : @(kCVPixelFormatType_32BGRA),
     (id)kCVPixelBufferMetalCompatibilityKey : @YES
   };
 }
 
-float RNSkiOSVideo::getRotationInDegrees() {
+float RNSkAppleVideo::getRotationInDegrees() {
   CGFloat rotationAngle = 0.0;
   auto transform = _preferredTransform;
   // Determine the rotation angle in radians
@@ -97,7 +97,7 @@ float RNSkiOSVideo::getRotationInDegrees() {
   return rotationAngle;
 }
 
-void RNSkiOSVideo::seek(double timeInMilliseconds) {
+void RNSkAppleVideo::seek(double timeInMilliseconds) {
   CMTime seekTime =
       CMTimeMakeWithSeconds(timeInMilliseconds / 1000.0, NSEC_PER_SEC);
   [_player seekToTime:seekTime
@@ -110,28 +110,28 @@ void RNSkiOSVideo::seek(double timeInMilliseconds) {
       }];
 }
 
-void RNSkiOSVideo::play() {
+void RNSkAppleVideo::play() {
   if (_player) {
     [_player play];
     _isPlaying = true;
   }
 }
 
-void RNSkiOSVideo::pause() {
+void RNSkAppleVideo::pause() {
   if (_player) {
     [_player pause];
     _isPlaying = false;
   }
 }
 
-double RNSkiOSVideo::duration() { return _duration; }
+double RNSkAppleVideo::duration() { return _duration; }
 
-double RNSkiOSVideo::framerate() { return _framerate; }
+double RNSkAppleVideo::framerate() { return _framerate; }
 
-SkISize RNSkiOSVideo::getSize() {
+SkISize RNSkAppleVideo::getSize() {
   return SkISize::Make(_videoWidth, _videoHeight);
 }
 
-void RNSkiOSVideo::setVolume(float volume) { _player.volume = volume; }
+void RNSkAppleVideo::setVolume(float volume) { _player.volume = volume; }
 
 } // namespace RNSkia

package/{ios/RNSkia-iOS/RNSkiOSView.h → apple/RNSkAppleView.h}

@@ -4,18 +4,18 @@
 
 #import "RNSkMetalCanvasProvider.h"
 #import "RNSkView.h"
-#import "RNSkiOSPlatformContext.h"
+#import "RNSkApplePlatformContext.h"
 
-class RNSkBaseiOSView {
+class RNSkBaseAppleView {
 public:
   virtual CALayer *getLayer() = 0;
   virtual void setSize(int width, int height) = 0;
   virtual std::shared_ptr<RNSkia::RNSkView> getDrawView() = 0;
 };
 
-template <class T> class RNSkiOSView : public RNSkBaseiOSView, public T {
+template <class T> class RNSkAppleView : public RNSkBaseAppleView, public T {
 public:
-  RNSkiOSView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
+  RNSkAppleView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
       : T(context,
           std::make_shared<RNSkMetalCanvasProvider>(
               std::bind(&RNSkia::RNSkView::requestRedraw, this), context)) {}

package/{ios/RNSkia-iOS/RNSkiOSView.mm → apple/RNSkAppleView.mm}

@@ -2,18 +2,18 @@
 
 #import "RNSkMetalCanvasProvider.h"
 #import "RNSkView.h"
-#import "RNSkiOSPlatformContext.h"
+#import "RNSkApplePlatformContext.h"
 
-class RNSkBaseiOSView {
+class RNSkBaseAppleView {
 public:
   virtual CALayer *getLayer() = 0;
   virtual void setSize(int width, int height) = 0;
   virtual std::shared_ptr<RNSkia::RNSkView> getDrawView() = 0;
 };
 
-template <class T> class RNSkiOSView : public RNSkBaseiOSView, public T {
+template <class T> class RNSkAppleView : public RNSkBaseAppleView, public T {
 public:
-  RNSkiOSView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
+  RNSkAppleView(std::shared_ptr<RNSkia::RNSkPlatformContext> context)
       : T(context,
           std::make_shared<RNSkMetalCanvasProvider>(
               std::bind(&RNSkia::RNSkView::requestRedraw, this), context)) {}

package/{ios/RNSkia-iOS → apple}/RNSkMetalCanvasProvider.mm

@@ -63,8 +63,13 @@ bool RNSkMetalCanvasProvider::renderToCanvas(
   // NOTE: UIApplication.sharedApplication.applicationState can only be
   // accessed from the main thread so we need to check here.
   if ([[NSThread currentThread] isMainThread]) {
+#if !TARGET_OS_OSX
     auto state = UIApplication.sharedApplication.applicationState;
-    if (state == UIApplicationStateBackground) {
+    bool appIsBackgrounded = (state == UIApplicationStateBackground);
+#else
+    bool appIsBackgrounded = !NSApplication.sharedApplication.isActive;
+#endif // !TARGET_OS_OSX
+    if (appIsBackgrounded) {
       // 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

package/{ios/RNSkia-iOS → apple}/SkiaManager.mm

@@ -6,7 +6,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 
-#import "RNSkiOSPlatformContext.h"
+#import "RNSkApplePlatformContext.h"
 
 static __weak SkiaManager *sharedInstance = nil;
 
@@ -41,7 +41,7 @@ static __weak SkiaManager *sharedInstance = nil;
       // Create the RNSkiaManager (cross platform)
       _skManager = std::make_shared<RNSkia::RNSkManager>(
           jsRuntime, jsInvoker,
-          std::make_shared<RNSkia::RNSkiOSPlatformContext>(bridge, jsInvoker));
+          std::make_shared<RNSkia::RNSkApplePlatformContext>(bridge, jsInvoker));
     }
   }
   return self;

package/{ios/RNSkia-iOS → apple}/SkiaPictureView.mm

@@ -1,7 +1,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "SkiaPictureView.h"
 
-#import "RNSkIOSView.h"
+#import "RNSkAppleView.h"
 #import "RNSkPictureView.h"
 #import "RNSkPlatformContext.h"
 
@@ -28,7 +28,7 @@ using namespace facebook::react;
     auto skManager = [SkiaManager latestActiveSkManager].get();
     [self initCommon:skManager
              factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
-               return std::make_shared<RNSkiOSView<RNSkia::RNSkPictureView>>(
+               return std::make_shared<RNSkAppleView<RNSkia::RNSkPictureView>>(
                    context);
              }];
     static const auto defaultProps =

package/{ios/RNSkia-iOS → apple}/SkiaPictureViewManager.mm

@@ -2,7 +2,7 @@
 #include "SkiaPictureViewManager.h"
 #include <React/RCTBridge+Private.h>
 
-#include "RNSkIOSView.h"
+#include "RNSkAppleView.h"
 #include "RNSkPictureView.h"
 #include "RNSkPlatformContext.h"
 
@@ -37,13 +37,17 @@ RCT_CUSTOM_VIEW_PROPERTY(opaque, BOOL, SkiaUIView) {
   [(SkiaUIView *)view setOpaque:opaque];
 }
 
+#if !TARGET_OS_OSX
 - (UIView *)view {
+#else
+- (RCTUIView *)view {
+#endif // !TARGET_OS_OSX
   auto skManager = [[self skiaManager] skManager];
   // Pass SkManager as a raw pointer to avoid circular dependenciesr
   return [[SkiaUIView alloc]
       initWithManager:skManager.get()
               factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
-                return std::make_shared<RNSkiOSView<RNSkia::RNSkPictureView>>(
+                return std::make_shared<RNSkAppleView<RNSkia::RNSkPictureView>>(
                     context);
               }];
 }

package/{ios/RNSkia-iOS → apple}/SkiaUIView.h

@@ -4,10 +4,14 @@
 #import <string>
 
 #import <CoreFoundation/CoreFoundation.h>
+#if !TARGET_OS_OSX
 #import <UIKit/UIKit.h>
+#else
+#import <React/RCTUIKit.h>
+#endif // !TARGET_OS_OSX
 
 #import "RNSkManager.h"
-#import "RNSkiOSView.h"
+#import "RNSkAppleView.h"
 #import "SkiaManager.h"
 
 #if RCT_NEW_ARCH_ENABLED
@@ -18,17 +22,21 @@
 #if RCT_NEW_ARCH_ENABLED
     RCTViewComponentView
 #else
+#if !TARGET_OS_OSX
     UIView
+#else
+    RCTUIView
+#endif // !TARGET_OS_OSX
 #endif // RCT_NEW_ARCH_ENABLED
 
 - (instancetype)
     initWithManager:(RNSkia::RNSkManager *)manager
-            factory:(std::function<std::shared_ptr<RNSkBaseiOSView>(
+            factory:(std::function<std::shared_ptr<RNSkBaseAppleView>(
                          std::shared_ptr<RNSkia::RNSkPlatformContext>)>)factory;
 - (void)initCommon:(RNSkia::RNSkManager *)manager
-           factory:(std::function<std::shared_ptr<RNSkBaseiOSView>(
+           factory:(std::function<std::shared_ptr<RNSkBaseAppleView>(
                         std::shared_ptr<RNSkia::RNSkPlatformContext>)>)factory;
-- (std::shared_ptr<RNSkBaseiOSView>)impl;
+- (std::shared_ptr<RNSkBaseAppleView>)impl;
 
 - (void)setDebugMode:(bool)debugMode;
 - (void)setOpaque:(bool)opaque;

package/{ios/RNSkia-iOS → apple}/SkiaUIView.mm

@@ -9,9 +9,9 @@
 #import "RNSkManager.h"
 
 @implementation SkiaUIView {
-  std::shared_ptr<RNSkBaseiOSView> _impl;
+  std::shared_ptr<RNSkBaseAppleView> _impl;
   RNSkia::RNSkManager *_manager;
-  std::function<std::shared_ptr<RNSkBaseiOSView>(
+  std::function<std::shared_ptr<RNSkBaseAppleView>(
       std::shared_ptr<RNSkia::RNSkPlatformContext>)>
       _factory;
   bool _debugMode;
@@ -23,7 +23,7 @@
 
 - (instancetype)initWithManager:(RNSkia::RNSkManager *)manager
                         factory:
-                            (std::function<std::shared_ptr<RNSkBaseiOSView>(
+                            (std::function<std::shared_ptr<RNSkBaseAppleView>(
                                  std::shared_ptr<RNSkia::RNSkPlatformContext>)>)
                                 factory {
   self = [super init];
@@ -40,7 +40,7 @@
 }
 
 - (void)initCommon:(RNSkia::RNSkManager *)manager
-           factory:(std::function<std::shared_ptr<RNSkBaseiOSView>(
+           factory:(std::function<std::shared_ptr<RNSkBaseAppleView>(
                         std::shared_ptr<RNSkia::RNSkPlatformContext>)>)factory {
   _manager = manager;
   _nativeId = 0;
@@ -55,8 +55,12 @@
 
 #pragma mark Lifecycle
 
-- (void)willMoveToSuperview:(UIView *)newWindow {
-  if (newWindow != nullptr) {
+#if !TARGET_OS_OSX
+- (void)willMoveToSuperview:(UIView *)newSuperView {
+#else
+- (void)viewWillMoveToSuperview:(NSView *)newSuperView {
+#endif // !TARGET_OS_OSX
+  if (newSuperView != nullptr) {
     // Create implementation view when the parent view is set
     if (_impl == nullptr && _manager != nullptr) {
       _impl = _factory(_manager->getPlatformContext());
@@ -161,7 +165,7 @@
 
 #pragma mark External API
 
-- (std::shared_ptr<RNSkBaseiOSView>)impl {
+- (std::shared_ptr<RNSkBaseAppleView>)impl {
   return _impl;
 }
 

package/{ios/RNSkia-iOS → apple}/ViewScreenshotService.h

@@ -1,7 +1,11 @@
 #pragma once
 
 #import <CoreFoundation/CoreFoundation.h>
+#if !TARGET_OS_OSX
 #import <UIKit/UIKit.h>
+#else
+#import <Appkit/Appkit.h>
+#endif // !TARGET_OS_OSX
 
 #import <React/RCTUIManager.h>
 

package/{ios/RNSkia-iOS → apple}/ViewScreenshotService.mm

@@ -20,6 +20,7 @@
 }
 
 - (sk_sp<SkImage>)screenshotOfViewWithTag:(NSNumber *)viewTag {
+#if !TARGET_OS_OSX
   // Find view corresponding to the tag
   auto view = [_uiManager viewForReactTag:viewTag];
   if (view == NULL) {
@@ -80,6 +81,9 @@
 
   // ... and then create the SkImage itself!
   return SkImages::RasterFromData(info, skData, bytesPerRow);
+#else
+  return nullptr;
+#endif // !TARGET_OS_OSX
 }
 
 @end

package/cpp/api/JsiSkContourMeasure.h

@@ -34,7 +34,7 @@ public:
     SkPoint tangent;
     auto result = getObject()->getPosTan(dist, &position, &tangent);
     if (!result) {
-      throw jsi::JSError(runtime, "getSegment() failed");
+      throw jsi::JSError(runtime, "getPosTan() failed");
     }
     auto posTan = jsi::Array(runtime, 2);
     auto pos = jsi::Object::createFromHostObject(