@pompadour/react-native-skia 1.5.33 → 1.5.35

package/cpp/skia/modules/neatplayer/include/NeatPlayer.h

@@ -2,43 +2,51 @@
 #define NEAT_PLAYER_H
 
 #include "CanvasManager.h"
-#include "InputManager.h"
 #include "PerformanceManager.h"
 #include "Renderer.h"
 #include "ResourceManager.h"
 #include "ShaderManager.h"
 #include "State.h"
 #include "UIManager.h"
-#include "utils/Input.h"
+#include "ViewportManager.h"
+#include "input/input.h"
 
-class NeatPlayer {
+using neat::input::GestureEvent;
+using neat::input::InputSystem;
+using neat::input::Key;
+
+class NeatPlayer : public Updatable, public Renderable {
 public:
     NeatPlayer();
-    ~NeatPlayer();
+    ~NeatPlayer() override;
 
-    // Update / Render
+    // Initialization
     void initialize(int argc, char** argv);
-    void update(double deltaTime);
-    void render(SkCanvas* canvas);
 
-    // Data Loading
+    // Updatable/Renderable interface
+    void update(double deltaTime) override;
+    void render(SkCanvas* canvas) override;
+
+    // Loading
     bool load();
 #ifdef __EMSCRIPTEN__
     void loadUrl(const std::string& url);
     void loadJSON(const std::string& json);
 #endif
 
-    // System Input
-    bool onKey(skui::Key key, skui::InputState inputState, skui::ModifierKey modifiers);
+    // Input handling
+    bool onKey(Key key, skui::InputState state, skui::ModifierKey modifiers);
     bool onChar(SkUnichar character);
-    bool onMouse(int x, int y, skui::InputState inputState, skui::ModifierKey modifiers);
-    bool onMouseWheel(float delta, int x, int y, skui::ModifierKey modifiers);
+    bool onMouse(float x, float y, skui::InputState state, skui::ModifierKey modifiers);
+    bool onMouseWheel(float deltaX, float deltaY, int x, int y, bool isPrecise, skui::ModifierKey modifiers);
+    bool onTouchBegan(int32_t touchId, const SkPoint& position);
+    bool onTouchMoved(int32_t touchId, const SkPoint& position);
+    bool onTouchEnded(int32_t touchId, const SkPoint& position);
+    bool onGesture(const GestureEvent& gesture);
 
     // Player API
-    bool isPlaying();
     void togglePlayPause();
     void seek(double time);
-    void cyclePlaybackSpeed();
     bool previous();
     bool next();
     void cycleBackgroundShader();
@@ -47,6 +55,7 @@ public:
     void toggleHelpVisibility();
 
 private:
+    ViewportManager viewportManager;
     State state;
     Renderer renderer;
     FontManager fontManager;
@@ -54,15 +63,19 @@ private:
     ResourceManager resourceManager;
     UIManager uiManager;
     ShaderManager shaderManager;
-    InputManager inputManager;
     PerformanceManager& performanceManager;
 
+    InputSystem& inputSystem;
+
     const double seekDelta = 1.0;  // 1 seconds seek
-    const std::vector<double> playbackSpeeds = {0.1, 0.25, 0.5, 1.0, 1.5, 2.0, 5.0};
-    size_t currentSpeedIndex = 1;  // Start at normal speed (1.0)
 
-    // void initializeInputHandlers();
+    void initializeInputSystem();
     void initializeKeyBindings();
+
+private:
+    void updateViewportForContent();
+    void renderCanvasCursor(SkCanvas* canvas);
+    void renderScreenCursor(SkCanvas* canvas);
 };
 
 #endif  // NEAT_PLAYER_H

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/libskparagraph.xcframework/Info.plist

@@ -8,34 +8,34 @@
 			<key>BinaryPath</key>
 			<string>libskparagraph.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskparagraph.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>libskparagraph.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskparagraph.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_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>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>
 	</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.33",
+  "version": "1.5.35",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",