refactor: rename allowNavFullscreenGesture to allowNavigationBackGesture for clarity and consistency and remove unnecessary properties

Author: kazhoang

README.md

@@ -163,7 +163,7 @@ For advanced usage please take a look into our [example project](https://github.
 | `offscreenPageLimit: number`                                         | Set the number of pages that should be retained to either side of the currently visible page(s). Pages beyond this limit will be recreated from the adapter when needed. Defaults to RecyclerView's caching strategy. The given value must either be larger than 0. | Android  |
 | `overdrag: boolean`                                                  |                                                                                   Allows for overscrolling after reaching the end or very beginning or pages. Defaults to `false`                                                                                   |   iOS    |
 | `layoutDirection: ('ltr' / 'rtl' / 'locale')`                        |                                                      Specifies layout direction. Use `ltr` or `rtl` to set explicitly or `locale` to deduce from the default language script of a locale. Defaults to `locale`                                                      |   both   |
-| `allowNavFullscreenGesture: boolean`                                  |                                                                                   Allows navigation swipe-back gestures to pass through when PagerView is at index 0. If `overdrag` is set to `true`, it will have higher priority. Defaults to `false`                                                                                   |   iOS    |
+| `allowNavigationBackGesture: boolean`                                  |                                                                                   Allows navigation swipe-back gestures to pass through when PagerView is at index 0. If `overdrag` is set to `true`, it will have higher priority. Defaults to `false`                                                                                   |   iOS    |
 
 | Method                                     |                                                                                                         Description                                                                                                          | Platform |
 | ------------------------------------------ | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------: |
@@ -243,6 +243,7 @@ const pageScrollHandler = usePageScrollHandler({
 ```
 
 ## usePagerView Hook Usage
+
 The `usePagerView` hook is a convenient way to manage the state and control the behavior of the `<PagerView />` component. It provides functions and variables to interact with the pager, such as navigating between pages and enabling/disabling scrolling.
 
 Below is an example of how to use the usePager hook:
@@ -295,7 +296,8 @@ export function PagerHookExample() {
   );
 }
 ```
-### How the Example Works:
+
+### How the Example Works
 
 - **Pager View Setup**: The `AnimatedPagerView` component wraps `PagerView` in React Native's animation capabilities. It accepts multiple props from the `usePager` hook, such as `overdragEnabled`, `scrollEnabled`, `onPageScroll`, `onPageSelected`, and others to manage pager behavior.
 
@@ -305,7 +307,6 @@ export function PagerHookExample() {
 
 The `usePager` hook makes it easy to handle pagination with dynamic views. This example demonstrates how to set up a simple paginated interface where users can scroll through pages, interact with page elements, and control the pager with external navigation.
 
-
 ## License
 
 MIT

android/src/main/java/com/reactnativepagerview/PagerViewViewManager.kt

@@ -163,8 +163,8 @@ class PagerViewViewManager : ViewGroupManager<NestedScrollableHost>(), RNCViewPa
         }
     }
 
-    @ReactProp(name = "allowNavFullscreenGesture")
-    override fun setAllowNavFullscreenGesture(view: NestedScrollableHost?, value: Boolean) {
+    @ReactProp(name = "allowNavigationBackGesture")
+    override fun setAllowNavigationBackGesture(view: NestedScrollableHost?, value: Boolean) {
         return
     }
 

ios/RNCPagerViewComponentView.mm

@@ -28,8 +28,7 @@ @implementation RNCPagerViewComponentView {
     NSInteger _destinationIndex;
     BOOL _overdrag;
     NSString *_layoutDirection;
-    BOOL _isDragging;
-    BOOL _allowNavFullscreenGesture;
+    BOOL _allowNavigationBackGesture;
     UIPanGestureRecognizer *_navGestureRecognizer;
 }
 
@@ -79,8 +78,7 @@ - (instancetype)initWithFrame:(CGRect)frame
         _destinationIndex = -1;
         _layoutDirection = @"ltr";
         _overdrag = NO;
-        _isDragging = NO;
-        _allowNavFullscreenGesture = NO;
+        _allowNavigationBackGesture = NO;
         _navGestureRecognizer = nil;
     }
 
@@ -95,16 +93,16 @@ - (void)willMoveToSuperview:(UIView *)newSuperview {
 }
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
-    if (!_allowNavFullscreenGesture) {
+    if (!_allowNavigationBackGesture) {
         return NO;
     }
 
     if (otherGestureRecognizer == self->scrollView.panGestureRecognizer) {
-        UIPanGestureRecognizer* p = (UIPanGestureRecognizer*) gestureRecognizer;
-        CGPoint velocity = [p velocityInView:self];
-        BOOL shouldPagerGestureFail = !_overdrag && !_isDragging && _currentIndex == 0 && velocity.x > 0;
+        UIPanGestureRecognizer* panGestureRecognizer = (UIPanGestureRecognizer*) gestureRecognizer;
+        CGPoint velocity = [panGestureRecognizer velocityInView:self];
+        BOOL shouldPagerGestureFail = !_overdrag && !scrollView.isDecelerating && _currentIndex == 0 && velocity.x > 0;
         if (shouldPagerGestureFail) {
-            self->scrollView.panGestureRecognizer.enabled = false;
+            self->scrollView.panGestureRecognizer.enabled = NO;
             return NO;
         } else {
             self->scrollView.panGestureRecognizer.enabled = self->scrollView.scrollEnabled;
@@ -148,16 +146,12 @@ -(void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
     [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:_layoutMetrics];
 }
 
-
 -(void)prepareForRecycle {
     [super prepareForRecycle];
     _nativePageViewController = nil;
     _currentIndex = -1;
-    _allowNavFullscreenGesture = NO;
-    if (_navGestureRecognizer) {
-        [self removeGestureRecognizer:_navGestureRecognizer];
-        _navGestureRecognizer = nil;
-    }
+    _allowNavigationBackGesture = NO;
+    [self cleanupGestureRecognizer];
 }
 
 - (void)shouldDismissKeyboard:(RNCViewPagerKeyboardDismissMode)dismissKeyboard {
@@ -205,19 +199,15 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props oldProps:(cons
         _overdrag = newScreenProps.overdrag;
     }
 
-    if (newScreenProps.allowNavFullscreenGesture != _allowNavFullscreenGesture) {
-        _allowNavFullscreenGesture = newScreenProps.allowNavFullscreenGesture;
+    if (newScreenProps.allowNavigationBackGesture != _allowNavigationBackGesture) {
+        _allowNavigationBackGesture = newScreenProps.allowNavigationBackGesture;
 
-        if (_allowNavFullscreenGesture) {
+        if (_allowNavigationBackGesture) {
             _navGestureRecognizer = [[UIPanGestureRecognizer alloc] init];
             _navGestureRecognizer.delegate = self;
             [self addGestureRecognizer:_navGestureRecognizer];
-            _isDragging = NO;
         } else {
-            if (_navGestureRecognizer) {
-                [self removeGestureRecognizer:_navGestureRecognizer];
-                _navGestureRecognizer = nil;
-            }
+            [self cleanupGestureRecognizer];
         }
     }
 
@@ -312,7 +302,6 @@ - (UIViewController *)currentlyDisplayed {
 #pragma mark - UIScrollViewDelegate
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
-    _isDragging = YES;
     const auto eventEmitter = [self pagerEventEmitter];
     eventEmitter->onPageScrollStateChanged(RNCViewPagerEventEmitter::OnPageScrollStateChanged{.pageScrollState =  RNCViewPagerEventEmitter::OnPageScrollStateChangedPageScrollState::Dragging });
 }
@@ -339,7 +328,6 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi
 }
 
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
-    _isDragging = NO;
     const auto eventEmitter = [self pagerEventEmitter];
     eventEmitter->onPageScrollStateChanged(RNCViewPagerEventEmitter::OnPageScrollStateChanged{.pageScrollState =  RNCViewPagerEventEmitter::OnPageScrollStateChangedPageScrollState::Idle });
 }
@@ -457,6 +445,13 @@ - (BOOL)isLtrLayout {
     return [_layoutDirection isEqualToString: @"ltr"];
 }
 
+- (void)cleanupGestureRecognizer {
+    if (_navGestureRecognizer) {
+        [self removeGestureRecognizer:_navGestureRecognizer];
+        _navGestureRecognizer = nil;
+    }
+}
+
 - (std::shared_ptr<const RNCViewPagerEventEmitter>)pagerEventEmitter
 {
   if (!_eventEmitter) {

src/PagerViewNativeComponent.ts

@@ -33,7 +33,7 @@ export interface NativeProps extends ViewProps {
   overScrollMode?: WithDefault<'auto' | 'always' | 'never', 'auto'>;
   overdrag?: WithDefault<boolean, false>;
   keyboardDismissMode?: WithDefault<'none' | 'on-drag', 'none'>;
-  allowNavFullscreenGesture?: WithDefault<boolean, false>;
+  allowNavigationBackGesture?: WithDefault<boolean, false>;
   onPageScroll?: DirectEventHandler<OnPageScrollEventData>;
   onPageSelected?: DirectEventHandler<OnPageSelectedEventData>;
   onPageScrollStateChanged?: DirectEventHandler<OnPageScrollStateChangedEventData>;