@nativescript-community/ui-material-bottomsheet 7.0.2 → 7.0.5
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 +27 -0
- package/README.md +1 -1
- package/bottomsheet.android.js +7 -7
- package/bottomsheet.android.js.map +1 -1
- package/bottomsheet.ios.js +19 -52
- package/bottomsheet.ios.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,33 @@
|
|
|
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
|
+
## [7.0.5](https://github.com/nativescript-community/ui-material-components/compare/v7.0.4...v7.0.5) (2022-05-04)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [7.0.4](https://github.com/nativescript-community/ui-material-components/compare/v7.0.3...v7.0.4) (2022-04-20)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* **bottomsheet:** ios fix for `peekHeight` + doc ([2818b70](https://github.com/nativescript-community/ui-material-components/commit/2818b70f4a0abe51650e022cb78afb96e8907599))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
## [7.0.3](https://github.com/nativescript-community/ui-material-components/compare/v7.0.2...v7.0.3) (2022-03-29)
|
|
26
|
+
|
|
27
|
+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
6
33
|
## [7.0.2](https://github.com/nativescript-community/ui-material-components/compare/v7.0.1...v7.0.2) (2022-03-13)
|
|
7
34
|
|
|
8
35
|
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
|
package/README.md
CHANGED
|
@@ -69,7 +69,7 @@ export interface BottomSheetOptions {
|
|
|
69
69
|
skipCollapsedState?: boolean;
|
|
70
70
|
// optional Android parameter to skip midway state when view is greater than 50%. Default is false
|
|
71
71
|
peekHeight?: number;
|
|
72
|
-
// optional parameter to set the collapsed sheet height. To work on iOS you need to set trackingScrollView.
|
|
72
|
+
// optional parameter to set the collapsed sheet height. To work on iOS you need to set trackingScrollView. Also ensure the scrollView is taking the full height of the bottomsheet content. Otherwise the "full" height wont be computed correctly
|
|
73
73
|
ignoreKeyboardHeight?: boolean;
|
|
74
74
|
//(iOS only) A Boolean value that controls whether the height of the keyboard should affect the bottom sheet's frame when the keyboard shows on the screen. (Default: true)
|
|
75
75
|
onChangeState?: onChangeStateBottomSheet;
|
package/bottomsheet.android.js
CHANGED
|
@@ -119,34 +119,34 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
119
119
|
return owner.nativeViewProtected;
|
|
120
120
|
},
|
|
121
121
|
onStart(fragment) {
|
|
122
|
-
var _a, _b;
|
|
122
|
+
var _a, _b, _c, _d, _e;
|
|
123
123
|
const color = owner.backgroundColor;
|
|
124
124
|
const contentViewId = getId('design_bottom_sheet');
|
|
125
125
|
const view = fragment.getDialog().findViewById(contentViewId);
|
|
126
|
-
const transparent = bottomSheetOptions.options
|
|
127
|
-
if (transparent
|
|
126
|
+
const transparent = ((_a = bottomSheetOptions.options) === null || _a === void 0 ? void 0 : _a.transparent) === true;
|
|
127
|
+
if (transparent) {
|
|
128
128
|
setTimeout(() => {
|
|
129
129
|
view.setBackground(null);
|
|
130
130
|
}, 0);
|
|
131
131
|
}
|
|
132
132
|
const behavior = com.google.android.material.bottomsheet.BottomSheetBehavior.from(view);
|
|
133
|
-
const dismissOnDraggingDownSheet =
|
|
133
|
+
const dismissOnDraggingDownSheet = ((_b = bottomSheetOptions.options) === null || _b === void 0 ? void 0 : _b.dismissOnDraggingDownSheet) !== false;
|
|
134
134
|
behavior.setHideable(dismissOnDraggingDownSheet);
|
|
135
135
|
if (!dismissOnDraggingDownSheet) {
|
|
136
136
|
behavior.setState(com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED);
|
|
137
137
|
behavior.setPeekHeight(java.lang.Integer.MAX_VALUE);
|
|
138
138
|
}
|
|
139
|
-
const skipCollapsedState =
|
|
139
|
+
const skipCollapsedState = ((_c = bottomSheetOptions.options) === null || _c === void 0 ? void 0 : _c.skipCollapsedState) === true;
|
|
140
140
|
if (skipCollapsedState) {
|
|
141
141
|
behavior.setState(com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED);
|
|
142
142
|
behavior.setSkipCollapsed(true);
|
|
143
143
|
}
|
|
144
|
-
const peekHeight = (
|
|
144
|
+
const peekHeight = (_d = bottomSheetOptions.options) === null || _d === void 0 ? void 0 : _d.peekHeight;
|
|
145
145
|
if (peekHeight) {
|
|
146
146
|
behavior.setState(com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED);
|
|
147
147
|
behavior.setPeekHeight(Utils.layout.toDevicePixels(peekHeight));
|
|
148
148
|
}
|
|
149
|
-
const onChangeState = (
|
|
149
|
+
const onChangeState = (_e = bottomSheetOptions.options) === null || _e === void 0 ? void 0 : _e.onChangeState;
|
|
150
150
|
if (onChangeState) {
|
|
151
151
|
const changeStateBottomSheet = new ChangeStateBottomSheet(owner);
|
|
152
152
|
behavior.addBottomSheetCallback(changeStateBottomSheet);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bottomsheet.android.js","sourceRoot":"../src/","sources":["bottomsheet.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAuC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/G,OAAO,EAAsB,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAErG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAS/D,SAAS,KAAK,CAAC,EAAU;IACrB,MAAM,OAAO,GAA4B,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;IACrE,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;AACpF,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgDD,MAAM,OAAO,mBAAoB,SAAQ,uBAAuB;IAElD,sBAAsB,CAAC,MAAY,EAAE,kBAA8B;QAEzE,kBAAkB,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;QAC/D,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,EAAE,CAAC;SACxD;QAED,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;IACrC,CAAC;IAES,sBAAsB,CAAC,MAAY,EAAE,OAA2B;QACtE,IAAI,CAAC,4BAA4B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC;QACnB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,MAAM,kBAAkB,GAA2B;YAC/C,KAAK,EAAE,IAAI;YACX,OAAO;YACP,aAAa,EAAE,GAAG,EAAE;gBAChB,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAClD,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACvC,CAAC;YACD,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE;SAC9D,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,yBAAyB,CAAC,iCAAiC,CAAC;YACrH,cAAc,CAAC,QAAyE,EAAE,kBAAqC;gBAC3H,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBAClC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,iBAAiB,CAAC,yBAAyB,CAAC;oBACzG,oBAAoB,CAAC,MAA+D;wBAC/E,MAAc,CAAC,SAAS,GAAG,IAAI,CAAC;oBACrC,CAAC;oBAED,aAAa,CAAC,MAA+D;wBACzE,IAAI,kBAAkB,CAAC,OAAO,IAAI,kBAAkB,CAAC,OAAO,CAAC,mBAAmB,KAAK,KAAK,EAAE;4BACxF,OAAO,IAAI,CAAC;yBACf;wBAED,IAAI,CAAC,KAAK,EAAE;4BACR,OAAO,KAAK,CAAC;yBAChB;wBACD,MAAM,IAAI,GAAG;4BACT,SAAS,EAAE,qBAAqB;4BAChC,MAAM,EAAE,KAAK;4BACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;4BACxB,MAAM,EAAE,KAAK;yBACuB,CAAC;wBAGzC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBACjC,IAAI,IAAI,CAAC,MAAM,EAAE;4BACb,OAAO,IAAI,CAAC;yBACf;wBAED,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBACnB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;4BACd,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;yBACvC;wBACD,OAAO,IAAI,CAAC,MAAM,CAAC;oBACvB,CAAC;iBACJ,CAAC,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC;gBAC1G,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;gBAClC,MAAc,CAAC,SAAS,GAAG,cAAc,CAAC;gBAC3C,IAAI,kBAAkB,CAAC,OAAO,EAAE;oBAC5B,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,CAAC;oBACnD,IAAI,eAAe,CAAC,sBAAsB,KAAK,SAAS,EAAE;wBACtD,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC;qBAC5E;oBACD,IAAI,eAAe,CAAC,oBAAoB,KAAK,IAAI,EAAE;wBAC/C,MAAM,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;qBAC1F;iBACJ;gBACD,OAAO,MAAM,CAAC;YAClB,CAAC;YAED,YAAY,CACR,QAAyE,EACzE,QAAqC,EACrC,SAAiC,EACjC,kBAAqC;gBAErC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/C,KAAK,CAAC,0BAA0B,GAAG,IAAI,CAAC;gBACxC,OAAO,KAAK,CAAC,mBAAmB,CAAC;YACrC,CAAC;YAED,OAAO,CAAC,QAAyE;;gBAC7E,MAAM,KAAK,GAAG,KAAK,CAAC,eAAe,CAAC;gBACpC,MAAM,aAAa,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBACnD,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC9D,MAAM,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"bottomsheet.android.js","sourceRoot":"../src/","sources":["bottomsheet.android.ts"],"names":[],"mappings":"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"}
|
package/bottomsheet.ios.js
CHANGED
|
@@ -101,7 +101,6 @@ function layoutView(controller, owner) {
|
|
|
101
101
|
const safeAreaHeight = Utils.layout.round(Utils.layout.toDevicePixels(safeAreaSize.height));
|
|
102
102
|
const widthSpec = Utils.layout.makeMeasureSpec(safeAreaWidth, Utils.layout.EXACTLY);
|
|
103
103
|
const heightSpec = Utils.layout.makeMeasureSpec(safeAreaHeight, Utils.layout.UNSPECIFIED);
|
|
104
|
-
owner._cachedFrame = null;
|
|
105
104
|
View.measureChild(null, owner, widthSpec, heightSpec);
|
|
106
105
|
const marginTop = owner.effectiveMarginTop;
|
|
107
106
|
const marginBottom = owner.effectiveMarginBottom;
|
|
@@ -142,7 +141,7 @@ function layoutView(controller, owner) {
|
|
|
142
141
|
const delta = fullscreenPosition[key] - safeAreaPosition[key];
|
|
143
142
|
adjustedPosition[oppositeKey] += Utils.layout.toDevicePixels(delta);
|
|
144
143
|
}
|
|
145
|
-
owner.nativeViewProtected.frame = CGRectMake(Utils.layout.toDeviceIndependentPixels(adjustedPosition.left), Utils.layout.toDeviceIndependentPixels(adjustedPosition.top), Utils.layout.toDeviceIndependentPixels(adjustedPosition.right
|
|
144
|
+
owner.nativeViewProtected.frame = CGRectMake(Utils.layout.toDeviceIndependentPixels(adjustedPosition.left), Utils.layout.toDeviceIndependentPixels(adjustedPosition.top), Utils.layout.toDeviceIndependentPixels(adjustedPosition.right), Utils.layout.toDeviceIndependentPixels(adjustedPosition.bottom));
|
|
146
145
|
}
|
|
147
146
|
controller.preferredContentSize = CGSizeMake(Utils.layout.toDeviceIndependentPixels(effectiveWidth), Utils.layout.toDeviceIndependentPixels(effectiveHeight));
|
|
148
147
|
if (owner.parent) {
|
|
@@ -183,17 +182,17 @@ function getAvailableSpaceFromParent(view, frame) {
|
|
|
183
182
|
}
|
|
184
183
|
return { safeArea, fullscreen };
|
|
185
184
|
}
|
|
186
|
-
var
|
|
187
|
-
__extends(
|
|
188
|
-
function
|
|
185
|
+
var MDLayoutViewController = /** @class */ (function (_super) {
|
|
186
|
+
__extends(MDLayoutViewController, _super);
|
|
187
|
+
function MDLayoutViewController() {
|
|
189
188
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
190
189
|
}
|
|
191
|
-
|
|
192
|
-
var delegate =
|
|
190
|
+
MDLayoutViewController.initWithOwner = function (owner) {
|
|
191
|
+
var delegate = MDLayoutViewController.new();
|
|
193
192
|
delegate.owner = new WeakRef(owner);
|
|
194
193
|
return delegate;
|
|
195
194
|
};
|
|
196
|
-
|
|
195
|
+
MDLayoutViewController.prototype.viewDidLoad = function () {
|
|
197
196
|
_super.prototype.viewDidLoad.call(this);
|
|
198
197
|
var owner = this.owner.get();
|
|
199
198
|
if (!owner) {
|
|
@@ -206,7 +205,7 @@ var UILayoutViewController = /** @class */ (function (_super) {
|
|
|
206
205
|
this.edgesForExtendedLayout = UIRectEdge.All;
|
|
207
206
|
this.extendedLayoutIncludesOpaqueBars = true;
|
|
208
207
|
};
|
|
209
|
-
|
|
208
|
+
MDLayoutViewController.prototype.viewWillLayoutSubviews = function () {
|
|
210
209
|
_super.prototype.viewWillLayoutSubviews.call(this);
|
|
211
210
|
var owner = this.owner.get();
|
|
212
211
|
if (owner) {
|
|
@@ -214,44 +213,14 @@ var UILayoutViewController = /** @class */ (function (_super) {
|
|
|
214
213
|
IOSHelper.updateConstraints(this, owner);
|
|
215
214
|
}
|
|
216
215
|
};
|
|
217
|
-
|
|
216
|
+
MDLayoutViewController.prototype.viewDidLayoutSubviews = function () {
|
|
218
217
|
_super.prototype.viewDidLayoutSubviews.call(this);
|
|
219
218
|
var owner = this.owner.get();
|
|
220
219
|
if (owner) {
|
|
221
220
|
layoutView(this, owner);
|
|
222
|
-
// if (majorVersion >= 11) {
|
|
223
|
-
// // Handle nested UILayoutViewController safe area application.
|
|
224
|
-
// // Currently, UILayoutViewController can be nested only in a TabView.
|
|
225
|
-
// // The TabView itself is handled by the OS, so we check the TabView's parent (usually a Page, but can be a Layout).
|
|
226
|
-
// const tabViewItem = owner.parent;
|
|
227
|
-
// const tabView = tabViewItem && tabViewItem.parent;
|
|
228
|
-
// let parent = tabView && tabView.parent;
|
|
229
|
-
// // Handle Angular scenario where TabView is in a ProxyViewContainer
|
|
230
|
-
// // It is possible to wrap components in ProxyViewContainers indefinitely
|
|
231
|
-
// // Not using instanceof ProxyViewContainer to avoid circular dependency
|
|
232
|
-
// // TODO: Try moving UILayoutViewController out of view module
|
|
233
|
-
// while (parent && !parent.nativeViewProtected) {
|
|
234
|
-
// parent = parent.parent;
|
|
235
|
-
// }
|
|
236
|
-
// const additionalInsets = { top: 0, left: 0, bottom: 0, right: 0 };
|
|
237
|
-
// if (parent) {
|
|
238
|
-
// const parentPageInsetsTop = parent.nativeViewProtected.safeAreaInsets.top;
|
|
239
|
-
// const currentInsetsTop = this.view.safeAreaInsets.top;
|
|
240
|
-
// const additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
|
|
241
|
-
// const parentPageInsetsBottom = parent.nativeViewProtected.safeAreaInsets.bottom;
|
|
242
|
-
// const currentInsetsBottom = this.view.safeAreaInsets.bottom;
|
|
243
|
-
// const additionalInsetsBottom = Math.max(parentPageInsetsBottom - currentInsetsBottom, 0);
|
|
244
|
-
// if (additionalInsetsTop > 0 || additionalInsetsBottom > 0) {
|
|
245
|
-
// additionalInsets.top = additionalInsetsTop;
|
|
246
|
-
// additionalInsets.bottom = additionalInsetsBottom;
|
|
247
|
-
// }
|
|
248
|
-
// }
|
|
249
|
-
// const insets = new UIEdgeInsets(additionalInsets);
|
|
250
|
-
// this.additionalSafeAreaInsets = insets;
|
|
251
|
-
// }
|
|
252
221
|
}
|
|
253
222
|
};
|
|
254
|
-
|
|
223
|
+
MDLayoutViewController.prototype.viewWillAppear = function (animated) {
|
|
255
224
|
_super.prototype.viewWillAppear.call(this, animated);
|
|
256
225
|
var owner = this.owner.get();
|
|
257
226
|
if (!owner) {
|
|
@@ -262,18 +231,14 @@ var UILayoutViewController = /** @class */ (function (_super) {
|
|
|
262
231
|
// owner.callLoaded();
|
|
263
232
|
// }
|
|
264
233
|
};
|
|
265
|
-
|
|
234
|
+
MDLayoutViewController.prototype.viewDidDisappear = function (animated) {
|
|
266
235
|
_super.prototype.viewDidDisappear.call(this, animated);
|
|
267
236
|
// let s not call callUnloaded here in case
|
|
268
237
|
// another modal / sheet is shown on top
|
|
269
238
|
// will be called on dismiss
|
|
270
|
-
// const owner = this.owner.get();
|
|
271
|
-
// if (owner && !owner.parent) {
|
|
272
|
-
// owner.callUnloaded();
|
|
273
|
-
// }
|
|
274
239
|
};
|
|
275
240
|
// Mind implementation for other controllers
|
|
276
|
-
|
|
241
|
+
MDLayoutViewController.prototype.traitCollectionDidChange = function (previousTraitCollection) {
|
|
277
242
|
_super.prototype.traitCollectionDidChange.call(this, previousTraitCollection);
|
|
278
243
|
if (majorVersion >= 13) {
|
|
279
244
|
var owner = this.owner.get();
|
|
@@ -284,7 +249,7 @@ var UILayoutViewController = /** @class */ (function (_super) {
|
|
|
284
249
|
}
|
|
285
250
|
}
|
|
286
251
|
};
|
|
287
|
-
return
|
|
252
|
+
return MDLayoutViewController;
|
|
288
253
|
}(UIViewController));
|
|
289
254
|
export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
290
255
|
_showNativeBottomSheet(parent, options) {
|
|
@@ -308,7 +273,7 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
308
273
|
let controller = this.viewController;
|
|
309
274
|
if (!controller) {
|
|
310
275
|
const nativeView = this.ios || this.nativeViewProtected;
|
|
311
|
-
controller =
|
|
276
|
+
controller = MDLayoutViewController.initWithOwner(this);
|
|
312
277
|
if (options.ignoreBottomSafeArea !== undefined) {
|
|
313
278
|
controller.ignoreBottomSafeArea = options.ignoreBottomSafeArea;
|
|
314
279
|
}
|
|
@@ -333,15 +298,17 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
333
298
|
bottomSheet.scrimAccessibilityLabel = 'close';
|
|
334
299
|
bottomSheet.dismissOnBackgroundTap = options.dismissOnBackgroundTap !== false;
|
|
335
300
|
bottomSheet.dismissOnDraggingDownSheet = options.dismissOnDraggingDownSheet !== false;
|
|
301
|
+
const presentationController = bottomSheet.presentationController;
|
|
336
302
|
const peekHeight = options.peekHeight;
|
|
337
303
|
if (peekHeight) {
|
|
338
|
-
|
|
304
|
+
presentationController.preferredSheetHeight = peekHeight;
|
|
339
305
|
}
|
|
340
|
-
|
|
306
|
+
presentationController.ignoreKeyboardHeight = options.ignoreKeyboardHeight !== false;
|
|
307
|
+
const skipCollapsedState = (options === null || options === void 0 ? void 0 : options.skipCollapsedState) === true;
|
|
341
308
|
if (options.trackingScrollView) {
|
|
342
309
|
const scrollView = this.getViewById(options.trackingScrollView);
|
|
343
310
|
if (scrollView && scrollView.nativeViewProtected instanceof UIScrollView) {
|
|
344
|
-
|
|
311
|
+
presentationController.trackingScrollView = scrollView.nativeViewProtected;
|
|
345
312
|
}
|
|
346
313
|
}
|
|
347
314
|
controller.nsAnimated = true;
|
package/bottomsheet.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bottomsheet.ios.js","sourceRoot":"../src/","sources":["bottomsheet.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAEvE,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuE5C,SAAS,eAAe,CAAC,UAA4B;IACjD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC;IACjC,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;IACjD,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACrC,kBAAkB,CAAC,mBAAmB,CAAC;QACnC,WAAW,CAAC,SAAS,CAAC,uBAAuB,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC;QACrF,WAAW,CAAC,YAAY,CAAC,uBAAuB,CAAC,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC;QACxF,WAAW,CAAC,aAAa,CAAC,uBAAuB,CAAC,QAAQ,CAAC,aAAa,CAAC;QACzE,WAAW,CAAC,cAAc,CAAC,uBAAuB,CAAC,QAAQ,CAAC,cAAc,CAAC;KACvE,CAAC,CAAC;IAEV,OAAO,WAAW,CAAC;AACvB,CAAC;AACD,SAAS,UAAU,CAAC,UAAmC,EAAE,KAAW;IAChE,IAAI,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC;IACtD,IAAI,CAAC,WAAW,EAAE;QACd,KAAK,CAAC,KAAK,CAAC,wCAAwC,KAAK,6DAA6D,EAAE,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE1K,WAAW,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;KAC7C;IACD,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC;IACzC,IAAI,QAAQ,GAAG,SAAS,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;IAEnC,MAAM,uBAAuB,GAAG,UAAU,CAAC,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC;IAC1E,IAAI,uBAAuB,EAAE;QACzB,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;QACzC,QAAQ,GAAG,SAAS,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;KACzD;IAED,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1F,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IAE5F,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpF,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"bottomsheet.ios.js","sourceRoot":"../src/","sources":["bottomsheet.ios.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nativescript-community/ui-material-bottomsheet",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.5",
|
|
4
4
|
"description": "Material Design Bottom Sheets slide up from the bottom of the screen to reveal more content. Bottom sheets integrate with the app to display supporting content or present deep-linked content from other apps.",
|
|
5
5
|
"main": "./bottomsheet",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
},
|
|
47
47
|
"readmeFilename": "README.md",
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@nativescript-community/ui-material-core": "^7.0.
|
|
49
|
+
"@nativescript-community/ui-material-core": "^7.0.5"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "0f4b7ae5bf3dd2f4eacd807f372360f9f8d99b43"
|
|
52
52
|
}
|