@shopify/react-native-skia 2.0.0-next.3 → 2.0.0-next.5

package/libs/apple/libskshaper.xcframework/Info.plist

@@ -8,82 +8,82 @@
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
+				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e_x86_64-simulator</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>tvos-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/apple/libskunicode_core.xcframework/Info.plist

@@ -8,16 +8,19 @@
 			<key>BinaryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>tvos-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -38,52 +41,49 @@
 			<key>BinaryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/apple/libskunicode_libgrapheme.xcframework/Info.plist

@@ -8,82 +8,82 @@
 			<key>BinaryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
+				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>tvos-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskunicode_libgrapheme.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/apple/libsvg.xcframework/Info.plist

@@ -44,22 +44,22 @@
 			<key>BinaryPath</key>
 			<string>libsvg.a</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libsvg.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
+				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsvg.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>tvos-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libsvg.a</string>
 			<key>SupportedArchitectures</key>
@@ -68,22 +68,22 @@
 				<string>arm64e</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsvg.a</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_arm64e</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libsvg.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.0.0-next.3",
+  "version": "2.0.0-next.5",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",

package/src/external/reanimated/textures.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
-import type { ReactElement } from "react";
+import type { DependencyList, ReactElement } from "react";
 import type { SharedValue } from "react-native-reanimated";
 
 import type {
@@ -25,7 +25,11 @@ const createTexture = (
   texture.value = drawAsImageFromPicture(picture, size);
 };
 
-export const useTexture = (element: ReactElement, size: SkSize) => {
+export const useTexture = (
+  element: ReactElement,
+  size: SkSize,
+  deps?: DependencyList
+) => {
   const { width, height } = size;
   const [picture, setPicture] = useState<SkPicture | null>(null);
   useEffect(() => {
@@ -34,23 +38,11 @@ export const useTexture = (element: ReactElement, size: SkSize) => {
       y: 0,
       width,
       height,
-    }).then((pic) => setPicture(pic));
-  }, [element, width, height]);
-  return usePictureAsTexture(picture, size);
-};
-
-export const useTextureAsValue = (element: ReactElement, size: SkSize) => {
-  console.warn("useTextureAsValue has been renamed to use useTexture");
-  return useTexture(element, size);
-};
-
-export const useTextureValueFromPicture = (
-  picture: SkPicture | null,
-  size: SkSize
-) => {
-  console.warn(
-    "useTextureValueFromPicture has been renamed to use usePictureAsTexture"
-  );
+    }).then((pic) => {
+      setPicture(pic);
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, deps ?? []);
   return usePictureAsTexture(picture, size);
 };
 
@@ -63,7 +55,7 @@ export const usePictureAsTexture = (
     if (picture !== null) {
       Rea.runOnUI(createTexture)(texture, picture, size);
     }
-  }, [texture, picture, size]);
+  }, [picture, size, texture]);
   return texture;
 };
 

package/src/sksg/HostConfig.ts

@@ -130,8 +130,9 @@ export const sksgHostConfig: SkiaHostConfig = {
     return null;
   },
 
