feat: added robust play method (#41)

rive-app · May 24, 2021 · f4b010f · f4b010f
1 parent f87f92b
commit f4b010f
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 4 deletions.
diff --git a/ios/RNDirection.swift b/ios/RNDirection.swift
@@ -0,0 +1,24 @@
+enum RNDirection: String {
+    case Backwards = "backwards"
+    case Auto = "auto"
+    case Forwards = "forwards"
+
+    static func mapToRNDirection(value: String) -> RNDirection {
+        if let rnEnum = RNDirection(rawValue: value) {
+            return rnEnum
+        } else {
+            fatalError("Unsupported direction type: \(value)")
+        }
+    }
+
+    static func mapToRiveDirection(rnDirection: RNDirection) -> Direction {
+        switch rnDirection {
+        case .Backwards:
+            return .directionBackwards
+        case .Auto:
+            return .directionAuto
+        case .Forwards:
+            return .directionForwards
+        }
+    }
+}
diff --git a/ios/RNFit.swift b/ios/RNFit.swift
@@ -18,7 +18,7 @@ enum RNFit: String {
         }
     }
 
-    static func mapToRiveFit(rnFit: RNFit) ->  Fit{
+    static func mapToRiveFit(rnFit: RNFit) -> Fit {
         switch rnFit {
         case .Contain:
             return Fit.fitContain

diff --git a/ios/RNLoopMode.swift b/ios/RNLoopMode.swift
@@ -0,0 +1,27 @@
+enum RNLoopMode: String {
+    case OneShot = "oneShot"
+    case Loop = "loop"
+    case PingPong = "pingPong"
+    case Auto = "none"
+
+    static func mapToRNLoopMode(value: String) -> RNLoopMode {
+        if let rnEnum = RNLoopMode(rawValue: value) {
+            return rnEnum
+        } else {
+            fatalError("Unsupported loop mode type: \(value)")
+        }
+    }
+
+    static func mapToRiveLoop(rnLoopMode: RNLoopMode) ->  Loop{
+        switch rnLoopMode {
+        case .OneShot:
+            return .loopOneShot
+        case .Loop:
+            return .loopLoop
+        case .PingPong:
+            return .loopPingPong
+        case .Auto:
+            return .loopAuto
+        }
+    }
+}
diff --git a/ios/RiveReactNativeView.swift b/ios/RiveReactNativeView.swift
@@ -167,8 +167,15 @@ class RiveReactNativeView: UIView, PlayDelegate, PauseDelegate, StopDelegate, Lo
         }
     }
 
-    @objc func play() {
-        riveView.play()
+    func play(animationNames: [String], rnLoopMode: RNLoopMode, rnDirection: RNDirection, areStateMachines: Bool) {
+        let loop = RNLoopMode.mapToRiveLoop(rnLoopMode: rnLoopMode)
+        let direction = RNDirection.mapToRiveDirection(rnDirection: rnDirection)
+        if animationNames.isEmpty {
+            riveView.play(loop: loop, direction: direction)
+        } else {
+            riveView.play(animationName: animationNames[0], loop: loop, direction: direction, isStateMachine: areStateMachines)
+        }
+
     }
 
     @objc func pause() {

diff --git a/ios/RiveReactNativeViewManager.swift b/ios/RiveReactNativeViewManager.swift
@@ -12,7 +12,8 @@ class RiveReactNativeViewManager: RCTViewManager {
     @objc func play(_ node: NSNumber, animationNames: [String], loopMode: String, direction: String, areStateMachines: Bool) {
         DispatchQueue.main.async {
             let component = self.bridge.uiManager.view(forReactTag: node) as! RiveReactNativeView
-            component.play()
+            component.play(animationNames: animationNames, rnLoopMode: RNLoopMode.mapToRNLoopMode(value: loopMode), rnDirection: RNDirection.mapToRNDirection(value: direction), areStateMachines: areStateMachines)
+
         }
     }