Skip to content

Commit 37f7ff5

Browse files
committed
fix!: upgrade nitro-modules to 0.35.0
BREAKING CHANGE: minimum nitro-modules version is now 0.35.0
1 parent 9831e19 commit 37f7ff5

File tree

144 files changed

+1532
-1814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+1532
-1814
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReactApplicationContext
66
import com.facebook.react.module.model.ReactModuleInfoProvider
77
import com.facebook.react.uimanager.ViewManager
88
import com.margelo.nitro.rive.riveOnLoad
9+
import com.margelo.nitro.rive.views.HybridRiveViewManager
910

1011
class RivePackage : BaseReactPackage() {
1112
override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<in Nothing, in Nothing>> {
@@ -16,7 +17,7 @@ class RivePackage : BaseReactPackage() {
1617
}
1718

1819
val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
19-
viewManagers.add(RiveViewManager())
20+
viewManagers.add(HybridRiveViewManager())
2021
return viewManagers
2122
}
2223

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,14 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
7777
private var eventListeners: MutableList<RiveFileController.RiveEventListener> = mutableListOf()
7878
private val viewReadyDeferred = CompletableDeferred<Boolean>()
7979
private var _activeStateMachineName: String? = null
80-
private var willDispose = false
81-
8280
init {
8381
riveAnimationView = ReactNativeRiveAnimationView(context)
8482
addView(riveAnimationView)
8583
}
8684

87-
fun dispose() {
88-
willDispose = true
89-
}
90-
9185
override fun onDetachedFromWindow() {
92-
if (willDispose) {
93-
riveAnimationView?.dispose()
94-
removeEventListeners()
95-
}
86+
riveAnimationView?.dispose()
87+
removeEventListeners()
9688
super.onDetachedFromWindow()
9789
}
9890

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"react": "19.0.0",
2222
"react-native": "0.79.2",
2323
"react-native-gesture-handler": "2.29.1",
24-
"react-native-nitro-modules": "0.33.2",
24+
"react-native-nitro-modules": "0.35.0",
2525
"react-native-reanimated": "4.1.5",
2626
"react-native-safe-area-context": "^5.4.0",
2727
"react-native-worklets": "0.6.1"

expo-example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"react-dom": "19.1.0",
3636
"react-native": "0.81.5",
3737
"react-native-gesture-handler": "2.29.1",
38-
"react-native-nitro-modules": "0.33.2",
38+
"react-native-nitro-modules": "0.35.0",
3939
"react-native-reanimated": "4.1.5",
4040
"react-native-safe-area-context": "~5.6.0",
4141
"react-native-screens": "~4.16.0",

ios/DataSource.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ enum DataSource {
2424
return .bundle(resource: name, extension: ext.isEmpty ? nil : ext)
2525
}
2626

27-
static func bytes(from buffer: ArrayBufferHolder) -> DataSource {
27+
static func bytes(from buffer: ArrayBuffer) -> DataSource {
2828
return .bytes(data: buffer.toData(copyIfNeeded: false))
2929
}
3030

ios/HybridRiveFileFactory.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ final class HybridRiveFileFactory: HybridRiveFileFactorySpec, @unchecked Sendabl
145145
return try fromResource(resource: resource, loadCdn: loadCdn, referencedAssets: nil)
146146
}
147147

148-
func fromBytes(bytes: ArrayBufferHolder, loadCdn: Bool, referencedAssets: ReferencedAssetsType?)
148+
func fromBytes(bytes: ArrayBuffer, loadCdn: Bool, referencedAssets: ReferencedAssetsType?)
149149
throws -> Promise<
150150
(any HybridRiveFileSpec)
151151
> {

ios/HybridRiveImageFactory.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ final class HybridRiveImageFactory: HybridRiveImageFactorySpec {
2020
return loadFromDataSource(.bundle(nameWithExtension: resource))
2121
}
2222

23-
func loadFromBytesAsync(bytes: ArrayBufferHolder) throws -> Promise<(any HybridRiveImageSpec)> {
23+
func loadFromBytesAsync(bytes: ArrayBuffer) throws -> Promise<(any HybridRiveImageSpec)> {
2424
return loadFromDataSource(.bytes(from: bytes))
2525
}
2626
}

nitrogen/generated/android/c++/JHybridBindableArtboardSpec.cpp

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

nitrogen/generated/android/c++/JHybridBindableArtboardSpec.hpp

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

0 commit comments

Comments
 (0)