Skip to content

Commit b7050e6

Browse files
committed
style(ios): address review comments
1 parent 7cdccc6 commit b7050e6

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

ios/RNPropertyType.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ enum RNPropertyType: String {
1515
case Trigger = "trigger"
1616
case Enum = "enum"
1717

18-
static func mapToRNPropertyType(value: String) -> RNPropertyType {
18+
static func mapToRNPropertyType(value: String) -> RNPropertyType? {
1919
if let rnEnum = RNPropertyType(rawValue: value) {
2020
return rnEnum
2121
} else {
22-
fatalError("Unsupported property type: \(value)")
22+
return nil
2323
}
2424
}
2525
}

ios/RiveReactNativeView.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
697697
initialValue: prop.value,
698698
createListener: { [weak self] in
699699
prop.addListener { newValue in
700-
self?.eventEmitter?.sendEvent(withName: key, body: prop.value)
700+
self?.eventEmitter?.sendEvent(withName: key, body: newValue)
701701
}
702702
}
703703
)
@@ -709,7 +709,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
709709
initialValue: prop.value,
710710
createListener: { [weak self] in
711711
prop.addListener { newValue in
712-
self?.eventEmitter?.sendEvent(withName: key, body: prop.value)
712+
self?.eventEmitter?.sendEvent(withName: key, body: newValue)
713713
}
714714
}
715715
)
@@ -721,7 +721,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
721721
initialValue: prop.value,
722722
createListener: { [weak self] in
723723
prop.addListener { newValue in
724-
self?.eventEmitter?.sendEvent(withName: key, body: prop.value)
724+
self?.eventEmitter?.sendEvent(withName: key, body: newValue)
725725
}
726726
}
727727
)
@@ -733,7 +733,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
733733
initialValue: prop.value.toHexInt(),
734734
createListener: { [weak self] in
735735
prop.addListener { newValue in
736-
self?.eventEmitter?.sendEvent(withName: key, body: prop.value.toHexInt())
736+
self?.eventEmitter?.sendEvent(withName: key, body: newValue.toHexInt())
737737
}
738738
}
739739
)
@@ -745,7 +745,7 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
745745
initialValue: prop.value,
746746
createListener: { [weak self] in
747747
prop.addListener { newValue in
748-
self?.eventEmitter?.sendEvent(withName: key, body: prop.value)
748+
self?.eventEmitter?.sendEvent(withName: key, body: newValue)
749749
}
750750
}
751751
)
@@ -755,21 +755,21 @@ class RiveReactNativeView: RCTView, RivePlayerDelegate, RiveStateMachineDelegate
755755
}
756756
}()
757757

758-
guard let reg = registration else {
758+
guard let registration else {
759759
var error = RNRiveError.DataBindingError;
760760
error.message = "\(propertyType) property not found at path: \(path)"
761761
onRNRiveError(error)
762762
return
763763
}
764764

765765
// Send initial value
766-
eventEmitter?.sendEvent(withName: key, body: reg.initialValue)
766+
eventEmitter?.sendEvent(withName: key, body: registration.initialValue)
767767

768768
// Create and store listener
769-
if let listener = reg.createListener() {
769+
if let listener = registration.createListener() {
770770
let propertyListener = PropertyListener(
771771
dataBindingInstance: dataBindingInstance,
772-
property: reg.property,
772+
property: registration.property,
773773
listener: listener,
774774
path: path,
775775
propertyType: propertyType

0 commit comments

Comments
 (0)