@sdcx/bottom-sheet 0.10.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/ios/BottomSheet/RNBottomSheet.m +13 -13
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
|
|
5
5
|
它位于屏幕底部，可拖拽，支持嵌套滚动，可以和可滚动视图（`FlatList`, `FlashList`, `WebView` 等等）一起使用。
|
|
6
6
|
|
|
7
|
-
|
|
|
8
|
-
|
|
|
9
|
-
| <img src="
|
|
7
|
+
| | |
|
|
8
|
+
| ---------------------------------------------------- | --------------------------------------------------- |
|
|
9
|
+
| <img src="./docs/assets/scrollview.gif" width="320"> | <img src="./docs/assets/pagerview.gif" width="320"> |
|
|
10
10
|
|
|
11
11
|
## Installation
|
|
12
12
|
|
|
@@ -54,7 +54,7 @@ const App = () => {
|
|
|
54
54
|
|
|
55
55
|
`BottomSheet` 由内外两层视图组成，外层是绝对定位，默认填满父组件，除非设置了 `top` 样式属性，内层也是绝对定位，默认填满外层视图。外层的位置固定不变，内层则可拖动。
|
|
56
56
|
|
|
57
|
-
|
|
58
58
|
|
|
59
59
|
`BottomSheet` 拥有 3 个属性和两个回调。
|
|
60
60
|
|
|
@@ -221,22 +221,22 @@
|
|
|
221
221
|
if (velocity > 400) {
|
|
222
222
|
if (self.target && self.target.contentOffset.y <= 0) {
|
|
223
223
|
//如果是类似轻扫的那种
|
|
224
|
-
[self settleToState:RNBottomSheetStateCollapsed];
|
|
224
|
+
[self settleToState:RNBottomSheetStateCollapsed withFling:YES];
|
|
225
225
|
}
|
|
226
226
|
|
|
227
227
|
if (!self.target) {
|
|
228
228
|
//如果是类似轻扫的那种
|
|
229
|
-
[self settleToState:RNBottomSheetStateCollapsed];
|
|
229
|
+
[self settleToState:RNBottomSheetStateCollapsed withFling:YES];
|
|
230
230
|
}
|
|
231
231
|
} else if (velocity < -400) {
|
|
232
232
|
//如果是类似轻扫的那种
|
|
233
|
-
[self settleToState:RNBottomSheetStateExpanded];
|
|
233
|
+
[self settleToState:RNBottomSheetStateExpanded withFling:YES];
|
|
234
234
|
} else {
|
|
235
235
|
//如果是普通拖拽
|
|
236
236
|
if(fabs(self.contentView.frame.origin.y - self.minY) > fabs(self.contentView.frame.origin.y - self.maxY)) {
|
|
237
|
-
[self settleToState:RNBottomSheetStateCollapsed];
|
|
237
|
+
[self settleToState:RNBottomSheetStateCollapsed withFling:NO];
|
|
238
238
|
} else {
|
|
239
|
-
[self settleToState:RNBottomSheetStateExpanded];
|
|
239
|
+
[self settleToState:RNBottomSheetStateExpanded withFling:NO];
|
|
240
240
|
}
|
|
241
241
|
}
|
|
242
242
|
}
|
|
@@ -283,7 +283,7 @@
|
|
|
283
283
|
if (!CGRectEqualToRect(self.contentView.frame, CGRectZero)) {
|
|
284
284
|
[self calculateOffset];
|
|
285
285
|
if (self.state == RNBottomSheetStateCollapsed) {
|
|
286
|
-
[self settleToState:RNBottomSheetStateCollapsed];
|
|
286
|
+
[self settleToState:RNBottomSheetStateCollapsed withFling:NO];
|
|
287
287
|
}
|
|
288
288
|
}
|
|
289
289
|
}
|
|
@@ -298,26 +298,26 @@
|
|
|
298
298
|
return;
|
|
299
299
|
}
|
|
300
300
|
|
|
301
|
-
[self settleToState:state];
|
|
301
|
+
[self settleToState:state withFling:NO];
|
|
302
302
|
}
|
|
303
303
|
|
|
304
|
-
- (void)settleToState:(RNBottomSheetState)state {
|
|
304
|
+
- (void)settleToState:(RNBottomSheetState)state withFling:(BOOL)fling {
|
|
305
305
|
if (state == RNBottomSheetStateCollapsed) {
|
|
306
|
-
[self startSettlingToState:state top:self.maxY];
|
|
306
|
+
[self startSettlingToState:state top:self.maxY withFling:fling];
|
|
307
307
|
} else if (state == RNBottomSheetStateExpanded) {
|
|
308
|
-
[self startSettlingToState:state top:self.minY];
|
|
308
|
+
[self startSettlingToState:state top:self.minY withFling:fling];
|
|
309
309
|
} else if (state == RNBottomSheetStateHidden) {
|
|
310
|
-
[self startSettlingToState:state top:self.frame.size.height];
|
|
310
|
+
[self startSettlingToState:state top:self.frame.size.height withFling:fling];
|
|
311
311
|
}
|
|
312
312
|
}
|
|
313
313
|
|
|
314
|
-
- (void)startSettlingToState:(RNBottomSheetState)state top:(CGFloat)top {
|
|
314
|
+
- (void)startSettlingToState:(RNBottomSheetState)state top:(CGFloat)top withFling:(BOOL)fling {
|
|
315
315
|
self.target.pagingEnabled = YES;
|
|
316
316
|
[self setStateInternal:RNBottomSheetStateSettling];
|
|
317
317
|
[self startWatchBottomSheetTransition];
|
|
318
318
|
[self.layer removeAllAnimations];
|
|
319
319
|
// CGFloat duration = fmin(fabs(self.contentView.frame.origin.y - top) / (self.maxY - self.minY) * 0.3, 0.3);
|
|
320
|
-
[UIView animateWithDuration:0.25 delay:0 usingSpringWithDamping:1 initialSpringVelocity:
|
|
320
|
+
[UIView animateWithDuration:fling ? 0.5 : 0.25 delay:0 usingSpringWithDamping:1 initialSpringVelocity:1 options:NULL animations:^{
|
|
321
321
|
self.contentView.frame = CGRectOffset(self.contentView.frame, 0, top - self.contentView.frame.origin.y);
|
|
322
322
|
} completion:^(BOOL finished) {
|
|
323
323
|
self.target.pagingEnabled = NO;
|