@nativescript/core 8.5.0-alpha.1 → 8.5.0-alpha.2
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/package.json +1 -1
- package/ui/core/view/view-common.js +7 -0
- package/ui/core/view/view-common.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/frame-common.js +8 -0
- package/ui/frame/frame-common.js.map +1 -1
- package/ui/page/index.ios.js +1 -5
- package/ui/page/index.ios.js.map +1 -1
- package/ui/transition/modal-transition.ios.js +1 -2
- package/ui/transition/page-transition.ios.js +2 -5
- package/ui/transition/page-transition.ios.js.map +1 -1
- package/ui/transition/shared-transition.d.ts +10 -11
- package/ui/transition/shared-transition.js +10 -22
- package/ui/transition/shared-transition.js.map +1 -1
package/ui/page/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EAAyB,cAAc,EAAE,MAAM,UAAU,CAAC;AAEjE,SAAS;AACT,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAE1F,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -137,8 +137,7 @@ var ModalTransitionController = /** @class */ (function (_super) {
|
|
|
137
137
|
var presenting = _a[_i];
|
|
138
138
|
presenting.snapshot.removeFromSuperview();
|
|
139
139
|
}
|
|
140
|
-
SharedTransition.updateState({
|
|
141
|
-
id: owner.id,
|
|
140
|
+
SharedTransition.updateState(owner.id, {
|
|
142
141
|
activeType: SharedTransitionAnimationType.dismiss,
|
|
143
142
|
});
|
|
144
143
|
transitionContext.completeTransition(true);
|
|
@@ -79,8 +79,7 @@ export class PageTransition extends Transition {
|
|
|
79
79
|
presentingView.opacity = 0;
|
|
80
80
|
presentedView.opacity = 0;
|
|
81
81
|
// add snapshot to animate
|
|
82
|
-
|
|
83
|
-
transitionContext.containerView.insertSubviewAboveSubview(sharedElementSnapshot, this.presented.view);
|
|
82
|
+
transitionContext.containerView.addSubview(sharedElementSnapshot);
|
|
84
83
|
}
|
|
85
84
|
const cleanupPresent = () => {
|
|
86
85
|
for (const presented of this.sharedElements.presented) {
|
|
@@ -97,8 +96,7 @@ export class PageTransition extends Transition {
|
|
|
97
96
|
for (const presenting of this.sharedElements.presenting) {
|
|
98
97
|
presenting.snapshot.removeFromSuperview();
|
|
99
98
|
}
|
|
100
|
-
SharedTransition.updateState({
|
|
101
|
-
id: this.id,
|
|
99
|
+
SharedTransition.updateState(this.id, {
|
|
102
100
|
activeType: SharedTransitionAnimationType.dismiss,
|
|
103
101
|
});
|
|
104
102
|
transitionContext.completeTransition(true);
|
|
@@ -163,7 +161,6 @@ export class PageTransition extends Transition {
|
|
|
163
161
|
for (const p of this.sharedElements.presenting) {
|
|
164
162
|
p.snapshot.alpha = p.endOpacity;
|
|
165
163
|
transitionContext.containerView.addSubview(p.snapshot);
|
|
166
|
-
// transitionContext.containerView.insertSubviewBelowSubview(p.snapshot, fromViewCtrl.view);
|
|
167
164
|
}
|
|
168
165
|
const cleanupDismiss = () => {
|
|
169
166
|
for (const presenting of this.sharedElements.presenting) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Transition } from '.';
|
|
2
|
+
import { ViewBase } from '../core/view-base';
|
|
2
3
|
import type { View } from '../core/view';
|
|
3
|
-
import type { Page } from '../page';
|
|
4
4
|
export declare const DEFAULT_DURATION = 0.35;
|
|
5
5
|
export declare enum SharedTransitionAnimationType {
|
|
6
6
|
present = 0,
|
|
@@ -10,7 +10,7 @@ export interface SharedTransitionConfig {
|
|
|
10
10
|
/**
|
|
11
11
|
* Page which will start the transition
|
|
12
12
|
*/
|
|
13
|
-
page?:
|
|
13
|
+
page?: ViewBase;
|
|
14
14
|
/**
|
|
15
15
|
* Preconfigured transition or your own custom configured one
|
|
16
16
|
*/
|
|
@@ -29,9 +29,8 @@ export interface SharedTransitionConfig {
|
|
|
29
29
|
fromPageEnd?: SharedTransitionPageProperties;
|
|
30
30
|
}
|
|
31
31
|
export interface SharedTransitionState extends SharedTransitionConfig {
|
|
32
|
-
id?: number;
|
|
33
32
|
activeType?: SharedTransitionAnimationType;
|
|
34
|
-
toPage?:
|
|
33
|
+
toPage?: ViewBase;
|
|
35
34
|
}
|
|
36
35
|
type SharedTransitionPageProperties = {
|
|
37
36
|
x?: number;
|
|
@@ -45,19 +44,19 @@ type SharedTransitionPageProperties = {
|
|
|
45
44
|
duration?: number;
|
|
46
45
|
};
|
|
47
46
|
/**
|
|
48
|
-
* Shared Element
|
|
47
|
+
* Shared Element Transitions (experimental)
|
|
49
48
|
*
|
|
50
|
-
*
|
|
51
|
-
* Note: some APIs may change in subsequent releases
|
|
49
|
+
* Note: some APIs may change in future releases
|
|
52
50
|
*/
|
|
53
51
|
export declare class SharedTransition {
|
|
54
|
-
static
|
|
52
|
+
static custom(instance: Transition, options: SharedTransitionConfig): {
|
|
53
|
+
instance: Transition;
|
|
54
|
+
};
|
|
55
55
|
static currentStack: Array<SharedTransitionState>;
|
|
56
|
-
static updateState(state: SharedTransitionState): void;
|
|
57
|
-
static addPageToTop(page: Page): void;
|
|
56
|
+
static updateState(id: number, state: SharedTransitionState): void;
|
|
58
57
|
static getState(id: number): SharedTransitionState;
|
|
59
58
|
static finishState(id: number): void;
|
|
60
|
-
static getSharedElements(fromPage:
|
|
59
|
+
static getSharedElements(fromPage: ViewBase, toPage: ViewBase): {
|
|
61
60
|
sharedElements: Array<View>;
|
|
62
61
|
presented: Array<View>;
|
|
63
62
|
presenting: Array<View>;
|
|
@@ -7,25 +7,24 @@ export var SharedTransitionAnimationType;
|
|
|
7
7
|
SharedTransitionAnimationType[SharedTransitionAnimationType["dismiss"] = 1] = "dismiss";
|
|
8
8
|
})(SharedTransitionAnimationType || (SharedTransitionAnimationType = {}));
|
|
9
9
|
/**
|
|
10
|
-
* Shared Element
|
|
10
|
+
* Shared Element Transitions (experimental)
|
|
11
11
|
*
|
|
12
|
-
*
|
|
13
|
-
* Note: some APIs may change in subsequent releases
|
|
12
|
+
* Note: some APIs may change in future releases
|
|
14
13
|
*/
|
|
15
14
|
export class SharedTransition {
|
|
16
|
-
static
|
|
17
|
-
SharedTransition.updateState({
|
|
15
|
+
static custom(instance, options) {
|
|
16
|
+
SharedTransition.updateState(instance.id, {
|
|
18
17
|
...options,
|
|
19
|
-
|
|
18
|
+
instance,
|
|
20
19
|
activeType: SharedTransitionAnimationType.present,
|
|
21
20
|
});
|
|
22
|
-
return
|
|
21
|
+
return { instance };
|
|
23
22
|
}
|
|
24
|
-
static updateState(state) {
|
|
23
|
+
static updateState(id, state) {
|
|
25
24
|
if (!SharedTransition.currentStack) {
|
|
26
25
|
SharedTransition.currentStack = [];
|
|
27
26
|
}
|
|
28
|
-
const existingTransition = SharedTransition.getState(
|
|
27
|
+
const existingTransition = SharedTransition.getState(id);
|
|
29
28
|
if (existingTransition) {
|
|
30
29
|
// updating existing
|
|
31
30
|
for (const key in state) {
|
|
@@ -37,22 +36,11 @@ export class SharedTransition {
|
|
|
37
36
|
SharedTransition.currentStack.push(state);
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
|
-
static addPageToTop(page) {
|
|
41
|
-
if (SharedTransition.currentStack?.length) {
|
|
42
|
-
const top = SharedTransition.currentStack.slice(-1)[0];
|
|
43
|
-
if (top) {
|
|
44
|
-
SharedTransition.updateState({
|
|
45
|
-
id: top.id,
|
|
46
|
-
toPage: page,
|
|
47
|
-
});
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
39
|
static getState(id) {
|
|
52
|
-
return SharedTransition.currentStack.find((t) => t.id === id);
|
|
40
|
+
return SharedTransition.currentStack.find((t) => t.instance.id === id);
|
|
53
41
|
}
|
|
54
42
|
static finishState(id) {
|
|
55
|
-
const index = SharedTransition.currentStack.findIndex((t) => t.id === id);
|
|
43
|
+
const index = SharedTransition.currentStack.findIndex((t) => t.instance.id === id);
|
|
56
44
|
if (index > -1) {
|
|
57
45
|
SharedTransition.currentStack.splice(index, 1);
|
|
58
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared-transition.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"shared-transition.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAY,MAAM,mBAAmB,CAAC;AAG/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AACrC,+EAA+E;AAC/E,MAAM,CAAN,IAAY,6BAGX;AAHD,WAAY,6BAA6B;IACxC,uFAAO,CAAA;IACP,uFAAO,CAAA;AACR,CAAC,EAHW,6BAA6B,KAA7B,6BAA6B,QAGxC;AAsCD;;;;GAIG;AACH,MAAM,OAAO,gBAAgB;IAC5B,MAAM,CAAC,MAAM,CAAC,QAAoB,EAAE,OAA+B;QAClE,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE;YACzC,GAAG,OAAO;YACV,QAAQ;YACR,UAAU,EAAE,6BAA6B,CAAC,OAAO;SACjD,CAAC,CAAC;QACH,OAAO,EAAE,QAAQ,EAAE,CAAC;IACrB,CAAC;IAGD,MAAM,CAAC,WAAW,CAAC,EAAU,EAAE,KAA4B;QAC1D,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE;YACnC,gBAAgB,CAAC,YAAY,GAAG,EAAE,CAAC;SACnC;QACD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACzD,IAAI,kBAAkB,EAAE;YACvB,oBAAoB;YACpB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;gBACxB,kBAAkB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBACrC,wDAAwD;aACxD;SACD;aAAM;YACN,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC1C;IACF,CAAC;IACD,MAAM,CAAC,QAAQ,CAAC,EAAU;QACzB,OAAO,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,EAAU;QAC5B,MAAM,KAAK,GAAG,gBAAgB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACnF,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACf,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SAC/C;IACF,CAAC;IACD,MAAM,CAAC,iBAAiB,CACvB,QAAkB,EAClB,MAAgB;QAMhB,0DAA0D;QAC1D,MAAM,uBAAuB,GAAgB,gBAAgB,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;QAC7F,uFAAuF;QAEvF,2DAA2D;QAC3D,MAAM,wBAAwB,GAAgB,gBAAgB,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;QAChG,yFAAyF;QAEzF,yEAAyE;QACzE,MAAM,aAAa,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAChF,OAAO;YACN,cAAc,EAAE,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;YACrG,SAAS,EAAE,uBAAuB;YAClC,UAAU,EAAE,wBAAwB;SACpC,CAAC;IACH,CAAC;CACD"}
|