@nativescript/core 8.5.0-alpha.1 → 8.5.0-alpha.3
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/file-system/file-system-access.android.d.ts +13 -0
- package/file-system/file-system-access.android.js +141 -0
- package/file-system/file-system-access.android.js.map +1 -1
- package/file-system/file-system-access.d.ts +12 -0
- package/file-system/file-system-access.ios.d.ts +7 -0
- package/file-system/file-system-access.ios.js +56 -0
- package/file-system/file-system-access.ios.js.map +1 -1
- package/package.json +1 -1
- package/platforms/android/widgets-release.aar +0 -0
- package/ui/core/view/index.android.js +1 -22
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.ios.js +28 -12
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view/view-common.d.ts +4 -0
- package/ui/core/view/view-common.js +33 -12
- package/ui/core/view/view-common.js.map +1 -1
- package/ui/core/view/view-helper/index.ios.d.ts +10 -0
- package/ui/core/view/view-helper/index.ios.js +99 -40
- package/ui/core/view/view-helper/index.ios.js.map +1 -1
- package/ui/core/view-base/index.d.ts +443 -538
- package/ui/core/view-base/index.js +150 -5
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/frame/fragment.transitions.d.ts +0 -4
- package/ui/frame/frame-common.d.ts +2 -2
- package/ui/frame/frame-common.js +8 -0
- package/ui/frame/frame-common.js.map +1 -1
- package/ui/frame/index.android.js +2 -4
- package/ui/frame/index.android.js.map +1 -1
- package/ui/frame/index.ios.js +58 -9
- package/ui/frame/index.ios.js.map +1 -1
- package/ui/index.d.ts +2 -0
- package/ui/index.js +2 -0
- package/ui/index.js.map +1 -1
- package/ui/page/index.ios.d.ts +4 -1
- package/ui/page/index.ios.js +81 -60
- package/ui/page/index.ios.js.map +1 -1
- package/ui/styling/background.ios.js +3 -0
- package/ui/styling/background.ios.js.map +1 -1
- package/ui/transition/fade-transition.d.ts +1 -3
- package/ui/transition/fade-transition.ios.d.ts +14 -1
- package/ui/transition/fade-transition.ios.js +60 -26
- package/ui/transition/fade-transition.ios.js.map +1 -1
- package/ui/transition/index.android.d.ts +0 -3
- package/ui/transition/index.android.js +0 -5
- package/ui/transition/index.android.js.map +1 -1
- package/ui/transition/index.d.ts +9 -9
- package/ui/transition/index.ios.d.ts +0 -3
- package/ui/transition/index.ios.js +0 -33
- package/ui/transition/index.ios.js.map +1 -1
- package/ui/transition/modal-transition.android.d.ts +3 -4
- package/ui/transition/modal-transition.android.js +4 -51
- package/ui/transition/modal-transition.android.js.map +1 -1
- package/ui/transition/modal-transition.ios.d.ts +6 -1
- package/ui/transition/modal-transition.ios.js +287 -80
- package/ui/transition/modal-transition.ios.js.map +1 -1
- package/ui/transition/page-transition.android.d.ts +4 -4
- package/ui/transition/page-transition.android.js +44 -33
- package/ui/transition/page-transition.android.js.map +1 -1
- package/ui/transition/page-transition.ios.d.ts +21 -1
- package/ui/transition/page-transition.ios.js +471 -184
- package/ui/transition/page-transition.ios.js.map +1 -1
- package/ui/transition/shared-transition.d.ts +87 -15
- package/ui/transition/shared-transition.js +41 -24
- package/ui/transition/shared-transition.js.map +1 -1
- package/ui/transition/slide-transition.android.d.ts +1 -1
- package/ui/transition/slide-transition.android.js +1 -1
- package/ui/transition/slide-transition.android.js.map +1 -1
- package/ui/transition/slide-transition.d.ts +1 -1
- package/ui/transition/slide-transition.ios.d.ts +15 -2
- package/ui/transition/slide-transition.ios.js +86 -52
- package/ui/transition/slide-transition.ios.js.map +1 -1
- package/utils/native-helper.d.ts +35 -0
- package/utils/native-helper.ios.d.ts +13 -0
- package/utils/native-helper.ios.js +73 -0
- package/utils/native-helper.ios.js.map +1 -1
- package/utils/number-utils.d.ts +10 -0
- package/utils/number-utils.js +12 -0
- package/utils/number-utils.js.map +1 -1
- package/ui/frame/fragment.transitions.ios.d.ts +0 -2
- package/ui/frame/fragment.transitions.ios.js +0 -71
- package/ui/frame/fragment.transitions.ios.js.map +0 -1
|
@@ -2,10 +2,20 @@ import { View } from '..';
|
|
|
2
2
|
export * from './view-helper-common';
|
|
3
3
|
declare class UILayoutViewController extends UIViewController {
|
|
4
4
|
owner: WeakRef<View>;
|
|
5
|
+
private _isRunningLayout;
|
|
6
|
+
private get isRunningLayout();
|
|
7
|
+
private startRunningLayout;
|
|
8
|
+
private finishRunningLayout;
|
|
9
|
+
private runLayout;
|
|
10
|
+
layoutTimer: number;
|
|
11
|
+
private clearScheduledLayout;
|
|
12
|
+
private scheduleLayout;
|
|
5
13
|
static initWithOwner(owner: WeakRef<View>): UILayoutViewController;
|
|
6
14
|
viewDidLoad(): void;
|
|
15
|
+
viewSafeAreaInsetsDidChange(): void;
|
|
7
16
|
viewWillLayoutSubviews(): void;
|
|
8
17
|
viewDidLayoutSubviews(): void;
|
|
18
|
+
layoutOwner(force?: boolean): void;
|
|
9
19
|
viewWillAppear(animated: boolean): void;
|
|
10
20
|
viewDidDisappear(animated: boolean): void;
|
|
11
21
|
traitCollectionDidChange(previousTraitCollection: UITraitCollection): void;
|
|
@@ -9,9 +9,51 @@ var UILayoutViewController = /** @class */ (function (_super) {
|
|
|
9
9
|
function UILayoutViewController() {
|
|
10
10
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
11
11
|
}
|
|
12
|
+
Object.defineProperty(UILayoutViewController.prototype, "isRunningLayout", {
|
|
13
|
+
get: function () {
|
|
14
|
+
return this._isRunningLayout !== 0;
|
|
15
|
+
},
|
|
16
|
+
enumerable: true,
|
|
17
|
+
configurable: true
|
|
18
|
+
});
|
|
19
|
+
UILayoutViewController.prototype.startRunningLayout = function () {
|
|
20
|
+
this._isRunningLayout++;
|
|
21
|
+
};
|
|
22
|
+
UILayoutViewController.prototype.finishRunningLayout = function () {
|
|
23
|
+
this._isRunningLayout--;
|
|
24
|
+
this.clearScheduledLayout();
|
|
25
|
+
};
|
|
26
|
+
UILayoutViewController.prototype.runLayout = function (cb) {
|
|
27
|
+
try {
|
|
28
|
+
this.startRunningLayout();
|
|
29
|
+
cb();
|
|
30
|
+
}
|
|
31
|
+
finally {
|
|
32
|
+
this.finishRunningLayout();
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
UILayoutViewController.prototype.clearScheduledLayout = function () {
|
|
36
|
+
if (this.layoutTimer) {
|
|
37
|
+
clearTimeout(this.layoutTimer);
|
|
38
|
+
this.layoutTimer = null;
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
UILayoutViewController.prototype.scheduleLayout = function () {
|
|
42
|
+
var _this = this;
|
|
43
|
+
if (this.layoutTimer) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
setTimeout(function () {
|
|
47
|
+
_this.layoutTimer = null;
|
|
48
|
+
if (!_this.isRunningLayout) {
|
|
49
|
+
_this.runLayout(function () { return _this.layoutOwner(); });
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
};
|
|
12
53
|
UILayoutViewController.initWithOwner = function (owner) {
|
|
13
54
|
var controller = UILayoutViewController.new();
|
|
14
55
|
controller.owner = owner;
|
|
56
|
+
controller._isRunningLayout = 0;
|
|
15
57
|
return controller;
|
|
16
58
|
};
|
|
17
59
|
UILayoutViewController.prototype.viewDidLoad = function () {
|
|
@@ -20,6 +62,10 @@ var UILayoutViewController = /** @class */ (function (_super) {
|
|
|
20
62
|
// this.edgesForExtendedLayout = UIRectEdgeBottom;
|
|
21
63
|
this.extendedLayoutIncludesOpaqueBars = true;
|
|
22
64
|
};
|
|
65
|
+
UILayoutViewController.prototype.viewSafeAreaInsetsDidChange = function () {
|
|
66
|
+
_super.prototype.viewSafeAreaInsetsDidChange.call(this);
|
|
67
|
+
this.scheduleLayout();
|
|
68
|
+
};
|
|
23
69
|
UILayoutViewController.prototype.viewWillLayoutSubviews = function () {
|
|
24
70
|
var _a;
|
|
25
71
|
_super.prototype.viewWillLayoutSubviews.call(this);
|
|
@@ -29,52 +75,65 @@ var UILayoutViewController = /** @class */ (function (_super) {
|
|
|
29
75
|
}
|
|
30
76
|
};
|
|
31
77
|
UILayoutViewController.prototype.viewDidLayoutSubviews = function () {
|
|
32
|
-
|
|
78
|
+
this.startRunningLayout();
|
|
33
79
|
_super.prototype.viewDidLayoutSubviews.call(this);
|
|
80
|
+
this.layoutOwner();
|
|
81
|
+
this.finishRunningLayout();
|
|
82
|
+
};
|
|
83
|
+
UILayoutViewController.prototype.layoutOwner = function (force) {
|
|
84
|
+
var _a, _b, _c, _d;
|
|
85
|
+
if (force === void 0) { force = false; }
|
|
34
86
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
35
|
-
if (owner) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
87
|
+
if (!owner) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
if (!force && owner.isLayoutValid && !((_d = (_b = owner.nativeViewProtected) === null || _b === void 0 ? void 0 : (_c = _b.layer).needsLayout) === null || _d === void 0 ? void 0 : _d.call(_c))) {
|
|
91
|
+
// we skip layout if the view is not yet laid out yet
|
|
92
|
+
// this usually means that viewDidLayoutSubviews will be called again
|
|
93
|
+
// so doing a layout pass now will layout with the wrong parameters
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
if (majorVersion >= 11) {
|
|
97
|
+
// Handle nested UILayoutViewController safe area application.
|
|
98
|
+
// Currently, UILayoutViewController can be nested only in a TabView.
|
|
99
|
+
// The TabView itself is handled by the OS, so we check the TabView's parent (usually a Page, but can be a Layout).
|
|
100
|
+
var tabViewItem = owner.parent;
|
|
101
|
+
var tabView = tabViewItem && tabViewItem.parent;
|
|
102
|
+
var parent = tabView && tabView.parent;
|
|
103
|
+
// Handle Angular scenario where TabView is in a ProxyViewContainer
|
|
104
|
+
// It is possible to wrap components in ProxyViewContainers indefinitely
|
|
105
|
+
// Not using instanceof ProxyViewContainer to avoid circular dependency
|
|
106
|
+
// TODO: Try moving UILayoutViewController out of view module
|
|
107
|
+
while (parent && !parent.nativeViewProtected) {
|
|
108
|
+
parent = parent.parent;
|
|
109
|
+
}
|
|
110
|
+
if (parent) {
|
|
111
|
+
var parentPageInsetsTop = parent.nativeViewProtected.safeAreaInsets.top;
|
|
112
|
+
var parentPageInsetsBottom = parent.nativeViewProtected.safeAreaInsets.bottom;
|
|
113
|
+
var currentInsetsTop = this.view.safeAreaInsets.top;
|
|
114
|
+
var currentInsetsBottom = this.view.safeAreaInsets.bottom;
|
|
115
|
+
// Safe area insets include additional safe area insets too, so subtract old values
|
|
116
|
+
if (this.additionalSafeAreaInsets) {
|
|
117
|
+
currentInsetsTop -= this.additionalSafeAreaInsets.top;
|
|
118
|
+
currentInsetsBottom -= this.additionalSafeAreaInsets.bottom;
|
|
119
|
+
}
|
|
120
|
+
var additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
|
|
121
|
+
var additionalInsetsBottom = Math.max(parentPageInsetsBottom - currentInsetsBottom, 0);
|
|
122
|
+
if (additionalInsetsTop > 0 || additionalInsetsBottom > 0) {
|
|
123
|
+
var additionalInsets = new UIEdgeInsets({
|
|
124
|
+
top: additionalInsetsTop,
|
|
125
|
+
left: 0,
|
|
126
|
+
bottom: additionalInsetsBottom,
|
|
127
|
+
right: 0,
|
|
128
|
+
});
|
|
129
|
+
this.additionalSafeAreaInsets = additionalInsets;
|
|
49
130
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
var parentPageInsetsBottom = parent.nativeViewProtected.safeAreaInsets.bottom;
|
|
53
|
-
var currentInsetsTop = this.view.safeAreaInsets.top;
|
|
54
|
-
var currentInsetsBottom = this.view.safeAreaInsets.bottom;
|
|
55
|
-
// Safe area insets include additional safe area insets too, so subtract old values
|
|
56
|
-
if (this.additionalSafeAreaInsets) {
|
|
57
|
-
currentInsetsTop -= this.additionalSafeAreaInsets.top;
|
|
58
|
-
currentInsetsBottom -= this.additionalSafeAreaInsets.bottom;
|
|
59
|
-
}
|
|
60
|
-
var additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
|
|
61
|
-
var additionalInsetsBottom = Math.max(parentPageInsetsBottom - currentInsetsBottom, 0);
|
|
62
|
-
if (additionalInsetsTop > 0 || additionalInsetsBottom > 0) {
|
|
63
|
-
var additionalInsets = new UIEdgeInsets({
|
|
64
|
-
top: additionalInsetsTop,
|
|
65
|
-
left: 0,
|
|
66
|
-
bottom: additionalInsetsBottom,
|
|
67
|
-
right: 0,
|
|
68
|
-
});
|
|
69
|
-
this.additionalSafeAreaInsets = additionalInsets;
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
this.additionalSafeAreaInsets = null;
|
|
73
|
-
}
|
|
131
|
+
else {
|
|
132
|
+
this.additionalSafeAreaInsets = null;
|
|
74
133
|
}
|
|
75
134
|
}
|
|
76
|
-
IOSHelper.layoutView(this, owner);
|
|
77
135
|
}
|
|
136
|
+
IOSHelper.layoutView(this, owner);
|
|
78
137
|
};
|
|
79
138
|
UILayoutViewController.prototype.viewWillAppear = function (animated) {
|
|
80
139
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../../../packages/core/ui/core/view/view-helper/index.ios.ts"],"names":[],"mappings":"AAGA,WAAW;AACX,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,cAAc,sBAAsB,CAAC;AAErC,MAAM,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../../../packages/core/ui/core/view/view-helper/index.ios.ts"],"names":[],"mappings":"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"}
|