@lodev09/react-native-true-sheet 3.9.7 → 3.9.9

package/android/src/main/java/com/lodev09/truesheet/TrueSheetViewController.kt

@@ -624,6 +624,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     isSheetVisible = false
     wasHiddenByScreen = true
+    backCallback?.isEnabled = false
 
     dimViews.forEach { it.animate().alpha(0f).setDuration(SCREEN_FADE_DURATION).start() }
     sheet.animate()
@@ -643,6 +644,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     setSheetVisibility(true)
     sheetView?.alpha = 1f
     updateDimAmount(animated = true)
+    backCallback?.isEnabled = true
   }
 
   /**

package/android/src/main/java/com/lodev09/truesheet/core/TrueSheetCoordinatorLayout.kt

@@ -7,6 +7,7 @@ import android.view.MotionEvent
 import android.view.ViewConfiguration
 import android.widget.ScrollView
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
 import com.lodev09.truesheet.utils.isDescendantOf
@@ -98,7 +99,9 @@ class TrueSheetCoordinatorLayout(context: Context) :
     }
 
     val scrollView = delegate?.findScrollView()
+    val hasRefreshControl = scrollView?.parent is SwipeRefreshLayout
     val cannotScroll = scrollView != null &&
+      !hasRefreshControl &&
       scrollView.scrollY == 0 &&
       !scrollView.canScrollVertically(1)
 

package/ios/TrueSheetViewController.mm

@@ -743,10 +743,35 @@ using namespace facebook::react;
     [_grabberView applyConfiguration];
     _grabberView.hidden = !showGrabber;
 
+    __weak __typeof(self) weakSelf = self;
+    _grabberView.onTap = ^{
+      [weakSelf handleGrabberTap];
+    };
+
     [self.view bringSubviewToFront:_grabberView];
   } else {
     self.sheet.prefersGrabberVisible = showGrabber;
     _grabberView.hidden = YES;
+    _grabberView.onTap = nil;
+  }
+}
+
+- (void)handleGrabberTap {
+  NSInteger detentCount = _detents.count;
+  if (detentCount == 0)
+    return;
+
+  NSInteger currentIndex = self.currentDetentIndex;
+  if (currentIndex < 0)
+    return;
+
+  NSInteger nextIndex = (currentIndex + 1) % detentCount;
+  if (nextIndex == 0 && detentCount == 1 && self.dismissible) {
+    [self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
+  } else {
+    [self.sheet animateChanges:^{
+      [self resizeToDetentIndex:nextIndex];
+    }];
   }
 }
 

package/ios/core/TrueSheetGrabberView.h

@@ -34,6 +34,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// Whether the grabber color adapts to the background (default: YES)
 @property (nonatomic, strong, nullable) NSNumber *adaptive;
 
+/// Called when the grabber is tapped
+@property (nonatomic, copy, nullable) void (^onTap)(void);
+
 /// Adds the grabber view to a parent view with proper constraints
 - (void)addToView:(UIView *)parentView;
 

package/ios/core/TrueSheetGrabberView.mm

@@ -51,9 +51,11 @@ static const CGFloat kDefaultGrabberTopMargin = 5.0;
 #pragma mark - Setup
 
 - (void)setupView {
-  self.userInteractionEnabled = NO;
   self.clipsToBounds = YES;
 
+  UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap)];
+  [self addGestureRecognizer:tap];
+
   _vibrancyView = [[UIVisualEffectView alloc] initWithEffect:nil];
   _vibrancyView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   [self addSubview:_vibrancyView];
@@ -64,6 +66,14 @@ static const CGFloat kDefaultGrabberTopMargin = 5.0;
   [_vibrancyView.contentView addSubview:_fillView];
 }
 
+#pragma mark - Actions
+
+- (void)handleTap {
+  if (_onTap) {
+    _onTap();
+  }
+}
+
 #pragma mark - Public
 
 - (void)addToView:(UIView *)parentView {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.9.7",
+  "version": "3.9.9",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -185,11 +185,8 @@
       "publish": false
     },
     "hooks": {
-      "before:init": [
-        "yarn tidy",
-        "yarn test"
-      ],
-      "after:bump": "sed -i '' 's/## Unreleased/## Unreleased\\n\\n## ${version}/' CHANGELOG.md && git add CHANGELOG.md"
+      "before:init": "yarn test",
+      "after:bump": "yarn tidy && sed -i '' 's/## Unreleased/## Unreleased\\n\\n## ${version}/' CHANGELOG.md"
     },
     "github": {
       "release": true,