Skip to content

Commit 585ac44

Browse files
committed
Change _enabled to rootViewEnabled
1 parent dff404d commit 585ac44

1 file changed

Lines changed: 12 additions & 16 deletions

File tree

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootView.kt

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,18 @@ import com.facebook.react.uimanager.RootView
1212
import com.facebook.react.views.view.ReactViewGroup
1313

1414
class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
15-
private var enabled = false
15+
private var rootViewEnabled = false
1616
private var rootHelper: RNGestureHandlerRootHelper? = null // TODO: resettable lateinit
17-
1817
override fun onAttachedToWindow() {
1918
super.onAttachedToWindow()
20-
enabled = !hasGestureHandlerEnabledRootView(this)
21-
if (!enabled) {
19+
rootViewEnabled = !hasGestureHandlerEnabledRootView(this)
20+
if (!rootViewEnabled) {
2221
Log.i(
2322
ReactConstants.TAG,
2423
"[GESTURE HANDLER] Gesture handler is already enabled for a parent view",
2524
)
2625
}
27-
if (enabled && rootHelper == null) {
26+
if (rootViewEnabled && rootHelper == null) {
2827
rootHelper = RNGestureHandlerRootHelper(context as ReactContext, this)
2928
}
3029
}
@@ -33,24 +32,21 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
3332
rootHelper?.tearDown()
3433
}
3534

36-
override fun dispatchTouchEvent(ev: MotionEvent) = if (enabled &&
37-
rootHelper!!.dispatchTouchEvent(ev)
38-
) {
35+
override fun dispatchTouchEvent(ev: MotionEvent) = if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(ev)) {
3936
true
4037
} else {
4138
super.dispatchTouchEvent(ev)
4239
}
4340

44-
override fun dispatchGenericMotionEvent(event: MotionEvent) = if (enabled &&
45-
rootHelper!!.dispatchTouchEvent(event)
46-
) {
47-
true
48-
} else {
49-
super.dispatchGenericMotionEvent(event)
50-
}
41+
override fun dispatchGenericMotionEvent(event: MotionEvent) =
42+
if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(event)) {
43+
true
44+
} else {
45+
super.dispatchGenericMotionEvent(event)
46+
}
5147

5248
override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
53-
if (enabled) {
49+
if (rootViewEnabled) {
5450
rootHelper!!.requestDisallowInterceptTouchEvent()
5551
}
5652
super.requestDisallowInterceptTouchEvent(disallowIntercept)

0 commit comments

Comments
 (0)