Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the pointerEvents prop on SafeAreaProvider (fixes #432 #130) #464

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions src/specs/NativeSafeAreaProvider.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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>(
Expand Down