@nativescript-community/ui-bottomsheet 1.0.0 → 1.0.1
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/CHANGELOG.md +6 -0
- package/index.ios.d.ts +57 -0
- package/index.ios.js +374 -6
- package/index.ios.js.map +1 -1
- package/ios-layout.d.ts +30 -0
- package/ios-layout.js +92 -3
- package/ios-layout.js.map +1 -1
- package/package.json +3 -3
- package/platforms/android/native-api-usage.json +2 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.0.1](https://github.com/nativescript-community/ui-native-components/compare/v1.0.0...v1.0.1) (2026-10-19)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* **android:** complete native-api-usage.json and read R attrs without R ([1a5c054](https://github.com/nativescript-community/ui-native-components/commit/1a5c05442dac31e3bc0277ffc49fb5672bf01705))
|
|
11
|
+
|
|
6
12
|
## 1.0.0 (2026-10-18)
|
|
7
13
|
|
|
8
14
|
### Features
|
package/index.ios.d.ts
CHANGED
|
@@ -34,6 +34,37 @@ declare class OutsideTapTarget extends NSObject {
|
|
|
34
34
|
};
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Catalyst card: a pan on the card moves it between its detents (like the scroll of its content, which is pinned while the card moves),
|
|
39
|
+
* a tap on the grabber goes to the next detent
|
|
40
|
+
*/
|
|
41
|
+
declare class CatalystCardTarget extends NSObject {
|
|
42
|
+
static ObjCProtocols: {
|
|
43
|
+
prototype: UIGestureRecognizerDelegate;
|
|
44
|
+
}[];
|
|
45
|
+
_owner: WeakRef<ViewWithBottomSheet>;
|
|
46
|
+
static initWithOwner(owner: ViewWithBottomSheet): CatalystCardTarget;
|
|
47
|
+
cardPanned(recognizer: UIPanGestureRecognizer): void;
|
|
48
|
+
cardScrolled(recognizer: UIPanGestureRecognizer): void;
|
|
49
|
+
grabberTapped(): void;
|
|
50
|
+
gestureRecognizerShouldBegin(recognizer: UIGestureRecognizer): boolean;
|
|
51
|
+
gestureRecognizerShouldReceiveTouch(recognizer: UIGestureRecognizer, touch: UITouch): boolean;
|
|
52
|
+
gestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer(recognizer: UIGestureRecognizer, other: UIGestureRecognizer): boolean;
|
|
53
|
+
static ObjCExposedMethods: {
|
|
54
|
+
cardPanned: {
|
|
55
|
+
returns: interop.Type<void>;
|
|
56
|
+
params: interop.Type<any>[];
|
|
57
|
+
};
|
|
58
|
+
cardScrolled: {
|
|
59
|
+
returns: interop.Type<void>;
|
|
60
|
+
params: interop.Type<any>[];
|
|
61
|
+
};
|
|
62
|
+
grabberTapped: {
|
|
63
|
+
returns: interop.Type<void>;
|
|
64
|
+
params: any[];
|
|
65
|
+
};
|
|
66
|
+
};
|
|
67
|
+
}
|
|
37
68
|
export declare class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
38
69
|
bottomSheetDelegate: SheetDelegateImpl;
|
|
39
70
|
_detentIds: string[];
|
|
@@ -43,9 +74,35 @@ export declare class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
43
74
|
_outsideTapRecognizer: UITapGestureRecognizer;
|
|
44
75
|
_outsideTapTarget: OutsideTapTarget;
|
|
45
76
|
_outsideTapView: UIView;
|
|
77
|
+
_catalystTarget: CatalystCardTarget;
|
|
78
|
+
_catalystOptions: BottomSheetOptions;
|
|
79
|
+
_catalystPan: {
|
|
80
|
+
startHeight: number;
|
|
81
|
+
scrollView: UIScrollView;
|
|
82
|
+
startOffsetY: number;
|
|
83
|
+
};
|
|
46
84
|
_onOutsideTap(): void;
|
|
47
85
|
bottomSheetController: UIViewController;
|
|
48
86
|
protected _showNativeBottomSheet(parent: View, options: BottomSheetOptions): void;
|
|
87
|
+
private configureCatalystCard;
|
|
88
|
+
private styleCatalystCard;
|
|
89
|
+
_isInCatalystCard(view: UIView): boolean;
|
|
90
|
+
_shouldBeginCatalystPan(recognizer: UIPanGestureRecognizer): boolean;
|
|
91
|
+
private _findCatalystScrollView;
|
|
92
|
+
private _snapCatalystCard;
|
|
93
|
+
/**
|
|
94
|
+
* Moves the card to a visible `height` (dip), from closed to the largest detent, without any layout
|
|
95
|
+
*/
|
|
96
|
+
private _dragCatalystCard;
|
|
97
|
+
_onCatalystPan(recognizer: UIPanGestureRecognizer): void;
|
|
98
|
+
_onCatalystScroll(recognizer: UIPanGestureRecognizer): void;
|
|
99
|
+
private _visibleCatalystHeight;
|
|
100
|
+
/**
|
|
101
|
+
* @returns false when the card cannot be dismissed (it then goes back to a detent)
|
|
102
|
+
*/
|
|
103
|
+
private _dismissCatalystCard;
|
|
104
|
+
private _applyCatalystDetent;
|
|
105
|
+
_cycleCatalystDetent(): void;
|
|
49
106
|
private configureSheet;
|
|
50
107
|
setBottomSheetDetentIndex(index: number, animated?: boolean): void;
|
|
51
108
|
getBottomSheetDetentIndex(): number;
|
package/index.ios.js
CHANGED
|
@@ -1,12 +1,29 @@
|
|
|
1
1
|
import { Application, Page, Trace, Utils, View, fromObject } from '@nativescript/core';
|
|
2
2
|
import { applyMixins } from '@nativescript-community/ui-core';
|
|
3
3
|
import { StateBottomSheet, ViewWithBottomSheetBase } from './index-common';
|
|
4
|
-
import { MDLayoutViewController, getPresentingController } from './ios-layout';
|
|
4
|
+
import { MDLayoutViewController, getCatalystDetentHeights, getPresentingController, setCatalystVisibleHeight } from './ios-layout';
|
|
5
5
|
export { ViewWithBottomSheetBase } from './index-common';
|
|
6
6
|
const majorVersion = Utils.ios.MajorVersion;
|
|
7
7
|
const CONTENT_DETENT = 'content';
|
|
8
8
|
const PEEK_DETENT = 'peek';
|
|
9
9
|
const LARGE_DETENT = 'large';
|
|
10
|
+
// UIKit shows a sheet as a window modal one on Mac Catalyst: the sheet is then a card at the bottom of the window
|
|
11
|
+
// isMacCatalystApp is not always in the runtime metadata: fall back to the KVC key
|
|
12
|
+
function detectCatalyst() {
|
|
13
|
+
const info = NSProcessInfo.processInfo;
|
|
14
|
+
if (typeof info.isMacCatalystApp === 'boolean') {
|
|
15
|
+
return info.isMacCatalystApp;
|
|
16
|
+
}
|
|
17
|
+
try {
|
|
18
|
+
return !!info.valueForKey('macCatalystApp');
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
const isCatalyst = (typeof __CATALYST__ !== 'undefined' && !!__CATALYST__) || detectCatalyst();
|
|
25
|
+
const CATALYST_GRABBER_AREA = { width: 120, height: 24 };
|
|
26
|
+
const CATALYST_SCRIM_ALPHA = 0.32;
|
|
10
27
|
var SheetDelegateImpl = /** @class */ (function (_super) {
|
|
11
28
|
__extends(SheetDelegateImpl, _super);
|
|
12
29
|
function SheetDelegateImpl() {
|
|
@@ -64,6 +81,64 @@ var OutsideTapTarget = /** @class */ (function (_super) {
|
|
|
64
81
|
};
|
|
65
82
|
return OutsideTapTarget;
|
|
66
83
|
}(NSObject));
|
|
84
|
+
var CatalystCardTarget = /** @class */ (function (_super) {
|
|
85
|
+
__extends(CatalystCardTarget, _super);
|
|
86
|
+
function CatalystCardTarget() {
|
|
87
|
+
return _super !== null && _super.apply(this, arguments) || this;
|
|
88
|
+
}
|
|
89
|
+
CatalystCardTarget.initWithOwner = function (owner) {
|
|
90
|
+
var target = CatalystCardTarget.new();
|
|
91
|
+
target._owner = new WeakRef(owner);
|
|
92
|
+
return target;
|
|
93
|
+
};
|
|
94
|
+
CatalystCardTarget.prototype.cardPanned = function (recognizer) {
|
|
95
|
+
var _a;
|
|
96
|
+
(_a = this._owner.get()) === null || _a === void 0 ? void 0 : _a._onCatalystPan(recognizer);
|
|
97
|
+
};
|
|
98
|
+
CatalystCardTarget.prototype.cardScrolled = function (recognizer) {
|
|
99
|
+
var _a;
|
|
100
|
+
(_a = this._owner.get()) === null || _a === void 0 ? void 0 : _a._onCatalystScroll(recognizer);
|
|
101
|
+
};
|
|
102
|
+
CatalystCardTarget.prototype.grabberTapped = function () {
|
|
103
|
+
var _a;
|
|
104
|
+
(_a = this._owner.get()) === null || _a === void 0 ? void 0 : _a._cycleCatalystDetent();
|
|
105
|
+
};
|
|
106
|
+
CatalystCardTarget.prototype.gestureRecognizerShouldBegin = function (recognizer) {
|
|
107
|
+
var _a, _b;
|
|
108
|
+
// the tap outside has this delegate too
|
|
109
|
+
if (!(recognizer instanceof UIPanGestureRecognizer)) {
|
|
110
|
+
return true;
|
|
111
|
+
}
|
|
112
|
+
return (_b = (_a = this._owner.get()) === null || _a === void 0 ? void 0 : _a._shouldBeginCatalystPan(recognizer)) !== null && _b !== void 0 ? _b : false;
|
|
113
|
+
};
|
|
114
|
+
CatalystCardTarget.prototype.gestureRecognizerShouldReceiveTouch = function (recognizer, touch) {
|
|
115
|
+
var _a;
|
|
116
|
+
// the tap outside: not for the touches in the card
|
|
117
|
+
return !(recognizer instanceof UITapGestureRecognizer) || !((_a = this._owner.get()) === null || _a === void 0 ? void 0 : _a._isInCatalystCard(touch.view));
|
|
118
|
+
};
|
|
119
|
+
CatalystCardTarget.prototype.gestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer = function (recognizer, other) {
|
|
120
|
+
// the scrolling of the content runs along, it is pinned while the card moves
|
|
121
|
+
return other.view instanceof UIScrollView;
|
|
122
|
+
};
|
|
123
|
+
CatalystCardTarget.ObjCProtocols = [UIGestureRecognizerDelegate];
|
|
124
|
+
CatalystCardTarget.ObjCExposedMethods = {
|
|
125
|
+
cardPanned: { returns: interop.types.void, params: [interop.types.id] },
|
|
126
|
+
cardScrolled: { returns: interop.types.void, params: [interop.types.id] },
|
|
127
|
+
grabberTapped: { returns: interop.types.void, params: [] }
|
|
128
|
+
};
|
|
129
|
+
return CatalystCardTarget;
|
|
130
|
+
}(NSObject));
|
|
131
|
+
var CatalystPassThroughView = /** @class */ (function (_super) {
|
|
132
|
+
__extends(CatalystPassThroughView, _super);
|
|
133
|
+
function CatalystPassThroughView() {
|
|
134
|
+
return _super !== null && _super.apply(this, arguments) || this;
|
|
135
|
+
}
|
|
136
|
+
CatalystPassThroughView.prototype.hitTestWithEvent = function (point, event) {
|
|
137
|
+
var hit = _super.prototype.hitTestWithEvent.call(this, point, event);
|
|
138
|
+
return hit === this ? null : hit;
|
|
139
|
+
};
|
|
140
|
+
return CatalystPassThroughView;
|
|
141
|
+
}(UIView));
|
|
67
142
|
export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
68
143
|
constructor() {
|
|
69
144
|
super(...arguments);
|
|
@@ -110,6 +185,9 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
110
185
|
controller = MDLayoutViewController.initWithOwner(this);
|
|
111
186
|
controller.ignoreBottomSafeArea = options.ignoreBottomSafeArea !== undefined ? options.ignoreBottomSafeArea : false;
|
|
112
187
|
controller.ignoreTopSafeArea = options.ignoreTopSafeArea !== undefined ? options.ignoreTopSafeArea : true;
|
|
188
|
+
if (isCatalyst && (options.canTouchBehind === true || options.disableDimBackground === true)) {
|
|
189
|
+
controller.view = CatalystPassThroughView.alloc().initWithFrame(controller.view.frame);
|
|
190
|
+
}
|
|
113
191
|
if (nativeView instanceof UIView) {
|
|
114
192
|
controller.view.addSubview(nativeView);
|
|
115
193
|
}
|
|
@@ -117,14 +195,24 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
117
195
|
}
|
|
118
196
|
this._raiseShowingBottomSheetEvent();
|
|
119
197
|
this.bottomSheetController = controller;
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
if (
|
|
123
|
-
|
|
198
|
+
const catalystCard = isCatalyst;
|
|
199
|
+
controller.modalPresentationStyle = catalystCard ? 5 /* UIModalPresentationStyle.OverFullScreen */ : 1 /* UIModalPresentationStyle.PageSheet */;
|
|
200
|
+
if (catalystCard) {
|
|
201
|
+
controller.modalTransitionStyle = 2 /* UIModalTransitionStyle.CrossDissolve */;
|
|
202
|
+
this.configureCatalystCard(controller, options, parentController);
|
|
203
|
+
}
|
|
204
|
+
else {
|
|
205
|
+
const sheet = controller.sheetPresentationController;
|
|
206
|
+
if (sheet) {
|
|
207
|
+
this.configureSheet(sheet, controller, options, parentController);
|
|
208
|
+
}
|
|
124
209
|
}
|
|
125
210
|
controller.nsAnimated = true;
|
|
126
211
|
parentController.presentViewControllerAnimatedCompletion(controller, true, null);
|
|
127
|
-
if (
|
|
212
|
+
if (catalystCard) {
|
|
213
|
+
this.styleCatalystCard(controller, options);
|
|
214
|
+
}
|
|
215
|
+
else if (options.transparent === true) {
|
|
128
216
|
controller.view.backgroundColor = UIColor.clearColor;
|
|
129
217
|
}
|
|
130
218
|
else {
|
|
@@ -147,6 +235,255 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
147
235
|
this._raiseShownBottomSheetEvent();
|
|
148
236
|
}
|
|
149
237
|
}
|
|
238
|
+
configureCatalystCard(controller, options, parentController) {
|
|
239
|
+
this._onDetentChange = options.onDetentChange;
|
|
240
|
+
this._onWillDismiss = options.onWillDismiss;
|
|
241
|
+
this._onDismissAttempt = options.onDismissAttempt;
|
|
242
|
+
this._catalystOptions = options;
|
|
243
|
+
let detents = options.detents;
|
|
244
|
+
if (!detents?.length) {
|
|
245
|
+
detents = options.peekHeight && options.skipCollapsedState !== true ? [options.peekHeight, CONTENT_DETENT] : [CONTENT_DETENT];
|
|
246
|
+
}
|
|
247
|
+
const card = { detents, index: Math.min(options.initialDetentIndex || 0, detents.length - 1) };
|
|
248
|
+
controller.catalystCard = card;
|
|
249
|
+
this._catalystTarget = CatalystCardTarget.initWithOwner(this);
|
|
250
|
+
const nativeView = this.nativeViewProtected;
|
|
251
|
+
if (nativeView instanceof UIView) {
|
|
252
|
+
const pan = UIPanGestureRecognizer.alloc().initWithTargetAction(this._catalystTarget, 'cardPanned');
|
|
253
|
+
pan.delegate = this._catalystTarget;
|
|
254
|
+
nativeView.addGestureRecognizer(pan);
|
|
255
|
+
// the wheel and the trackpad: the card opens first, then the content scrolls. They never close it
|
|
256
|
+
const scroll = UIPanGestureRecognizer.alloc().initWithTargetAction(this._catalystTarget, 'cardScrolled');
|
|
257
|
+
scroll.delegate = this._catalystTarget;
|
|
258
|
+
scroll.allowedTouchTypes = NSArray.arrayWithArray([]);
|
|
259
|
+
scroll.allowedScrollTypesMask = 3 /* UIScrollTypeMask.All */;
|
|
260
|
+
nativeView.addGestureRecognizer(scroll);
|
|
261
|
+
}
|
|
262
|
+
if (options.transparent !== true && options.grabber !== false) {
|
|
263
|
+
const area = UIView.alloc().initWithFrame(CGRectMake(0, 0, CATALYST_GRABBER_AREA.width, CATALYST_GRABBER_AREA.height));
|
|
264
|
+
const grabber = UIView.alloc().initWithFrame(CGRectMake((CATALYST_GRABBER_AREA.width - 36) / 2, 6, 36, 5));
|
|
265
|
+
grabber.backgroundColor = UIColor.tertiaryLabelColor;
|
|
266
|
+
grabber.layer.cornerRadius = 2.5;
|
|
267
|
+
area.addSubview(grabber);
|
|
268
|
+
area.addGestureRecognizer(UITapGestureRecognizer.alloc().initWithTargetAction(this._catalystTarget, 'grabberTapped'));
|
|
269
|
+
controller.view.addSubview(area);
|
|
270
|
+
card.grabberArea = area;
|
|
271
|
+
}
|
|
272
|
+
if (options.canTouchBehind === true || options.disableDimBackground === true) {
|
|
273
|
+
if (options.canTouchBehind !== true && options.dismissOnBackgroundTap !== false) {
|
|
274
|
+
// no scrim to tap: a recognizer on the content behind closes the sheet and keeps the touch from it
|
|
275
|
+
const view = parentController?.view;
|
|
276
|
+
if (view) {
|
|
277
|
+
this._outsideTapTarget = OutsideTapTarget.initWithOwner(this);
|
|
278
|
+
this._outsideTapRecognizer = UITapGestureRecognizer.alloc().initWithTargetAction(this._outsideTapTarget, 'outsideTapped');
|
|
279
|
+
this._outsideTapRecognizer.cancelsTouchesInView = true;
|
|
280
|
+
view.addGestureRecognizer(this._outsideTapRecognizer);
|
|
281
|
+
this._outsideTapView = view;
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
else if (options.dismissOnBackgroundTap !== false) {
|
|
286
|
+
this._outsideTapTarget = OutsideTapTarget.initWithOwner(this);
|
|
287
|
+
this._outsideTapRecognizer = UITapGestureRecognizer.alloc().initWithTargetAction(this._outsideTapTarget, 'outsideTapped');
|
|
288
|
+
this._outsideTapRecognizer.delegate = this._catalystTarget;
|
|
289
|
+
controller.view.addGestureRecognizer(this._outsideTapRecognizer);
|
|
290
|
+
this._outsideTapView = controller.view;
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
styleCatalystCard(controller, options) {
|
|
294
|
+
const dimmed = options.transparent !== true && options.canTouchBehind !== true && options.disableDimBackground !== true;
|
|
295
|
+
controller.view.backgroundColor = dimmed ? UIColor.blackColor.colorWithAlphaComponent(CATALYST_SCRIM_ALPHA) : UIColor.clearColor;
|
|
296
|
+
const nativeView = this.nativeViewProtected;
|
|
297
|
+
if (options.transparent === true || !(nativeView instanceof UIView)) {
|
|
298
|
+
return;
|
|
299
|
+
}
|
|
300
|
+
nativeView.backgroundColor = UIColor.systemBackgroundColor;
|
|
301
|
+
if (options.backgroundOpacity) {
|
|
302
|
+
nativeView.backgroundColor = nativeView.backgroundColor.colorWithAlphaComponent(options.backgroundOpacity);
|
|
303
|
+
}
|
|
304
|
+
nativeView.layer.cornerRadius = options.cornerRadius ?? 16;
|
|
305
|
+
// top corners only
|
|
306
|
+
nativeView.layer.maskedCorners = 1 /* CACornerMask.kCALayerMinXMinYCorner */ | 2 /* CACornerMask.kCALayerMaxXMinYCorner */;
|
|
307
|
+
nativeView.clipsToBounds = true;
|
|
308
|
+
}
|
|
309
|
+
_isInCatalystCard(view) {
|
|
310
|
+
const card = this.bottomSheetController?.catalystCard;
|
|
311
|
+
const nativeView = this.nativeViewProtected;
|
|
312
|
+
return !!view && ((nativeView instanceof UIView && view.isDescendantOfView(nativeView)) || (!!card?.grabberArea && view.isDescendantOfView(card.grabberArea)));
|
|
313
|
+
}
|
|
314
|
+
_shouldBeginCatalystPan(recognizer) {
|
|
315
|
+
const card = this.bottomSheetController?.catalystCard;
|
|
316
|
+
if (!card) {
|
|
317
|
+
return false;
|
|
318
|
+
}
|
|
319
|
+
if (recognizer.allowedScrollTypesMask) {
|
|
320
|
+
// the wheel: only to open the card
|
|
321
|
+
return card.index < card.detents.length - 1;
|
|
322
|
+
}
|
|
323
|
+
const velocity = recognizer.velocityInView(recognizer.view);
|
|
324
|
+
// the velocity is often still 0 here with a mouse: _onCatalystPan then leaves to the content what it must scroll
|
|
325
|
+
return velocity.x === 0 && velocity.y === 0 ? true : Math.abs(velocity.y) > Math.abs(velocity.x);
|
|
326
|
+
}
|
|
327
|
+
_findCatalystScrollView(recognizer) {
|
|
328
|
+
const cardView = recognizer.view;
|
|
329
|
+
let view = cardView.hitTestWithEvent(recognizer.locationInView(cardView), null);
|
|
330
|
+
while (view && view !== cardView) {
|
|
331
|
+
if (view instanceof UIScrollView) {
|
|
332
|
+
return view;
|
|
333
|
+
}
|
|
334
|
+
view = view.superview;
|
|
335
|
+
}
|
|
336
|
+
return null;
|
|
337
|
+
}
|
|
338
|
+
_snapCatalystCard(card, velocity) {
|
|
339
|
+
const toDip = (value) => Utils.layout.toDeviceIndependentPixels(value);
|
|
340
|
+
const heights = getCatalystDetentHeights(card).map(toDip);
|
|
341
|
+
const lowest = Math.min(...heights);
|
|
342
|
+
const projected = toDip(card.dragHeight ?? card.height) - velocity * 0.15;
|
|
343
|
+
if (projected < lowest * 0.6 && this._dismissCatalystCard()) {
|
|
344
|
+
return;
|
|
345
|
+
}
|
|
346
|
+
let index = 0;
|
|
347
|
+
heights.forEach((height, heightIndex) => {
|
|
348
|
+
if (Math.abs(height - projected) < Math.abs(heights[index] - projected)) {
|
|
349
|
+
index = heightIndex;
|
|
350
|
+
}
|
|
351
|
+
});
|
|
352
|
+
this._applyCatalystDetent(index, true);
|
|
353
|
+
}
|
|
354
|
+
/**
|
|
355
|
+
* Moves the card to a visible `height` (dip), from closed to the largest detent, without any layout
|
|
356
|
+
*/
|
|
357
|
+
_dragCatalystCard(card, height) {
|
|
358
|
+
const toPx = (value) => Utils.layout.toDevicePixels(value);
|
|
359
|
+
const clamped = Math.min(card.height, Math.max(0, toPx(height)));
|
|
360
|
+
card.dragHeight = clamped;
|
|
361
|
+
const nativeView = this.nativeViewProtected;
|
|
362
|
+
if (nativeView instanceof UIView) {
|
|
363
|
+
setCatalystVisibleHeight(card, nativeView, clamped);
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
_onCatalystPan(recognizer) {
|
|
367
|
+
const card = this.bottomSheetController?.catalystCard;
|
|
368
|
+
if (!card) {
|
|
369
|
+
return;
|
|
370
|
+
}
|
|
371
|
+
const toDip = (value) => Utils.layout.toDeviceIndependentPixels(value);
|
|
372
|
+
if (recognizer.state === 1 /* UIGestureRecognizerState.Began */) {
|
|
373
|
+
const scrollView = this._findCatalystScrollView(recognizer);
|
|
374
|
+
this._catalystPan = { startHeight: toDip(card.dragHeight ?? this._visibleCatalystHeight(card)), scrollView, startOffsetY: scrollView ? scrollView.contentOffset.y : 0 };
|
|
375
|
+
return;
|
|
376
|
+
}
|
|
377
|
+
const pan = this._catalystPan;
|
|
378
|
+
if (!pan) {
|
|
379
|
+
return;
|
|
380
|
+
}
|
|
381
|
+
if (recognizer.state === 2 /* UIGestureRecognizerState.Changed */) {
|
|
382
|
+
const translation = recognizer.translationInView(recognizer.view).y;
|
|
383
|
+
const scrollView = pan.scrollView;
|
|
384
|
+
const maxHeight = toDip(card.height);
|
|
385
|
+
const currentHeight = toDip(card.dragHeight ?? this._visibleCatalystHeight(card));
|
|
386
|
+
const contentAtTop = !scrollView || scrollView.contentOffset.y <= -scrollView.adjustedContentInset.top + 1;
|
|
387
|
+
if ((translation < 0 && currentHeight >= maxHeight - 0.5) || (translation > 0 && !contentAtTop)) {
|
|
388
|
+
// the content scrolls: the card closes only once the content is back at its top
|
|
389
|
+
pan.startHeight = currentHeight;
|
|
390
|
+
recognizer.setTranslationInView(CGPointMake(0, 0), recognizer.view);
|
|
391
|
+
return;
|
|
392
|
+
}
|
|
393
|
+
this._dragCatalystCard(card, pan.startHeight - translation);
|
|
394
|
+
if (scrollView && toDip(card.dragHeight) < maxHeight) {
|
|
395
|
+
scrollView.contentOffset = CGPointMake(scrollView.contentOffset.x, pan.startOffsetY);
|
|
396
|
+
}
|
|
397
|
+
return;
|
|
398
|
+
}
|
|
399
|
+
this._catalystPan = null;
|
|
400
|
+
this._snapCatalystCard(card, recognizer.velocityInView(recognizer.view).y);
|
|
401
|
+
}
|
|
402
|
+
_onCatalystScroll(recognizer) {
|
|
403
|
+
const card = this.bottomSheetController?.catalystCard;
|
|
404
|
+
if (!card) {
|
|
405
|
+
return;
|
|
406
|
+
}
|
|
407
|
+
const toDip = (value) => Utils.layout.toDeviceIndependentPixels(value);
|
|
408
|
+
if (recognizer.state === 1 /* UIGestureRecognizerState.Began */) {
|
|
409
|
+
this._catalystPan = { startHeight: 0, scrollView: this._findCatalystScrollView(recognizer), startOffsetY: 0 };
|
|
410
|
+
this._catalystPan.startOffsetY = this._catalystPan.scrollView ? this._catalystPan.scrollView.contentOffset.y : 0;
|
|
411
|
+
return;
|
|
412
|
+
}
|
|
413
|
+
const pan = this._catalystPan;
|
|
414
|
+
if (!pan) {
|
|
415
|
+
return;
|
|
416
|
+
}
|
|
417
|
+
if (recognizer.state === 2 /* UIGestureRecognizerState.Changed */) {
|
|
418
|
+
const delta = recognizer.translationInView(recognizer.view).y;
|
|
419
|
+
recognizer.setTranslationInView(CGPointMake(0, 0), recognizer.view);
|
|
420
|
+
// content moving up = scrolling to its end: the card opens first
|
|
421
|
+
if (delta < 0 && toDip(card.dragHeight ?? this._visibleCatalystHeight(card)) < toDip(card.height) - 0.5) {
|
|
422
|
+
this._dragCatalystCard(card, toDip(card.dragHeight ?? this._visibleCatalystHeight(card)) - delta);
|
|
423
|
+
if (pan.scrollView) {
|
|
424
|
+
pan.scrollView.contentOffset = CGPointMake(pan.scrollView.contentOffset.x, pan.startOffsetY);
|
|
425
|
+
}
|
|
426
|
+
}
|
|
427
|
+
return;
|
|
428
|
+
}
|
|
429
|
+
this._catalystPan = null;
|
|
430
|
+
if (card.dragHeight !== undefined) {
|
|
431
|
+
this._snapCatalystCard(card, 0);
|
|
432
|
+
}
|
|
433
|
+
}
|
|
434
|
+
_visibleCatalystHeight(card) {
|
|
435
|
+
return getCatalystDetentHeights(card)[Math.min(card.index, card.detents.length - 1)] || card.height;
|
|
436
|
+
}
|
|
437
|
+
/**
|
|
438
|
+
* @returns false when the card cannot be dismissed (it then goes back to a detent)
|
|
439
|
+
*/
|
|
440
|
+
_dismissCatalystCard() {
|
|
441
|
+
if (this._catalystOptions?.dismissOnDraggingDownSheet === false) {
|
|
442
|
+
return false;
|
|
443
|
+
}
|
|
444
|
+
if (this._onWillDismiss?.() === false) {
|
|
445
|
+
this._onDismissAttempt?.();
|
|
446
|
+
return false;
|
|
447
|
+
}
|
|
448
|
+
this.closeBottomSheet();
|
|
449
|
+
return true;
|
|
450
|
+
}
|
|
451
|
+
_applyCatalystDetent(index, animated) {
|
|
452
|
+
const controller = this.bottomSheetController;
|
|
453
|
+
const card = controller?.catalystCard;
|
|
454
|
+
if (!card) {
|
|
455
|
+
return;
|
|
456
|
+
}
|
|
457
|
+
const changed = index !== card.index;
|
|
458
|
+
card.index = index;
|
|
459
|
+
card.dragHeight = undefined;
|
|
460
|
+
const nativeView = this.nativeViewProtected;
|
|
461
|
+
const apply = () => {
|
|
462
|
+
if (nativeView instanceof UIView) {
|
|
463
|
+
setCatalystVisibleHeight(card, nativeView, this._visibleCatalystHeight(card));
|
|
464
|
+
}
|
|
465
|
+
};
|
|
466
|
+
if (animated) {
|
|
467
|
+
// a layout during the animation must not set the final position before it
|
|
468
|
+
card.animating = true;
|
|
469
|
+
UIView.animateWithDurationDelayOptionsAnimationsCompletion(0.25, 0, 131072 /* UIViewAnimationOptions.CurveEaseOut */ | 4 /* UIViewAnimationOptions.BeginFromCurrentState */, apply, () => {
|
|
470
|
+
card.animating = false;
|
|
471
|
+
});
|
|
472
|
+
}
|
|
473
|
+
else {
|
|
474
|
+
apply();
|
|
475
|
+
}
|
|
476
|
+
if (changed) {
|
|
477
|
+
this._onChangeStateBottomSheetCallback?.(index === 0 ? StateBottomSheet.COLLAPSED : StateBottomSheet.EXPANDED);
|
|
478
|
+
this._onDetentChange?.(index);
|
|
479
|
+
}
|
|
480
|
+
}
|
|
481
|
+
_cycleCatalystDetent() {
|
|
482
|
+
const card = this.bottomSheetController?.catalystCard;
|
|
483
|
+
if (card && card.detents.length > 1) {
|
|
484
|
+
this.setBottomSheetDetentIndex((card.index + 1) % card.detents.length);
|
|
485
|
+
}
|
|
486
|
+
}
|
|
150
487
|
configureSheet(sheet, controller, options, parentController) {
|
|
151
488
|
const large = UISheetPresentationControllerDetent.largeDetent();
|
|
152
489
|
const detentIds = [];
|
|
@@ -242,6 +579,14 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
242
579
|
sheet.delegate = this.bottomSheetDelegate;
|
|
243
580
|
}
|
|
244
581
|
setBottomSheetDetentIndex(index, animated = true) {
|
|
582
|
+
const controller = this.bottomSheetController;
|
|
583
|
+
const card = controller?.catalystCard;
|
|
584
|
+
if (card) {
|
|
585
|
+
if (index >= 0 && index < card.detents.length) {
|
|
586
|
+
this._applyCatalystDetent(index, animated);
|
|
587
|
+
}
|
|
588
|
+
return;
|
|
589
|
+
}
|
|
245
590
|
const sheet = this.bottomSheetController?.sheetPresentationController;
|
|
246
591
|
const id = this._detentIds[index];
|
|
247
592
|
if (!sheet || !id) {
|
|
@@ -253,6 +598,10 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
253
598
|
animated ? sheet.animateChanges(apply) : apply();
|
|
254
599
|
}
|
|
255
600
|
getBottomSheetDetentIndex() {
|
|
601
|
+
const card = this.bottomSheetController?.catalystCard;
|
|
602
|
+
if (card) {
|
|
603
|
+
return card.index;
|
|
604
|
+
}
|
|
256
605
|
const sheet = this.bottomSheetController?.sheetPresentationController;
|
|
257
606
|
return sheet ? this._detentIds.indexOf(sheet.selectedDetentIdentifier) : -1;
|
|
258
607
|
}
|
|
@@ -264,9 +613,13 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
264
613
|
sheet.delegate = null;
|
|
265
614
|
}
|
|
266
615
|
this.bottomSheetController.onLayoutCallback = null;
|
|
616
|
+
this.bottomSheetController.catalystCard = null;
|
|
267
617
|
this.bottomSheetController = null;
|
|
268
618
|
}
|
|
269
619
|
this.bottomSheetDelegate = null;
|
|
620
|
+
this._catalystTarget = null;
|
|
621
|
+
this._catalystPan = null;
|
|
622
|
+
this._catalystOptions = null;
|
|
270
623
|
if (this._outsideTapRecognizer) {
|
|
271
624
|
this._outsideTapView?.removeGestureRecognizer(this._outsideTapRecognizer);
|
|
272
625
|
this._outsideTapRecognizer = null;
|
|
@@ -288,6 +641,21 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
288
641
|
}
|
|
289
642
|
const parentController = getPresentingController(parent);
|
|
290
643
|
const animated = this.viewController.nsAnimated;
|
|
644
|
+
const controller = this.bottomSheetController;
|
|
645
|
+
const nativeView = this.nativeViewProtected;
|
|
646
|
+
const card = controller?.catalystCard;
|
|
647
|
+
if (card && animated && nativeView instanceof UIView) {
|
|
648
|
+
// slide out, the scrim fades along
|
|
649
|
+
const offset = CGAffineTransformMakeTranslation(0, Utils.layout.toDeviceIndependentPixels(card.height + 40));
|
|
650
|
+
// no layout may move the card back before it slides out
|
|
651
|
+
card.animating = true;
|
|
652
|
+
UIView.animateWithDurationDelayOptionsAnimationsCompletion(0.25, 0, 65536 /* UIViewAnimationOptions.CurveEaseIn */ | 4 /* UIViewAnimationOptions.BeginFromCurrentState */, () => {
|
|
653
|
+
nativeView.transform = offset;
|
|
654
|
+
card.grabberArea && (card.grabberArea.transform = offset);
|
|
655
|
+
controller.view.backgroundColor = UIColor.clearColor;
|
|
656
|
+
}, () => parentController.dismissViewControllerAnimatedCompletion(false, whenClosedCallback));
|
|
657
|
+
return;
|
|
658
|
+
}
|
|
291
659
|
parentController.dismissViewControllerAnimatedCompletion(animated, whenClosedCallback);
|
|
292
660
|
}
|
|
293
661
|
_unloadBottomSheet() {
|
package/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../src/ui-bottomsheet/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAA2B,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAExG,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC;AAC5C,MAAM,cAAc,GAAG,SAAS,CAAC;AACjC,MAAM,WAAW,GAAG,MAAM,CAAC;AAC3B,MAAM,YAAY,GAAG,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6D7B,MAAM,OAAO,mBAAoB,SAAQ,uBAAuB;IAAhE;;QAEI,eAAU,GAAa,EAAE,CAAC;IAiP9B,CAAC;IAzOG,aAAa;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;QACtE,MAAM,UAAU,GAAG,KAAK,EAAE,+BAA+B,CAAC;QAC1D,iEAAiE;QACjE,IAAI,UAAU,IAAI,KAAK,CAAC,wBAAwB,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/J,OAAO;QACX,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC3B,OAAO;QACX,CAAC;QACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAES,sBAAsB,CAAC,MAAY,EAAE,OAA2B;QACtE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;QACxC,IAAI,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,QAAQ,GAAG,QAAQ,CAAC,MAAa,CAAC;QACtC,CAAC;QACD,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC;QAC1C,WAAW,GAAG,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC;QAC/C,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1D,KAAK,CAAC,KAAK,CAAC,kDAAkD,EAAE,KAAK,CAAC,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACzH,OAAO;QACX,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;QAExC,8FAA8F;QAC9F,wFAAwF;QACxF,gEAAgE;QAChE,MAAM,4BAA4B,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC;QAC5E,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QACrD,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,4BAA4B,CAAC;QAEtE,IAAI,CAAC,4BAA4B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACxD,IAAI,UAAU,GAA4B,IAAI,CAAC,cAAc,CAAC;QAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,mBAAmB,CAAC;YACxD,UAAU,GAAG,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACxD,UAAU,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC;YACpH,UAAU,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC;YAC1G,IAAI,UAAU,YAAY,MAAM,EAAE,CAAC;gBAC/B,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC3C,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,CAAC,0EAA0E;QAChH,CAAC;QAED,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACrC,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAC;QACxC,UAAU,CAAC,sBAAsB,6CAAqC,CAAC;QACvE,MAAM,KAAK,GAAG,UAAU,CAAC,2BAA2B,CAAC;QACrD,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACtE,CAAC;QACD,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC;QAC7B,gBAAgB,CAAC,uCAAuC,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACjF,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC/B,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;gBAC1B,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC;YACpE,CAAC;YACD,IAAI,OAAO,CAAC,iBAAiB,IAAI,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC/D,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACzH,CAAC;QACL,CAAC;QACD,MAAM,qBAAqB,GAAG,UAAU,CAAC,qBAAqB,CAAC;QAC/D,IAAI,qBAAqB,EAAE,CAAC;YACxB,qCAAqC,CAAC,SAAS,CAAC,oCAAoC,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,EAAE,GAAG,EAAE;gBACxH,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAClD,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACvC,CAAC,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACvC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,KAAoC,EAAE,UAAmC,EAAE,OAA2B,EAAE,gBAAkC;QAC7J,MAAM,KAAK,GAAG,mCAAmC,CAAC,WAAW,EAAE,CAAC;QAChE,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;QAC9C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAClD,IAAI,YAAY,IAAI,EAAE,EAAE,CAAC;YACrB,iFAAiF;YACjF,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;YAChH,MAAM,OAAO,GAA0C,EAAE,CAAC;YAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;YACtC,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC1B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBACtC,MAAM,EAAE,GAAG,UAAU,KAAK,EAAE,CAAC;oBAC7B,OAAO,CAAC,IAAI,CACR,mCAAmC,CAAC,kCAAkC,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE;wBACnF,MAAM,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC;wBACvC,IAAI,MAAc,CAAC;wBACnB,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;4BACrB,MAAM,GAAG,GAAG,CAAC;wBACjB,CAAC;6BAAM,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;4BAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC;wBACrB,CAAC;6BAAM,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;4BAC9B,MAAM,GAAG,aAAa,EAAE,IAAI,GAAG,CAAC;wBACpC,CAAC;6BAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;4BACpC,MAAM,GAAG,MAAM,CAAC;wBACpB,CAAC;6BAAM,CAAC;4BACJ,MAAM,GAAG,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC;wBACnC,CAAC;wBACD,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;oBACjC,CAAC,CAAC,CACL,CAAC;oBACF,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;YACP,CAAC;iBAAM,IAAI,UAAU,IAAI,OAAO,CAAC,kBAAkB,KAAK,IAAI,EAAE,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,mCAAmC,CAAC,kCAAkC,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBACjK,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChC,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC3B,OAAO,CAAC,IAAI,CACR,mCAAmC,CAAC,kCAAkC,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;oBAC/F,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;oBAC/B,OAAO,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;gBAClG,CAAC,CAAC,CACL,CAAC;gBACF,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,CAAC;YACD,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,OAAc,CAAC,CAAC;YACvD,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC1B,KAAK,CAAC,wBAAwB,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YAChH,CAAC;YACD,iDAAiD;YACjD,UAAU,CAAC,gBAAgB,GAAG,GAAG,EAAE;gBAC/B,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC9B,CAAC,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,8BAA8B;YAC9B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,mCAAmC,CAAC,YAAY,EAAE,EAAE,KAAK,CAAQ,CAAC,CAAC;YACvK,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,qBAAqB,GAAG,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC;QACxD,KAAK,CAAC,yCAAyC,GAAG,OAAO,CAAC,aAAa,KAAK,KAAK,CAAC;QAClF,KAAK,CAAC,kCAAkC,GAAG,OAAO,CAAC,2BAA2B,KAAK,IAAI,CAAC;QACxF,KAAK,CAAC,gDAAgD,GAAG,IAAI,CAAC;QAC9D,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACrC,KAAK,CAAC,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;QACvD,CAAC;QACD,IAAI,OAAO,CAAC,0BAA0B,KAAK,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACpG,KAAK,CAAC,+BAA+B,GAAG,SAAS,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;YACtF,IAAI,OAAO,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,CAAC,sBAAsB,KAAK,KAAK,EAAE,CAAC;gBAC9E,sEAAsE;gBACtE,MAAM,IAAI,GAAG,gBAAgB,EAAE,IAAI,CAAC;gBACpC,IAAI,IAAI,EAAE,CAAC;oBACP,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBAC9D,IAAI,CAAC,qBAAqB,GAAG,sBAAsB,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;oBAC1H,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,GAAG,IAAI,CAAC;oBACvD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;oBACtD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;gBAChC,CAAC;YACL,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;YAClF,+EAA+E;YAC/E,KAAK,CAAC,+BAA+B,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,OAAO,CAAC,sBAAsB,KAAK,KAAK,IAAI,OAAO,CAAC,0BAA0B,KAAK,KAAK,EAAE,CAAC;YAC3F,UAAU,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,mBAAmB,GAAG,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC;IAC9C,CAAC;IAED,yBAAyB,CAAC,KAAa,EAAE,QAAQ,GAAG,IAAI;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;QACtE,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QACD,MAAM,KAAK,GAAG,GAAG,EAAE;YACf,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC;QACxC,CAAC,CAAC;QACF,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IACrD,CAAC;IAED,yBAAyB;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;QACtE,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,kBAAkB;QACd,2CAA2C;QAC3C,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAAC;YACrE,IAAI,KAAK,EAAE,CAAC;gBACR,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC1B,CAAC;YACA,IAAI,CAAC,qBAAiD,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAChF,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,eAAe,EAAE,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAC1E,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;YAClC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,uEAAuE;QACvE,4FAA4F;QAC5F,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC/B,CAAC;IACS,sBAAsB,CAAC,MAAY,EAAE,kBAA8B;QACzE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,yDAAyD;YACzD,kBAAkB,EAAE,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QACD,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;QAChD,gBAAgB,CAAC,uCAAuC,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAC3F,CAAC;IAED,kBAAkB;QACd,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,6BAA6B,IAAI,IAAI,CAAC,6BAA6B,EAAE,CAAC;IAC/E,CAAC;CACJ;AAED,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,UAAU,mBAAmB;IAC/B,WAAW,CAAC,IAAI,EAAE,CAAC,uBAAuB,EAAE,mBAAmB,CAAC,CAAC,CAAC;AACtE,CAAC;AACD,MAAM,UAAU,OAAO;IACnB,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,cAAc,GAAG,IAAI,CAAC;QACtB,mBAAmB,EAAE,CAAC;IAC1B,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../src/ui-bottomsheet/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAyC,sBAAsB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE1K,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC;AAC5C,MAAM,cAAc,GAAG,SAAS,CAAC;AACjC,MAAM,WAAW,GAAG,MAAM,CAAC;AAC3B,MAAM,YAAY,GAAG,OAAO,CAAC;AAC7B,kHAAkH;AAClH,mFAAmF;AACnF,SAAS,cAAc;IACnB,MAAM,IAAI,GAAG,aAAa,CAAC,WAA6D,CAAC;IACzF,IAAI,OAAO,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IACD,IAAI,CAAC;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC;AAGD,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,KAAK,WAAW,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,cAAc,EAAE,CAAC;AAC/F,MAAM,qBAAqB,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;AACzD,MAAM,oBAAoB,GAAG,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoHlC,MAAM,OAAO,mBAAoB,SAAQ,uBAAuB;IAAhE;;QAEI,eAAU,GAAa,EAAE,CAAC;IA8iB9B,CAAC;IAniBG,aAAa;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;QACtE,MAAM,UAAU,GAAG,KAAK,EAAE,+BAA+B,CAAC;QAC1D,iEAAiE;QACjE,IAAI,UAAU,IAAI,KAAK,CAAC,wBAAwB,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/J,OAAO;QACX,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC3B,OAAO;QACX,CAAC;QACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAES,sBAAsB,CAAC,MAAY,EAAE,OAA2B;QACtE,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;QACxC,IAAI,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,QAAQ,GAAG,QAAQ,CAAC,MAAa,CAAC;QACtC,CAAC;QACD,IAAI,WAAW,GAAG,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC;QAC1C,WAAW,GAAG,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC;QAC/C,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1D,KAAK,CAAC,KAAK,CAAC,kDAAkD,EAAE,KAAK,CAAC,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACzH,OAAO;QACX,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;QAExC,8FAA8F;QAC9F,wFAAwF;QACxF,gEAAgE;QAChE,MAAM,4BAA4B,GAAG,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC;QAC5E,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;QACrD,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,0BAA0B,GAAG,4BAA4B,CAAC;QAEtE,IAAI,CAAC,4BAA4B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACxD,IAAI,UAAU,GAA4B,IAAI,CAAC,cAAc,CAAC;QAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,mBAAmB,CAAC;YACxD,UAAU,GAAG,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACxD,UAAU,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC;YACpH,UAAU,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC;YAC1G,IAAI,UAAU,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,CAAC,oBAAoB,KAAK,IAAI,CAAC,EAAE,CAAC;gBAC3F,UAAU,CAAC,IAAI,GAAG,uBAAuB,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3F,CAAC;YACD,IAAI,UAAU,YAAY,MAAM,EAAE,CAAC;gBAC/B,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC3C,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,CAAC,0EAA0E;QAChH,CAAC;QAED,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACrC,IAAI,CAAC,qBAAqB,GAAG,UAAU,CAAC;QACxC,MAAM,YAAY,GAAG,UAAU,CAAC;QAChC,UAAU,CAAC,sBAAsB,GAAG,YAAY,CAAC,CAAC,iDAAyC,CAAC,2CAAmC,CAAC;QAChI,IAAI,YAAY,EAAE,CAAC;YACf,UAAU,CAAC,oBAAoB,+CAAuC,CAAC;YACvE,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACtE,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,GAAG,UAAU,CAAC,2BAA2B,CAAC;YACrD,IAAI,KAAK,EAAE,CAAC;gBACR,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;YACtE,CAAC;QACL,CAAC;QACD,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC;QAC7B,gBAAgB,CAAC,uCAAuC,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACjF,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YACtC,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;gBAC1B,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC;YACpE,CAAC;YACD,IAAI,OAAO,CAAC,iBAAiB,IAAI,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC/D,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACzH,CAAC;QACL,CAAC;QACD,MAAM,qBAAqB,GAAG,UAAU,CAAC,qBAAqB,CAAC;QAC/D,IAAI,qBAAqB,EAAE,CAAC;YACxB,qCAAqC,CAAC,SAAS,CAAC,oCAAoC,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,EAAE,GAAG,EAAE;gBACxH,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAClD,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACvC,CAAC,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACvC,CAAC;IACL,CAAC;IAEO,qBAAqB,CAAC,UAAmC,EAAE,OAA2B,EAAE,gBAAkC;QAC9H,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;QAC9C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAClD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAChC,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YACnB,OAAO,GAAG,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,kBAAkB,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;QAClI,CAAC;QACD,MAAM,IAAI,GAAiB,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;QAC7G,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,kBAAkB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,mBAA6B,CAAC;QACtD,IAAI,UAAU,YAAY,MAAM,EAAE,CAAC;YAC/B,MAAM,GAAG,GAAG,sBAAsB,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;YACpG,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACrC,kGAAkG;YAClG,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;YACzG,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACvC,MAAM,CAAC,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YACtD,MAAM,CAAC,sBAAsB,+BAAuB,CAAC;YACrD,UAAU,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,qBAAqB,CAAC,KAAK,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;YACvH,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,qBAAqB,CAAC,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3G,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;YACrD,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,GAAG,CAAC;YACjC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACzB,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;YACtH,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,OAAO,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;YAC3E,IAAI,OAAO,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,CAAC,sBAAsB,KAAK,KAAK,EAAE,CAAC;gBAC9E,mGAAmG;gBACnG,MAAM,IAAI,GAAG,gBAAgB,EAAE,IAAI,CAAC;gBACpC,IAAI,IAAI,EAAE,CAAC;oBACP,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBAC9D,IAAI,CAAC,qBAAqB,GAAG,sBAAsB,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;oBAC1H,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,GAAG,IAAI,CAAC;oBACvD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;oBACtD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;gBAChC,CAAC;YACL,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,CAAC,sBAAsB,KAAK,KAAK,EAAE,CAAC;YAClD,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC9D,IAAI,CAAC,qBAAqB,GAAG,sBAAsB,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;YAC1H,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YAC3D,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACjE,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC;QAC3C,CAAC;IACL,CAAC;IAEO,iBAAiB,CAAC,UAAmC,EAAE,OAA2B;QACtF,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,KAAK,IAAI,IAAI,OAAO,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,CAAC,oBAAoB,KAAK,IAAI,CAAC;QACxH,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QACjI,MAAM,UAAU,GAAG,IAAI,CAAC,mBAA6B,CAAC;QACtD,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,CAAC,UAAU,YAAY,MAAM,CAAC,EAAE,CAAC;YAClE,OAAO;QACX,CAAC;QACD,UAAU,CAAC,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC;QAC3D,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC5B,UAAU,CAAC,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAC/G,CAAC;QACD,UAAU,CAAC,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;QAC3D,mBAAmB;QACnB,UAAU,CAAC,KAAK,CAAC,aAAa,GAAG,yFAAyE,CAAC;QAC3G,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC;IACpC,CAAC;IAED,iBAAiB,CAAC,IAAY;QAC1B,MAAM,IAAI,GAAI,IAAI,CAAC,qBAAiD,EAAE,YAAY,CAAC;QACnF,MAAM,UAAU,GAAG,IAAI,CAAC,mBAA6B,CAAC;QACtD,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,YAAY,MAAM,IAAI,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACnK,CAAC;IAED,uBAAuB,CAAC,UAAkC;QACtD,MAAM,IAAI,GAAI,IAAI,CAAC,qBAAiD,EAAE,YAAY,CAAC;QACnF,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,UAAU,CAAC,sBAAsB,EAAE,CAAC;YACpC,mCAAmC;YACnC,OAAO,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5D,iHAAiH;QACjH,OAAO,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrG,CAAC;IAEO,uBAAuB,CAAC,UAAkC;QAC9D,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC;QACjC,IAAI,IAAI,GAAG,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAChF,OAAO,IAAI,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC/B,IAAI,IAAI,YAAY,YAAY,EAAE,CAAC;gBAC/B,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,iBAAiB,CAAC,IAAkB,EAAE,QAAgB;QAC1D,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG,wBAAwB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QACpC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAC;QAC1E,IAAI,SAAS,GAAG,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;YAC1D,OAAO;QACX,CAAC;QACD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;YACpC,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;gBACtE,KAAK,GAAG,WAAW,CAAC;YACxB,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,IAAkB,EAAE,MAAc;QACxD,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAA6B,CAAC;QACtD,IAAI,UAAU,YAAY,MAAM,EAAE,CAAC;YAC/B,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxD,CAAC;IACL,CAAC;IAED,cAAc,CAAC,UAAkC;QAC7C,MAAM,IAAI,GAAI,IAAI,CAAC,qBAAiD,EAAE,YAAY,CAAC;QACnF,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO;QACX,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QAC/E,IAAI,UAAU,CAAC,KAAK,2CAAmC,EAAE,CAAC;YACtD,MAAM,UAAU,GAAG,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;YAC5D,IAAI,CAAC,YAAY,GAAG,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACxK,OAAO;QACX,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC;QAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,OAAO;QACX,CAAC;QACD,IAAI,UAAU,CAAC,KAAK,6CAAqC,EAAE,CAAC;YACxD,MAAM,WAAW,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;YAClC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;YAClF,MAAM,YAAY,GAAG,CAAC,UAAU,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,GAAG,GAAG,CAAC,CAAC;YAC3G,IAAI,CAAC,WAAW,GAAG,CAAC,IAAI,aAAa,IAAI,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC9F,gFAAgF;gBAChF,GAAG,CAAC,WAAW,GAAG,aAAa,CAAC;gBAChC,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;gBACpE,OAAO;YACX,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC,CAAC;YAC5D,IAAI,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC;gBACnD,UAAU,CAAC,aAAa,GAAG,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;YACzF,CAAC;YACD,OAAO;QACX,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,iBAAiB,CAAC,UAAkC;QAChD,MAAM,IAAI,GAAI,IAAI,CAAC,qBAAiD,EAAE,YAAY,CAAC;QACnF,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO;QACX,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QAC/E,IAAI,UAAU,CAAC,KAAK,2CAAmC,EAAE,CAAC;YACtD,IAAI,CAAC,YAAY,GAAG,EAAE,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;YAC9G,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjH,OAAO;QACX,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC;QAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,OAAO;QACX,CAAC;QACD,IAAI,UAAU,CAAC,KAAK,6CAAqC,EAAE,CAAC;YACxD,MAAM,KAAK,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC9D,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;YACpE,iEAAiE;YACjE,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC;gBACtG,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;gBAClG,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;oBACjB,GAAG,CAAC,UAAU,CAAC,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;gBACjG,CAAC;YACL,CAAC;YACD,OAAO;QACX,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;IAEO,sBAAsB,CAAC,IAAkB;QAC7C,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC;IACxG,CAAC;IAED;;OAEG;IACK,oBAAoB;QACxB,IAAI,IAAI,CAAC,gBAAgB,EAAE,0BAA0B,KAAK,KAAK,EAAE,CAAC;YAC9D,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,KAAK,EAAE,CAAC;YACpC,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,oBAAoB,CAAC,KAAa,EAAE,QAAiB;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAgD,CAAC;QACzE,MAAM,IAAI,GAAG,UAAU,EAAE,YAAY,CAAC;QACtC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO;QACX,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QACrC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAA6B,CAAC;QACtD,MAAM,KAAK,GAAG,GAAG,EAAE;YACf,IAAI,UAAU,YAAY,MAAM,EAAE,CAAC;gBAC/B,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;YAClF,CAAC;QACL,CAAC,CAAC;QACF,IAAI,QAAQ,EAAE,CAAC;YACX,0EAA0E;YAC1E,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,MAAM,CAAC,mDAAmD,CACtD,IAAI,EACJ,CAAC,EACD,uGAAkF,EAClF,KAAK,EACL,GAAG,EAAE;gBACD,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YAC3B,CAAC,CACJ,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,KAAK,EAAE,CAAC;QACZ,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,iCAAiC,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAC/G,IAAI,CAAC,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;IACL,CAAC;IAED,oBAAoB;QAChB,MAAM,IAAI,GAAI,IAAI,CAAC,qBAAiD,EAAE,YAAY,CAAC;QACnF,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,yBAAyB,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,KAAoC,EAAE,UAAmC,EAAE,OAA2B,EAAE,gBAAkC;QAC7J,MAAM,KAAK,GAAG,mCAAmC,CAAC,WAAW,EAAE,CAAC;QAChE,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;QAC9C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAClD,IAAI,YAAY,IAAI,EAAE,EAAE,CAAC;YACrB,iFAAiF;YACjF,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;YAChH,MAAM,OAAO,GAA0C,EAAE,CAAC;YAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;YACtC,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC1B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;oBACtC,MAAM,EAAE,GAAG,UAAU,KAAK,EAAE,CAAC;oBAC7B,OAAO,CAAC,IAAI,CACR,mCAAmC,CAAC,kCAAkC,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE;wBACnF,MAAM,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC;wBACvC,IAAI,MAAc,CAAC;wBACnB,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;4BACrB,MAAM,GAAG,GAAG,CAAC;wBACjB,CAAC;6BAAM,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;4BAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC;wBACrB,CAAC;6BAAM,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;4BAC9B,MAAM,GAAG,aAAa,EAAE,IAAI,GAAG,CAAC;wBACpC,CAAC;6BAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;4BACpC,MAAM,GAAG,MAAM,CAAC;wBACpB,CAAC;6BAAM,CAAC;4BACJ,MAAM,GAAG,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC;wBACnC,CAAC;wBACD,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;oBACjC,CAAC,CAAC,CACL,CAAC;oBACF,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;YACP,CAAC;iBAAM,IAAI,UAAU,IAAI,OAAO,CAAC,kBAAkB,KAAK,IAAI,EAAE,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,mCAAmC,CAAC,kCAAkC,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBACjK,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChC,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC3B,OAAO,CAAC,IAAI,CACR,mCAAmC,CAAC,kCAAkC,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;oBAC/F,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;oBAC/B,OAAO,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;gBAClG,CAAC,CAAC,CACL,CAAC;gBACF,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACnC,CAAC;YACD,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,OAAc,CAAC,CAAC;YACvD,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;gBAC1B,KAAK,CAAC,wBAAwB,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YAChH,CAAC;YACD,iDAAiD;YACjD,UAAU,CAAC,gBAAgB,GAAG,GAAG,EAAE;gBAC/B,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC9B,CAAC,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,8BAA8B;YAC9B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,mCAAmC,CAAC,YAAY,EAAE,EAAE,KAAK,CAAQ,CAAC,CAAC;YACvK,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,qBAAqB,GAAG,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC;QACxD,KAAK,CAAC,yCAAyC,GAAG,OAAO,CAAC,aAAa,KAAK,KAAK,CAAC;QAClF,KAAK,CAAC,kCAAkC,GAAG,OAAO,CAAC,2BAA2B,KAAK,IAAI,CAAC;QACxF,KAAK,CAAC,gDAAgD,GAAG,IAAI,CAAC;QAC9D,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACrC,KAAK,CAAC,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;QACvD,CAAC;QACD,IAAI,OAAO,CAAC,0BAA0B,KAAK,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACpG,KAAK,CAAC,+BAA+B,GAAG,SAAS,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;YACtF,IAAI,OAAO,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,CAAC,sBAAsB,KAAK,KAAK,EAAE,CAAC;gBAC9E,sEAAsE;gBACtE,MAAM,IAAI,GAAG,gBAAgB,EAAE,IAAI,CAAC;gBACpC,IAAI,IAAI,EAAE,CAAC;oBACP,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBAC9D,IAAI,CAAC,qBAAqB,GAAG,sBAAsB,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;oBAC1H,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,GAAG,IAAI,CAAC;oBACvD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;oBACtD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;gBAChC,CAAC;YACL,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,IAAI,IAAI,OAAO,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;YAClF,+EAA+E;YAC/E,KAAK,CAAC,+BAA+B,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,OAAO,CAAC,sBAAsB,KAAK,KAAK,IAAI,OAAO,CAAC,0BAA0B,KAAK,KAAK,EAAE,CAAC;YAC3F,UAAU,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,mBAAmB,GAAG,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC;IAC9C,CAAC;IAED,yBAAyB,CAAC,KAAa,EAAE,QAAQ,GAAG,IAAI;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAgD,CAAC;QACzE,MAAM,IAAI,GAAG,UAAU,EAAE,YAAY,CAAC;QACtC,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC5C,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO;QACX,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;QACtE,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QACD,MAAM,KAAK,GAAG,GAAG,EAAE;YACf,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC;QACxC,CAAC,CAAC;QACF,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IACrD,CAAC;IAED,yBAAyB;QACrB,MAAM,IAAI,GAAI,IAAI,CAAC,qBAAiD,EAAE,YAAY,CAAC;QACnF,IAAI,IAAI,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,KAAK,CAAC;QACtB,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;QACtE,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,kBAAkB;QACd,2CAA2C;QAC3C,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAAC;YACrE,IAAI,KAAK,EAAE,CAAC;gBACR,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC1B,CAAC;YACA,IAAI,CAAC,qBAAiD,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC/E,IAAI,CAAC,qBAAiD,CAAC,YAAY,GAAG,IAAI,CAAC;YAC5E,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,eAAe,EAAE,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAC1E,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;YAClC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,uEAAuE;QACvE,4FAA4F;QAC5F,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC/B,CAAC;IACS,sBAAsB,CAAC,MAAY,EAAE,kBAA8B;QACzE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,yDAAyD;YACzD,kBAAkB,EAAE,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QACD,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAgD,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,CAAC,mBAA6B,CAAC;QACtD,MAAM,IAAI,GAAG,UAAU,EAAE,YAAY,CAAC;QACtC,IAAI,IAAI,IAAI,QAAQ,IAAI,UAAU,YAAY,MAAM,EAAE,CAAC;YACnD,mCAAmC;YACnC,MAAM,MAAM,GAAG,gCAAgC,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC;YAC7G,wDAAwD;YACxD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,MAAM,CAAC,mDAAmD,CACtD,IAAI,EACJ,CAAC,EACD,qGAAiF,EACjF,GAAG,EAAE;gBACD,UAAU,CAAC,SAAS,GAAG,MAAM,CAAC;gBAC9B,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC;gBAC1D,UAAU,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;YACzD,CAAC,EACD,GAAG,EAAE,CAAC,gBAAgB,CAAC,uCAAuC,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAC5F,CAAC;YACF,OAAO;QACX,CAAC;QACD,gBAAgB,CAAC,uCAAuC,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAC3F,CAAC;IAED,kBAAkB;QACd,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,6BAA6B,IAAI,IAAI,CAAC,6BAA6B,EAAE,CAAC;IAC/E,CAAC;CACJ;AAED,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,UAAU,mBAAmB;IAC/B,WAAW,CAAC,IAAI,EAAE,CAAC,uBAAuB,EAAE,mBAAmB,CAAC,CAAC,CAAC;AACtE,CAAC;AACD,MAAM,UAAU,OAAO;IACnB,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,cAAc,GAAG,IAAI,CAAC;QACtB,mBAAmB,EAAE,CAAC;IAC1B,CAAC;AACL,CAAC"}
|
package/ios-layout.d.ts
CHANGED
|
@@ -1,9 +1,37 @@
|
|
|
1
1
|
import { View } from '@nativescript/core';
|
|
2
|
+
import type { BottomSheetDetent } from './index-common';
|
|
2
3
|
/**
|
|
3
4
|
* Finds the view controller from which a new sheet/dialog can be presented:
|
|
4
5
|
* the top most presented controller, ignoring alert controllers.
|
|
5
6
|
*/
|
|
6
7
|
export declare function getPresentingController(parent: View, rootView?: View): UIViewController;
|
|
8
|
+
/**
|
|
9
|
+
* Mac Catalyst: UIKit shows a sheet as a window modal one (no detents, no tap outside to close).
|
|
10
|
+
* The sheet is then a card at the bottom of the window, `detents` are its heights.
|
|
11
|
+
*/
|
|
12
|
+
export interface CatalystCard {
|
|
13
|
+
detents: BottomSheetDetent[];
|
|
14
|
+
index: number;
|
|
15
|
+
grabberArea?: UIView;
|
|
16
|
+
/** px, set while the card is dragged: replaces the height of the detent */
|
|
17
|
+
dragHeight?: number;
|
|
18
|
+
/** px, known after the layout */
|
|
19
|
+
maxHeight?: number;
|
|
20
|
+
contentHeight?: number;
|
|
21
|
+
/** px, the current height of the card */
|
|
22
|
+
height?: number;
|
|
23
|
+
/** the slide in was started */
|
|
24
|
+
entered?: boolean;
|
|
25
|
+
/** a detent animation runs */
|
|
26
|
+
animating?: boolean;
|
|
27
|
+
}
|
|
28
|
+
/** px */
|
|
29
|
+
export declare function getCatalystDetentHeights(card: CatalystCard): number[];
|
|
30
|
+
/**
|
|
31
|
+
* The card is laid out at the height of its largest detent once: the other detents move it with a transform, no layout of the content
|
|
32
|
+
* @param visibleHeight px
|
|
33
|
+
*/
|
|
34
|
+
export declare function setCatalystVisibleHeight(card: CatalystCard, nativeView: UIView, visibleHeight: number): void;
|
|
7
35
|
export declare class IMDLayoutViewController extends UIViewController {
|
|
8
36
|
_trackingScrollView: UIScrollView;
|
|
9
37
|
static new(): IMDLayoutViewController;
|
|
@@ -13,6 +41,7 @@ export declare class IMDLayoutViewController extends UIViewController {
|
|
|
13
41
|
ignoreBottomSafeArea: boolean;
|
|
14
42
|
ignoreTopSafeArea: boolean;
|
|
15
43
|
onLayoutCallback?: () => void;
|
|
44
|
+
catalystCard?: CatalystCard;
|
|
16
45
|
}
|
|
17
46
|
export declare class MDLayoutViewController extends UIViewController {
|
|
18
47
|
owner: WeakRef<View>;
|
|
@@ -20,6 +49,7 @@ export declare class MDLayoutViewController extends UIViewController {
|
|
|
20
49
|
ignoreTopSafeArea: boolean;
|
|
21
50
|
nsAnimated: boolean;
|
|
22
51
|
_trackingScrollView: UIScrollView;
|
|
52
|
+
catalystCard?: CatalystCard;
|
|
23
53
|
/**
|
|
24
54
|
* called after each layout pass, once preferredContentSize was updated
|
|
25
55
|
*/
|
package/ios-layout.js
CHANGED
|
@@ -39,6 +39,89 @@ function initLayoutGuide(controller) {
|
|
|
39
39
|
]);
|
|
40
40
|
return layoutGuide;
|
|
41
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* The size of the window the sheet is presented in: smaller than the screen on Mac Catalyst and iPad windows
|
|
44
|
+
*/
|
|
45
|
+
function getWindowSizePixels(controller) {
|
|
46
|
+
const window = controller.presentingViewController?.view?.window ?? controller.view?.window;
|
|
47
|
+
if (!window) {
|
|
48
|
+
return { width: Screen.mainScreen.widthPixels, height: Screen.mainScreen.heightPixels };
|
|
49
|
+
}
|
|
50
|
+
return { width: Utils.layout.toDevicePixels(window.bounds.size.width), height: Utils.layout.toDevicePixels(window.bounds.size.height) };
|
|
51
|
+
}
|
|
52
|
+
/** px */
|
|
53
|
+
export function getCatalystDetentHeights(card) {
|
|
54
|
+
return card.detents.map((detent) => resolveCatalystDetentHeight(detent, card.maxHeight, card.contentHeight));
|
|
55
|
+
}
|
|
56
|
+
function resolveCatalystDetentHeight(detent, maxHeight, contentHeight) {
|
|
57
|
+
let height;
|
|
58
|
+
if (detent === 'large') {
|
|
59
|
+
height = maxHeight;
|
|
60
|
+
}
|
|
61
|
+
else if (detent === 'medium') {
|
|
62
|
+
height = maxHeight / 2;
|
|
63
|
+
}
|
|
64
|
+
else if (detent === 'content') {
|
|
65
|
+
height = contentHeight;
|
|
66
|
+
}
|
|
67
|
+
else if (typeof detent === 'number') {
|
|
68
|
+
height = Utils.layout.toDevicePixels(detent);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
height = detent.fraction * maxHeight;
|
|
72
|
+
}
|
|
73
|
+
return Math.round(Math.min(height, maxHeight));
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* The card is laid out at the height of its largest detent once: the other detents move it with a transform, no layout of the content
|
|
77
|
+
* @param visibleHeight px
|
|
78
|
+
*/
|
|
79
|
+
export function setCatalystVisibleHeight(card, nativeView, visibleHeight) {
|
|
80
|
+
const offset = CGAffineTransformMakeTranslation(0, Utils.layout.toDeviceIndependentPixels(Math.max(0, card.height - visibleHeight)));
|
|
81
|
+
nativeView.transform = offset;
|
|
82
|
+
if (card.grabberArea) {
|
|
83
|
+
card.grabberArea.transform = offset;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
function getCatalystVisibleHeight(card) {
|
|
87
|
+
return card.dragHeight ?? (getCatalystDetentHeights(card)[Math.min(card.index, card.detents.length - 1)] || card.height);
|
|
88
|
+
}
|
|
89
|
+
function layoutCatalystCard(controller, owner) {
|
|
90
|
+
const card = controller.catalystCard;
|
|
91
|
+
const { size } = controller.view.bounds;
|
|
92
|
+
const windowWidth = Utils.layout.toDevicePixels(size.width);
|
|
93
|
+
const windowHeight = Utils.layout.toDevicePixels(size.height);
|
|
94
|
+
const maxHeight = windowHeight - Utils.layout.toDevicePixels(controller.view.safeAreaInsets.top);
|
|
95
|
+
const width = windowWidth;
|
|
96
|
+
View.measureChild(null, owner, Utils.layout.makeMeasureSpec(width, Utils.layout.EXACTLY), Utils.layout.makeMeasureSpec(maxHeight, Utils.layout.AT_MOST));
|
|
97
|
+
const contentHeight = owner.getMeasuredHeight();
|
|
98
|
+
card.maxHeight = maxHeight;
|
|
99
|
+
card.contentHeight = contentHeight;
|
|
100
|
+
const height = Math.max(...getCatalystDetentHeights(card)) || contentHeight;
|
|
101
|
+
if (height !== contentHeight) {
|
|
102
|
+
View.measureChild(null, owner, Utils.layout.makeMeasureSpec(width, Utils.layout.EXACTLY), Utils.layout.makeMeasureSpec(height, Utils.layout.EXACTLY));
|
|
103
|
+
}
|
|
104
|
+
card.height = height;
|
|
105
|
+
const top = windowHeight - height;
|
|
106
|
+
View.layoutChild(null, owner, 0, top, width, top + height);
|
|
107
|
+
const nativeView = owner.nativeViewProtected;
|
|
108
|
+
if (card.grabberArea) {
|
|
109
|
+
const area = card.grabberArea;
|
|
110
|
+
area.center = CGPointMake(Utils.layout.toDeviceIndependentPixels(width) / 2, Utils.layout.toDeviceIndependentPixels(top) + area.bounds.size.height / 2);
|
|
111
|
+
}
|
|
112
|
+
if (!(nativeView instanceof UIView)) {
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
if (!card.entered) {
|
|
116
|
+
// slide in from the bottom of the window
|
|
117
|
+
card.entered = true;
|
|
118
|
+
setCatalystVisibleHeight(card, nativeView, -40);
|
|
119
|
+
UIView.animateWithDurationDelayOptionsAnimationsCompletion(0.3, 0, 131072 /* UIViewAnimationOptions.CurveEaseOut */, () => setCatalystVisibleHeight(card, nativeView, getCatalystVisibleHeight(card)), null);
|
|
120
|
+
}
|
|
121
|
+
else if (!card.animating) {
|
|
122
|
+
setCatalystVisibleHeight(card, nativeView, getCatalystVisibleHeight(card));
|
|
123
|
+
}
|
|
124
|
+
}
|
|
42
125
|
function layoutView(controller, owner) {
|
|
43
126
|
let layoutGuide = controller.view.safeAreaLayoutGuide;
|
|
44
127
|
if (!layoutGuide) {
|
|
@@ -56,7 +139,8 @@ function layoutView(controller, owner) {
|
|
|
56
139
|
const safeAreaWidth = Utils.layout.round(Utils.layout.toDevicePixels(safeAreaSize.width));
|
|
57
140
|
const safeAreaHeight = Utils.layout.round(Utils.layout.toDevicePixels(safeAreaSize.height));
|
|
58
141
|
const widthSpec = Utils.layout.makeMeasureSpec(safeAreaWidth, Utils.layout.EXACTLY);
|
|
59
|
-
const
|
|
142
|
+
const windowSize = getWindowSizePixels(controller);
|
|
143
|
+
const heightSpec = Utils.layout.makeMeasureSpec(windowSize.height, Utils.layout.AT_MOST);
|
|
60
144
|
// reset _cachedFrame or it will wrongly move the view on subsequent layouts
|
|
61
145
|
// (owner as any)._cachedFrame = null;
|
|
62
146
|
View.measureChild(null, owner, widthSpec, heightSpec);
|
|
@@ -65,7 +149,7 @@ function layoutView(controller, owner) {
|
|
|
65
149
|
const marginLeft = owner.effectiveMarginLeft + position.left;
|
|
66
150
|
const marginRight = owner.effectiveMarginRight;
|
|
67
151
|
const top = marginTop + position.top;
|
|
68
|
-
const width =
|
|
152
|
+
const width = windowSize.width;
|
|
69
153
|
const height = owner.getMeasuredHeight();
|
|
70
154
|
View.layoutChild(null, owner, marginLeft, top, width - marginLeft - marginRight, position.top + height + marginBottom);
|
|
71
155
|
const effectiveWidth = width;
|
|
@@ -216,7 +300,12 @@ var MDLayoutViewController = /** @class */ (function (_super) {
|
|
|
216
300
|
_super.prototype.viewDidLayoutSubviews.call(this);
|
|
217
301
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.get();
|
|
218
302
|
if (owner) {
|
|
219
|
-
|
|
303
|
+
if (this.catalystCard) {
|
|
304
|
+
layoutCatalystCard(this, owner);
|
|
305
|
+
}
|
|
306
|
+
else {
|
|
307
|
+
layoutView(this, owner);
|
|
308
|
+
}
|
|
220
309
|
(_b = this.onLayoutCallback) === null || _b === void 0 ? void 0 : _b.call(this);
|
|
221
310
|
}
|
|
222
311
|
// safeAreaInsetsDidChange inflates contentInset.bottom on this layout pass, floating
|
package/ios-layout.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios-layout.js","sourceRoot":"","sources":["../../src/ui-bottomsheet/ios-layout.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ios-layout.js","sourceRoot":"","sources":["../../src/ui-bottomsheet/ios-layout.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nativescript-community/ui-bottomsheet",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.1",
|
|
4
4
|
"description": "BottomSheet: showBottomSheet()/closeBottomSheet() on every View. Material on Android, native UISheetPresentationController on iOS.",
|
|
5
5
|
"main": "./index",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
},
|
|
45
45
|
"readmeFilename": "README.md",
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@nativescript-community/ui-core": "^1.0.
|
|
47
|
+
"@nativescript-community/ui-core": "^1.0.1"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "6a7607e3cb227ab29fa533776e85b2717a800c8e"
|
|
50
50
|
}
|
|
@@ -14,9 +14,11 @@
|
|
|
14
14
|
"android.view:ViewGroup.LayoutParams",
|
|
15
15
|
"android.view:ViewGroup.MarginLayoutParams",
|
|
16
16
|
"android.view:Window",
|
|
17
|
+
"android.view:WindowManager",
|
|
17
18
|
"android.view:WindowManager.LayoutParams",
|
|
18
19
|
"android.webkit:WebView",
|
|
19
20
|
"android.widget:AbsListView",
|
|
21
|
+
"android.widget:FrameLayout",
|
|
20
22
|
"android.widget:FrameLayout.LayoutParams",
|
|
21
23
|
"android.widget:ScrollView",
|
|
22
24
|
"androidx.appcompat.app:AppCompatActivity",
|