@nativescript/core 8.5.0 → 8.5.1-rc.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/package.json +1 -1
- package/ui/core/view-base/index.js +1 -1
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/frame/fragment.transitions.android.js +33 -0
- package/ui/frame/fragment.transitions.android.js.map +1 -1
- package/ui/frame/frame-common.js +6 -1
- package/ui/frame/frame-common.js.map +1 -1
- package/ui/frame/index.android.js +0 -9
- package/ui/frame/index.android.js.map +1 -1
- package/ui/index.d.ts +1 -1
- package/ui/transition/index.d.ts +15 -1
- package/ui/transition/page-transition.android.d.ts +3 -2
- package/ui/transition/page-transition.android.js +84 -4
- package/ui/transition/page-transition.android.js.map +1 -1
- package/ui/transition/shared-transition-helper.ios.js +191 -124
- package/ui/transition/shared-transition-helper.ios.js.map +1 -1
- package/ui/transition/shared-transition.d.ts +25 -2
- package/ui/transition/shared-transition.js +14 -8
- package/ui/transition/shared-transition.js.map +1 -1
- package/utils/native-helper.d.ts +2 -1
- package/utils/native-helper.ios.d.ts +4 -1
- package/utils/native-helper.ios.js +3 -3
- package/utils/native-helper.ios.js.map +1 -1
|
@@ -5,7 +5,7 @@ import { iOSNativeHelper } from '../../utils/native-helper';
|
|
|
5
5
|
export class SharedTransitionHelper {
|
|
6
6
|
static animate(state, transitionContext, type) {
|
|
7
7
|
const transition = state.instance;
|
|
8
|
-
setTimeout(() => {
|
|
8
|
+
setTimeout(async () => {
|
|
9
9
|
// Run on next tick
|
|
10
10
|
// ensures that existing UI state finishes before snapshotting
|
|
11
11
|
// (eg, button touch up state)
|
|
@@ -28,6 +28,7 @@ export class SharedTransitionHelper {
|
|
|
28
28
|
}
|
|
29
29
|
transition.presented.view.layoutIfNeeded();
|
|
30
30
|
const { sharedElements, presented, presenting } = SharedTransition.getSharedElements(state.page, state.toPage);
|
|
31
|
+
const sharedElementTags = sharedElements.map((v) => v.sharedTransitionTag);
|
|
31
32
|
if (!transition.sharedElements) {
|
|
32
33
|
transition.sharedElements = {
|
|
33
34
|
presented: [],
|
|
@@ -37,130 +38,164 @@ export class SharedTransitionHelper {
|
|
|
37
38
|
}
|
|
38
39
|
if (SharedTransition.DEBUG) {
|
|
39
40
|
console.log(` ${type}: Present`);
|
|
40
|
-
console.log(`1. Found sharedTransitionTags to animate:`,
|
|
41
|
+
console.log(`1. Found sharedTransitionTags to animate:`, sharedElementTags);
|
|
41
42
|
console.log(`2. Take snapshots of shared elements and position them based on presenting view:`);
|
|
42
43
|
}
|
|
43
44
|
const pageStart = state.pageStart;
|
|
44
45
|
const startFrame = getRectFromProps(pageStart, getPageStartDefaultsForType(type));
|
|
45
46
|
const pageEnd = state.pageEnd;
|
|
46
|
-
const
|
|
47
|
+
const pageEndTags = pageEnd?.sharedTransitionTags || {};
|
|
47
48
|
// console.log('pageEndIndependentTags:', pageEndIndependentTags);
|
|
48
|
-
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
49
|
+
const positionSharedTags = async () => {
|
|
50
|
+
for (const presentingView of sharedElements) {
|
|
51
|
+
const presentingSharedElement = presentingView.ios;
|
|
52
|
+
// console.log('fromTarget instanceof UIImageView:', fromTarget instanceof UIImageView)
|
|
53
|
+
// TODO: discuss whether we should check if UIImage/UIImageView type to always snapshot images or if other view types could be duped/added vs. snapshotted
|
|
54
|
+
// Note: snapshot may be most efficient/simple
|
|
55
|
+
// console.log('---> ', presentingView.sharedTransitionTag, ': ', presentingSharedElement)
|
|
56
|
+
const presentedView = presented.find((v) => v.sharedTransitionTag === presentingView.sharedTransitionTag);
|
|
57
|
+
const presentedSharedElement = presentedView.ios;
|
|
58
|
+
const pageEndProps = pageEndTags[presentingView.sharedTransitionTag];
|
|
59
|
+
const snapshot = UIImageView.alloc().init();
|
|
60
|
+
if (pageEndProps?.callback) {
|
|
61
|
+
await pageEndProps?.callback(presentedView, 'present');
|
|
62
|
+
}
|
|
63
|
+
// treat images differently...
|
|
64
|
+
if (presentedSharedElement instanceof UIImageView) {
|
|
65
|
+
// in case the image is loaded async, we need to update the snapshot when it changes
|
|
66
|
+
// todo: remove listener on transition end
|
|
67
|
+
presentedView.on('imageSourceChange', () => {
|
|
68
|
+
snapshot.image = iOSNativeHelper.snapshotView(presentedSharedElement, Screen.mainScreen.scale);
|
|
69
|
+
snapshot.tintColor = presentedSharedElement.tintColor;
|
|
70
|
+
});
|
|
63
71
|
snapshot.tintColor = presentedSharedElement.tintColor;
|
|
72
|
+
snapshot.contentMode = presentedSharedElement.contentMode;
|
|
73
|
+
}
|
|
74
|
+
iOSNativeHelper.copyLayerProperties(snapshot, presentingSharedElement, pageEndProps?.propertiesToMatch);
|
|
75
|
+
snapshot.clipsToBounds = true;
|
|
76
|
+
// console.log('---> snapshot: ', snapshot);
|
|
77
|
+
const startFrame = presentingSharedElement.convertRectToView(presentingSharedElement.bounds, transitionContext.containerView);
|
|
78
|
+
const endFrame = presentedSharedElement.convertRectToView(presentedSharedElement.bounds, transitionContext.containerView);
|
|
79
|
+
snapshot.frame = startFrame;
|
|
80
|
+
if (SharedTransition.DEBUG) {
|
|
81
|
+
console.log('---> ', presentingView.sharedTransitionTag, ' frame:', iOSNativeHelper.printCGRect(snapshot.frame));
|
|
82
|
+
}
|
|
83
|
+
transition.sharedElements.presenting.push({
|
|
84
|
+
view: presentingView,
|
|
85
|
+
startFrame,
|
|
86
|
+
endFrame,
|
|
87
|
+
snapshot,
|
|
88
|
+
startOpacity: presentingView.opacity,
|
|
89
|
+
endOpacity: isNumber(pageEndProps?.opacity) ? pageEndProps.opacity : presentedView.opacity,
|
|
90
|
+
propertiesToMatch: pageEndProps?.propertiesToMatch,
|
|
91
|
+
zIndex: isNumber(pageEndProps?.zIndex) ? pageEndProps.zIndex : 0,
|
|
64
92
|
});
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
93
|
+
transition.sharedElements.presented.push({
|
|
94
|
+
view: presentedView,
|
|
95
|
+
startFrame: endFrame,
|
|
96
|
+
endFrame: startFrame,
|
|
97
|
+
startOpacity: presentedView.opacity,
|
|
98
|
+
endOpacity: presentingView.opacity,
|
|
99
|
+
propertiesToMatch: pageEndProps?.propertiesToMatch,
|
|
100
|
+
});
|
|
101
|
+
// set initial opacity to match the source view opacity
|
|
102
|
+
snapshot.alpha = presentingView.opacity;
|
|
103
|
+
// hide both while animating within the transition context
|
|
104
|
+
presentingView.opacity = 0;
|
|
105
|
+
presentedView.opacity = 0;
|
|
76
106
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
107
|
+
};
|
|
108
|
+
const positionIndependentTags = async () => {
|
|
109
|
+
// independent tags
|
|
110
|
+
for (const tag in pageEndTags) {
|
|
111
|
+
// only handle if independent (otherwise it's shared between both pages and handled above)
|
|
112
|
+
if (!sharedElementTags.includes(tag)) {
|
|
113
|
+
// only consider start when there's a matching end
|
|
114
|
+
const pageStartIndependentProps = pageStart?.sharedTransitionTags ? pageStart?.sharedTransitionTags[tag] : null;
|
|
115
|
+
// console.log('start:', tag, pageStartIndependentProps);
|
|
116
|
+
const pageEndProps = pageEndTags[tag];
|
|
117
|
+
let independentView = presenting.find((v) => v.sharedTransitionTag === tag);
|
|
118
|
+
let isPresented = false;
|
|
119
|
+
if (!independentView) {
|
|
120
|
+
independentView = presented.find((v) => v.sharedTransitionTag === tag);
|
|
121
|
+
if (!independentView) {
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
124
|
+
isPresented = true;
|
|
125
|
+
}
|
|
126
|
+
const independentSharedElement = independentView.ios;
|
|
127
|
+
if (pageEndProps?.callback) {
|
|
128
|
+
await pageEndProps?.callback(independentView, 'present');
|
|
129
|
+
}
|
|
130
|
+
let snapshot;
|
|
131
|
+
// if (isPresented) {
|
|
132
|
+
// snapshot = UIImageView.alloc().init();
|
|
133
|
+
// } else {
|
|
134
|
+
snapshot = UIImageView.alloc().initWithImage(iOSNativeHelper.snapshotView(independentSharedElement, Screen.mainScreen.scale));
|
|
135
|
+
// }
|
|
136
|
+
if (independentSharedElement instanceof UIImageView) {
|
|
137
|
+
// in case the image is loaded async, we need to update the snapshot when it changes
|
|
138
|
+
// todo: remove listener on transition end
|
|
139
|
+
// if (isPresented) {
|
|
140
|
+
// independentView.on('imageSourceChange', () => {
|
|
141
|
+
// snapshot.image = iOSNativeHelper.snapshotView(independentSharedElement, Screen.mainScreen.scale);
|
|
142
|
+
// snapshot.tintColor = independentSharedElement.tintColor;
|
|
143
|
+
// });
|
|
144
|
+
// }
|
|
145
|
+
snapshot.tintColor = independentSharedElement.tintColor;
|
|
146
|
+
snapshot.contentMode = independentSharedElement.contentMode;
|
|
147
|
+
}
|
|
148
|
+
snapshot.clipsToBounds = true;
|
|
149
|
+
const startFrame = independentSharedElement.convertRectToView(independentSharedElement.bounds, transitionContext.containerView);
|
|
150
|
+
const startFrameRect = getRectFromProps(pageStartIndependentProps);
|
|
151
|
+
// adjust for any specified start positions
|
|
152
|
+
const startFrameAdjusted = CGRectMake(startFrame.origin.x + startFrameRect.x, startFrame.origin.y + startFrameRect.y, startFrame.size.width, startFrame.size.height);
|
|
153
|
+
// console.log('startFrameAdjusted:', tag, iOSNativeHelper.printCGRect(startFrameAdjusted));
|
|
154
|
+
// if (pageStartIndependentProps?.scale) {
|
|
155
|
+
// snapshot.transform = CGAffineTransformConcat(CGAffineTransformMakeTranslation(startFrameAdjusted.origin.x, startFrameAdjusted.origin.y), CGAffineTransformMakeScale(pageStartIndependentProps.scale.x, pageStartIndependentProps.scale.y))
|
|
156
|
+
// } else {
|
|
157
|
+
snapshot.frame = startFrame; //startFrameAdjusted;
|
|
158
|
+
// }
|
|
159
|
+
if (SharedTransition.DEBUG) {
|
|
160
|
+
console.log('---> ', independentView.sharedTransitionTag, ' frame:', iOSNativeHelper.printCGRect(snapshot.frame));
|
|
161
|
+
}
|
|
162
|
+
const endFrameRect = getRectFromProps(pageEndProps);
|
|
163
|
+
const endFrame = CGRectMake(startFrame.origin.x + endFrameRect.x, startFrame.origin.y + endFrameRect.y, startFrame.size.width, startFrame.size.height);
|
|
164
|
+
// console.log('endFrame:', tag, iOSNativeHelper.printCGRect(endFrame));
|
|
165
|
+
transition.sharedElements.independent.push({
|
|
166
|
+
view: independentView,
|
|
167
|
+
isPresented,
|
|
168
|
+
startFrame,
|
|
169
|
+
snapshot,
|
|
170
|
+
endFrame,
|
|
171
|
+
startTransform: independentSharedElement.transform,
|
|
172
|
+
scale: pageEndProps.scale,
|
|
173
|
+
startOpacity: independentView.opacity,
|
|
174
|
+
endOpacity: isNumber(pageEndProps.opacity) ? pageEndProps.opacity : 0,
|
|
175
|
+
propertiesToMatch: pageEndProps?.propertiesToMatch,
|
|
176
|
+
zIndex: isNumber(pageEndProps?.zIndex) ? pageEndProps.zIndex : 0,
|
|
177
|
+
});
|
|
178
|
+
independentView.opacity = 0;
|
|
111
179
|
}
|
|
112
|
-
isPresented = true;
|
|
113
|
-
}
|
|
114
|
-
const independentSharedElement = independentView.ios;
|
|
115
|
-
let snapshot;
|
|
116
|
-
// if (isPresented) {
|
|
117
|
-
// snapshot = UIImageView.alloc().init();
|
|
118
|
-
// } else {
|
|
119
|
-
snapshot = UIImageView.alloc().initWithImage(iOSNativeHelper.snapshotView(independentSharedElement, Screen.mainScreen.scale));
|
|
120
|
-
// }
|
|
121
|
-
if (independentSharedElement instanceof UIImageView) {
|
|
122
|
-
// in case the image is loaded async, we need to update the snapshot when it changes
|
|
123
|
-
// todo: remove listener on transition end
|
|
124
|
-
// if (isPresented) {
|
|
125
|
-
// independentView.on('imageSourceChange', () => {
|
|
126
|
-
// snapshot.image = iOSNativeHelper.snapshotView(independentSharedElement, Screen.mainScreen.scale);
|
|
127
|
-
// snapshot.tintColor = independentSharedElement.tintColor;
|
|
128
|
-
// });
|
|
129
|
-
// }
|
|
130
|
-
snapshot.tintColor = independentSharedElement.tintColor;
|
|
131
|
-
snapshot.contentMode = independentSharedElement.contentMode;
|
|
132
|
-
}
|
|
133
|
-
snapshot.clipsToBounds = true;
|
|
134
|
-
const startFrame = independentSharedElement.convertRectToView(independentSharedElement.bounds, transitionContext.containerView);
|
|
135
|
-
const startFrameRect = getRectFromProps(pageStartIndependentProps);
|
|
136
|
-
// adjust for any specified start positions
|
|
137
|
-
const startFrameAdjusted = CGRectMake(startFrame.origin.x + startFrameRect.x, startFrame.origin.y + startFrameRect.y, startFrame.size.width, startFrame.size.height);
|
|
138
|
-
// console.log('startFrameAdjusted:', tag, iOSNativeHelper.printCGRect(startFrameAdjusted));
|
|
139
|
-
// if (pageStartIndependentProps?.scale) {
|
|
140
|
-
// snapshot.transform = CGAffineTransformConcat(CGAffineTransformMakeTranslation(startFrameAdjusted.origin.x, startFrameAdjusted.origin.y), CGAffineTransformMakeScale(pageStartIndependentProps.scale.x, pageStartIndependentProps.scale.y))
|
|
141
|
-
// } else {
|
|
142
|
-
snapshot.frame = startFrame; //startFrameAdjusted;
|
|
143
|
-
// }
|
|
144
|
-
if (SharedTransition.DEBUG) {
|
|
145
|
-
console.log('---> ', independentView.sharedTransitionTag, ' frame:', iOSNativeHelper.printCGRect(snapshot.frame));
|
|
146
180
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
});
|
|
161
|
-
|
|
181
|
+
};
|
|
182
|
+
// position all sharedTransitionTag elements
|
|
183
|
+
await positionSharedTags();
|
|
184
|
+
await positionIndependentTags();
|
|
185
|
+
// combine to order by zIndex and add to transition context
|
|
186
|
+
const snapshotData = transition.sharedElements.presenting.concat(transition.sharedElements.independent);
|
|
187
|
+
snapshotData.sort((a, b) => (a.zIndex > b.zIndex ? 1 : -1));
|
|
188
|
+
if (SharedTransition.DEBUG) {
|
|
189
|
+
console.log(`zIndex settings:`, snapshotData.map((s) => {
|
|
190
|
+
return {
|
|
191
|
+
sharedTransitionTag: s.view.sharedTransitionTag,
|
|
192
|
+
zIndex: s.zIndex,
|
|
193
|
+
};
|
|
194
|
+
}));
|
|
195
|
+
}
|
|
196
|
+
for (const data of snapshotData) {
|
|
162
197
|
// add snapshot to animate
|
|
163
|
-
transitionContext.containerView.addSubview(snapshot);
|
|
198
|
+
transitionContext.containerView.addSubview(data.snapshot);
|
|
164
199
|
}
|
|
165
200
|
// Important: always set after above shared element positions have had their start positions set
|
|
166
201
|
transition.presented.view.alpha = isNumber(pageStart?.opacity) ? pageStart?.opacity : 0;
|
|
@@ -215,7 +250,7 @@ export class SharedTransitionHelper {
|
|
|
215
250
|
const correctedEndFrame = CGRectMake(updatedEndFrame.origin.x, updatedEndFrame.origin.y, presentingMatch.endFrame.size.width, presentingMatch.endFrame.size.height);
|
|
216
251
|
presentingMatch.snapshot.frame = correctedEndFrame;
|
|
217
252
|
// apply view and layer properties to the snapshot view to match the source/presented view
|
|
218
|
-
iOSNativeHelper.copyLayerProperties(presentingMatch.snapshot, presented.view.ios);
|
|
253
|
+
iOSNativeHelper.copyLayerProperties(presentingMatch.snapshot, presented.view.ios, presented.propertiesToMatch);
|
|
219
254
|
// create a snapshot of the presented view
|
|
220
255
|
presentingMatch.snapshot.image = iOSNativeHelper.snapshotView(presented.view.ios, Screen.mainScreen.scale);
|
|
221
256
|
// apply correct alpha
|
|
@@ -282,16 +317,48 @@ export class SharedTransitionHelper {
|
|
|
282
317
|
console.log(`1. Dismiss sharedTransitionTags to animate:`, transition.sharedElements.presented.map((p) => p.view.sharedTransitionTag));
|
|
283
318
|
console.log(`2. Add back previously stored sharedElements to dismiss:`);
|
|
284
319
|
}
|
|
320
|
+
const pageEnd = state.pageEnd;
|
|
321
|
+
const pageEndTags = pageEnd?.sharedTransitionTags || {};
|
|
285
322
|
for (const p of transition.sharedElements.presented) {
|
|
286
323
|
p.view.opacity = 0;
|
|
287
324
|
}
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
325
|
+
// combine to order by zIndex and add to transition context
|
|
326
|
+
const snapshotData = transition.sharedElements.presenting.concat(transition.sharedElements.independent);
|
|
327
|
+
snapshotData.sort((a, b) => (a.zIndex > b.zIndex ? 1 : -1));
|
|
328
|
+
if (SharedTransition.DEBUG) {
|
|
329
|
+
console.log(`zIndex settings:`, snapshotData.map((s) => {
|
|
330
|
+
return {
|
|
331
|
+
sharedTransitionTag: s.view.sharedTransitionTag,
|
|
332
|
+
zIndex: s.zIndex,
|
|
333
|
+
};
|
|
334
|
+
}));
|
|
335
|
+
}
|
|
336
|
+
// first loop through all the shared elements and fire the callback
|
|
337
|
+
for (const data of snapshotData) {
|
|
338
|
+
const pageEndProps = pageEndTags[data.view.sharedTransitionTag];
|
|
339
|
+
if (pageEndProps?.callback) {
|
|
340
|
+
await pageEndProps?.callback(data.view, 'dismiss');
|
|
341
|
+
}
|
|
291
342
|
}
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
343
|
+
// now that all the callbacks had their chance to run, we can take the snapshots
|
|
344
|
+
for (const data of snapshotData) {
|
|
345
|
+
const view = data.view.ios;
|
|
346
|
+
// we need to reset the alpha to the start value so the view is visible in the snapshot
|
|
347
|
+
view.alpha = data.startOpacity;
|
|
348
|
+
// take a new snapshot
|
|
349
|
+
data.snapshot.image = iOSNativeHelper.snapshotView(view, Screen.mainScreen.scale);
|
|
350
|
+
// find the currently visible view with the same sharedTransitionTag
|
|
351
|
+
const fromView = transition.sharedElements.presented.find((p) => p.view.sharedTransitionTag === data.view.sharedTransitionTag)?.view;
|
|
352
|
+
if (fromView) {
|
|
353
|
+
// match the snapshot frame to the current frame of the fromView
|
|
354
|
+
data.snapshot.frame = fromView.ios.convertRectToView(fromView.ios.bounds, transitionContext.containerView);
|
|
355
|
+
}
|
|
356
|
+
// snapshot has been taken, we can restore the alpha
|
|
357
|
+
view.alpha = data.endOpacity;
|
|
358
|
+
// we recalculate the startFrame because the view might have changed its position in the background
|
|
359
|
+
data.startFrame = view.convertRectToView(view.bounds, transitionContext.containerView);
|
|
360
|
+
// add snapshot to animate
|
|
361
|
+
transitionContext.containerView.addSubview(data.snapshot);
|
|
295
362
|
}
|
|
296
363
|
const pageReturn = state.pageReturn;
|
|
297
364
|
const cleanupDismiss = () => {
|
|
@@ -323,11 +390,11 @@ export class SharedTransitionHelper {
|
|
|
323
390
|
const endFrame = getRectFromProps(pageReturn, getPageStartDefaultsForType(type));
|
|
324
391
|
transition.presented.view.frame = CGRectMake(endFrame.x, endFrame.y, endFrame.width, endFrame.height);
|
|
325
392
|
for (const presenting of transition.sharedElements.presenting) {
|
|
326
|
-
iOSNativeHelper.copyLayerProperties(presenting.snapshot, presenting.view.ios);
|
|
393
|
+
iOSNativeHelper.copyLayerProperties(presenting.snapshot, presenting.view.ios, presenting.propertiesToMatch);
|
|
327
394
|
presenting.snapshot.frame = presenting.startFrame;
|
|
328
395
|
presenting.snapshot.alpha = presenting.startOpacity;
|
|
329
396
|
if (SharedTransition.DEBUG) {
|
|
330
|
-
console.log(`---> ${presenting.view.sharedTransitionTag} animate to: `, iOSNativeHelper.printCGRect(presenting.
|
|
397
|
+
console.log(`---> ${presenting.view.sharedTransitionTag} animate to: `, iOSNativeHelper.printCGRect(presenting.snapshot.frame));
|
|
331
398
|
}
|
|
332
399
|
}
|
|
333
400
|
for (const independent of transition.sharedElements.independent) {
|
|
@@ -339,7 +406,7 @@ export class SharedTransitionHelper {
|
|
|
339
406
|
independent.snapshot.frame = independent.startFrame;
|
|
340
407
|
}
|
|
341
408
|
if (SharedTransition.DEBUG) {
|
|
342
|
-
console.log(`---> ${independent.view.sharedTransitionTag} animate to: `, iOSNativeHelper.printCGRect(independent.
|
|
409
|
+
console.log(`---> ${independent.view.sharedTransitionTag} animate to: `, iOSNativeHelper.printCGRect(independent.snapshot.frame));
|
|
343
410
|
}
|
|
344
411
|
}
|
|
345
412
|
};
|
|
@@ -397,7 +464,7 @@ export class SharedTransitionHelper {
|
|
|
397
464
|
interactiveState.propertyAnimator = UIViewPropertyAnimator.alloc().initWithDurationDampingRatioAnimations(1, 1, () => {
|
|
398
465
|
for (const p of state.instance.sharedElements.presenting) {
|
|
399
466
|
p.snapshot.frame = p.startFrame;
|
|
400
|
-
iOSNativeHelper.copyLayerProperties(p.snapshot, p.view.ios);
|
|
467
|
+
iOSNativeHelper.copyLayerProperties(p.snapshot, p.view.ios, p.propertiesToMatch);
|
|
401
468
|
p.snapshot.alpha = 1;
|
|
402
469
|
}
|
|
403
470
|
state.instance.presented.view.alpha = isNumber(state.pageReturn?.opacity) ? state.pageReturn?.opacity : 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared-transition-helper.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition-helper.ios.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"shared-transition-helper.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition-helper.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Transition, TransitionNavigationType } from '.';
|
|
1
|
+
import type { Transition, TransitionNavigationType, SharedTransitionTagPropertiesToMatch } from '.';
|
|
2
2
|
import { Observable } from '../../data/observable';
|
|
3
3
|
import { ViewBase } from '../core/view-base';
|
|
4
4
|
import type { View } from '../core/view';
|
|
@@ -38,6 +38,29 @@ export type SharedProperties = SharedRect & {
|
|
|
38
38
|
y?: number;
|
|
39
39
|
};
|
|
40
40
|
};
|
|
41
|
+
/**
|
|
42
|
+
* Properties which can be set on individual Shared Elements
|
|
43
|
+
*/
|
|
44
|
+
export type SharedTransitionTagProperties = SharedProperties & {
|
|
45
|
+
/**
|
|
46
|
+
* The visual stacking order where 0 is at the bottom.
|
|
47
|
+
* Shared elements are stacked one on top of the other during each transition.
|
|
48
|
+
* By default they are not ordered in any particular fashion.
|
|
49
|
+
*/
|
|
50
|
+
zIndex?: number;
|
|
51
|
+
/**
|
|
52
|
+
* Collection of properties to match and animate on each shared element.
|
|
53
|
+
*
|
|
54
|
+
* Defaults to: 'backgroundColor', 'cornerRadius', 'borderWidth', 'borderColor'
|
|
55
|
+
*
|
|
56
|
+
* Tip: Using an empty array, [], for view or layer will avoid copying any properties if desired.
|
|
57
|
+
*/
|
|
58
|
+
propertiesToMatch?: SharedTransitionTagPropertiesToMatch;
|
|
59
|
+
/**
|
|
60
|
+
*
|
|
61
|
+
*/
|
|
62
|
+
callback?: (view: View, action: SharedTransitionEventAction) => Promise<void>;
|
|
63
|
+
};
|
|
41
64
|
export type SharedSpringProperties = {
|
|
42
65
|
tension?: number;
|
|
43
66
|
friction?: number;
|
|
@@ -52,7 +75,7 @@ type SharedTransitionPageProperties = SharedProperties & {
|
|
|
52
75
|
* Note: This feature will be brought to Android in a future release.
|
|
53
76
|
*/
|
|
54
77
|
sharedTransitionTags?: {
|
|
55
|
-
[key: string]:
|
|
78
|
+
[key: string]: SharedTransitionTagProperties;
|
|
56
79
|
};
|
|
57
80
|
/**
|
|
58
81
|
* Spring animation settings.
|
|
@@ -104,10 +104,10 @@ export class SharedTransition {
|
|
|
104
104
|
*/
|
|
105
105
|
static getSharedElements(fromPage, toPage) {
|
|
106
106
|
// 1. Presented view: gather all sharedTransitionTag views
|
|
107
|
-
const presentedSharedElements = querySelectorAll(toPage, 'sharedTransitionTag').filter((v) => !v.sharedTransitionIgnore);
|
|
107
|
+
const presentedSharedElements = querySelectorAll(toPage, 'sharedTransitionTag').filter((v) => !v.sharedTransitionIgnore && typeof v.sharedTransitionTag === 'string');
|
|
108
108
|
// console.log('presented sharedTransitionTag total:', presentedSharedElements.length);
|
|
109
109
|
// 2. Presenting view: gather all sharedTransitionTag views
|
|
110
|
-
const presentingSharedElements = querySelectorAll(fromPage, 'sharedTransitionTag').filter((v) => !v.sharedTransitionIgnore);
|
|
110
|
+
const presentingSharedElements = querySelectorAll(fromPage, 'sharedTransitionTag').filter((v) => !v.sharedTransitionIgnore && typeof v.sharedTransitionTag === 'string');
|
|
111
111
|
// console.log(
|
|
112
112
|
// 'presenting sharedTransitionTags:',
|
|
113
113
|
// presentingSharedElements.map((v) => v.sharedTransitionTag)
|
|
@@ -151,8 +151,8 @@ export function getRectFromProps(props, defaults) {
|
|
|
151
151
|
defaults = {
|
|
152
152
|
x: 0,
|
|
153
153
|
y: 0,
|
|
154
|
-
width:
|
|
155
|
-
height:
|
|
154
|
+
width: getPlatformWidth(),
|
|
155
|
+
height: getPlatformHeight(),
|
|
156
156
|
...(defaults || {}),
|
|
157
157
|
};
|
|
158
158
|
return {
|
|
@@ -183,10 +183,16 @@ export function getSpringFromProps(props) {
|
|
|
183
183
|
*/
|
|
184
184
|
export function getPageStartDefaultsForType(type) {
|
|
185
185
|
return {
|
|
186
|
-
x: type === 'page' ?
|
|
187
|
-
y: type === 'page' ? 0 :
|
|
188
|
-
width:
|
|
189
|
-
height:
|
|
186
|
+
x: type === 'page' ? getPlatformWidth() : 0,
|
|
187
|
+
y: type === 'page' ? 0 : getPlatformHeight(),
|
|
188
|
+
width: getPlatformWidth(),
|
|
189
|
+
height: getPlatformHeight(),
|
|
190
190
|
};
|
|
191
191
|
}
|
|
192
|
+
function getPlatformWidth() {
|
|
193
|
+
return global.isAndroid ? Screen.mainScreen.widthPixels : Screen.mainScreen.widthDIPs;
|
|
194
|
+
}
|
|
195
|
+
function getPlatformHeight() {
|
|
196
|
+
return global.isAndroid ? Screen.mainScreen.heightPixels : Screen.mainScreen.heightDIPs;
|
|
197
|
+
}
|
|
192
198
|
//# sourceMappingURL=shared-transition.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared-transition.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAY,MAAM,mBAAmB,CAAC;AAI/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AACrC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC7B,OAAO,EAAE,GAAG;IACZ,QAAQ,EAAE,EAAE;IACZ,IAAI,EAAE,CAAC;IACP,QAAQ,EAAE,CAAC;IACX,KAAK,EAAE,CAAC;CACR,CAAC;AACF,+EAA+E;AAC/E,MAAM,CAAN,IAAY,6BAGX;AAHD,WAAY,6BAA6B;IACxC,uFAAO,CAAA;IACP,uFAAO,CAAA;AACR,CAAC,EAHW,6BAA6B,KAA7B,6BAA6B,QAGxC;
|
|
1
|
+
{"version":3,"file":"shared-transition.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition.ts"],"names":[],"mappings":"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"}
|