review fixes

Author: mfazekas

example/src/pages/OutOfBandAssets.tsx

@@ -11,7 +11,6 @@ import {
   /*Rive, */ Fit,
   /*RNRiveError,*/ useRiveFile,
   RiveView,
-  DataBindMode,
 } from 'react-native-rive';
 import { Picker } from '@react-native-picker/picker';
 import { type Metadata } from '../helpers/metadata';

example/src/pages/RiveEventsExample.tsx

@@ -7,7 +7,6 @@ import {
   useRiveFile,
   type RiveEvent,
   RiveEventType,
-  DataBindMode,
 } from 'react-native-rive';
 import { type Metadata } from '../helpers/metadata';
 

example/src/pages/RiveFileLoadingExample.tsx

@@ -11,7 +11,6 @@ import {
   useRive,
   useRiveFile,
   type RiveFileInput,
-  DataBindMode,
 } from 'react-native-rive';
 import { useState, useEffect } from 'react';
 import { downloadFileAsArrayBuffer } from '../helpers/fileHelpers';

example/src/pages/RiveStateMachineInputsExample.tsx

@@ -1,12 +1,6 @@
 import { View, Text, StyleSheet, ActivityIndicator } from 'react-native';
 import { useEffect } from 'react';
-import {
-  Fit,
-  RiveView,
-  useRive,
-  useRiveFile,
-  DataBindMode,
-} from 'react-native-rive';
+import { Fit, RiveView, useRive, useRiveFile } from 'react-native-rive';
 import { type Metadata } from '../helpers/metadata';
 
 export default function StateMachineInputsExample() {

example/src/pages/RiveTextRunExample.tsx

@@ -1,12 +1,6 @@
 import { View, Text, StyleSheet, ActivityIndicator } from 'react-native';
 import { useEffect } from 'react';
-import {
-  Fit,
-  RiveView,
-  useRive,
-  useRiveFile,
-  DataBindMode,
-} from 'react-native-rive';
+import { Fit, RiveView, useRive, useRiveFile } from 'react-native-rive';
 import { type Metadata } from '../helpers/metadata';
 
 export default function TextRunExample() {

example/src/pages/index.ts

@@ -5,4 +5,4 @@ export { default as EventsExample } from './RiveEventsExample';
 export { default as StateMachineInputsExample } from './RiveStateMachineInputsExample';
 export { default as TextRunExample } from './RiveTextRunExample';
 export { default as OutOfBandAssets } from './OutOfBandAssets';
-export { default as MiklosViewModels } from './MIklosViewModels';
+export { default as ManyViewModels } from './ManyViewModels';

ios/HybridRiveView.swift

@@ -10,8 +10,10 @@ private struct DefaultConfiguration {
   static let layoutScaleFactor = RiveRuntime.RiveViewModel.layoutScaleFactorAutomatic
 }
 
+typealias HybridDataBindMode = Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName
+
 extension Optional
-where Wrapped == Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName {
+where Wrapped == HybridDataBindMode {
   func toDataBingMode() throws -> BindData {
     guard let value = self else {
       return .auto
@@ -38,14 +40,12 @@ where Wrapped == Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBind
 }
 
 class HybridRiveView: HybridRiveViewSpec {
-  var firstUpdate = true
-  var dataBind: Variant__any_HybridViewModelInstanceSpec__DataBindMode_DataBindByName? = nil {
+  // MARK: View Props
+  var dataBind: HybridDataBindMode? = nil {
     didSet {
       applyDataBinding()
     }
   }
-
-  // MARK: View Props
   var artboardName: String? { didSet { needsReload = true } }
   var stateMachineName: String? { didSet { needsReload = true } }
   var autoPlay: Bool? { didSet { needsReload = true } }
@@ -155,6 +155,7 @@ class HybridRiveView: HybridRiveViewSpec {
   }
 
   // MARK: Internal State
+  private var firstUpdate = true
   private var needsReload = false
 
   // MARK: Helpers

ios/RiveReactNativeView.swift

@@ -1,6 +1,6 @@
-import UIKit
-import RiveRuntime
 import NitroModules
+import RiveRuntime
+import UIKit
 
 protocol RiveViewSource: AnyObject {
   func registerView(_ view: RiveReactNativeView)
@@ -38,10 +38,10 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
 
   // MARK: Public Config Properties
   var autoPlay: Bool = true
-  
+
   // MARK: - Public Methods
-  
-  func awaitViewReady()async -> Bool {
+
+  func awaitViewReady() async -> Bool {
     if !isViewReady {
       await withCheckedContinuation { continuation in
         viewReadyContinuation = continuation
@@ -50,7 +50,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     }
     return true
   }
-  
+
   func configure(_ config: ViewConfiguration, reload: Bool = false) {
     if reload {
       cleanup()
@@ -77,7 +77,7 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
 
     applyDataBinding(config.bindData, refresh: false)
   }
-  
+
   func bindViewModelInstance(viewModelInstance: RiveDataBindingViewModel.Instance) {
     baseViewModel?.riveModel?.stateMachine?.bind(viewModelInstance: viewModelInstance)
   }
@@ -93,36 +93,37 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
     switch bindData {
     case .none:
       baseViewModel?.riveModel?.disableAutoBind()
-      
 
     case .auto:
-      baseViewModel?.riveModel?.enableAutoBind { [weak self] instance in
+      baseViewModel?.riveModel?.enableAutoBind { instance in
         // Auto-bind callback
       }
 
     case .byName(let name):
       guard let artboard = artboard,
-            let riveFile = baseViewModel?.riveModel?.riveFile,
-            let viewModel = riveFile.defaultViewModel(for: artboard),
-            let instance = viewModel.createInstance(fromName: name) else {
+        let riveFile = baseViewModel?.riveModel?.riveFile,
+        let viewModel = riveFile.defaultViewModel(for: artboard),
+        let instance = viewModel.createInstance(fromName: name)
+      else {
         return
       }
       stateMachine?.bind(viewModelInstance: instance)
-      artboard.bind(viewModelInstance: instance)
+      // this should be added if we support only playing artboards on their own - https://github.com/rive-app/rive-nitro-react-native/pull/23#discussion_r2534698281
+      // artboard.bind(viewModelInstance: instance)
 
     case .instance(let instance):
       stateMachine?.bind(viewModelInstance: instance)
       artboard?.bind(viewModelInstance: instance)
     }
-    if (refresh) {
+    if refresh {
       baseViewModel?.play()
     }
   }
 
   func play() {
     baseViewModel?.play()
   }
-  
+
   func pause() {
     baseViewModel?.pause()
   }
@@ -136,74 +137,76 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
   func addEventListener(_ onEvent: @escaping (UnifiedRiveEvent) -> Void) {
     eventListeners.append(onEvent)
   }
-  
+
   func removeEventListeners() {
     eventListeners.removeAll()
   }
-  
+
   func setNumberInputValue(name: String, value: Float, path: String?) throws {
     try handleInput(name: name, path: path, type: .number) { (input: RiveRuntime.RiveSMINumber) in
       input.setValue(value)
     }
   }
-  
+
   func getNumberInputValue(name: String, path: String?) throws -> Float {
     try handleInput(name: name, path: path, type: .number) { (input: RiveRuntime.RiveSMINumber) in
       input.value()
     }
   }
-  
+
   func setBooleanInputValue(name: String, value: Bool, path: String?) throws {
     try handleInput(name: name, path: path, type: .boolean) { (input: RiveRuntime.RiveSMIBool) in
       input.setValue(value)
     }
   }
-  
+
   func getBooleanInputValue(name: String, path: String?) throws -> Bool {
     try handleInput(name: name, path: path, type: .boolean) { (input: RiveRuntime.RiveSMIBool) in
       input.value()
     }
   }
-  
+
   func triggerInput(name: String, path: String?) throws {
     try handleInput(name: name, path: path, type: .trigger) { (input: RiveRuntime.RiveSMITrigger) in
       input.fire()
     }
   }
-  
+
   func setTextRunValue(name: String, value: String, path: String?) throws {
     let textRun = try textRunOptionPath(name: name, path: path)
     textRun.setText(value)
   }
-  
+
   func getTextRunValue(name: String, path: String?) throws -> String {
     let textRun = try textRunOptionPath(name: name, path: path)
     return textRun.text()
   }
-  
-  private func textRunOptionPath(name: String, path: String?) throws -> RiveRuntime.RiveTextValueRun {
+
+  private func textRunOptionPath(name: String, path: String?) throws -> RiveRuntime.RiveTextValueRun
+  {
     let textRun: RiveRuntime.RiveTextValueRun?
     if let path = path {
       textRun = baseViewModel?.riveModel?.artboard?.textRun(name, path: path)
     } else {
       textRun = baseViewModel?.riveModel?.artboard?.textRun(name)
     }
-    
+
     guard let textRun = textRun else {
-      throw RuntimeError.error(withMessage: "Could not find text run `\(name)`\(path.map { " at path `\($0)`" } ?? "")")
+      throw RuntimeError.error(
+        withMessage: "Could not find text run `\(name)`\(path.map { " at path `\($0)`" } ?? "")")
     }
-    
+
     return textRun
   }
-  
+
   // MARK: - Internal
   deinit {
     cleanup()
   }
-  
+
   private func createViewFromViewModel() {
     riveView = baseViewModel?.createRiveView()
-    
+
     if let riveView = riveView {
       riveView.translatesAutoresizingMaskIntoConstraints = false
       addSubview(riveView)
@@ -212,11 +215,11 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
         riveView.leadingAnchor.constraint(equalTo: leadingAnchor),
         riveView.trailingAnchor.constraint(equalTo: trailingAnchor),
         riveView.topAnchor.constraint(equalTo: topAnchor),
-        riveView.bottomAnchor.constraint(equalTo: bottomAnchor)
+        riveView.bottomAnchor.constraint(equalTo: bottomAnchor),
       ])
     }
   }
-  
+
   private func cleanup() {
     riveView?.removeFromSuperview()
     riveView?.stateMachineDelegate = nil
@@ -227,27 +230,30 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
       self.viewSource = nil
     }
   }
-  
+
   @objc func onRiveEventReceived(onRiveEvent riveEvent: RiveRuntime.RiveEvent) {
     let eventType = UnifiedRiveEvent(
       name: riveEvent.name(),
-      type: riveEvent is RiveRuntime.RiveOpenUrlEvent ? RiveEventType.openurl : RiveEventType.general,
+      type: riveEvent is RiveRuntime.RiveOpenUrlEvent
+        ? RiveEventType.openurl : RiveEventType.general,
       delay: Double(riveEvent.delay()),
       properties: convertEventProperties(riveEvent.properties()),
       url: (riveEvent as? RiveRuntime.RiveOpenUrlEvent)?.url(),
       target: (riveEvent as? RiveRuntime.RiveOpenUrlEvent)?.target()
     )
-    
+
     for listener in eventListeners {
       listener(eventType)
     }
   }
-  
-  private func convertEventProperties(_ properties: Dictionary<String, Any>?) -> Dictionary<String, EventPropertiesOutput>?{
+
+  private func convertEventProperties(_ properties: [String: Any]?) -> [String:
+    EventPropertiesOutput]?
+  {
     guard let properties = properties else { return nil }
-    
-    var newMap: Dictionary<String, EventPropertiesOutput> = [:]
-    
+
+    var newMap: [String: EventPropertiesOutput] = [:]
+
     for (key, value) in properties {
       if let string = value as? String {
         newMap[key] = .string(string)
@@ -257,17 +263,19 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
         newMap[key] = .boolean(boolean)
       }
     }
-    
+
     return newMap
   }
-  
+
   private enum InputType {
     case number
     case boolean
     case trigger
   }
-  
-  private func handleInput<P: RiveRuntime.RiveSMIInput, T>(name: String, path: String?, type: InputType, onSuccess: (P) throws -> T) throws -> T {
+
+  private func handleInput<P: RiveRuntime.RiveSMIInput, T>(
+    name: String, path: String?, type: InputType, onSuccess: (P) throws -> T
+  ) throws -> T {
     let input: P?
     if let path = path {
       switch type {
@@ -288,11 +296,12 @@ class RiveReactNativeView: UIView, RiveStateMachineDelegate {
         input = baseViewModel?.riveModel?.stateMachine?.getTrigger(name) as? P
       }
     }
-    
+
     guard let input = input else {
-      throw RuntimeError.error(withMessage: "Could not find input `\(name)`\(path.map { " at path `\($0)`" } ?? "")")
+      throw RuntimeError.error(
+        withMessage: "Could not find input `\(name)`\(path.map { " at path `\($0)`" } ?? "")")
     }
-    
+
     return try onSuccess(input)
   }
 }