@shopify/react-native-skia 1.4.1 → 1.5.0

package/android/CMakeLists.txt

@@ -155,10 +155,13 @@ endif()
 message("-- JSI     : " ${JSI_LIB})
 
 unset(REACT_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
+    # RN 0.76 packs react_nativemodule_core into ReactAndroid::reactnative
+    set (REACT_LIB ReactAndroid::reactnative)
+elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
     # RN 0.71 distributes prebuilt binaries.
     set (REACT_LIB ReactAndroid::react_nativemodule_core)
-else()
+    else()
     find_library(
             REACT_LIB
             react_nativemodule_core
@@ -183,7 +186,10 @@ endif()
 message("-- FBJNI   : " ${FBJNI_LIBRARY})
 
 unset(REACTNATIVEJNI_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
+    # RN 0.76 doesn't have reactnativejni
+    # DO NOTHING, we'll not link these libraries
+elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
     # RN 0.71 distributes prebuilt binaries.
     set (REACTNATIVEJNI_LIB "ReactAndroid::reactnativejni")
 else()
@@ -197,7 +203,10 @@ endif()
 message("-- REACTNATIVEJNI   : " ${REACTNATIVEJNI_LIB})
 
 unset(RUNTIMEEXECUTOR_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
+    # RN 0.76 doesn't have runtimeexecutor
+    # DO NOTHING, we'll not link these libraries
+elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
     # RN 0.71 distributes prebuilt binaries.
     set (RUNTIMEEXECUTOR_LIB "ReactAndroid::runtimeexecutor")
 else()
@@ -211,7 +220,10 @@ endif()
 message("-- RUNTIMEEXECUTOR   : " ${RUNTIMEEXECUTOR_LIB})
 
 unset(TURBOMODULES_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
+    # RN 0.76 doesn't have turbomodulejsijni
+    # DO NOTHING, we'll not link these libraries
+elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
     # RN 0.71 distributes prebuilt binaries.
     set (TURBOMODULES_LIB "ReactAndroid::turbomodulejsijni")
 else()
@@ -227,7 +239,26 @@ message("-- TURBO   : " ${TURBOMODULES_LIB})
 add_definitions(-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION})
 
 # Link
-target_link_libraries(
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
+    target_link_libraries(
+        ${PACKAGE_NAME}
+        ${LOG_LIB}
+        ${REACT_LIB}
+        ${FBJNI_LIBRARY}
+        ${JSI_LIB}
+        ${SKIA_SVG_LIB}
+        ${SKIA_SKSHAPER_LIB}
+        ${SKIA_SKPARAGRAPH_LIB}
+        ${SKIA_SKUNICODE_CORE_LIB}
+        ${SKIA_SKUNICODE_ICU_LIB}
+        ${SKIA_LIB}
+        -ljnigraphics
+        -lGLESv2
+        -lEGL
+        -landroid
+    )
+else()
+    target_link_libraries(
         ${PACKAGE_NAME}
         ${LOG_LIB}
         ${FBJNI_LIBRARY}
@@ -247,3 +278,4 @@ target_link_libraries(
         -lEGL
         -landroid
     )
+endif()

package/android/build.gradle

@@ -201,6 +201,7 @@ android {
              "**/libreactnativejni.so",
              "**/libruntimeexecutor.so",
              "**/libturbomodulejsijni.so",
+             "**/libreactnative.so",
              "META-INF/**"
         ]
     }

package/android/cpp/jni/JniSkiaManager.cpp

@@ -9,7 +9,7 @@
 
 namespace {
 
-#ifdef REACT_NATIVE_VERSION >= 75
+#if REACT_NATIVE_VERSION >= 75
 using CallFuncType = facebook::react::CallFunc;
 #else
 using CallFuncType = std::function<void()>;

package/android/cpp/jni/include/JniSkiaBaseView.h

@@ -29,9 +29,6 @@ public:
   }
 
 protected:
-  virtual void updateTouchPoints(jni::JArrayDouble touches) {
-    _skiaAndroidView->updateTouchPoints(touches);
-  }
 
   virtual void surfaceAvailable(jobject surface, int width, int height) {
     _skiaAndroidView->surfaceAvailable(surface, width, height);

package/android/cpp/jni/include/JniSkiaDomView.h

@@ -42,17 +42,11 @@ public:
                           JniSkiaDomView::surfaceSizeChanged),
          makeNativeMethod("setMode", JniSkiaDomView::setMode),
          makeNativeMethod("setDebugMode", JniSkiaDomView::setDebugMode),
-         makeNativeMethod("updateTouchPoints",
-                          JniSkiaDomView::updateTouchPoints),
          makeNativeMethod("registerView", JniSkiaDomView::registerView),
          makeNativeMethod("unregisterView", JniSkiaDomView::unregisterView)});
   }
 
 protected:
-  void updateTouchPoints(jni::JArrayDouble touches) override {
-    JniSkiaBaseView::updateTouchPoints(touches);
-  }
-
   void surfaceAvailable(jobject surface, int width, int height) override {
     JniSkiaBaseView::surfaceAvailable(surface, width, height);
   }

package/android/cpp/jni/include/JniSkiaPictureView.h

@@ -43,17 +43,12 @@ public:
                           JniSkiaPictureView::surfaceSizeChanged),
          makeNativeMethod("setMode", JniSkiaPictureView::setMode),
          makeNativeMethod("setDebugMode", JniSkiaPictureView::setDebugMode),
-         makeNativeMethod("updateTouchPoints",
-                          JniSkiaPictureView::updateTouchPoints),
          makeNativeMethod("registerView", JniSkiaPictureView::registerView),
          makeNativeMethod("unregisterView",
                           JniSkiaPictureView::unregisterView)});
   }
 
 protected:
-  void updateTouchPoints(jni::JArrayDouble touches) override {
-    JniSkiaBaseView::updateTouchPoints(touches);
-  }
 
   void surfaceAvailable(jobject surface, int width, int height) override {
     JniSkiaBaseView::surfaceAvailable(surface, width, height);

package/android/cpp/rnskia-android/GrAHardwareBufferUtils.cpp

@@ -11,10 +11,10 @@
 #define GL_GLEXT_PROTOTYPES
 #define EGL_EGLEXT_PROTOTYPES
 
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/GrBackendSurface.h"
+#include "include/gpu/ganesh/GrDirectContext.h"
 #include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
-#include "include/gpu/gl/GrGLTypes.h"
+#include "include/gpu/ganesh/gl/GrGLTypes.h"
 #include "src/gpu/ganesh/gl/GrGLDefines.h"
 // #include "src/gpu/ganesh/GrDirectContextPriv.h"
 // #include "src/gpu/ganesh/gl/GrGLUtil.h"

package/android/cpp/rnskia-android/GrAHardwareBufferUtils.h

@@ -6,8 +6,8 @@
 
 #if __ANDROID_API__ >= 26
 
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrTypes.h"
+#include "include/gpu/ganesh/GrBackendSurface.h"
+#include "include/gpu/ganesh/GrTypes.h"
 
 class GrDirectContext;
 

package/android/cpp/rnskia-android/RNSkAndroidView.h

@@ -19,8 +19,6 @@ public:
 
   virtual float getPixelDensity() = 0;
 
-  virtual void updateTouchPoints(jni::JArrayDouble touches) = 0;
-
   virtual void setMode(std::string mode) = 0;
 
   virtual void setShowDebugInfo(bool show) = 0;
@@ -76,24 +74,6 @@ public:
 
   void viewDidUnmount() override { T::endDrawingLoop(); }
 
-  void updateTouchPoints(jni::JArrayDouble touches) override {
-    // Create touch points
-    std::vector<RNSkia::RNSkTouchInfo> points;
-    auto pin = touches.pin();
-    auto scale = getPixelDensity();
-    points.reserve(pin.size() / 5);
-    for (size_t i = 0; i < pin.size(); i += 5) {
-      RNSkTouchInfo point;
-      point.x = pin[i] / scale;
-      point.y = pin[i + 1] / scale;
-      point.force = pin[i + 2];
-      point.type = (RNSkia::RNSkTouchInfo::TouchType)pin[i + 3];
-      point.id = pin[i + 4];
-      points.push_back(point);
-    }
-    T::updateTouchState(points);
-  }
-
   std::shared_ptr<RNSkView> getSkiaView() override {
     return T::shared_from_this();
   }

package/android/cpp/rnskia-android/SkiaOpenGLHelper.h

@@ -15,9 +15,9 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColorSpace.h"
 #include "include/core/SkSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/GrDirectContext.h"
 #include "include/gpu/ganesh/gl/GrGLDirectContext.h"
-#include "include/gpu/gl/GrGLInterface.h"
+#include "include/gpu/ganesh/gl/GrGLInterface.h"
 
 #pragma clang diagnostic pop
 

package/android/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.h

@@ -22,10 +22,10 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColorSpace.h"
 #include "include/core/SkSurface.h"
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/GrBackendSurface.h"
+#include "include/gpu/ganesh/GrDirectContext.h"
 #include "include/gpu/ganesh/SkSurfaceGanesh.h"
-#include "include/gpu/gl/GrGLInterface.h"
+#include "include/gpu/ganesh/gl/GrGLInterface.h"
 
 #pragma clang diagnostic pop
 

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

@@ -53,76 +53,6 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
         mTexture.layout(0, 0, this.getMeasuredWidth(), this.getMeasuredHeight());
     }
 
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        // https://developer.android.com/training/gestures/multi
-        int action = ev.getActionMasked();
-
-        MotionEvent.PointerCoords r = new MotionEvent.PointerCoords();
-
-        double[] points;
-
-        // If this is a pointer_up/down event we need to handle it a bit specialized
-        switch (action) {
-            case MotionEvent.ACTION_POINTER_DOWN:
-            case MotionEvent.ACTION_POINTER_UP: {
-                points = new double[5];
-                int pointerIndex = ev.getActionIndex();
-                ev.getPointerCoords(pointerIndex, r);
-                points[0] = r.x;
-                points[1] = r.y;
-                points[2] = ev.getPressure(pointerIndex);
-                points[3] = motionActionToType(action);
-                points[4] = ev.getPointerId(pointerIndex);
-
-                updateTouchPoints(points);
-
-                break;
-            }
-            default: {
-                // For the rest we can just handle it like expected
-                int count = ev.getPointerCount();
-                int pointerIndex = 0;
-                points = new double[5 * count];
-                for (int i = 0; i < count; i++) {
-                    ev.getPointerCoords(i, r);
-                    points[pointerIndex++] = r.x;
-                    points[pointerIndex++] = r.y;
-                    points[pointerIndex++] = ev.getPressure(i);
-                    points[pointerIndex++] = motionActionToType(action);
-                    points[pointerIndex++] = ev.getPointerId(i);
-                }
-
-                updateTouchPoints(points);
-
-                break;
-            }
-        }
-
-        return true;
-    }
-
-    private static int motionActionToType(int action) {
-        int actionType = 3;
-        switch (action) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_POINTER_DOWN:
-                actionType = 0;
-                break;
-            case MotionEvent.ACTION_MOVE:
-                actionType = 1;
-                break;
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_POINTER_UP:
-                actionType = 2;
-                break;
-            case MotionEvent.ACTION_CANCEL:
-                actionType = 3;
-                break;
-        }
-        return actionType;
-    }
-
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
         Log.i(tag, "onSurfaceTextureAvailable " + width + "/" + height);
