@shopify/react-native-skia 1.0.2 → 1.0.4

package/libs/ios/libskia.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskia.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>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskia.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/ios/libskottie.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskottie.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>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskottie.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/ios/libskunicode.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskunicode.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>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskunicode.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/ios/libsvg.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</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>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</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>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -49,7 +49,7 @@
     "test": "jest",
     "e2e": "E2E=true yarn test -i e2e",
     "build": "bob build && merge-dirs lib/typescript/src lib/commonjs && merge-dirs lib/typescript/src lib/module",
-    "release": "standard-version"
+    "release": "semantic-release"
   },
   "repository": {
     "type": "git",
@@ -106,7 +106,6 @@
     "react-native": "0.72.6",
     "react-native-builder-bob": "0.18.2",
     "react-native-reanimated": "3.6.2",
-    "standard-version": "^9.5.0",
     "ts-jest": "29.1.1",
     "typescript": "5.1.6",
     "ws": "8.11.0"

package/react-native-skia.podspec

@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
     "HEADER_SEARCH_PATHS" => '"$(PODS_TARGET_SRCROOT)/cpp/"/**'
   }
 
-  s.frameworks = 'GLKit', 'MetalKit'
+  s.frameworks = 'MetalKit'
 
   s.ios.vendored_frameworks = [
     'libs/ios/libskia.xcframework', 

package/src/Platform/Platform.web.tsx

@@ -97,13 +97,23 @@ const View = (({ children, onLayout, style: rawStyle }: ViewProps) => {
   useElementLayout(ref, onLayout);
   const cssStyles = useMemo(() => {
     return {
+      alignItems: "stretch" as const,
+      backgroundColor: "transparent" as const,
+      border: "0 solid black" as const,
+      boxSizing: "border-box" as const,
+      display: "flex" as const,
+      flexBasis: "auto" as const,
+      flexDirection: "column" as const,
+      flexShrink: 0,
+      listStyle: "none" as const,
+      margin: 0,
+      minHeight: 0,
+      minWidth: 0,
+      padding: 0,
+      position: "relative" as const,
+      textDecoration: "none" as const,
+      zIndex: 0,
       ...style,
-      display: "flex",
-      flexDirection: style.flexDirection || "inherit",
-      flexWrap: style.flexWrap || "nowrap",
-      justifyContent: style.justifyContent || "flex-start",
-      alignItems: style.alignItems || "stretch",
-      alignContent: style.alignContent || "stretch",
     };
   }, [style]);
 

package/src/external/reanimated/buffers.ts

@@ -4,27 +4,29 @@ import type { WorkletFunction } from "react-native-reanimated/lib/typescript/rea
 import type { SkColor, SkHostRect, SkPoint, SkRSXform } from "../../skia/types";
 import { Skia } from "../../skia";
 
-import { startMapper, stopMapper, useSharedValue } from "./moduleWrapper";
+import { startMapper, stopMapper, makeMutable } from "./moduleWrapper";
 import { notifyChange } from "./interpolators";
 
 type Modifier<T> = (input: T, index: number) => void;
 
+const useBufferValue = <T>(size: number, bufferInitializer: () => T) =>
+  useMemo(
+    () => makeMutable(new Array(size).fill(0).map(bufferInitializer)),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [size]
+  );
+
 const useBuffer = <T>(
   size: number,
   bufferInitializer: () => T,
   modifier: Modifier<T>
 ) => {
-  const buffer = useMemo(
-    () => new Array(size).fill(0).map(bufferInitializer),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [size]
-  );
-  const values = useSharedValue(buffer);
+  const values = useBufferValue(size, bufferInitializer);
   const mod = modifier as WorkletFunction;
-  const deps = Object.values(mod.__closure ?? {});
+  const deps = [size, ...Object.values(mod.__closure ?? {})];
   const mapperId = startMapper(() => {
     "worklet";
-    buffer.forEach((val, index) => {
+    values.value.forEach((val, index) => {
       modifier(val, index);
     });
     notifyChange(values);

package/src/external/reanimated/moduleWrapper.ts

@@ -64,6 +64,8 @@ export const stopMapper: (mapperID: number) => void =
 
 export const runOnJS = Reanimated2?.runOnJS || throwOnMissingReanimated;
 export const runOnUI = Reanimated2?.runOnUI || throwOnMissingReanimated;
+export const makeMutable: <T>(val: T) => SharedValue<T> =
+  Reanimated2?.makeMutable || throwOnMissingReanimated;
 
 export const useAnimatedReaction: <T>(
   prepare: () => T,

package/cpp/skia/include/utils/SkAnimCodecPlayer.h

@@ -1,67 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkAnimCodecPlayer_DEFINED
-#define SkAnimCodecPlayer_DEFINED
-
-#include "include/codec/SkCodec.h"
-#include "include/core/SkImageInfo.h"
-#include "include/core/SkRefCnt.h"
-#include "include/core/SkSize.h"
-
-#include <cstdint>
-#include <memory>
-#include <vector>
-
-class SkImage;
-
-class SkAnimCodecPlayer {
-public:
-    SkAnimCodecPlayer(std::unique_ptr<SkCodec> codec);
-    ~SkAnimCodecPlayer();
-
-    /**
-     *  Returns the current frame of the animation. This defaults to the first frame for
-     *  animated codecs (i.e. msec = 0). Calling this multiple times (without calling seek())
-     *  will always return the same image object (or null if there was an error).
-     */
-    sk_sp<SkImage> getFrame();
-
-    /**
-     *  Return the size of the image(s) that will be returned by getFrame().
-     */
-    SkISize dimensions() const;
-
-    /**
-     *  Returns the total duration of the animation in milliseconds. Returns 0 for a single-frame
-     *  image.
-     */
-    uint32_t duration() const { return fTotalDuration; }
-
-    /**
-     *  Finds the closest frame associated with the time code (in milliseconds) and sets that
-     *  to be the current frame (call getFrame() to retrieve that image).
-     *  Returns true iff this call to seek() changed the "current frame" for the animation.
-     *  Thus if seek() returns false, then getFrame() will return the same image as it did
-     *  before this call to seek().
-     */
-    bool seek(uint32_t msec);
-
-
-private:
-    std::unique_ptr<SkCodec>        fCodec;
-    SkImageInfo                     fImageInfo;
-    std::vector<SkCodec::FrameInfo> fFrameInfos;
-    std::vector<sk_sp<SkImage> >    fImages;
-    int                             fCurrIndex = 0;
-    uint32_t                        fTotalDuration;
-
-    sk_sp<SkImage> getFrameAt(int index);
-};
-
-#endif
-