@shopify/react-native-skia 2.5.3 → 2.5.5

package/android/CMakeLists.txt

@@ -214,6 +214,12 @@ set_property(TARGET pathops PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libpat
 add_library(jsonreader STATIC IMPORTED)
 set_property(TARGET jsonreader PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libjsonreader.a")
 
+# Dawn library for Graphite builds (contains dawn::native symbols)
+if(SK_GRAPHITE)
+    add_library(dawn_combined STATIC IMPORTED)
+    set_property(TARGET dawn_combined PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libdawn_combined.a")
+endif()
+
 find_library(
         LOG_LIB
         log
@@ -386,6 +392,7 @@ endif()
 if(SK_GRAPHITE)
     target_link_libraries(${PACKAGE_NAME}
         ${COMMON_LIBS}
+        dawn_combined
     )
 else()
     target_link_libraries(${PACKAGE_NAME}

package/android/cpp/jni/JniWebGPUView.cpp

@@ -18,7 +18,7 @@ Java_com_shopify_reactnative_skia_WebGPUView_onSurfaceCreate(
   auto gpu = dawnContext.getWGPUInstance();
 
   // Create surface from ANativeWindow
-  wgpu::SurfaceDescriptorFromAndroidNativeWindow androidSurfaceDesc;
+  wgpu::SurfaceSourceAndroidNativeWindow androidSurfaceDesc;
   androidSurfaceDesc.window = window;
   wgpu::SurfaceDescriptor surfaceDescriptor;
   surfaceDescriptor.nextInChain = &androidSurfaceDesc;

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

@@ -5,24 +5,24 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
-import com.facebook.react.viewmanagers.WebGPUViewManagerDelegate;
-import com.facebook.react.viewmanagers.WebGPUViewManagerInterface;
+import com.facebook.react.viewmanagers.SkiaWebGPUViewManagerDelegate;
+import com.facebook.react.viewmanagers.SkiaWebGPUViewManagerInterface;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 @ReactModule(name = WebGPUViewManager.NAME)
-public class WebGPUViewManager extends ReactViewManager implements WebGPUViewManagerInterface<WebGPUView> {
+public class WebGPUViewManager extends ReactViewManager implements SkiaWebGPUViewManagerInterface<WebGPUView> {
 
-  public static final String NAME = "WebGPUView";
+  public static final String NAME = "SkiaWebGPUView";
 
-  protected WebGPUViewManagerDelegate mDelegate;
+  protected SkiaWebGPUViewManagerDelegate mDelegate;
 
   public WebGPUViewManager() {
-    mDelegate = new WebGPUViewManagerDelegate(this);
+    mDelegate = new SkiaWebGPUViewManagerDelegate(this);
   }
 
-  protected WebGPUViewManagerDelegate getDelegate() {
+  protected SkiaWebGPUViewManagerDelegate getDelegate() {
     return mDelegate;
   }
 

package/apple/{WebGPUView.h → SkiaWebGPUView.h}

@@ -12,7 +12,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface WebGPUView : RCTViewComponentView
+@interface SkiaWebGPUView : RCTViewComponentView
 @end
 
 NS_ASSUME_NONNULL_END

package/apple/{WebGPUView.mm → SkiaWebGPUView.mm}

@@ -1,6 +1,6 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
-#import "WebGPUView.h"
+#import "SkiaWebGPUView.h"
 
 #import <react/renderer/components/rnskia/ComponentDescriptors.h>
 #import <react/renderer/components/rnskia/EventEmitters.h>
@@ -12,18 +12,18 @@
 
 using namespace facebook::react;
 
-@implementation WebGPUView
+@implementation SkiaWebGPUView
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const WebGPUViewProps>();
+    static const auto defaultProps = std::make_shared<const SkiaWebGPUViewProps>();
     _props = defaultProps;
   }
   return self;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
-  return concreteComponentDescriptorProvider<WebGPUViewComponentDescriptor>();
+  return concreteComponentDescriptorProvider<SkiaWebGPUViewComponentDescriptor>();
 }
 
 - (void)prepareForRecycle {
@@ -46,9 +46,9 @@ using namespace facebook::react;
 - (void)updateProps:(const Props::Shared &)props
            oldProps:(const Props::Shared &)oldProps {
   const auto &oldViewProps =
-      *std::static_pointer_cast<const WebGPUViewProps>(_props);
+      *std::static_pointer_cast<const SkiaWebGPUViewProps>(_props);
   const auto &newViewProps =
-      *std::static_pointer_cast<const WebGPUViewProps>(props);
+      *std::static_pointer_cast<const SkiaWebGPUViewProps>(props);
 
   if (newViewProps.contextId != oldViewProps.contextId) {
     /*
@@ -72,6 +72,6 @@ using namespace facebook::react;
 
 @end
 
-Class<RCTComponentViewProtocol> WebGPUViewCls(void) { return WebGPUView.class; }
+Class<RCTComponentViewProtocol> SkiaWebGPUViewCls(void) { return SkiaWebGPUView.class; }
 
 #endif // RCT_NEW_ARCH_ENABLED

package/cpp/rnskia/RNDawnContext.h

@@ -297,11 +297,11 @@ public:
     // 1. Create Surface
     wgpu::SurfaceDescriptor surfaceDescriptor;
 #ifdef __APPLE__
-    wgpu::SurfaceDescriptorFromMetalLayer metalSurfaceDesc;
+    wgpu::SurfaceSourceMetalLayer metalSurfaceDesc;
     metalSurfaceDesc.layer = window;
     surfaceDescriptor.nextInChain = &metalSurfaceDesc;
 #else
-    wgpu::SurfaceDescriptorFromAndroidNativeWindow androidSurfaceDesc;
+    wgpu::SurfaceSourceAndroidNativeWindow androidSurfaceDesc;
     androidSurfaceDesc.window = window;
     surfaceDescriptor.nextInChain = &androidSurfaceDesc;
 #endif

package/cpp/rnskia/RNDawnWindowContext.h

@@ -34,6 +34,9 @@ public:
     wgpu::SurfaceTexture surfaceTexture;
     _surface.GetCurrentTexture(&surfaceTexture);
     auto texture = surfaceTexture.texture;
+    if (!texture) {
+      return nullptr;
+    }
     skgpu::graphite::DawnTextureInfo info(
         /*sampleCount=*/1, skgpu::Mipmapped::kNo,
         DawnUtils::PreferredTextureFormat, texture.GetUsage(),

package/cpp/rnwgpu/Canvas.h

@@ -21,6 +21,9 @@ public:
   int getWidth() { return _width; }
   int getHeight() { return _height; }
 
+  void setWidth(int width) { _width = width; }
+  void setHeight(int height) { _height = height; }
+
   int getClientWidth() { return _clientWidth; }
   int getClientHeight() { return _clientHeight; }
 
@@ -28,8 +31,10 @@ public:
   void setClientHeight(int height) { _clientHeight = height; }
 
   static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
-    installGetter(runtime, prototype, "width", &Canvas::getWidth);
-    installGetter(runtime, prototype, "height", &Canvas::getHeight);
+    installGetterSetter(runtime, prototype, "width", &Canvas::getWidth,
+                        &Canvas::setWidth);
+    installGetterSetter(runtime, prototype, "height", &Canvas::getHeight,
+                        &Canvas::setHeight);
     installGetter(runtime, prototype, "clientWidth", &Canvas::getClientWidth);
     installGetter(runtime, prototype, "clientHeight", &Canvas::getClientHeight);
   }

package/cpp/rnwgpu/api/GPU.cpp

@@ -88,6 +88,18 @@ std::unordered_set<std::string> GPU::getWgslLanguageFeatures() {
     case wgpu::WGSLLanguageFeatureName::PointerCompositeAccess:
       name = "pointer_composite_access";
       break;
+    case wgpu::WGSLLanguageFeatureName::UniformBufferStandardLayout:
+      name = "uniform_buffer_standard_layout";
+      break;
+    case wgpu::WGSLLanguageFeatureName::SubgroupId:
+      name = "subgroup_id";
+      break;
+    case wgpu::WGSLLanguageFeatureName::FragmentDepth:
+      name = "fragment_depth";
+      break;
+    case wgpu::WGSLLanguageFeatureName::ImmediateAddressSpace:
+      name = "immediate_address_space";
+      break;
     case wgpu::WGSLLanguageFeatureName::ChromiumTestingUnimplemented:
       name = "chromium_testing_unimplemented";
       break;

package/cpp/rnwgpu/api/GPUQueue.cpp

@@ -124,7 +124,7 @@ void GPUQueue::copyExternalImageToTexture(
   //    throw std::runtime_error("Invalid input for GPUQueue::writeTexture()");
   //  }
   //
-  //  if (source->flipY) {
+  //  if (source->flipY.value_or(false)) {
   //    // Calculate the row size and total size
   //    uint32_t rowSize = bytesPerPixel * source->source->getWidth();
   //    uint32_t totalSize = source->source->getSize();

package/lib/commonjs/specs/WebGPUViewNativeComponent.js

@@ -7,5 +7,5 @@ exports.default = void 0;
 var _codegenNativeComponent = _interopRequireDefault(require("react-native/Libraries/Utilities/codegenNativeComponent"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // eslint-disable-next-line import/no-default-export
-var _default = exports.default = (0, _codegenNativeComponent.default)("WebGPUView");
+var _default = exports.default = (0, _codegenNativeComponent.default)("SkiaWebGPUView");
 //# sourceMappingURL=WebGPUViewNativeComponent.js.map

package/lib/commonjs/specs/WebGPUViewNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","e","__esModule","default","_default","exports","codegenNativeComponent"],"sources":["WebGPUViewNativeComponent.ts"],"sourcesContent":["import codegenNativeComponent from \"react-native/Libraries/Utilities/codegenNativeComponent\";\nimport type { Int32 } from \"react-native/Libraries/Types/CodegenTypes\";\nimport type { ViewProps } from \"react-native\";\n\nexport interface NativeProps extends ViewProps {\n  contextId: Int32;\n  transparent: boolean;\n}\n\n// eslint-disable-next-line import/no-default-export\nexport default codegenNativeComponent<NativeProps>(\"WebGPUView\");\n"],"mappings":";;;;;;AAAA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAS7F;AAAA,IAAAG,QAAA,GAAAC,OAAA,CAAAF,OAAA,GACe,IAAAG,+BAAsB,EAAc,YAAY,CAAC","ignoreList":[]}
+{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","e","__esModule","default","_default","exports","codegenNativeComponent"],"sources":["WebGPUViewNativeComponent.ts"],"sourcesContent":["import codegenNativeComponent from \"react-native/Libraries/Utilities/codegenNativeComponent\";\nimport type { Int32 } from \"react-native/Libraries/Types/CodegenTypes\";\nimport type { ViewProps } from \"react-native\";\n\nexport interface NativeProps extends ViewProps {\n  contextId: Int32;\n  transparent: boolean;\n}\n\n// eslint-disable-next-line import/no-default-export\nexport default codegenNativeComponent<NativeProps>(\"SkiaWebGPUView\");\n"],"mappings":";;;;;;AAAA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAS7F;AAAA,IAAAG,QAAA,GAAAC,OAAA,CAAAF,OAAA,GACe,IAAAG,+BAAsB,EAAc,gBAAgB,CAAC","ignoreList":[]}

package/lib/module/specs/WebGPUViewNativeComponent.js

@@ -1,4 +1,4 @@
 import codegenNativeComponent from "react-native/Libraries/Utilities/codegenNativeComponent";
 // eslint-disable-next-line import/no-default-export
-export default codegenNativeComponent("WebGPUView");
+export default codegenNativeComponent("SkiaWebGPUView");
 //# sourceMappingURL=WebGPUViewNativeComponent.js.map

package/lib/module/specs/WebGPUViewNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["codegenNativeComponent"],"sources":["WebGPUViewNativeComponent.ts"],"sourcesContent":["import codegenNativeComponent from \"react-native/Libraries/Utilities/codegenNativeComponent\";\nimport type { Int32 } from \"react-native/Libraries/Types/CodegenTypes\";\nimport type { ViewProps } from \"react-native\";\n\nexport interface NativeProps extends ViewProps {\n  contextId: Int32;\n  transparent: boolean;\n}\n\n// eslint-disable-next-line import/no-default-export\nexport default codegenNativeComponent<NativeProps>(\"WebGPUView\");\n"],"mappings":"AAAA,OAAOA,sBAAsB,MAAM,yDAAyD;AAS5F;AACA,eAAeA,sBAAsB,CAAc,YAAY,CAAC","ignoreList":[]}
+{"version":3,"names":["codegenNativeComponent"],"sources":["WebGPUViewNativeComponent.ts"],"sourcesContent":["import codegenNativeComponent from \"react-native/Libraries/Utilities/codegenNativeComponent\";\nimport type { Int32 } from \"react-native/Libraries/Types/CodegenTypes\";\nimport type { ViewProps } from \"react-native\";\n\nexport interface NativeProps extends ViewProps {\n  contextId: Int32;\n  transparent: boolean;\n}\n\n// eslint-disable-next-line import/no-default-export\nexport default codegenNativeComponent<NativeProps>(\"SkiaWebGPUView\");\n"],"mappings":"AAAA,OAAOA,sBAAsB,MAAM,yDAAyD;AAS5F;AACA,eAAeA,sBAAsB,CAAc,gBAAgB,CAAC","ignoreList":[]}

package/package.json

@@ -9,7 +9,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -148,7 +148,7 @@
     "ios": {
       "componentProvider": {
         "SkiaPictureView": "SkiaPictureView",
-        "WebGPUView": "WebGPUView"
+        "SkiaWebGPUView": "SkiaWebGPUView"
       }
     }
   },

package/react-native-skia.podspec

@@ -18,6 +18,9 @@ framework_names = ['libskia', 'libsvg', 'libskshaper', 'libskparagraph',
                    'libskunicode_core', 'libskunicode_libgrapheme',
                    'libskottie', 'libsksg']
 
+# Add Dawn library for Graphite builds (contains dawn::native symbols)
+framework_names += ['libdawn_combined'] if use_graphite
+
 # Verify that prebuilt binaries have been installed by the postinstall script
 unless Dir.exist?(File.join(__dir__, 'libs', 'ios')) && Dir.exist?(File.join(__dir__, 'libs', 'macos'))
   Pod::UI.warn "#{'-' * 72}"

package/scripts/install-libs.js

@@ -3,7 +3,6 @@
 
 const path = require("path");
 const fs = require("fs");
-const { execSync } = require("child_process");
 
 const useGraphite =
   process.env.SK_GRAPHITE === "1" ||
@@ -11,6 +10,21 @@ const useGraphite =
 const prefix = useGraphite ? "react-native-skia-graphite" : "react-native-skia";
 const libsDir = path.join(__dirname, "..", "libs");
 
+function copySync(src, dest, options) {
+  if (!src.includes("*")) {
+    return fs.cpSync(src, dest, options);
+  }
+
+  const wildcardSplit = src.split("*");
+  const basePath = wildcardSplit[0];
+  const files = fs.readdirSync(basePath);
+  files
+    .filter(file => file.endsWith(wildcardSplit[1]))
+    .forEach((file) => {
+      return fs.cpSync(path.join(basePath, file), path.join(dest, file), options);
+    });
+}
+
 // --- Apple platforms ---
 
 let iosPackage, macosPackage;
@@ -49,30 +63,14 @@ console.log("-- Skia iOS package: " + iosPackage);
 console.log("-- Skia macOS package: " + macosPackage);
 
 // Clean and copy Apple frameworks
-execSync(
-  "rm -rf " +
-    path.join(libsDir, "ios") +
-    " " +
-    path.join(libsDir, "macos") +
-    " " +
-    path.join(libsDir, "tvos")
-);
+fs.rmSync(path.join(libsDir, "ios"), { recursive: true, force: true });
+fs.rmSync(path.join(libsDir, "macos"), { recursive: true, force: true });
+fs.rmSync(path.join(libsDir, "tvos"), { recursive: true, force: true });
 fs.mkdirSync(path.join(libsDir, "ios"), { recursive: true });
 fs.mkdirSync(path.join(libsDir, "macos"), { recursive: true });
-execSync(
-  'cp -R "' +
-    iosPackage +
-    '/libs/"*.xcframework "' +
-    path.join(libsDir, "ios") +
-    '/"'
-);
-execSync(
-  'cp -R "' +
-    macosPackage +
-    '/libs/"*.xcframework "' +
-    path.join(libsDir, "macos") +
-    '/"'
-);
+
+copySync(iosPackage + '/libs/*.xcframework', path.join(libsDir, "ios"), {recursive: true});
+copySync(macosPackage + '/libs/*.xcframework', path.join(libsDir, "macos"), {recursive: true});
 
 // Handle tvOS (non-Graphite only)
 if (!useGraphite) {
@@ -82,13 +80,7 @@ if (!useGraphite) {
     );
     console.log("-- Skia tvOS package: " + tvosPackage);
     fs.mkdirSync(path.join(libsDir, "tvos"), { recursive: true });
-    execSync(
-      'cp -R "' +
-        tvosPackage +
-        '/libs/"*.xcframework "' +
-        path.join(libsDir, "tvos") +
-        '/"'
-    );
+    copySync(tvosPackage + '/libs/*.xcframework', path.join(libsDir, "tvos"), {recursive: true});
   } catch (e) {
     console.log("-- tvOS package not found, skipping");
   }
@@ -125,7 +117,7 @@ console.log("-- Skia Android package: " + androidPackage);
 
 // Copy Android libs (per-ABI static libraries)
 const androidDest = path.join(libsDir, "android");
-execSync("rm -rf " + androidDest);
-execSync('cp -R "' + androidSrcLibs + '" "' + androidDest + '"');
+fs.rmSync(androidDest, { recursive: true, force: true });
+copySync(androidSrcLibs, androidDest, {recursive: true});
 
 console.log("-- Copied Android libs to libs/android/");

package/src/specs/WebGPUViewNativeComponent.ts

@@ -8,4 +8,4 @@ export interface NativeProps extends ViewProps {
 }
 
 // eslint-disable-next-line import/no-default-export
-export default codegenNativeComponent<NativeProps>("WebGPUView");
+export default codegenNativeComponent<NativeProps>("SkiaWebGPUView");