refactor: use enums for aligment use union for properties (#3)

* refactor: use enums for aligment use union for properties

* fix(api): use RiveEvent union for TS side and UnifiedRiveEvent struct for native side

Author: mfazekas

android/src/main/java/com/margelo/nitro/rive/EventPropertiesOutputExtensions.kt

@@ -0,0 +1,12 @@
+package com.margelo.nitro.rive
+
+object EventPropertiesOutputExtensions {
+  fun boolean(value: Boolean): EventPropertiesOutput =
+    EventPropertiesOutput.First(value)
+
+  fun string(value: String): EventPropertiesOutput =
+    EventPropertiesOutput.Second(value)
+
+  fun number(value: Double): EventPropertiesOutput =
+    EventPropertiesOutput.Third(value)
+}

android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt

@@ -72,7 +72,7 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
 
   override fun pause() = executeOnUiThread { view.pause() }
 
-  override fun onEventListener(onEvent: (event: RiveEvent) -> Unit) =
+  override fun onEventListener(onEvent: (event: UnifiedRiveEvent) -> Unit) =
     executeOnUiThread { view.addEventListener(onEvent) }
 
   override fun removeEventListeners() = executeOnUiThread { view.removeEventListeners() }

android/src/main/java/com/rive/RiveReactNativeView.kt

@@ -15,8 +15,10 @@ import app.rive.runtime.kotlin.core.SMIInput
 import app.rive.runtime.kotlin.core.SMINumber
 import app.rive.runtime.kotlin.core.ViewModelInstance
 import com.margelo.nitro.core.AnyMap
+import com.margelo.nitro.rive.EventPropertiesOutput
+import com.margelo.nitro.rive.EventPropertiesOutputExtensions as EPO
 import com.margelo.nitro.rive.RiveEventType
-import com.margelo.nitro.rive.RiveEvent as RNEvent
+import com.margelo.nitro.rive.UnifiedRiveEvent as RNEvent
 import kotlinx.coroutines.CompletableDeferred
 
 data class ViewConfiguration(
@@ -206,16 +208,16 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
 
   //region Internal
 
-  private fun convertEventProperties(properties: Map<String, Any>?): AnyMap? {
+  private fun convertEventProperties(properties: Map<String, Any>?): Map<String, EventPropertiesOutput>? {
     if (properties == null) return null
 
-    val newMap = AnyMap()
+    val newMap = HashMap<String, EventPropertiesOutput>()
 
     properties.forEach { (key, value) ->
       when (value) {
-        is String -> newMap.setString(key, value)
-        is Number -> newMap.setDouble(key, value.toDouble())
-        is Boolean -> newMap.setBoolean(key, value)
+        is String -> newMap.set(key, EPO.string(value))
+        is Number -> newMap.set(key, EPO.number(value.toDouble()))
+        is Boolean -> newMap.set(key, EPO.boolean(value))
       }
     }
 

example/src/pages/RiveEventsExample.tsx

@@ -63,8 +63,12 @@ export default function EventsExample() {
               ? 'General Event'
               : 'Open URL Event'}
           </Text>
-          {lastEvent.url && <Text>URL: {lastEvent.url}</Text>}
-          {lastEvent.target && <Text>Target: {lastEvent.target}</Text>}
+          {lastEvent.type === RiveEventType.OpenUrl && lastEvent.url && (
+            <Text>URL: {lastEvent.url}</Text>
+          )}
+          {lastEvent.type === RiveEventType.OpenUrl && lastEvent.target && (
+            <Text>Target: {lastEvent.target}</Text>
+          )}
           {lastEvent.properties &&
             Object.keys(lastEvent.properties).length > 0 && (
               <>

ios/EventPropertiesOutputExtensions.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+extension EventPropertiesOutput {
+  static func boolean(_ value: Bool) -> EventPropertiesOutput {
+    return .first(value)
+  }
+
+  static func string(_ value: String) -> EventPropertiesOutput {
+    return .second(value)
+  }
+
+  static func number(_ value: Double) -> EventPropertiesOutput {
+    return .third(value)
+  }
+}

ios/HybridRiveView.swift

@@ -39,7 +39,7 @@ class HybridRiveView : HybridRiveViewSpec {
 
   func pause() throws { try getRiveView().pause() }
 
-  func onEventListener(onEvent: @escaping (RiveEvent) -> Void) throws {
+  func onEventListener(onEvent: @escaping (UnifiedRiveEvent) -> Void) throws {
     try getRiveView().addEventListener(onEvent)
   }
 

ios/RiveReactNativeView.swift

@@ -17,7 +17,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
   // MARK: Internal Properties
   private var riveView: RiveView?
   private var baseViewModel: RiveViewModel?
-  private var eventListeners: [(RiveEvent) -> Void] = []
+  private var eventListeners: [(UnifiedRiveEvent) -> Void] = []
   private var viewReadyContinuation: CheckedContinuation<Void, Never>?
   private var isViewReady = false
 
@@ -68,7 +68,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     baseViewModel?.pause()
   }
 
-  func addEventListener(_ onEvent: @escaping (RiveEvent) -> Void) {
+  func addEventListener(_ onEvent: @escaping (UnifiedRiveEvent) -> Void) {
     eventListeners.append(onEvent)
   }
 
@@ -160,7 +160,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
   }
 
   @objc func onRiveEventReceived(onRiveEvent riveEvent: RiveRuntime.RiveEvent) {
-    let eventType = RiveEvent(
+    let eventType = UnifiedRiveEvent(
       name: riveEvent.name(),
       type: riveEvent is RiveRuntime.RiveOpenUrlEvent ? RiveEventType.openurl : RiveEventType.general,
       delay: Double(riveEvent.delay()),
@@ -174,18 +174,18 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     }
   }
 
-  private func convertEventProperties(_ properties: Dictionary<String, Any>?) -> AnyMapHolder?{
+  private func convertEventProperties(_ properties: Dictionary<String, Any>?) -> Dictionary<String, EventPropertiesOutput>?{
     guard let properties = properties else { return nil }
 
-    let newMap = AnyMapHolder()
+    var newMap: Dictionary<String, EventPropertiesOutput> = [:]
 
     for (key, value) in properties {
       if let string = value as? String {
-        newMap.setString(key: key, value: string)
+        newMap[key] = .string(string)
       } else if let number = value as? NSNumber {
-        newMap.setDouble(key: key, value: number.doubleValue)
+        newMap[key] = .number(number.doubleValue)
       } else if let boolean = value as? Bool {
-        newMap.setBoolean(key: key, value: boolean)
+        newMap[key] = .boolean(boolean)
       }
     }