@nativescript/core 8.5.0-alpha.3 → 8.5.0-alpha.4

package/ui/transition/page-transition.ios.js

@@ -1,9 +1,8 @@
 import { Transition } from '.';
-import { Screen } from '../../platform';
-import { iOSNativeHelper } from '../../utils/native-helper';
 import { isNumber } from '../../utils/types';
 import { GestureStateTypes } from '../gestures';
-import { SharedTransition, SharedTransitionAnimationType, DEFAULT_DURATION, DEFAULT_SPRING } from './shared-transition';
+import { SharedTransition, DEFAULT_DURATION } from './shared-transition';
+import { SharedTransitionHelper } from './shared-transition-helper';
 export class PageTransition extends Transition {
     iosNavigatedController(navigationController, operation, fromVC, toVC) {
         this.navigationController = navigationController;
@@ -32,7 +31,9 @@ export class PageTransition extends Transition {
         view.on('pan', this._interactiveDismissGesture);
         this._interactiveGestureTeardown = () => {
             // console.log(`-- TEARDOWN setupInteractiveGesture --`);
-            view.off('pan', this._interactiveDismissGesture);
+            if (view) {
+                view.off('pan', this._interactiveDismissGesture);
+            }
             this._interactiveDismissGesture = null;
         };
         return this._interactiveGestureTeardown;
@@ -41,6 +42,14 @@ export class PageTransition extends Transition {
         if (args?.ios?.view) {
             // console.log('this.id:', this.id);
             const state = SharedTransition.getState(this.id);
+            if (!state) {
+                // cleanup and exit, already shutdown
+                if (this._interactiveGestureTeardown) {
+                    this._interactiveGestureTeardown();
+                    this._interactiveGestureTeardown = null;
+                }
+                return;
+            }
             const percent = state.interactive?.dismiss?.percentFormula ? state.interactive.dismiss.percentFormula(args) : args.deltaX / (args.ios.view.bounds.size.width / 2);
             if (SharedTransition.DEBUG) {
                 console.log('Interactive dismissal percentage:', percent);
@@ -88,10 +97,7 @@ export class PageTransition extends Transition {
 var PercentInteractiveController = /** @class */ (function (_super) {
     __extends(PercentInteractiveController, _super);
     function PercentInteractiveController() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.started = false;
-        _this.added = false;
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     PercentInteractiveController.initWithOwner = function (owner) {
         var ctrl = PercentInteractiveController.new();
@@ -101,12 +107,14 @@ var PercentInteractiveController = /** @class */ (function (_super) {
     PercentInteractiveController.prototype.startInteractiveTransition = function (transitionContext) {
         var _a;
         // console.log('startInteractiveTransition');
-        this.transitionContext = transitionContext;
-        if (!this.started) {
-            this.started = true;
+        if (!this.interactiveState) {
+            this.interactiveState = {
+                transitionContext: transitionContext,
+            };
             var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
             if (owner) {
-                this.transitionContext.containerView.insertSubviewBelowSubview(owner.presenting.view, owner.presented.view);
+                var state = SharedTransition.getState(owner.id);
+                SharedTransitionHelper.interactiveStart(state, this.interactiveState, 'page');
             }
         }
     };
@@ -114,98 +122,26 @@ var PercentInteractiveController = /** @class */ (function (_super) {
         var _a;
         var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
         if (owner) {
-            if (!this.added) {
-                this.added = true;
-                for (var _i = 0, _b = owner.sharedElements.presented; _i < _b.length; _i++) {
-                    var p = _b[_i];
-                    p.view.opacity = 0;
-                }
-                for (var _c = 0, _d = owner.sharedElements.presenting; _c < _d.length; _c++) {
-                    var p = _d[_c];
-                    p.snapshot.alpha = p.endOpacity;
-                    this.transitionContext.containerView.addSubview(p.snapshot);
-                }
-                var state = SharedTransition.getState(owner.id);
-                var props_1 = state.fromPageEnd;
-                this.backgroundAnimation = UIViewPropertyAnimator.alloc().initWithDurationDampingRatioAnimations(1, 1, function () {
-                    for (var _i = 0, _a = owner.sharedElements.presenting; _i < _a.length; _i++) {
-                        var p = _a[_i];
-                        p.snapshot.frame = p.startFrame;
-                        iOSNativeHelper.copyLayerProperties(p.snapshot, p.view.ios);
-                        p.snapshot.alpha = 1;
-                    }
-                    owner.presented.view.alpha = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.opacity) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.opacity : 0;
-                    var endX = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.x) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.x : Screen.mainScreen.widthDIPs;
-                    var endY = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.y) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.y : 0;
-                    var endWidth = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.width) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.width : Screen.mainScreen.widthDIPs;
-                    var endHeight = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.height) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.height : Screen.mainScreen.heightDIPs;
-                    owner.presented.view.frame = CGRectMake(endX, endY, endWidth, endHeight);
-                });
-            }
-            this.backgroundAnimation.fractionComplete = percentComplete;
+            var state = SharedTransition.getState(owner.id);
+            SharedTransitionHelper.interactiveUpdate(state, this.interactiveState, 'page', percentComplete);
         }
     };
     PercentInteractiveController.prototype.cancelInteractiveTransition = function () {
-        var _this = this;
-        var _a, _b, _c;
+        var _a;
         // console.log('cancelInteractiveTransition');
         var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
-        if (owner && this.added) {
+        if (owner) {
             var state = SharedTransition.getState(owner.id);
-            if (!state) {
-                return;
-            }
-            if (this.backgroundAnimation) {
-                this.backgroundAnimation.reversed = true;
-                var duration = isNumber((_b = state.toPageStart) === null || _b === void 0 ? void 0 : _b.duration) ? ((_c = state.toPageStart) === null || _c === void 0 ? void 0 : _c.duration) / 1000 : 0.35;
-                this.backgroundAnimation.continueAnimationWithTimingParametersDurationFactor(null, duration);
-                setTimeout(function () {
-                    for (var _i = 0, _a = owner.sharedElements.presented; _i < _a.length; _i++) {
-                        var p = _a[_i];
-                        p.view.opacity = 1;
-                    }
-                    for (var _b = 0, _c = owner.sharedElements.presenting; _b < _c.length; _b++) {
-                        var p = _c[_b];
-                        p.snapshot.removeFromSuperview();
-                    }
-                    owner.presented.view.alpha = 1;
-                    _this.backgroundAnimation = null;
-                    _this.added = false;
-                    _this.transitionContext.cancelInteractiveTransition();
-                    _this.transitionContext.completeTransition(false);
-                }, duration * 1000);
-            }
+            SharedTransitionHelper.interactiveCancel(state, this.interactiveState, 'page');
         }
     };
     PercentInteractiveController.prototype.finishInteractiveTransition = function () {
-        var _this = this;
-        var _a, _b, _c;
+        var _a;
         // console.log('finishInteractiveTransition');
         var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
-        if (owner && this.added) {
-            if (this.backgroundAnimation) {
-                this.backgroundAnimation.reversed = false;
-                var state = SharedTransition.getState(owner.id);
-                if (!state) {
-                    SharedTransition.finishState(owner.id);
-                    this.transitionContext.completeTransition(true);
-                    return;
-                }
-                var duration = isNumber((_b = state.fromPageEnd) === null || _b === void 0 ? void 0 : _b.duration) ? ((_c = state.fromPageEnd) === null || _c === void 0 ? void 0 : _c.duration) / 1000 : 0.35;
-                this.backgroundAnimation.continueAnimationWithTimingParametersDurationFactor(null, duration);
-                setTimeout(function () {
-                    for (var _i = 0, _a = owner.sharedElements.presenting; _i < _a.length; _i++) {
-                        var presenting = _a[_i];
-                        presenting.view.opacity = presenting.startOpacity;
-                        presenting.snapshot.removeFromSuperview();
-                    }
-                    SharedTransition.finishState(owner.id);
-                    _this.backgroundAnimation = null;
-                    _this.added = false;
-                    _this.transitionContext.finishInteractiveTransition();
-                    _this.transitionContext.completeTransition(true);
-                }, duration * 1000);
-            }
+        if (owner) {
+            var state = SharedTransition.getState(owner.id);
+            SharedTransitionHelper.interactiveFinish(state, this.interactiveState, 'page');
         }
     };
     PercentInteractiveController.ObjCProtocols = [UIViewControllerInteractiveTransitioning];
@@ -232,255 +168,11 @@ var PageTransitionController = /** @class */ (function (_super) {
         var owner = this.owner.deref();
         if (owner) {
             // console.log('--- PageTransitionController animateTransition');
-            // console.log('owner.presented:', owner.presented);
-            // console.log('owner.presenting:', owner.presenting);
-            // console.log('owner.id:', owner.id);
-            var state_1 = SharedTransition.getState(owner.id);
-            if (!state_1) {
+            var state = SharedTransition.getState(owner.id);
+            if (!state) {
                 return;
             }
-            // console.log('state.activeType:', state.activeType);
-            // console.log('operation:', owner.operation);
-            // switch (state.activeType) {
-            switch (owner.operation) {
-                case UINavigationControllerOperation.Push: {
-                    // console.log('pushing!!');
-                    // this.presented = toViewCtrl;
-                    // this.presenting = fromViewCtrl;
-                    transitionContext.containerView.insertSubviewAboveSubview(owner.presented.view, owner.presenting.view);
-                    owner.presented.view.layoutIfNeeded();
-                    var _a = SharedTransition.getSharedElements(state_1.page, state_1.toPage), sharedElements = _a.sharedElements, presented = _a.presented;
-                    if (SharedTransition.DEBUG) {
-                        console.log('  PageTransition: Push');
-                        console.log("1. Found sharedTransitionTags to animate:", sharedElements.map(function (v) { return v.sharedTransitionTag; }));
-                        console.log("2. Take snapshots of shared elements and position them based on presenting view:");
-                    }
-                    var _loop_1 = function (presentingView) {
-                        if (!owner.sharedElements) {
-                            owner.sharedElements = {
-                                presented: [],
-                                presenting: [],
-                            };
-                        }
-                        var presentingSharedElement = presentingView.ios;
-                        // 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
-                        // Note: snapshot may be most efficient/simple
-                        // console.log('---> ', presentingView.sharedTransitionTag, ': ', presentingSharedElement)
-                        var presentedView = presented.find(function (v) { return v.sharedTransitionTag === presentingView.sharedTransitionTag; });
-                        var presentedSharedElement = presentedView.ios;
-                        var sharedElementSnapshot = UIImageView.alloc().init(); // WithImage(snapshotView(presentedSharedElement));
-                        // treat images differently...
-                        if (presentedSharedElement instanceof UIImageView) {
-                            // in case the image is loaded async, we need to update the snapshot when it changes
-                            // todo: remove listener on transition end
-                            presentedView.on('imageSourceChange', function () {
-                                sharedElementSnapshot.image = iOSNativeHelper.snapshotView(presentedSharedElement, Screen.mainScreen.scale);
-                                sharedElementSnapshot.tintColor = presentedSharedElement.tintColor;
-                            });
-                            sharedElementSnapshot.tintColor = presentedSharedElement.tintColor;
-                            sharedElementSnapshot.contentMode = presentedSharedElement.contentMode;
-                        }
-                        iOSNativeHelper.copyLayerProperties(sharedElementSnapshot, presentingSharedElement);
-                        sharedElementSnapshot.clipsToBounds = true;
-                        // console.log('---> snapshot: ', sharedElementSnapshot);
-                        var startFrame = presentingSharedElement.convertRectToView(presentingSharedElement.bounds, transitionContext.containerView);
-                        var endFrame = presentedSharedElement.convertRectToView(presentedSharedElement.bounds, transitionContext.containerView);
-                        sharedElementSnapshot.frame = startFrame;
-                        if (SharedTransition.DEBUG) {
-                            console.log('---> ', presentingView.sharedTransitionTag, ' frame:', iOSNativeHelper.printCGRect(sharedElementSnapshot.frame));
-                        }
-                        owner.sharedElements.presenting.push({
-                            view: presentingView,
-                            startFrame: startFrame,
-                            endFrame: endFrame,
-                            snapshot: sharedElementSnapshot,
-                            startOpacity: presentingView.opacity,
-                            endOpacity: presentedView.opacity,
-                        });
-                        owner.sharedElements.presented.push({
-                            view: presentedView,
-                            startFrame: endFrame,
-                            endFrame: startFrame,
-                            startOpacity: presentedView.opacity,
-                            endOpacity: presentingView.opacity,
-                        });
-                        // set initial opacity to match the source view opacity
-                        sharedElementSnapshot.alpha = presentingView.opacity;
-                        // hide both while animating within the transition context
-                        presentingView.opacity = 0;
-                        presentedView.opacity = 0;
-                        // add snapshot to animate
-                        transitionContext.containerView.addSubview(sharedElementSnapshot);
-                    };
-                    for (var _i = 0, sharedElements_1 = sharedElements; _i < sharedElements_1.length; _i++) {
-                        var presentingView = sharedElements_1[_i];
-                        _loop_1(presentingView);
-                    }
-                    var cleanupPresent_1 = function () {
-                        for (var _i = 0, _a = owner.sharedElements.presented; _i < _a.length; _i++) {
-                            var presented_1 = _a[_i];
-                            presented_1.view.opacity = presented_1.startOpacity;
-                        }
-                        for (var _b = 0, _c = owner.sharedElements.presenting; _b < _c.length; _b++) {
-                            var presenting = _c[_b];
-                            presenting.snapshot.removeFromSuperview();
-                        }
-                        SharedTransition.updateState(owner.id, {
-                            activeType: SharedTransitionAnimationType.dismiss,
-                        });
-                        owner.presenting.view.removeFromSuperview();
-                        transitionContext.completeTransition(true);
-                    };
-                    var updateFramePresent_1 = function () {
-                        // https://stackoverflow.com/a/27997678/1418981
-                        // In order to have proper layout. Seems mostly needed when presenting.
-                        // For instance during presentation, destination view doesn't account navigation bar height.
-                        // Not sure if best to leave all the time?
-                        // owner.presented.view.setNeedsLayout();
-                        // owner.presented.view.layoutIfNeeded();
-                        if (SharedTransition.DEBUG) {
-                            console.log('3. Animating shared elements:');
-                        }
-                        var _loop_2 = function (presented_2) {
-                            var presentingMatch = owner.sharedElements.presenting.find(function (v) { return v.view.sharedTransitionTag === presented_2.view.sharedTransitionTag; });
-                            // Workaround wrong origin due ongoing layout process.
-                            var updatedEndFrame = presented_2.view.ios.convertRectToView(presented_2.view.ios.bounds, transitionContext.containerView);
-                            var correctedEndFrame = CGRectMake(updatedEndFrame.origin.x, updatedEndFrame.origin.y, presentingMatch.endFrame.size.width, presentingMatch.endFrame.size.height);
-                            presentingMatch.snapshot.frame = correctedEndFrame;
-                            // apply view and layer properties to the snapshot view to match the source/presented view
-                            iOSNativeHelper.copyLayerProperties(presentingMatch.snapshot, presented_2.view.ios);
-                            // create a snapshot of the presented view
-                            presentingMatch.snapshot.image = iOSNativeHelper.snapshotView(presented_2.view.ios, Screen.mainScreen.scale);
-                            // apply correct alpha
-                            presentingMatch.snapshot.alpha = presentingMatch.endOpacity;
-                            if (SharedTransition.DEBUG) {
-                                console.log("---> ".concat(presentingMatch.view.sharedTransitionTag, " animate to: "), iOSNativeHelper.printCGRect(correctedEndFrame));
-                            }
-                        };
-                        for (var _i = 0, _a = owner.sharedElements.presented; _i < _a.length; _i++) {
-                            var presented_2 = _a[_i];
-                            _loop_2(presented_2);
-                        }
-                    };
-                    // starting page properties
-                    var toProps = state_1.toPageStart;
-                    owner.presented.view.alpha = isNumber(toProps === null || toProps === void 0 ? void 0 : toProps.opacity) ? toProps === null || toProps === void 0 ? void 0 : toProps.opacity : 0;
-                    var startX = isNumber(toProps === null || toProps === void 0 ? void 0 : toProps.x) ? toProps === null || toProps === void 0 ? void 0 : toProps.x : Screen.mainScreen.widthDIPs;
-                    var startY = isNumber(toProps === null || toProps === void 0 ? void 0 : toProps.y) ? toProps === null || toProps === void 0 ? void 0 : toProps.y : 0;
-                    var startWidth = isNumber(toProps === null || toProps === void 0 ? void 0 : toProps.width) ? toProps === null || toProps === void 0 ? void 0 : toProps.width : Screen.mainScreen.widthDIPs;
-                    var startHeight = isNumber(toProps === null || toProps === void 0 ? void 0 : toProps.height) ? toProps === null || toProps === void 0 ? void 0 : toProps.height : Screen.mainScreen.heightDIPs;
-                    owner.presented.view.frame = CGRectMake(startX, startY, startWidth, startHeight);
-                    var animateProperties_1 = function () {
-                        var props = state_1.toPageEnd;
-                        // animate page properties to the following:
-                        owner.presented.view.alpha = isNumber(props === null || props === void 0 ? void 0 : props.opacity) ? props === null || props === void 0 ? void 0 : props.opacity : 1;
-                        var endX = isNumber(props === null || props === void 0 ? void 0 : props.x) ? props === null || props === void 0 ? void 0 : props.x : 0;
-                        var endY = isNumber(props === null || props === void 0 ? void 0 : props.y) ? props === null || props === void 0 ? void 0 : props.y : 0;
-                        var endWidth = isNumber(props === null || props === void 0 ? void 0 : props.width) ? props === null || props === void 0 ? void 0 : props.width : Screen.mainScreen.widthDIPs;
-                        var endHeight = isNumber(props === null || props === void 0 ? void 0 : props.height) ? props === null || props === void 0 ? void 0 : props.height : Screen.mainScreen.heightDIPs;
-                        owner.presented.view.frame = CGRectMake(endX, endY, endWidth, endHeight);
-                    };
-                    if (isNumber(toProps === null || toProps === void 0 ? void 0 : toProps.duration)) {
-                        // override spring and use only linear animation
-                        UIView.animateWithDurationAnimationsCompletion((toProps === null || toProps === void 0 ? void 0 : toProps.duration) / 1000, function () {
-                            animateProperties_1();
-                            updateFramePresent_1();
-                        }, function () {
-                            cleanupPresent_1();
-                        });
-                    }
-                    else {
-                        var spring = toProps === null || toProps === void 0 ? void 0 : toProps.spring;
-                        iOSNativeHelper.animateWithSpring({
-                            tension: isNumber(spring === null || spring === void 0 ? void 0 : spring.tension) ? spring === null || spring === void 0 ? void 0 : spring.tension : DEFAULT_SPRING.tension,
-                            friction: isNumber(spring === null || spring === void 0 ? void 0 : spring.friction) ? spring === null || spring === void 0 ? void 0 : spring.tension : DEFAULT_SPRING.friction,
-                            animations: function () {
-                                animateProperties_1();
-                                updateFramePresent_1();
-                            },
-                            completion: function () {
-                                cleanupPresent_1();
-                            },
-                        });
-                    }
-                    break;
-                }
-                case UINavigationControllerOperation.Pop: {
-                    // console.log('popping!');
-                    transitionContext.containerView.insertSubviewBelowSubview(owner.presenting.view, owner.presented.view);
-                    // console.log('transitionContext.containerView.subviews.count:', transitionContext.containerView.subviews.count);
-                    if (SharedTransition.DEBUG) {
-                        console.log('  PageTransition: Pop');
-                        console.log("1. Dismiss sharedTransitionTags to animate:", owner.sharedElements.presented.map(function (p) { return p.view.sharedTransitionTag; }));
-                        console.log("2. Add back previously stored sharedElements to dismiss:");
-                    }
-                    for (var _b = 0, _c = owner.sharedElements.presented; _b < _c.length; _b++) {
-                        var p = _c[_b];
-                        p.view.opacity = 0;
-                    }
-                    for (var _d = 0, _e = owner.sharedElements.presenting; _d < _e.length; _d++) {
-                        var p = _e[_d];
-                        p.snapshot.alpha = p.endOpacity;
-                        transitionContext.containerView.addSubview(p.snapshot);
-                    }
-                    var cleanupDismiss_1 = function () {
-                        for (var _i = 0, _a = owner.sharedElements.presenting; _i < _a.length; _i++) {
-                            var presenting = _a[_i];
-                            presenting.view.opacity = presenting.startOpacity;
-                            presenting.snapshot.removeFromSuperview();
-                        }
-                        SharedTransition.finishState(owner.id);
-                        transitionContext.completeTransition(true);
-                    };
-                    var updateFrameDismiss_1 = function () {
-                        if (SharedTransition.DEBUG) {
-                            console.log('3. Dismissing shared elements:');
-                        }
-                        for (var _i = 0, _a = owner.sharedElements.presenting; _i < _a.length; _i++) {
-                            var presenting = _a[_i];
-                            iOSNativeHelper.copyLayerProperties(presenting.snapshot, presenting.view.ios);
-                            presenting.snapshot.frame = presenting.startFrame;
-                            presenting.snapshot.alpha = presenting.startOpacity;
-                            if (SharedTransition.DEBUG) {
-                                console.log("---> ".concat(presenting.view.sharedTransitionTag, " animate to: "), iOSNativeHelper.printCGRect(presenting.startFrame));
-                            }
-                        }
-                    };
-                    var props_1 = state_1.fromPageEnd;
-                    var animateProperties_2 = function () {
-                        owner.presented.view.alpha = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.opacity) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.opacity : 0;
-                        var endX = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.x) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.x : Screen.mainScreen.widthDIPs;
-                        var endY = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.y) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.y : 0;
-                        var endWidth = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.width) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.width : Screen.mainScreen.widthDIPs;
-                        var endHeight = isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.height) ? props_1 === null || props_1 === void 0 ? void 0 : props_1.height : Screen.mainScreen.heightDIPs;
-                        owner.presented.view.frame = CGRectMake(endX, endY, endWidth, endHeight);
-                    };
-                    if (isNumber(props_1 === null || props_1 === void 0 ? void 0 : props_1.duration)) {
-                        // override spring and use only linear animation
-                        UIView.animateWithDurationAnimationsCompletion((props_1 === null || props_1 === void 0 ? void 0 : props_1.duration) / 1000, function () {
-                            animateProperties_2();
-                            updateFrameDismiss_1();
-                        }, function () {
-                            cleanupDismiss_1();
-                        });
-                    }
-                    else {
-                        var spring = props_1 === null || props_1 === void 0 ? void 0 : props_1.spring;
-                        iOSNativeHelper.animateWithSpring({
-                            tension: isNumber(spring === null || spring === void 0 ? void 0 : spring.tension) ? spring === null || spring === void 0 ? void 0 : spring.tension : DEFAULT_SPRING.tension,
-                            friction: isNumber(spring === null || spring === void 0 ? void 0 : spring.friction) ? spring === null || spring === void 0 ? void 0 : spring.tension : DEFAULT_SPRING.friction,
-                            animations: function () {
-                                animateProperties_2();
-                                updateFrameDismiss_1();
-                            },
-                            completion: function () {
-                                cleanupDismiss_1();
-                            },
-                        });
-                    }
-                    break;
-                }
-            }
+            SharedTransitionHelper.animate(state, transitionContext, 'page');
         }
     };
     PageTransitionController.ObjCProtocols = [UIViewControllerAnimatedTransitioning];

package/ui/transition/page-transition.ios.js.map

@@ -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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"}
+{"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"AACA,OAAO,EAAiD,UAAU,EAAE,MAAM,GAAG,CAAC;AAG9E,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAuB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAiC,gBAAgB,EAAiE,MAAM,qBAAqB,CAAC;AACvK,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,OAAO,cAAe,SAAQ,UAAU;IAiB7C,sBAAsB,CAAC,oBAA4C,EAAE,SAAiB,EAAE,MAAwB,EAAE,IAAsB;QACvI,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;SACzB;QACD,IAAI,CAAC,oBAAoB,GAAG,wBAAwB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtF,sEAAsE;QAEtE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,qBAAqB,CAAC,QAA+C;QACpE,8CAA8C;QAC9C,IAAI,CAAC,qBAAqB,GAAG,4BAA4B,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,uBAAuB,CAAC,aAAyB,EAAE,IAAU;QAC5D,iDAAiD;QACjD,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE;YACrC,gDAAgD;YAChD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACjD,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpF;QACD,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEhD,IAAI,CAAC,2BAA2B,GAAG,GAAG,EAAE;YACvC,yDAAyD;YACzD,IAAI,IAAI,EAAE;gBACT,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;aACjD;YACD,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC;QACxC,CAAC,CAAC;QACF,OAAO,IAAI,CAAC,2BAA2B,CAAC;IACzC,CAAC;IAEO,iCAAiC,CAAC,IAAyB;QAClE,IAAI,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;YACpB,oCAAoC;YACpC,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,EAAE;gBACX,qCAAqC;gBACrC,IAAI,IAAI,CAAC,2BAA2B,EAAE;oBACrC,IAAI,CAAC,2BAA2B,EAAE,CAAC;oBACnC,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC;iBACxC;gBACD,OAAO;aACP;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAClK,IAAI,gBAAgB,CAAC,KAAK,EAAE;gBAC3B,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;aAC1D;YACD,QAAQ,IAAI,CAAC,KAAK,EAAE;gBACnB,KAAK,iBAAiB,CAAC,KAAK;oBAC3B,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE;wBACrC,gBAAgB,EAAE,IAAI;wBACtB,oBAAoB,EAAE,KAAK;qBAC3B,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,yBAAyB,EAAE;wBACnC,IAAI,CAAC,yBAAyB,EAAE,CAAC;qBACjC;oBACD,MAAM;gBACP,KAAK,iBAAiB,CAAC,OAAO;oBAC7B,IAAI,OAAO,GAAG,CAAC,EAAE;wBAChB,IAAI,IAAI,CAAC,qBAAqB,EAAE;4BAC/B,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;yBAChE;qBACD;oBACD,MAAM;gBACP,KAAK,iBAAiB,CAAC,SAAS,CAAC;gBACjC,KAAK,iBAAiB,CAAC,KAAK;oBAC3B,IAAI,IAAI,CAAC,qBAAqB,EAAE;wBAC/B,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC;wBAChI,IAAI,OAAO,GAAG,eAAe,EAAE;4BAC9B,IAAI,IAAI,CAAC,2BAA2B,EAAE;gCACrC,IAAI,CAAC,2BAA2B,EAAE,CAAC;gCACnC,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC;6BACxC;4BACD,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,EAAE,CAAC;yBACzD;6BAAM;4BACN,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE;gCACrC,oBAAoB,EAAE,IAAI;6BAC1B,CAAC,CAAC;4BACH,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,EAAE,CAAC;yBACzD;qBACD;oBACD,MAAM;aACP;SACD;IACF,CAAC;CACD"}

package/ui/transition/shared-transition-helper.android.d.ts

@@ -0,0 +1,4 @@
+import { SharedTransitionState } from './shared-transition';
+export declare class SharedTransitionHelper {
+    static animate(state: SharedTransitionState, transitionContext: any, type: 'page' | 'modal'): void;
+}

package/ui/transition/shared-transition-helper.android.js

@@ -0,0 +1,6 @@
+export class SharedTransitionHelper {
+    static animate(state, transitionContext, type) {
+        // may be able to consolidate android handling here in future
+    }
+}
+//# sourceMappingURL=shared-transition-helper.android.js.map

package/ui/transition/shared-transition-helper.android.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared-transition-helper.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/shared-transition-helper.android.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,sBAAsB;IAClC,MAAM,CAAC,OAAO,CAAC,KAA4B,EAAE,iBAAsB,EAAE,IAAsB;QAC1F,6DAA6D;IAC9D,CAAC;CACD"}

package/ui/transition/shared-transition-helper.d.ts

@@ -0,0 +1,10 @@
+import type { SharedTransitionType, SharedInteractiveState } from '.';
+import type { SharedTransitionState } from './shared-transition';
+
+export declare class SharedTransitionHelper {
+	static animate(state: SharedTransitionState, transitionContext: any /* iOS: UIViewControllerContextTransitioning */, type: SharedTransitionType): void;
+	static interactiveStart(state: SharedTransitionState, interactiveState: SharedInteractiveState, type: SharedTransitionType): void;
+	static interactiveUpdate(state: SharedTransitionState, interactiveState: SharedInteractiveState, type: SharedTransitionType, percent: number): void;
+	static interactiveCancel(state: SharedTransitionState, interactiveState: SharedInteractiveState, type: SharedTransitionType): void;
+	static interactiveFinish(state: SharedTransitionState, interactiveState: SharedInteractiveState, type: SharedTransitionType): void;
+}

package/ui/transition/shared-transition-helper.ios.d.ts

@@ -0,0 +1,9 @@
+import type { SharedInteractiveState, SharedTransitionType } from '.';
+import { SharedTransitionState } from './shared-transition';
+export declare class SharedTransitionHelper {
+    static animate(state: SharedTransitionState, transitionContext: UIViewControllerContextTransitioning, type: SharedTransitionType): void;
+    static interactiveStart(state: SharedTransitionState, interactiveState: SharedInteractiveState, type: SharedTransitionType): void;
+    static interactiveUpdate(state: SharedTransitionState, interactiveState: SharedInteractiveState, type: SharedTransitionType, percent: number): void;
+    static interactiveCancel(state: SharedTransitionState, interactiveState: SharedInteractiveState, type: SharedTransitionType): void;
+    static interactiveFinish(state: SharedTransitionState, interactiveState: SharedInteractiveState, type: SharedTransitionType): void;
+}