@nativescript-community/ui-material-bottomsheet 6.0.1 → 6.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 +35 -0
- package/bottomsheet-common.d.ts +11 -0
- package/bottomsheet-common.js +12 -0
- package/bottomsheet-common.js.map +1 -1
- package/bottomsheet.android.js +54 -2
- package/bottomsheet.android.js.map +1 -1
- package/bottomsheet.ios.js +41 -3
- package/bottomsheet.ios.js.map +1 -1
- package/package.json +3 -3
- package/platforms/android/include.gradle +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,41 @@
|
|
|
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
|
+
## [6.0.5](https://github.com/nativescript-community/ui-material-components/tree/master/packages/bottomsheet/compare/v6.0.4...v6.0.5) (2021-09-22)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **android:** gradle 7.0 support ([bd7abd8](https://github.com/nativescript-community/ui-material-components/tree/master/packages/bottomsheet/commit/bd7abd860439f582ec78b93159ae9e6ca65b6271))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [6.0.4](https://github.com/nativescript-community/ui-material-components/tree/master/packages/bottomsheet/compare/v6.0.3...v6.0.4) (2021-09-20)
|
|
18
|
+
|
|
19
|
+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
## [6.0.3](https://github.com/nativescript-community/ui-material-components/tree/master/packages/bottomsheet/compare/v6.0.2...v6.0.3) (2021-09-20)
|
|
26
|
+
|
|
27
|
+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
## [6.0.2](https://github.com/nativescript-community/ui-material-components/tree/master/packages/bottomsheet/compare/v6.0.1...v6.0.2) (2021-09-20)
|
|
34
|
+
|
|
35
|
+
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
|
|
6
41
|
## [6.0.1](https://github.com/nativescript-community/ui-material-components/tree/master/packages/bottomsheet/compare/v6.0.0...v6.0.1) (2021-09-19)
|
|
7
42
|
|
|
8
43
|
**Note:** Version bump only for package @nativescript-community/ui-material-bottomsheet
|
package/bottomsheet-common.d.ts
CHANGED
|
@@ -3,6 +3,13 @@ export interface ShownBottomSheetData extends EventData {
|
|
|
3
3
|
context?: any;
|
|
4
4
|
closeCallback?: Function;
|
|
5
5
|
}
|
|
6
|
+
export declare enum StateBottomSheet {
|
|
7
|
+
CLOSED = -1,
|
|
8
|
+
COLLAPSED = 0,
|
|
9
|
+
EXPANDED = 1,
|
|
10
|
+
DRAGGING = 2
|
|
11
|
+
}
|
|
12
|
+
export declare type onChangeStateBottomSheet = (stateBottomSheet: StateBottomSheet, slideOffset?: number) => void;
|
|
6
13
|
export declare const shownInBottomSheetEvent = "shownInBottomSheet";
|
|
7
14
|
export declare const showingInBottomSheetEvent = "showingInBottomSheet";
|
|
8
15
|
export interface BottomSheetOptions {
|
|
@@ -19,10 +26,14 @@ export interface BottomSheetOptions {
|
|
|
19
26
|
ignoreBottomSafeArea?: boolean;
|
|
20
27
|
disableDimBackground?: boolean;
|
|
21
28
|
skipCollapsedState?: boolean;
|
|
29
|
+
peekHeight?: number;
|
|
30
|
+
ignoreKeyboardHeight: boolean;
|
|
31
|
+
onChangeState?: onChangeStateBottomSheet;
|
|
22
32
|
}
|
|
23
33
|
export declare abstract class ViewWithBottomSheetBase extends View {
|
|
24
34
|
protected _closeBottomSheetCallback: Function;
|
|
25
35
|
_onDismissBottomSheetCallback: Function;
|
|
36
|
+
_onChangeStateBottomSheetCallback: onChangeStateBottomSheet;
|
|
26
37
|
_bottomSheetFragment: any;
|
|
27
38
|
protected abstract _hideNativeBottomSheet(parent: any, whenClosedCallback: any): any;
|
|
28
39
|
protected _bottomSheetContext: any;
|
package/bottomsheet-common.js
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
import { Builder, CSSUtils, View } from '@nativescript/core';
|
|
2
|
+
export var StateBottomSheet;
|
|
3
|
+
(function (StateBottomSheet) {
|
|
4
|
+
StateBottomSheet[StateBottomSheet["CLOSED"] = -1] = "CLOSED";
|
|
5
|
+
StateBottomSheet[StateBottomSheet["COLLAPSED"] = 0] = "COLLAPSED";
|
|
6
|
+
StateBottomSheet[StateBottomSheet["EXPANDED"] = 1] = "EXPANDED";
|
|
7
|
+
StateBottomSheet[StateBottomSheet["DRAGGING"] = 2] = "DRAGGING";
|
|
8
|
+
})(StateBottomSheet || (StateBottomSheet = {}));
|
|
2
9
|
export const shownInBottomSheetEvent = 'shownInBottomSheet';
|
|
3
10
|
export const showingInBottomSheetEvent = 'showingInBottomSheet';
|
|
4
11
|
export class ViewWithBottomSheetBase extends View {
|
|
@@ -53,6 +60,11 @@ export class ViewWithBottomSheetBase extends View {
|
|
|
53
60
|
};
|
|
54
61
|
this._hideNativeBottomSheet(parent, whenClosedCallback);
|
|
55
62
|
};
|
|
63
|
+
if (options.onChangeState && typeof options.onChangeState === 'function') {
|
|
64
|
+
this._onChangeStateBottomSheetCallback = (stateBottomSheet, slideOffset) => {
|
|
65
|
+
options.onChangeState(stateBottomSheet, slideOffset !== null && slideOffset !== void 0 ? slideOffset : stateBottomSheet);
|
|
66
|
+
};
|
|
67
|
+
}
|
|
56
68
|
this._bottomSheetContext.closeCallback = this._closeBottomSheetCallback;
|
|
57
69
|
}
|
|
58
70
|
_raiseShowingBottomSheetEvent() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bottomsheet-common.js","sourceRoot":"../src/","sources":["bottomsheet-common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAa,IAAI,EAAY,MAAM,oBAAoB,CAAC;AAgBlF,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AAC5D,MAAM,CAAC,MAAM,yBAAyB,GAAG,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"bottomsheet-common.js","sourceRoot":"../src/","sources":["bottomsheet-common.ts"],"names":[],"mappings":"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"}
|
package/bottomsheet.android.js
CHANGED
|
@@ -1,11 +1,51 @@
|
|
|
1
1
|
import { applyMixins } from '@nativescript-community/ui-material-core';
|
|
2
|
-
import { Application, View, fromObject } from '@nativescript/core';
|
|
3
|
-
import { ViewWithBottomSheetBase } from './bottomsheet-common';
|
|
2
|
+
import { Application, Utils, View, fromObject } from '@nativescript/core';
|
|
3
|
+
import { StateBottomSheet, ViewWithBottomSheetBase } from './bottomsheet-common';
|
|
4
4
|
export { ViewWithBottomSheetBase } from './bottomsheet-common';
|
|
5
5
|
function getId(id) {
|
|
6
6
|
const context = Application.android.context;
|
|
7
7
|
return context.getResources().getIdentifier(id, 'id', context.getPackageName());
|
|
8
8
|
}
|
|
9
|
+
var ChangeStateBottomSheet = /** @class */ (function (_super) {
|
|
10
|
+
__extends(ChangeStateBottomSheet, _super);
|
|
11
|
+
function ChangeStateBottomSheet(owner) {
|
|
12
|
+
var _this = _super.call(this) || this;
|
|
13
|
+
_this.owner = owner;
|
|
14
|
+
return global.__native(_this);
|
|
15
|
+
}
|
|
16
|
+
ChangeStateBottomSheet.prototype.onSlide = function (bottomSheet, slideOffset) {
|
|
17
|
+
if (this.checkActiveCallback()) {
|
|
18
|
+
this.owner._onChangeStateBottomSheetCallback(StateBottomSheet.DRAGGING, slideOffset);
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
ChangeStateBottomSheet.prototype.onStateChanged = function (bottomSheet, newState) {
|
|
22
|
+
if (this.checkActiveCallback()) {
|
|
23
|
+
var status = this.getStateBottomSheetFromBottomSheetBehavior(newState);
|
|
24
|
+
if (status !== undefined) {
|
|
25
|
+
this.owner._onChangeStateBottomSheetCallback(status);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
ChangeStateBottomSheet.prototype.checkActiveCallback = function () {
|
|
30
|
+
return this.owner && this.owner._onChangeStateBottomSheetCallback;
|
|
31
|
+
};
|
|
32
|
+
ChangeStateBottomSheet.prototype.getStateBottomSheetFromBottomSheetBehavior = function (state) {
|
|
33
|
+
switch (state) {
|
|
34
|
+
case com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN:
|
|
35
|
+
return StateBottomSheet.CLOSED;
|
|
36
|
+
case com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED:
|
|
37
|
+
return StateBottomSheet.EXPANDED;
|
|
38
|
+
case com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED:
|
|
39
|
+
return StateBottomSheet.COLLAPSED;
|
|
40
|
+
case com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING:
|
|
41
|
+
return StateBottomSheet.DRAGGING;
|
|
42
|
+
default:
|
|
43
|
+
// @ts-ignore
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
return ChangeStateBottomSheet;
|
|
48
|
+
}(com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback));
|
|
9
49
|
export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
10
50
|
_hideNativeBottomSheet(parent, whenClosedCallback) {
|
|
11
51
|
whenClosedCallback();
|
|
@@ -79,6 +119,7 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
79
119
|
return owner.nativeViewProtected;
|
|
80
120
|
},
|
|
81
121
|
onStart(fragment) {
|
|
122
|
+
var _a, _b;
|
|
82
123
|
const color = owner.backgroundColor;
|
|
83
124
|
const contentViewId = getId('design_bottom_sheet');
|
|
84
125
|
const view = fragment.getDialog().findViewById(contentViewId);
|
|
@@ -100,6 +141,17 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
100
141
|
behavior.setState(com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED);
|
|
101
142
|
behavior.setSkipCollapsed(true);
|
|
102
143
|
}
|
|
144
|
+
const peekHeight = (_a = bottomSheetOptions.options) === null || _a === void 0 ? void 0 : _a.peekHeight;
|
|
145
|
+
if (peekHeight) {
|
|
146
|
+
behavior.setState(com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED);
|
|
147
|
+
behavior.setPeekHeight(Utils.layout.toDevicePixels(peekHeight));
|
|
148
|
+
}
|
|
149
|
+
const onChangeState = (_b = bottomSheetOptions.options) === null || _b === void 0 ? void 0 : _b.onChangeState;
|
|
150
|
+
if (onChangeState) {
|
|
151
|
+
const changeStateBottomSheet = new ChangeStateBottomSheet(owner);
|
|
152
|
+
behavior.addBottomSheetCallback(changeStateBottomSheet);
|
|
153
|
+
owner._onChangeStateBottomSheetCallback(changeStateBottomSheet.getStateBottomSheetFromBottomSheetBehavior(behavior.getState()));
|
|
154
|
+
}
|
|
103
155
|
if (owner && !owner.isLoaded) {
|
|
104
156
|
owner.callLoaded();
|
|
105
157
|
}
|
|
@@ -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,IAAI,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"bottomsheet.android.js","sourceRoot":"../src/","sources":["bottomsheet.android.ts"],"names":[],"mappings":"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"}
|
package/bottomsheet.ios.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Application, IOSHelper, Page, Screen, Trace, Utils, View, fromObject } from '@nativescript/core';
|
|
2
2
|
import { applyMixins } from '@nativescript-community/ui-material-core';
|
|
3
|
-
import { ViewWithBottomSheetBase } from './bottomsheet-common';
|
|
3
|
+
import { StateBottomSheet, ViewWithBottomSheetBase } from './bottomsheet-common';
|
|
4
4
|
export { ViewWithBottomSheetBase } from './bottomsheet-common';
|
|
5
5
|
const majorVersion = Utils.ios.MajorVersion;
|
|
6
6
|
var MDCBottomSheetControllerDelegateImpl = /** @class */ (function (_super) {
|
|
@@ -13,6 +13,33 @@ var MDCBottomSheetControllerDelegateImpl = /** @class */ (function (_super) {
|
|
|
13
13
|
delegate._owner = new WeakRef(owner);
|
|
14
14
|
return delegate;
|
|
15
15
|
};
|
|
16
|
+
MDCBottomSheetControllerDelegateImpl.prototype.bottomSheetControllerDidChangeYOffsetYOffset = function (controller, yOffset) {
|
|
17
|
+
var owner = this._owner.get();
|
|
18
|
+
if (owner && owner._onChangeStateBottomSheetCallback) {
|
|
19
|
+
var presentationController = controller.presentationController;
|
|
20
|
+
var heightScreen = Screen.mainScreen.heightDIPs;
|
|
21
|
+
var heightCollapsedSheet = presentationController.preferredSheetHeight || controller.preferredContentSize.height;
|
|
22
|
+
var window = UIApplication.sharedApplication.windows.firstObject;
|
|
23
|
+
var topPadding = window.safeAreaInsets.top;
|
|
24
|
+
var bottomPadding = window.safeAreaInsets.bottom;
|
|
25
|
+
var isCollapsed = heightScreen - yOffset - bottomPadding === heightCollapsedSheet;
|
|
26
|
+
var isExpanded = yOffset === topPadding;
|
|
27
|
+
if (!isCollapsed && !isExpanded) {
|
|
28
|
+
//normalized = (value - min) / (max - min);
|
|
29
|
+
var normalized = 0;
|
|
30
|
+
if (yOffset + bottomPadding > heightScreen - heightCollapsedSheet) {
|
|
31
|
+
normalized = ((heightScreen - yOffset - bottomPadding) - 0) / (heightCollapsedSheet - 0) - 1;
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
normalized = ((heightScreen - yOffset) - heightCollapsedSheet) / (heightScreen - heightCollapsedSheet);
|
|
35
|
+
}
|
|
36
|
+
owner._onChangeStateBottomSheetCallback(StateBottomSheet.DRAGGING, normalized);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
owner._onChangeStateBottomSheetCallback(isCollapsed ? StateBottomSheet.COLLAPSED : StateBottomSheet.EXPANDED);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
};
|
|
16
43
|
MDCBottomSheetControllerDelegateImpl.prototype.bottomSheetControllerDidDismissBottomSheet = function (controller) {
|
|
17
44
|
// called when clicked on background
|
|
18
45
|
var owner = this._owner.get();
|
|
@@ -25,15 +52,21 @@ var MDCBottomSheetControllerDelegateImpl = /** @class */ (function (_super) {
|
|
|
25
52
|
};
|
|
26
53
|
MDCBottomSheetControllerDelegateImpl.prototype.bottomSheetControllerStateChangedState = function (controller, state) {
|
|
27
54
|
// called when swiped
|
|
55
|
+
var owner = this._owner.get();
|
|
28
56
|
if (state === MDCSheetState.Closed) {
|
|
29
|
-
var owner = this._owner.get();
|
|
30
57
|
if (owner) {
|
|
31
58
|
owner._onDismissBottomSheetCallback && owner._onDismissBottomSheetCallback();
|
|
59
|
+
owner._onChangeStateBottomSheetCallback && owner._onChangeStateBottomSheetCallback(StateBottomSheet.CLOSED);
|
|
32
60
|
if (owner && owner.isLoaded) {
|
|
33
61
|
owner.callUnloaded();
|
|
34
62
|
}
|
|
35
63
|
}
|
|
36
64
|
}
|
|
65
|
+
else {
|
|
66
|
+
if (owner && owner._onChangeStateBottomSheetCallback) {
|
|
67
|
+
owner._onChangeStateBottomSheetCallback(state === MDCSheetState.Extended ? StateBottomSheet.EXPANDED : StateBottomSheet.EXPANDED);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
37
70
|
};
|
|
38
71
|
MDCBottomSheetControllerDelegateImpl.ObjCProtocols = [MDCBottomSheetControllerDelegate];
|
|
39
72
|
return MDCBottomSheetControllerDelegateImpl;
|
|
@@ -302,10 +335,15 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
|
|
|
302
335
|
bottomSheet.scrimAccessibilityLabel = 'close';
|
|
303
336
|
bottomSheet.dismissOnBackgroundTap = options.dismissOnBackgroundTap !== false;
|
|
304
337
|
bottomSheet.dismissOnDraggingDownSheet = options.dismissOnDraggingDownSheet !== false;
|
|
338
|
+
const peekHeight = options.peekHeight;
|
|
339
|
+
if (peekHeight) {
|
|
340
|
+
bottomSheet.presentationController.preferredSheetHeight = peekHeight;
|
|
341
|
+
}
|
|
342
|
+
bottomSheet.presentationController.ignoreKeyboardHeight = options.ignoreKeyboardHeight !== false;
|
|
305
343
|
if (options.trackingScrollView) {
|
|
306
344
|
const scrollView = this.getViewById(options.trackingScrollView);
|
|
307
345
|
if (scrollView && scrollView.nativeViewProtected instanceof UIScrollView) {
|
|
308
|
-
bottomSheet.trackingScrollView = scrollView.nativeViewProtected;
|
|
346
|
+
bottomSheet.presentationController.trackingScrollView = scrollView.nativeViewProtected;
|
|
309
347
|
}
|
|
310
348
|
}
|
|
311
349
|
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;
|
|
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": "6.0.
|
|
3
|
+
"version": "6.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,
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
},
|
|
46
46
|
"readmeFilename": "README.md",
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@nativescript-community/ui-material-core": "^6.0.
|
|
48
|
+
"@nativescript-community/ui-material-core": "^6.0.5"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "786b63f238966cbeb15217f7cbd0ccada2420ffb"
|
|
51
51
|
}
|
|
@@ -3,6 +3,6 @@ dependencies {
|
|
|
3
3
|
def androidXAppCompatVersion = project.hasProperty("androidXAppCompatVersion") ? project.androidXAppCompatVersion : "1.2.0"
|
|
4
4
|
def androidXMaterial = project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.2.1"
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
|
|
7
|
+
implementation "com.google.android.material:material:$androidXMaterial"
|
|
8
8
|
}
|