@@ -172,8 +102,6 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
 
     protected abstract void setDebugMode(boolean show);
 
-    protected abstract void updateTouchPoints(double[] points);
-
     protected abstract void registerView(int nativeId);
 
     protected abstract void unregisterView();

package/cpp/api/JsiSkSurface.h

@@ -14,7 +14,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "include/core/SkSurface.h"
-#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/GrDirectContext.h"
 
 #pragma clang diagnostic pop
 

package/cpp/rnskia/RNSkDomView.cpp

@@ -17,7 +17,6 @@ RNSkDomRenderer::RNSkDomRenderer(std::function<void()> requestRedraw,
                                  std::shared_ptr<RNSkPlatformContext> context)
     : RNSkRenderer(requestRedraw), _platformContext(std::move(context)),
       _renderLock(std::make_shared<std::timed_mutex>()),
-      _touchCallbackLock(std::make_shared<std::timed_mutex>()),
       _renderTimingInfo("SKIA/RENDER") {}
 
 RNSkDomRenderer::~RNSkDomRenderer() {
@@ -29,10 +28,6 @@ RNSkDomRenderer::~RNSkDomRenderer() {
 
 bool RNSkDomRenderer::tryRender(
     std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
-  // If we have touches we need to call the touch callback as well
-  if (_currentTouches.size() > 0) {
-    callOnTouch();
-  }
 
   // We render on the main thread
   if (_renderLock->try_lock()) {
@@ -70,11 +65,6 @@ void RNSkDomRenderer::setRoot(std::shared_ptr<JsiDomRenderNode> node) {
   _root = node;
 }
 
-void RNSkDomRenderer::setOnTouchCallback(
-    std::shared_ptr<jsi::Function> onTouchCallback) {
-  _touchCallback = onTouchCallback;
-}
-
 void RNSkDomRenderer::renderCanvas(SkCanvas *canvas, float scaledWidth,
                                    float scaledHeight) {
   _renderTimingInfo.beginTiming();
@@ -125,75 +115,6 @@ void RNSkDomRenderer::renderCanvas(SkCanvas *canvas, float scaledWidth,
   _renderTimingInfo.stopTiming();
 }
 
-void RNSkDomRenderer::updateTouches(std::vector<RNSkTouchInfo> &touches) {
-  std::lock_guard<std::mutex> lock(_touchMutex);
-  // Add timestamp
-  auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(
-                std::chrono::system_clock::now().time_since_epoch())
-                .count();
-
-  for (size_t i = 0; i < touches.size(); i++) {
-    touches.at(i).timestamp = ms;
-  }
-  _currentTouches.push_back(std::move(touches));
-}
-
-void RNSkDomRenderer::callOnTouch() {
-
-  if (_touchCallback == nullptr) {
-    return;
-  }
-
-  if (_touchCallbackLock->try_lock()) {
-
-    {
-      std::lock_guard<std::mutex> lock(_touchMutex);
-      _touchesCache.clear();
-      _touchesCache.reserve(_currentTouches.size());
-      for (size_t i = 0; i < _currentTouches.size(); ++i) {
-        _touchesCache.push_back(_currentTouches.at(i));
-      }
-      _currentTouches.clear();
-    }
-
-    // We have an onDraw method - use it to render since we don't have a
-    // DOM-node yet.
-    _platformContext->runOnJavascriptThread([weakSelf = weak_from_this()]() {
-      auto self = weakSelf.lock();
-      if (self) {
-        jsi::Runtime &runtime = *self->_platformContext->getJsRuntime();
-        // Set up touches
-        auto size = self->_touchesCache.size();
-        auto ops = jsi::Array(runtime, size);
-        for (size_t i = 0; i < size; i++) {
-          auto cur = self->_touchesCache.at(i);
-          auto curSize = cur.size();
-          auto touches = jsi::Array(runtime, curSize);
-          for (size_t n = 0; n < curSize; n++) {
-            auto touchObj = jsi::Object(runtime);
-            auto t = cur.at(n);
-            touchObj.setProperty(runtime, "x", t.x);
-            touchObj.setProperty(runtime, "y", t.y);
-            touchObj.setProperty(runtime, "force", t.force);
-            touchObj.setProperty(runtime, "type", static_cast<double>(t.type));
-            touchObj.setProperty(runtime, "timestamp",
-                                 static_cast<double>(t.timestamp) / 1000.0);
-            touchObj.setProperty(runtime, "id", static_cast<double>(t.id));
-            touches.setValueAtIndex(runtime, n, touchObj);
-          }
-          ops.setValueAtIndex(runtime, i, touches);
-        }
-        // Call on touch callback
-        self->_touchCallback->call(runtime, ops, 1);
-      }
-      self->_touchCallbackLock->unlock();
-    });
-  } else {
-    // We'll try next time - schedule a new redraw
-    _requestRedraw();
-  }
-}
-
 void RNSkDomRenderer::renderDebugOverlays(SkCanvas *canvas) {
   if (!getShowDebugOverlays()) {
     return;

package/cpp/rnskia/RNSkDomView.h

@@ -13,7 +13,6 @@
 #include "RNSkView.h"
 
 #include "JsiDomRenderNode.h"
-#include "RNSkInfoParameter.h"
 #include "RNSkLog.h"
 #include "RNSkPlatformContext.h"
 #include "RNSkTimingInfo.h"
@@ -50,29 +49,19 @@ public:
 
   void setRoot(std::shared_ptr<JsiDomRenderNode> node);
 
-  void setOnTouchCallback(std::shared_ptr<jsi::Function> onTouchCallback);
-
-  void updateTouches(std::vector<RNSkTouchInfo> &touches);
-
 private:
-  void callOnTouch();
   void renderCanvas(SkCanvas *canvas, float scaledWidth, float scaledHeight);
   void renderDebugOverlays(SkCanvas *canvas);
 
   std::shared_ptr<RNSkPlatformContext> _platformContext;
-  std::shared_ptr<jsi::Function> _touchCallback;
 
   std::shared_ptr<std::timed_mutex> _renderLock;
-  std::shared_ptr<std::timed_mutex> _touchCallbackLock;
 
   std::shared_ptr<JsiDomRenderNode> _root;
   std::shared_ptr<DrawingContext> _drawingContext;
 
   RNSkTimingInfo _renderTimingInfo;
 
-  std::mutex _touchMutex;
-  std::vector<std::vector<RNSkTouchInfo>> _currentTouches;
-  std::vector<std::vector<RNSkTouchInfo>> _touchesCache;
   std::mutex _rootLock;
 };
 
@@ -87,40 +76,13 @@ public:
                  std::make_shared<RNSkDomRenderer>(
                      std::bind(&RNSkView::requestRedraw, this), context)) {}
 
-  void updateTouchState(std::vector<RNSkTouchInfo> &touches) override {
-    std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
-        ->updateTouches(touches);
-    RNSkView::updateTouchState(touches);
-  }
-
   void setJsiProperties(
       std::unordered_map<std::string, JsiValueWrapper> &props) override {
 
     RNSkView::setJsiProperties(props);
 
     for (auto &prop : props) {
-      if (prop.first == "onTouch") {
-        if (prop.second.isUndefinedOrNull()) {
-          // Clear touchCallback
-          std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
-              ->setOnTouchCallback(nullptr);
-          requestRedraw();
-          continue;
-
-        } else if (prop.second.getType() != JsiWrapperValueType::Function) {
-          // We expect a function for the draw callback custom property
-          throw std::runtime_error(
-              "Expected a function for the onTouch property.");
-        }
-
-        // Save callback
-        std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
-            ->setOnTouchCallback(prop.second.getAsFunction());
-
-        // Request redraw
-        requestRedraw();
-
-      } else if (prop.first == "root") {
+      if (prop.first == "root") {
         // Save root
         if (prop.second.isUndefined() || prop.second.isNull()) {
           std::static_pointer_cast<RNSkDomRenderer>(getRenderer())

package/cpp/rnskia/RNSkPictureView.h

@@ -13,7 +13,6 @@
 #include "RNSkView.h"
 
 #include "JsiSkPicture.h"
-#include "RNSkInfoParameter.h"
 #include "RNSkLog.h"
 #include "RNSkPlatformContext.h"
 #include "RNSkTimingInfo.h"

package/cpp/rnskia/RNSkView.h

@@ -138,16 +138,6 @@ private:
 
 enum RNSkDrawingMode { Default, Continuous };
 
-using RNSkTouchInfo = struct {
-  enum TouchType { Start, Active, End, Cancelled };
-  double x;
-  double y;
-  double force;
-  TouchType type;
-  size_t id;
-  long timestamp;
-};
-
 class RNSkView : public std::enable_shared_from_this<RNSkView> {
 public:
   /**
@@ -218,13 +208,6 @@ public:
     requestRedraw();
   }
 
-  /**
-    Update touch state with new touch points
-   */
-  virtual void updateTouchState(std::vector<RNSkTouchInfo> &) {
-    requestRedraw();
-  }
-
   /**
    Renders the view into an SkImage instead of the screen.
    */

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.h

@@ -9,7 +9,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/GrDirectContext.h>
 
 #pragma clang diagnostic pop
 

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -9,8 +9,8 @@
 #import "include/core/SkColorSpace.h"
 #import "include/core/SkSurface.h"
 
-#import <include/gpu/GrBackendSurface.h>
-#import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/GrBackendSurface.h>
+#import <include/gpu/ganesh/GrDirectContext.h>
 #import <include/gpu/ganesh/SkSurfaceGanesh.h>
 
 #pragma clang diagnostic pop

package/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.h

@@ -17,8 +17,8 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 #import "include/core/SkColorSpace.h"
 #import "include/core/SkImage.h"
-#import "include/gpu/GrBackendSurface.h"
-#import "include/gpu/GrYUVABackendTextures.h"
+#import "include/gpu/ganesh/GrBackendSurface.h"
+#import "include/gpu/ganesh/GrYUVABackendTextures.h"
 #pragma clang diagnostic pop
 
 /**

package/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.mm

@@ -11,7 +11,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 #import "include/core/SkColorSpace.h"
-#import <include/gpu/GrBackendSurface.h>
+#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>

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.h

@@ -11,7 +11,7 @@
 #import "include/core/SkCanvas.h"
 #import <CoreMedia/CMSampleBuffer.h>
 #import <CoreVideo/CVMetalTextureCache.h>
-#import <include/gpu/GrDirectContext.h>
+#import <include/gpu/ganesh/GrDirectContext.h>
 
 #pragma clang diagnostic pop
 

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.mm

@@ -10,8 +10,8 @@
 #import "include/core/SkColorSpace.h"
 #import "include/core/SkSurface.h"
 
-#import <include/gpu/GrBackendSurface.h>
-#import <include/gpu/GrDirectContext.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>