Skip to content
Permalink
Browse files

fix(animation): enable backwards compatibility for overlay animations (

…#19160)

* fix backwards compat for overlays

* fix overlay

* Address navigation edge case
  • Loading branch information...
liamdebeasi committed Aug 23, 2019
1 parent 547f648 commit fb7098080a47a40694ec807b5faa4c6710d93240
@@ -4,7 +4,7 @@ import { Animator } from './animator';

export const create = (animationBuilder?: AnimationBuilder, baseEl?: any, opts?: any): Promise<Animation> => {
if (animationBuilder) {
return animationBuilder(baseEl, opts);
return animationBuilder(Animator as any, baseEl, opts);
}
return Promise.resolve(new Animator() as any);
};
@@ -190,11 +190,15 @@ const overlayAnimation = async (
/**
* TODO: Remove AnimationBuilder
*/
const animation = await import('./animation/old-animation').then(mod => mod.create(animationBuilder as AnimationBuilder, aniRoot, opts));
const isAnimationBuilder = (animation as any).fill === undefined;

if (!isAnimationBuilder) {
(animation as any).fill('both');
let animation;
let isAnimationBuilder = true;
try {
const mod = await import('./animation/old-animation');
animation = await mod.create(animationBuilder as AnimationBuilder, aniRoot, opts);
} catch (err) {
animation = (animationBuilder as IonicAnimationInterface)(aniRoot, opts);
animation.fill('both');
isAnimationBuilder = false;
}

overlay.animation = animation;
@@ -85,7 +85,8 @@ const animation = async (animationBuilder: IonicAnimationInterface | AnimationBu
let trans: Animation | IonicAnimation;

try {
trans = await import('../animation/old-animation').then(mod => mod.create(animationBuilder as AnimationBuilder, opts.baseEl, opts));
const mod = await import('../animation/old-animation');
trans = await mod.create(animationBuilder as AnimationBuilder, opts.baseEl, opts);
} catch (err) {
trans = (animationBuilder as IonicAnimationInterface)(opts.baseEl, opts);
}

0 comments on commit fb70980

Please sign in to comment.
You can’t perform that action at this time.