Skip to content

feat(android): allow shared element transition to work with ListView/CollectionView/Pager #10411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 24, 2023
Merged

feat(android): allow shared element transition to work with ListView/CollectionView/Pager #10411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad3bfc1
fix: shared element transition now working with ListView/CollectionVi…
farfromrefug Sep 29, 2023
00e9c91
fix(android): added construtor parameter to `PageTransition` to allow…
farfromrefug Oct 16, 2023
b94cf88
Merge branch 'main' into transition_collectionview
NathanWalker Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions packages/core/ui/transition/page-transition.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function setTransitionName(view: ViewBase) {
}

export class PageTransition extends Transition {
constructor(duration?: number, curve?: any) {
constructor(duration?: number, curve?: any, private pageLoadedTimeout: number = 0) {
// disable custom curves until we can fix the issue with the animation not completing
if (curve) {
console.warn('PageTransition does not support custom curves at the moment. The passed in curve will be ignored.');
Expand Down Expand Up @@ -178,12 +178,10 @@ export class PageTransition extends Transition {
const state = SharedTransition.getState(this.id);
const pageEnd = state.pageEnd;

const { sharedElements, presented, presenting } = SharedTransition.getSharedElements(fromPage, toPage);
const sharedElementTags = sharedElements.map((v) => v.sharedTransitionTag);
if (SharedTransition.DEBUG) {
console.log(` Page: ${state.activeType === SharedTransitionAnimationType.present ? 'Present' : 'Dismiss'}`);
console.log(`1. Found sharedTransitionTags to animate:`, sharedElementTags);
}
//we can't look for presented right now as the toPage might not be loaded
// and thus some views like ListView/Pager... might not have loaded their "children"
// presented will be handled in loaded event of toPage
const { presenting } = SharedTransition.getSharedElements(fromPage, toPage);

// Note: we can enhance android more over time with element targeting across different screens
// const pageStart = state.pageStart;
Expand Down Expand Up @@ -215,16 +213,15 @@ export class PageTransition extends Transition {
// independentView.opacity = 0;
// }
// }

toPage.once('loaded', () => {
presented.filter((v) => sharedElementTags.includes(v.sharedTransitionTag)).forEach(setTransitionName);
newFragment.startPostponedEnterTransition();
});

sharedElements.forEach((v) => {
setTransitionName(v);
fragmentTransaction.addSharedElement(v.nativeView, v.sharedTransitionTag);
});
const onPageLoaded = () => {
// add a timeout so that Views like ListView / CollectionView can have their children instantiated
setTimeout(() => {
const { presented } = SharedTransition.getSharedElements(fromPage, toPage);
// const sharedElementTags = sharedElements.map((v) => v.sharedTransitionTag);
presented.forEach(setTransitionName);
newFragment.startPostponedEnterTransition();
}, this.pageLoadedTimeout);
};

fragmentTransaction.setReorderingAllowed(true);

Expand Down Expand Up @@ -252,6 +249,16 @@ export class PageTransition extends Transition {
newFragment.postponeEnterTransition();
newFragment.setSharedElementEnterTransition(transitionSet);
newFragment.setSharedElementReturnTransition(transitionSet);

presenting.forEach((v) => {
setTransitionName(v);
fragmentTransaction.addSharedElement(v.nativeView, v.sharedTransitionTag);
});
if (toPage.isLoaded) {
onPageLoaded();
} else {
toPage.once('loaded', onPageLoaded);
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion packages/core/ui/transition/page-transition.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
import { Transition } from '.';
export declare class PageTransition extends Transition {}
export declare class PageTransition extends Transition {
constructor(duration?: number, nativeCurve?: any /* UIViewAnimationCurve | string | CubicBezierAnimationCurve | android.view.animation.Interpolator | android.view.animation.LinearInterpolator */, pageLoadedTimeout?: number);
}