-  resetAfterCommit(_container) {
+  resetAfterCommit(container: Container) {
     debug("resetAfterCommit");
+    container.redraw();
   },
 
   getPublicInstance(node: Instance) {

package/cpp/skia/include/core/SkColorPriv.h

@@ -1,165 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkColorPriv_DEFINED
-#define SkColorPriv_DEFINED
-
-#include "include/core/SkColor.h"
-#include "include/private/base/SkMath.h"
-#include "include/private/base/SkTPin.h"
-#include "include/private/base/SkTo.h"
-
-#include <algorithm>
-
-/** Turn 0..255 into 0..256 by adding 1 at the half-way point. Used to turn a
-    byte into a scale value, so that we can say scale * value >> 8 instead of
-    alpha * value / 255.
-
-    In debugging, asserts that alpha is 0..255
-*/
-static inline unsigned SkAlpha255To256(U8CPU alpha) {
-    SkASSERT(SkToU8(alpha) == alpha);
-    // this one assues that blending on top of an opaque dst keeps it that way
-    // even though it is less accurate than a+(a>>7) for non-opaque dsts
-    return alpha + 1;
-}
-
-/** Multiplify value by 0..256, and shift the result down 8
-    (i.e. return (value * alpha256) >> 8)
- */
-#define SkAlphaMul(value, alpha256)     (((value) * (alpha256)) >> 8)
-
-static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
-    return static_cast<U8CPU>(SkTPin(x, 0.0f, 1.0f) * 255 + 0.5);
-}
-
-#define SK_A32_BITS     8
-#define SK_R32_BITS     8
-#define SK_G32_BITS     8
-#define SK_B32_BITS     8
-
-#define SK_A32_MASK     ((1 << SK_A32_BITS) - 1)
-#define SK_R32_MASK     ((1 << SK_R32_BITS) - 1)
-#define SK_G32_MASK     ((1 << SK_G32_BITS) - 1)
-#define SK_B32_MASK     ((1 << SK_B32_BITS) - 1)
-
-/*
- *  Skia's 32bit backend only supports 1 swizzle order at a time (compile-time).
- *  This is specified by SK_R32_SHIFT=0 or SK_R32_SHIFT=16.
- *
- *  For easier compatibility with Skia's GPU backend, we further restrict these
- *  to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does
- *  not directly correspond to the same shift-order, since we have to take endianess
- *  into account.
- *
- *  Here we enforce this constraint.
- */
-
-#define SK_RGBA_R32_SHIFT   0
-#define SK_RGBA_G32_SHIFT   8
-#define SK_RGBA_B32_SHIFT   16
-#define SK_RGBA_A32_SHIFT   24
-
-#define SK_BGRA_B32_SHIFT   0
-#define SK_BGRA_G32_SHIFT   8
-#define SK_BGRA_R32_SHIFT   16
-#define SK_BGRA_A32_SHIFT   24
-
-#if defined(SK_PMCOLOR_IS_RGBA) || defined(SK_PMCOLOR_IS_BGRA)
-    #error "Configure PMCOLOR by setting SK_R32_SHIFT."
-#endif
-
-// Deduce which SK_PMCOLOR_IS_ to define from the _SHIFT defines
-
-#if (SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \
-     SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \
-     SK_G32_SHIFT == SK_RGBA_G32_SHIFT && \
-     SK_B32_SHIFT == SK_RGBA_B32_SHIFT)
-    #define SK_PMCOLOR_IS_RGBA
-#elif (SK_A32_SHIFT == SK_BGRA_A32_SHIFT && \
-       SK_R32_SHIFT == SK_BGRA_R32_SHIFT && \
-       SK_G32_SHIFT == SK_BGRA_G32_SHIFT && \
-       SK_B32_SHIFT == SK_BGRA_B32_SHIFT)
-    #define SK_PMCOLOR_IS_BGRA
-#else
-    #error "need 32bit packing to be either RGBA or BGRA"
-#endif
-
-#define SkGetPackedA32(packed)      ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24)
-#define SkGetPackedR32(packed)      ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24)
-#define SkGetPackedG32(packed)      ((uint32_t)((packed) << (24 - SK_G32_SHIFT)) >> 24)
-#define SkGetPackedB32(packed)      ((uint32_t)((packed) << (24 - SK_B32_SHIFT)) >> 24)
-
-#define SkA32Assert(a)  SkASSERT((unsigned)(a) <= SK_A32_MASK)
-#define SkR32Assert(r)  SkASSERT((unsigned)(r) <= SK_R32_MASK)
-#define SkG32Assert(g)  SkASSERT((unsigned)(g) <= SK_G32_MASK)
-#define SkB32Assert(b)  SkASSERT((unsigned)(b) <= SK_B32_MASK)
-
-/**
- *  Pack the components into a SkPMColor
- */
-static inline SkPMColor SkPackARGB32(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
-    SkA32Assert(a);
-    SkR32Assert(r);
-    SkG32Assert(g);
-    SkB32Assert(b);
-
-    return (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
-           (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
-}
-
-/**
- *  Legacy "NoCheck" version of SkPackARGB32. Remove this once all callers are updated.
- */
-static inline SkPMColor SkPackARGB32NoCheck(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
-    return (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
-           (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
-}
-
-static inline
-SkPMColor SkPremultiplyARGBInline(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
-    SkA32Assert(a);
-    SkR32Assert(r);
-    SkG32Assert(g);
-    SkB32Assert(b);
-
-    if (a != 255) {
-        r = SkMulDiv255Round(r, a);
-        g = SkMulDiv255Round(g, a);
-        b = SkMulDiv255Round(b, a);
-    }
-    return SkPackARGB32(a, r, g, b);
-}
-
-// When Android is compiled optimizing for size, SkAlphaMulQ doesn't get
-// inlined; forcing inlining significantly improves performance.
-static SK_ALWAYS_INLINE uint32_t SkAlphaMulQ(uint32_t c, unsigned scale) {
-    uint32_t mask = 0xFF00FF;
-
-    uint32_t rb = ((c & mask) * scale) >> 8;
-    uint32_t ag = ((c >> 8) & mask) * scale;
-    return (rb & mask) | (ag & ~mask);
-}
-
-static inline SkPMColor SkPMSrcOver(SkPMColor src, SkPMColor dst) {
-    uint32_t scale = SkAlpha255To256(255 - SkGetPackedA32(src));
-
-    uint32_t mask = 0xFF00FF;
-    uint32_t rb = (((dst & mask) * scale) >> 8) & mask;
-    uint32_t ag = (((dst >> 8) & mask) * scale) & ~mask;
-
-    rb += (src &  mask);
-    ag += (src & ~mask);
-
-    // Color channels (but not alpha) can overflow, so we have to saturate to 0xFF in each lane.
-    return std::min(rb & 0x000001FF, 0x000000FFU) |
-           std::min(ag & 0x0001FF00, 0x0000FF00U) |
-           std::min(rb & 0x01FF0000, 0x00FF0000U) |
-                   (ag & 0xFF000000);
-}
-
-#endif