Skip to content

Commit 49041db

Browse files
authored
Remove unnecessary empty init() methods and autolinking entries for ViewModel classes (#68)
1 parent 1d571ca commit 49041db

11 files changed

Lines changed: 6 additions & 336 deletions

ios/HybridViewModel.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ class HybridViewModel: HybridViewModelSpec {
66
init(viewModel: RiveDataBindingViewModel) {
77
self.viewModel = viewModel
88
}
9-
10-
override init() {
11-
self.viewModel = nil
12-
super.init()
13-
}
14-
9+
1510
var propertyCount: Double { Double(viewModel?.propertyCount ?? 0) }
1611

1712
var instanceCount: Double { Double(viewModel?.instanceCount ?? 0) }

ios/HybridViewModelBooleanProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ class HybridViewModelBooleanProperty: HybridViewModelBooleanPropertySpec, Valued
99
self.property = property
1010
super.init()
1111
}
12-
13-
/// ⚠️ DO NOT REMOVE
14-
/// Nitro requires a parameterless initializer for JS bridging.
15-
/// This is invoked automatically during hybrid module construction.
16-
/// Internally we always use `init(property:)`
17-
override init() {
18-
super.init()
19-
}
20-
12+
2113
var value: Bool {
2214
get {
2315
return property.value

ios/HybridViewModelColorProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ class HybridViewModelColorProperty: HybridViewModelColorPropertySpec, ValuedProp
99
self.property = property
1010
super.init()
1111
}
12-
13-
/// ⚠️ DO NOT REMOVE
14-
/// Nitro requires a parameterless initializer for JS bridging.
15-
/// This is invoked automatically during hybrid module construction.
16-
/// Internally we always use `init(property:)`
17-
override init() {
18-
super.init()
19-
}
20-
12+
2113
var value: Double {
2214
get {
2315
return property.value.toHexDouble()

ios/HybridViewModelEnumProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ class HybridViewModelEnumProperty: HybridViewModelEnumPropertySpec, ValuedProper
99
self.property = property
1010
super.init()
1111
}
12-
13-
/// ⚠️ DO NOT REMOVE
14-
/// Nitro requires a parameterless initializer for JS bridging.
15-
/// This is invoked automatically during hybrid module construction.
16-
/// Internally we always use `init(property:)`
17-
override init() {
18-
super.init()
19-
}
20-
12+
2113
var value: String {
2214
get {
2315
return property.value

ios/HybridViewModelInstance.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ class HybridViewModelInstance: HybridViewModelInstanceSpec {
66
init(viewModelInstance: RiveDataBindingViewModel.Instance) {
77
self.viewModelInstance = viewModelInstance
88
}
9-
10-
override init() {
11-
self.viewModelInstance = nil
12-
super.init()
13-
}
14-
9+
1510
var instanceName: String { viewModelInstance?.name ?? "" }
1611

1712
func numberProperty(path: String) throws -> (any HybridViewModelNumberPropertySpec)? {

ios/HybridViewModelNumberProperty.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ class HybridViewModelNumberProperty: HybridViewModelNumberPropertySpec, ValuedPr
99
super.init()
1010
}
1111

12-
/// ⚠️ DO NOT REMOVE
13-
/// Nitro requires a parameterless initializer for JS bridging.
14-
/// This is invoked automatically during hybrid module construction.
15-
/// Internally we always use `init(property:)`
16-
override init() {
17-
super.init()
18-
}
19-
2012
var value: Double {
2113
get {
2214
return Double(property.value)

ios/HybridViewModelStringProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ class HybridViewModelStringProperty: HybridViewModelStringPropertySpec, ValuedPr
99
self.property = property
1010
super.init()
1111
}
12-
13-
/// ⚠️ DO NOT REMOVE
14-
/// Nitro requires a parameterless initializer for JS bridging.
15-
/// This is invoked automatically during hybrid module construction.
16-
/// Internally we always use `init(property:)`
17-
override init() {
18-
super.init()
19-
}
20-
12+
2113
var value: String {
2214
get {
2315
return property.value

nitro.json

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,6 @@
2121
"swift": "HybridRiveFile",
2222
"kotlin": "HybridRiveFile"
2323
},
24-
"ViewModel": {
25-
"swift": "HybridViewModel",
26-
"kotlin": "HybridViewModel"
27-
},
28-
"ViewModelInstance": {
29-
"swift": "HybridViewModelInstance",
30-
"kotlin": "HybridViewModelInstance"
31-
},
32-
"ViewModelNumberProperty": {
33-
"swift": "HybridViewModelNumberProperty",
34-
"kotlin": "HybridViewModelNumberProperty"
35-
},
36-
"ViewModelStringProperty": {
37-
"swift": "HybridViewModelStringProperty",
38-
"kotlin": "HybridViewModelStringProperty"
39-
},
40-
"ViewModelBooleanProperty": {
41-
"swift": "HybridViewModelBooleanProperty",
42-
"kotlin": "HybridViewModelBooleanProperty"
43-
},
44-
"ViewModelColorProperty": {
45-
"swift": "HybridViewModelColorProperty",
46-
"kotlin": "HybridViewModelColorProperty"
47-
},
48-
"ViewModelEnumProperty": {
49-
"swift": "HybridViewModelEnumProperty",
50-
"kotlin": "HybridViewModelEnumProperty"
51-
},
52-
"ViewModelImageProperty": {
53-
"swift": "HybridViewModelImageProperty",
54-
"kotlin": "HybridViewModelImageProperty"
55-
},
5624
"RiveView": {
5725
"swift": "HybridRiveView",
5826
"kotlin": "HybridRiveView"

nitrogen/generated/android/riveOnLoad.cpp

Lines changed: 0 additions & 64 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nitrogen/generated/ios/RNRiveAutolinking.mm

Lines changed: 0 additions & 64 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)