Merge branch 'main' into minor-refactoring

Shopify · Nov 20, 2024 · 128dd23 · 128dd23
2 parents 8afeef3 + ad6e7d0
commit 128dd23
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/apps/paper/src/Examples/Breathe/Breathe.tsx b/apps/paper/src/Examples/Breathe/Breathe.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from "react";
-import { StyleSheet, useWindowDimensions } from "react-native";
+import { StyleSheet, useWindowDimensions, View } from "react-native";
 import {
   BlurMask,
   vec,
@@ -67,15 +67,17 @@ export const Breathe = () => {
   );
 
   return (
-    <Canvas style={styles.container}>
-      <Fill color="rgb(36,43,56)" />
-      <Group origin={center} transform={transform} blendMode="screen">
-        <BlurMask style="solid" blur={40} />
-        {new Array(6).fill(0).map((_, index) => {
-          return <Ring key={index} index={index} progress={progress} />;
-        })}
-      </Group>
-    </Canvas>
+    <View style={{ flex: 1 }}>
+      <Canvas style={styles.container}>
+        <Fill color="rgb(36,43,56)" />
+        <Group origin={center} transform={transform} blendMode="screen">
+          <BlurMask style="solid" blur={40} />
+          {new Array(6).fill(0).map((_, index) => {
+            return <Ring key={index} index={index} progress={progress} />;
+          })}
+        </Group>
+      </Canvas>
+    </View>
   );
 };
 

diff --git a/packages/skia/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm b/packages/skia/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm
@@ -77,6 +77,9 @@
   // 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();