@pompadour/react-native-skia 1.5.25 → 1.5.27

package/ios/RNSkiaModule.mm

@@ -1,14 +1,11 @@
+
 #import "RNSkiaModule.h"
 #import <React/RCTBridge+Private.h>
 #import <ReactCommon/RCTTurboModule.h>
-#import <jsi/jsi.h>
-#include "JsiNeatPlayer.h"
-#include "NeatPlayer.h"
 
 @implementation RNSkiaModule {
   SkiaManager *skiaManager;
   std::shared_ptr<facebook::react::CallInvoker> jsInvoker;
-  std::shared_ptr<RNSkia::JsiNeatPlayer> jsiNeatPlayer;
 }
 
 RCT_EXPORT_MODULE()
@@ -30,7 +27,6 @@ RCT_EXPORT_MODULE()
     [skiaManager invalidate];
   }
   skiaManager = nil;
-  jsiNeatPlayer = nullptr;
 }
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
@@ -43,28 +39,9 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
     jsInvoker = bridge.jsCallInvoker;
   }
   skiaManager = [[SkiaManager alloc] initWithBridge:bridge jsInvoker:jsInvoker];
-  
-  // Install JsiNeatPlayer
-  [self installJsiNeatPlayer:bridge];
-  
   return @true;
 }
 
-- (void)installJsiNeatPlayer:(RCTBridge *)bridge {
-  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge;
-  if (!cxxBridge.runtime) {
-    return;
-  }
-  
-  facebook::jsi::Runtime &jsiRuntime = *(facebook::jsi::Runtime *)cxxBridge.runt ime;
-  
-  auto neatPlayer = std::make_shared<NeatPlayer>();
-  jsiNeatPlayer = std::make_shared<RNSkia::JsiNeatPlayer>(neatPlayer);
-  
-  auto neatPlayerObj = facebook::jsi::Object::createFromHostObject(jsiRuntime, jsiNeatPlayer);
-  jsiRuntime.global().setProperty(jsiRuntime, "NeatPlayer", std::move(neatPlayerObj));
-}
-
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
@@ -73,4 +50,4 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
 }
 #endif
 
-@end
+@end

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

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libskia.a</string>
 			<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>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskia.a</string>
 			<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>
 	</array>
 	<key>CFBundlePackageType</key>

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

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<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>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskottie.a</string>
 			<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>
 	</array>
 	<key>CFBundlePackageType</key>

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

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libskshaper.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-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>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</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>
 	</array>
 	<key>CFBundlePackageType</key>

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

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libskunicode.a</string>
 			<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>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libskunicode.a</string>
 			<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>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

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

package/cpp/api/JsiNeatPlayer.cpp

@@ -1,39 +0,0 @@
-#include "JsiNeatPlayer.h"
-#include <utility>
-
-namespace RNSkia {
-
-JsiNeatPlayer::JsiNeatPlayer(std::shared_ptr<NeatPlayer> player)
-    : player_(std::move(player)) {}
-
-JSI_HOST_FUNCTION(JsiNeatPlayer, load) {
-    player_->load();
-    return jsi::Value::undefined();
-}
-
-JSI_HOST_FUNCTION(JsiNeatPlayer, update) {
-    if (count < 1) {
-        throw jsi::JSError(runtime, "NeatPlayer.update() requires a deltaTime argument");
-    }
-    double deltaTime = arguments[0].asNumber();
-    player_->update(deltaTime);
-    return jsi::Value::undefined();
-}
-
-JSI_HOST_FUNCTION(JsiNeatPlayer, render) {
-    // Note: This is a simplified version. You may need to handle canvas creation and passing differently.
-    // For now, we'll assume the canvas is passed as a pointer wrapped in a number.
-    if (count < 1) {
-        throw jsi::JSError(runtime, "NeatPlayer.render() requires a canvas argument");
-    }
-    SkCanvas* canvas = reinterpret_cast<SkCanvas*>(arguments[0].asNumber());
-    player_->render(canvas);
-    return jsi::Value::undefined();
-}
-
-JSI_HOST_FUNCTION(JsiNeatPlayer, togglePlayPause) {
-    player_->togglePlayPause();
-    return jsi::Value::undefined();
-}
-
-} // namespace RNSkia

package/cpp/api/JsiNeatPlayer.h

@@ -1,32 +0,0 @@
-#ifndef PACKAGE_CPP_API_JSINEATPLAYER_H_
-#define PACKAGE_CPP_API_JSINEATPLAYER_H_
-
-#include <jsi/jsi.h>
-#include <memory>
-#include "NeatPlayer.h"
-
-namespace jsi = facebook::jsi;
-
-namespace RNSkia {
-
-class JsiNeatPlayer : public jsi::HostObject {
-public:
-    explicit JsiNeatPlayer(std::shared_ptr<NeatPlayer> player);
-
-    jsi::Value load(jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments, size_t count);
-    jsi::Value update(jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments, size_t count);
-    jsi::Value render(jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments, size_t count);
-    jsi::Value togglePlayPause(jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments, size_t count);
-
-    JSI_HOST_FUNCTION(load);
-    JSI_HOST_FUNCTION(update);
-    JSI_HOST_FUNCTION(render);
-    JSI_HOST_FUNCTION(togglePlayPause);
-
-private:
-    std::shared_ptr<NeatPlayer> player_;
-};
-
-} // namespace RNSkia
-
-#endif // PACKAGE_CPP_API_JSINEATPLAYER_H_