@sdcx/bottom-sheet 0.13.0 → 0.15.0

package/ios/BottomSheet/RNBottomSheet.m

@@ -22,10 +22,13 @@
 @property(nonatomic, strong) CADisplayLink *displayLink;
 @property(nonatomic, strong) RCTEventDispatcher *eventDispatcher;
 
+@property(nonatomic, assign) RNBottomSheetState finalState;
+
 @end
 
 @implementation RNBottomSheet {
     __weak RCTRootContentView *_rootView;
+    BOOL _isInitialRender;
 }
 
 - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher {
@@ -33,7 +36,9 @@
         _panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)];
         _panGestureRecognizer.delegate = self;
         _state = RNBottomSheetStateCollapsed;
+        _finalState = RNBottomSheetStateCollapsed;
         _eventDispatcher = eventDispatcher;
+        _isInitialRender = YES;
     }
     return self;
 }
@@ -162,6 +167,14 @@
         }
         [self dispatchOnSlide:self.contentView.frame.origin.y];
     }
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.finalState == RNBottomSheetStateExpanded && self->_isInitialRender) {
+            [self settleToState:self.finalState withFling:YES];
+        }
+        
+        self->_isInitialRender = NO;
+    });
 }
 
 - (void)calculateOffset {
@@ -171,7 +184,7 @@
 }
 
 - (void)handlePan:(UIPanGestureRecognizer *)pan {
-    if (!self.draggable) {
+    if (!self.draggable || self.state == RNBottomSheetStateSettling) {
         return;
     }
     
@@ -292,15 +305,17 @@
 }
 
 - (void)setState:(RNBottomSheetState)state {
-    if (_state == state) {
+    if (_isInitialRender) {
+        self.finalState = state;
         return;
     }
-
-    if (CGRectEqualToRect(self.contentView.frame, CGRectZero)) {
-        [self setStateInternal:state];
+    
+    if (self.finalState == state) {
         return;
     }
     
+    self.finalState = state;
+
     [self settleToState:state withFling:YES];
 }
 
@@ -320,7 +335,7 @@
     [self startWatchBottomSheetTransition];
     [self.layer removeAllAnimations];
 //    CGFloat duration = fmin(fabs(self.contentView.frame.origin.y - top) / (self.maxY - self.minY) * 0.3, 0.3);
-    [UIView animateWithDuration:fling ? 0.5 : 0.25 delay:0 usingSpringWithDamping:1 initialSpringVelocity:1 options:NULL animations:^{
+    [UIView animateWithDuration:fling ? 0.5 : 0.25 delay:0 usingSpringWithDamping:1 initialSpringVelocity:1 options:UIViewAnimationOptionTransitionNone animations:^{
         self.contentView.frame = CGRectOffset(self.contentView.frame, 0, top - self.contentView.frame.origin.y);
     } completion:^(BOOL finished) {
         self.target.pagingEnabled = NO;
@@ -335,6 +350,18 @@
     }
     _state = state;
     
+    if (state == RNBottomSheetStateExpanded) {
+        [self dispatchOnSlide:self.minY];
+    }
+    
+    if (state == RNBottomSheetStateHidden) {
+        [self dispatchOnSlide:self.frame.size.height];
+    }
+    
+    if (state == RNBottomSheetStateCollapsed) {
+        [self dispatchOnSlide:self.maxY];
+    }
+    
     if (state == RNBottomSheetStateCollapsed || state == RNBottomSheetStateExpanded || state == RNBottomSheetStateHidden) {
         [self.eventDispatcher sendEvent:[[RNBottomSheetStateChangedEvent alloc] initWithViewTag:self.reactTag state:state]];
     }
@@ -356,11 +383,6 @@
 }
 
 - (void)stopWatchBottomSheetTransition {
-    if (self.state == RNBottomSheetStateCollapsed) {
-        [self dispatchOnSlide:self.maxY];
-    } else if (self.state == RNBottomSheetStateExpanded) {
-        [self dispatchOnSlide:self.minY];
-    }
     if(_displayLink){
         [_displayLink invalidate];
         _displayLink = nil;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sdcx/bottom-sheet",
   "description": "A react-native BottomSheet component.",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
   "react-native": "src/index",
@@ -11,6 +11,7 @@
     "lib",
     "android",
     "ios",
+    "docs",
     "RNBottomSheet.podspec",
     "!android/build",
     "!ios/build",