@lodev09/react-native-true-sheet 3.0.1 → 3.0.3

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

@@ -300,10 +300,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
 
     dialog.setOnCancelListener {
+      delegate?.viewControllerWillDismiss()
+
       // Notify parent sheet that it is about to regain focus
       parentSheetView?.viewControllerWillFocus()
-
-      delegate?.viewControllerWillDismiss()
     }
 
     dialog.setOnDismissListener {

package/ios/TrueSheetView.mm

@@ -471,12 +471,12 @@ using namespace facebook::react;
   if (!rootViewController)
     return nil;
 
-  // Find topmost presented view controller
+  // Find topmost presented view controller that is not being dismissed
   while (rootViewController.presentedViewController) {
     UIViewController *presented = rootViewController.presentedViewController;
 
-    // Skip TrueSheetViewController if being dismissed
-    if ([presented isKindOfClass:[TrueSheetViewController class]] && presented.isBeingDismissed) {
+    // Skip any view controller that is being dismissed
+    if (presented.isBeingDismissed) {
       break;
     }
     rootViewController = presented;

package/ios/TrueSheetViewController.mm

@@ -193,19 +193,19 @@
     _isPresented = NO;
     _activeDetentIndex = -1;
 
-    // Notify the parent sheet (if any) that it is about to regain focus
-    if (_parentSheetController) {
-      if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerWillFocus)]) {
-        [_parentSheetController.delegate viewControllerWillFocus];
-      }
+    if ([self.delegate respondsToSelector:@selector(viewControllerWillDismiss)]) {
+      [self.delegate viewControllerWillDismiss];
     }
 
     dispatch_async(dispatch_get_main_queue(), ^{
       [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO];
     });
 
-    if ([self.delegate respondsToSelector:@selector(viewControllerWillDismiss)]) {
-      [self.delegate viewControllerWillDismiss];
+    // Notify the parent sheet (if any) that it is about to regain focus
+    if (_parentSheetController) {
+      if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerWillFocus)]) {
+        [_parentSheetController.delegate viewControllerWillFocus];
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -41,7 +41,7 @@
     "tidy": "yarn typecheck && yarn lint && yarn format && scripts/objclint.sh && scripts/ktlint.sh",
     "clean": "scripts/clean.sh",
     "prepare": "bob build",
-    "release": "release-it",
+    "release": "release-it --only-version",
     "release:beta": "yarn release --preRelease=beta"
   },
   "keywords": [