Skip to content

Commit

Permalink
Support React Native 0.77 (#3278)
Browse files Browse the repository at this point in the history
## Description

* 54710a6 - Added `sourceSets` to the
package due to changes in ViewManager function signatures, which are no
longer nullable
* a20adca - Updated to reflect changes
in facebook/react-native#47551,
`findHostInstance_DEPRECATED` is now a property of the `default` object
instead of being a named export. Modified implementation reads from
default and fall back to named export as needed
* ac7e786 - Similar change to the
software-mansion/react-native-svg#2572 that uses
new API to create an association map between JS components and their
native implementations, avoiding `codegen` crawling through the entire
filesystem for `.mm` files.

## Test plan

App with React Native 0.77 (like
#3277)
should compile and work as expected.
  • Loading branch information
jakex7 authored Dec 13, 2024
1 parent 281b8a5 commit 7826f50
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 2 deletions.
9 changes: 9 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,15 @@ android {
// codegen turned off
srcDirs += 'paper/src/main/java'
}

if (REACT_NATIVE_MINOR_VERSION >= 77) {
// With RN 0.77, ViewManager related functions in the package has different signatures as they
// are no longer nullable
srcDirs += 'package77/src/main/java'
} else {
// It's safe to delete this block once we drop support for RN 0.76
srcDirs += 'packageDeprecated/src/main/java'
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package com.swmansion.gesturehandler

import com.facebook.react.BaseReactPackage
import com.facebook.react.ViewManagerOnDemandReactPackage
import com.facebook.react.bridge.ModuleSpec
import com.facebook.react.bridge.NativeModule
import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.module.annotations.ReactModule
import com.facebook.react.module.annotations.ReactModuleList
import com.facebook.react.module.model.ReactModuleInfo
import com.facebook.react.module.model.ReactModuleInfoProvider
import com.facebook.react.uimanager.ViewManager
import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager
import com.swmansion.gesturehandler.react.RNGestureHandlerModule
import com.swmansion.gesturehandler.react.RNGestureHandlerRootViewManager

@ReactModuleList(
nativeModules = [
RNGestureHandlerModule::class
]
)
class RNGestureHandlerPackage : BaseReactPackage(), ViewManagerOnDemandReactPackage {
private val viewManagers: Map<String, ModuleSpec> by lazy {
mapOf(
RNGestureHandlerRootViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec {
RNGestureHandlerRootViewManager()
},
RNGestureHandlerButtonViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec {
RNGestureHandlerButtonViewManager()
}
)
}

override fun createViewManagers(reactContext: ReactApplicationContext) =
listOf<ViewManager<*, *>>(
RNGestureHandlerRootViewManager(),
RNGestureHandlerButtonViewManager()
)

override fun getViewManagerNames(reactContext: ReactApplicationContext) =
viewManagers.keys.toList()

override fun getViewManagers(reactContext: ReactApplicationContext): MutableList<ModuleSpec> =
viewManagers.values.toMutableList()

override fun createViewManager(
reactContext: ReactApplicationContext,
viewManagerName: String
) = viewManagers[viewManagerName]?.provider?.get() as? ViewManager<*, *>

override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
return if (name == RNGestureHandlerModule.NAME) {
RNGestureHandlerModule(reactContext)
} else {
null
}
}

override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
try {
val reactModuleInfoProviderClass =
Class.forName("com.swmansion.gesturehandler.RNGestureHandlerPackage$\$ReactModuleInfoProvider")
return reactModuleInfoProviderClass.getDeclaredConstructor().newInstance() as ReactModuleInfoProvider
} catch (e: ClassNotFoundException) {
return ReactModuleInfoProvider {
val reactModule: ReactModule = RNGestureHandlerModule::class.java.getAnnotation(ReactModule::class.java)!!

mutableMapOf(
RNGestureHandlerModule.NAME to ReactModuleInfo(
reactModule.name,
RNGestureHandlerModule::class.java.name,
reactModule.canOverrideExistingModule,
reactModule.needsEagerInit,
reactModule.isCxxModule,
true
)
)
}
} catch (e: InstantiationException) {
throw RuntimeException("No ReactModuleInfoProvider for RNGestureHandlerPackage$\$ReactModuleInfoProvider", e)
} catch (e: IllegalAccessException) {
throw RuntimeException("No ReactModuleInfoProvider for RNGestureHandlerPackage$\$ReactModuleInfoProvider", e)
}
}
}
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@
"jsSrcsDir": "./src/specs",
"android": {
"javaPackageName": "com.swmansion.gesturehandler"
},
"ios": {
"componentProvider": {
"RNGestureHandlerButton": "RNGestureHandlerButtonComponentView"
}
}
},
"packageManager": "[email protected]"
Expand Down
10 changes: 8 additions & 2 deletions src/getShadowNodeFromRef.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,16 @@ export function getShadowNodeFromRef(ref: unknown) {
// Load findHostInstance_DEPRECATED lazily because it may not be available before render
if (findHostInstance_DEPRECATED === undefined) {
try {
// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
const ReactFabric = require('react-native/Libraries/Renderer/shims/ReactFabric');
// Since RN 0.77 ReactFabric exports findHostInstance_DEPRECATED in default object so we're trying to
// access it first, then fallback on named export
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
findHostInstance_DEPRECATED =
// eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-member-access
require('react-native/Libraries/Renderer/shims/ReactFabric').findHostInstance_DEPRECATED;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
ReactFabric?.default?.findHostInstance_DEPRECATED ||
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
ReactFabric?.findHostInstance_DEPRECATED;
} catch (e) {
findHostInstance_DEPRECATED = (_ref: unknown) => null;
}
Expand Down

0 comments on commit 7826f50

Please sign in to comment.