fix(th3rdwave#432): allow pointerEvents prop to reach SafeAreaProvider

cboar · Jan 4, 2024 · e4deb14 · e4deb14
1 parent f7e7e20
commit e4deb14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaProviderManager.kt b/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaProviderManager.kt
@@ -4,28 +4,29 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.viewmanagers.RNCSafeAreaProviderManagerDelegate
 import com.facebook.react.viewmanagers.RNCSafeAreaProviderManagerInterface
+import com.facebook.react.views.view.ReactViewGroup
+import com.facebook.react.views.view.ReactViewManager
 
 @ReactModule(name = SafeAreaProviderManager.REACT_CLASS)
 class SafeAreaProviderManager :
-    ViewGroupManager<SafeAreaProvider>(), RNCSafeAreaProviderManagerInterface<SafeAreaProvider> {
+    ReactViewManager(), RNCSafeAreaProviderManagerInterface<ReactViewGroup> {
   private val mDelegate = RNCSafeAreaProviderManagerDelegate(this)
 
   override fun getDelegate() = mDelegate
 
   override fun getName() = REACT_CLASS
 
-  public override fun createViewInstance(context: ThemedReactContext) = SafeAreaProvider(context)
+  override fun createViewInstance(context: ThemedReactContext) = SafeAreaProvider(context)
 
   override fun getExportedCustomDirectEventTypeConstants() =
       mutableMapOf(
           InsetsChangeEvent.EVENT_NAME to mutableMapOf("registrationName" to "onInsetsChange"))
 
-  override fun addEventEmitters(reactContext: ThemedReactContext, view: SafeAreaProvider) {
+  override fun addEventEmitters(reactContext: ThemedReactContext, view: ReactViewGroup) {
     super.addEventEmitters(reactContext, view)
-    view.setOnInsetsChangeHandler(::handleOnInsetsChange)
+    (view as? SafeAreaProvider)?.setOnInsetsChangeHandler(::handleOnInsetsChange)
   }
 
   companion object {

diff --git a/src/specs/NativeSafeAreaProvider.ts b/src/specs/NativeSafeAreaProvider.ts
@@ -1,6 +1,7 @@
 import type {
   DirectEventHandler,
   Double,
+  WithDefault,
 } from 'react-native/Libraries/Types/CodegenTypes';
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 import type { ViewProps, HostComponent } from 'react-native';
@@ -20,8 +21,13 @@ export type Event = Readonly<{
   }>;
 }>;
 
+// @ts-ignore
 export interface NativeProps extends ViewProps {
   onInsetsChange?: DirectEventHandler<Event, 'paperInsetsChange'>;
+  pointerEvents?: WithDefault<
+    'box-none' | 'none' | 'box-only' | 'auto',
+    'auto'
+  >;
 }
 
 export default codegenNativeComponent<NativeProps>(