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

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

@@ -1,6 +1,8 @@
-import { Screen } from '../../platform';
-import { Transition, iosMatchLayerProperties, iosPrintRect, iosSnapshotView } from '.';
-import { SharedTransition, SharedTransitionAnimationType, DEFAULT_DURATION } from './shared-transition';
+import { isNumber } from '../../utils/types';
+import { Transition } from '.';
+import { SharedTransition, DEFAULT_DURATION } from './shared-transition';
+import { SharedTransitionHelper } from './shared-transition-helper';
+import { GestureStateTypes } from '../gestures';
 export class ModalTransition extends Transition {
     iosPresentedController(presented, presenting, source) {
         this.transitionController = ModalTransitionController.initWithOwner(new WeakRef(this));
@@ -14,18 +16,119 @@ export class ModalTransition extends Transition {
         return this.transitionController;
     }
     iosInteractionDismiss(animator) {
-        console.log('-- iosInteractionDismiss --');
-        return null;
+        // console.log('-- iosInteractionDismiss --');
+        this.interactiveController = PercentInteractiveController.initWithOwner(new WeakRef(this));
+        return this.interactiveController;
     }
     iosInteractionPresented(animator) {
-        console.log('-- iosInteractionPresented --');
+        // console.log('-- iosInteractionPresented --');
         return null;
     }
-    iosPresentedViewController(presented, presenting, source) {
-        console.log('-- iosPresentedViewController --');
-        return null;
+    setupInteractiveGesture(startCallback, view) {
+        this._interactiveStartCallback = startCallback;
+        this._interactiveDismissGesture = this._interactiveDismissGestureHandler.bind(this);
+        view.on('pan', this._interactiveDismissGesture);
+        // this.interactiveGestureRecognizer = UIScreenEdgePanGestureRecognizer.alloc().initWithTargetAction()
+        // 			let edgeSwipeGestureRecognizer = UIScreenEdgePanGestureRecognizer(target: self, action: #selector(handleSwipe(_:)))
+        // edgeSwipeGestureRecognizer.edges = .left
+        // view.addGestureRecognizer(edgeSwipeGestureRecognizer)
+    }
+    _interactiveDismissGestureHandler(args) {
+        if (args?.ios?.view) {
+            const state = SharedTransition.getState(this.id);
+            const percent = state.interactive?.dismiss?.percentFormula ? state.interactive.dismiss.percentFormula(args) : args.deltaY / (args.ios.view.bounds.size.height / 2);
+            if (SharedTransition.DEBUG) {
+                console.log('Interactive dismissal percentage:', percent);
+            }
+            switch (args.state) {
+                case GestureStateTypes.began:
+                    SharedTransition.updateState(this.id, {
+                        interactiveBegan: true,
+                        interactiveCancelled: false,
+                    });
+                    if (this._interactiveStartCallback) {
+                        this._interactiveStartCallback();
+                    }
+                    break;
+                case GestureStateTypes.changed:
+                    if (percent < 1) {
+                        if (this.interactiveController) {
+                            this.interactiveController.updateInteractiveTransition(percent);
+                        }
+                    }
+                    break;
+                case GestureStateTypes.cancelled:
+                case GestureStateTypes.ended:
+                    if (this.interactiveController) {
+                        const finishThreshold = isNumber(state.interactive?.dismiss?.finishThreshold) ? state.interactive.dismiss.finishThreshold : 0.5;
+                        if (percent > finishThreshold) {
+                            this.interactiveController.finishInteractiveTransition();
+                        }
+                        else {
+                            SharedTransition.updateState(this.id, {
+                                interactiveCancelled: true,
+                            });
+                            this.interactiveController.cancelInteractiveTransition();
+                        }
+                    }
+                    break;
+            }
+        }
     }
 }
+var PercentInteractiveController = /** @class */ (function (_super) {
+    __extends(PercentInteractiveController, _super);
+    function PercentInteractiveController() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    PercentInteractiveController.initWithOwner = function (owner) {
+        var ctrl = PercentInteractiveController.new();
+        ctrl.owner = owner;
+        return ctrl;
+    };
+    PercentInteractiveController.prototype.startInteractiveTransition = function (transitionContext) {
+        var _a;
+        // console.log('startInteractiveTransition');
+        if (!this.interactiveState) {
+            this.interactiveState = {
+                transitionContext: transitionContext,
+            };
+            var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
+            if (owner) {
+                var state = SharedTransition.getState(owner.id);
+                SharedTransitionHelper.interactiveStart(state, this.interactiveState, 'modal');
+            }
+        }
+    };
+    PercentInteractiveController.prototype.updateInteractiveTransition = function (percentComplete) {
+        var _a;
+        var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
+        if (owner) {
+            var state = SharedTransition.getState(owner.id);
+            SharedTransitionHelper.interactiveUpdate(state, this.interactiveState, 'modal', percentComplete);
+        }
+    };
+    PercentInteractiveController.prototype.cancelInteractiveTransition = function () {
+        var _a;
+        // console.log('cancelInteractiveTransition');
+        var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
+        if (owner) {
+            var state = SharedTransition.getState(owner.id);
+            SharedTransitionHelper.interactiveCancel(state, this.interactiveState, 'modal');
+        }
+    };
+    PercentInteractiveController.prototype.finishInteractiveTransition = function () {
+        var _a;
+        // console.log('finishInteractiveTransition');
+        var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
+        if (owner) {
+            var state = SharedTransition.getState(owner.id);
+            SharedTransitionHelper.interactiveFinish(state, this.interactiveState, 'modal');
+        }
+    };
+    PercentInteractiveController.ObjCProtocols = [UIViewControllerInteractiveTransitioning];
+    return PercentInteractiveController;
+}(UIPercentDrivenInteractiveTransition));
 var ModalTransitionController = /** @class */ (function (_super) {
     __extends(ModalTransitionController, _super);
     function ModalTransitionController() {
@@ -40,208 +143,15 @@ var ModalTransitionController = /** @class */ (function (_super) {
         return DEFAULT_DURATION;
     };
     ModalTransitionController.prototype.animateTransition = function (transitionContext) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-        // console.log('ModalTransitionController animateTransition:', animationType);
+        // console.log('ModalTransitionController animateTransition');
         var owner = this.owner.deref();
         if (owner) {
             // 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)
-            switch (state_1.activeType) {
-                case SharedTransitionAnimationType.present: {
-                    console.log('-- Transition present --');
-                    transitionContext.containerView.addSubview(owner.presented.view);
-                    owner.presented.view.layoutIfNeeded();
-                    var _q = SharedTransition.getSharedElements(state_1.page, state_1.toPage), sharedElements = _q.sharedElements, presented = _q.presented;
-                    console.log('  ');
-                    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;
-                        // console.log('fromTarget instanceof UIImageView:', fromTarget instanceof UIImageView)
-                        // 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 = iosSnapshotView(presentedSharedElement);
-                                sharedElementSnapshot.tintColor = presentedSharedElement.tintColor;
-                            });
-                            sharedElementSnapshot.tintColor = presentedSharedElement.tintColor;
-                            sharedElementSnapshot.contentMode = presentedSharedElement.contentMode;
-                        }
-                        iosMatchLayerProperties(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;
-                        console.log('---> ', presentingView.sharedTransitionTag, ' frame:', iosPrintRect(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;
-                        }
-                        // TODO: Discuss with Igor whether this is necessary
-                        // potential this could help smooth some shared element transitions
-                        UIView.animateWithDurationAnimationsCompletion(0, // Igor: disabled for now, we'll talk about this and decide
-                        function () {
-                            for (var _i = 0, _a = owner.sharedElements.presenting; _i < _a.length; _i++) {
-                                var presenting = _a[_i];
-                                presenting.snapshot.alpha = presenting.endOpacity;
-                            }
-                        }, function () {
-                            for (var _i = 0, _a = owner.sharedElements.presenting; _i < _a.length; _i++) {
-                                var presenting = _a[_i];
-                                presenting.snapshot.removeFromSuperview();
-                            }
-                            SharedTransition.updateState(owner.id, {
-                                activeType: SharedTransitionAnimationType.dismiss,
-                            });
-                            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();
-                        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
-                            iosMatchLayerProperties(presentingMatch.snapshot, presented_2.view.ios);
-                            // create a snapshot of the presented view
-                            presentingMatch.snapshot.image = iosSnapshotView(presented_2.view.ios);
-                            // apply correct alpha
-                            presentingMatch.snapshot.alpha = presentingMatch.endOpacity;
-                            console.log("---> ".concat(presentingMatch.view.sharedTransitionTag, " animate to: "), iosPrintRect(correctedEndFrame));
-                        };
-                        for (var _i = 0, _a = owner.sharedElements.presented; _i < _a.length; _i++) {
-                            var presented_2 = _a[_i];
-                            _loop_2(presented_2);
-                        }
-                        console.log('  ');
-                    };
-                    // starting page properties
-                    owner.presented.view.alpha = typeof ((_a = state_1.toPageStart) === null || _a === void 0 ? void 0 : _a.opacity) === 'number' ? (_b = state_1.toPageStart) === null || _b === void 0 ? void 0 : _b.opacity : 0;
-                    var startX = typeof ((_c = state_1.toPageStart) === null || _c === void 0 ? void 0 : _c.x) === 'number' ? (_d = state_1.toPageStart) === null || _d === void 0 ? void 0 : _d.x : 0;
-                    var startY = typeof ((_e = state_1.toPageStart) === null || _e === void 0 ? void 0 : _e.y) === 'number' ? (_f = state_1.toPageStart) === null || _f === void 0 ? void 0 : _f.y : Screen.mainScreen.heightDIPs;
-                    var startWidth = typeof ((_g = state_1.toPageStart) === null || _g === void 0 ? void 0 : _g.width) === 'number' ? (_h = state_1.toPageStart) === null || _h === void 0 ? void 0 : _h.width : Screen.mainScreen.widthDIPs;
-                    var startHeight = typeof ((_j = state_1.toPageStart) === null || _j === void 0 ? void 0 : _j.height) === 'number' ? (_k = state_1.toPageStart) === null || _k === void 0 ? void 0 : _k.height : Screen.mainScreen.heightDIPs;
-                    owner.presented.view.frame = CGRectMake(startX, startY, startWidth, startHeight);
-                    UIView.animateWithDurationDelayUsingSpringWithDampingInitialSpringVelocityOptionsAnimationsCompletion(typeof ((_l = state_1.toPageStart) === null || _l === void 0 ? void 0 : _l.duration) === 'number' ? ((_m = state_1.toPageStart) === null || _m === void 0 ? void 0 : _m.duration) / 1000 : DEFAULT_DURATION, 0, 0.5, 3, UIViewAnimationOptions.CurveEaseInOut, function () {
-                        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                        // animate page properties to the following:
-                        owner.presented.view.alpha = typeof ((_a = state_1.toPageEnd) === null || _a === void 0 ? void 0 : _a.opacity) === 'number' ? (_b = state_1.toPageEnd) === null || _b === void 0 ? void 0 : _b.opacity : 1;
-                        var endX = typeof ((_c = state_1.toPageEnd) === null || _c === void 0 ? void 0 : _c.x) === 'number' ? (_d = state_1.toPageEnd) === null || _d === void 0 ? void 0 : _d.x : 0;
-                        var endY = typeof ((_e = state_1.toPageEnd) === null || _e === void 0 ? void 0 : _e.y) === 'number' ? (_f = state_1.toPageEnd) === null || _f === void 0 ? void 0 : _f.y : 0;
-                        var endWidth = typeof ((_g = state_1.toPageEnd) === null || _g === void 0 ? void 0 : _g.width) === 'number' ? (_h = state_1.toPageEnd) === null || _h === void 0 ? void 0 : _h.width : Screen.mainScreen.widthDIPs;
-                        var endHeight = typeof ((_j = state_1.toPageEnd) === null || _j === void 0 ? void 0 : _j.height) === 'number' ? (_k = state_1.toPageEnd) === null || _k === void 0 ? void 0 : _k.height : Screen.mainScreen.heightDIPs;
-                        owner.presented.view.frame = CGRectMake(endX, endY, endWidth, endHeight);
-                        updateFramePresent_1();
-                    }, function () {
-                        cleanupPresent_1();
-                    });
-                    break;
-                }
-                case SharedTransitionAnimationType.dismiss: {
-                    console.log('-- Transition dismiss --');
-                    // console.log('transitionContext.containerView.subviews.count:', transitionContext.containerView.subviews.count);
-                    console.log('  ');
-                    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 _r = 0, _s = owner.sharedElements.presented; _r < _s.length; _r++) {
-                        var p = _s[_r];
-                        p.view.opacity = 0;
-                    }
-                    for (var _t = 0, _u = owner.sharedElements.presenting; _t < _u.length; _t++) {
-                        var p = _u[_t];
-                        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;
-                        }
-                        SharedTransition.finishState(owner.id);
-                        transitionContext.completeTransition(true);
-                    };
-                    var updateFrameDismiss_1 = function () {
-                        console.log('3. Dismissing shared elements:');
-                        for (var _i = 0, _a = owner.sharedElements.presenting; _i < _a.length; _i++) {
-                            var presenting = _a[_i];
-                            iosMatchLayerProperties(presenting.snapshot, presenting.view.ios);
-                            presenting.snapshot.frame = presenting.startFrame;
-                            presenting.snapshot.alpha = presenting.startOpacity;
-                            console.log("---> ".concat(presenting.view.sharedTransitionTag, " animate to: "), iosPrintRect(presenting.startFrame));
-                        }
-                        console.log('  ');
-                    };
-                    UIView.animateWithDurationDelayUsingSpringWithDampingInitialSpringVelocityOptionsAnimationsCompletion(typeof ((_o = state_1.fromPageEnd) === null || _o === void 0 ? void 0 : _o.duration) === 'number' ? ((_p = state_1.fromPageEnd) === null || _p === void 0 ? void 0 : _p.duration) / 1000 : DEFAULT_DURATION, 0, 0.5, 3, UIViewAnimationOptions.CurveEaseInOut, function () {
-                        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                        owner.presented.view.alpha = typeof ((_a = state_1.fromPageEnd) === null || _a === void 0 ? void 0 : _a.opacity) === 'number' ? (_b = state_1.fromPageEnd) === null || _b === void 0 ? void 0 : _b.opacity : 0;
-                        var endX = typeof ((_c = state_1.fromPageEnd) === null || _c === void 0 ? void 0 : _c.x) === 'number' ? (_d = state_1.fromPageEnd) === null || _d === void 0 ? void 0 : _d.x : 0;
-                        var endY = typeof ((_e = state_1.fromPageEnd) === null || _e === void 0 ? void 0 : _e.y) === 'number' ? (_f = state_1.fromPageEnd) === null || _f === void 0 ? void 0 : _f.y : Screen.mainScreen.heightDIPs;
-                        var endWidth = typeof ((_g = state_1.fromPageEnd) === null || _g === void 0 ? void 0 : _g.width) === 'number' ? (_h = state_1.fromPageEnd) === null || _h === void 0 ? void 0 : _h.width : Screen.mainScreen.widthDIPs;
-                        var endHeight = typeof ((_j = state_1.fromPageEnd) === null || _j === void 0 ? void 0 : _j.height) === 'number' ? (_k = state_1.fromPageEnd) === null || _k === void 0 ? void 0 : _k.height : Screen.mainScreen.heightDIPs;
-                        owner.presented.view.frame = CGRectMake(endX, endY, endWidth, endHeight);
-                        updateFrameDismiss_1();
-                    }, function () {
-                        cleanupDismiss_1();
-                    });
-                    break;
-                }
-            }
+            SharedTransitionHelper.animate(state, transitionContext, 'modal');
         }
     };
     ModalTransitionController.ObjCProtocols = [UIViewControllerAnimatedTransitioning];

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

@@ -1 +1 @@
-{"version":3,"file":"modal-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/modal-transition.ios.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,GAAG,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAExG,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAS9C,sBAAsB,CAAC,SAA2B,EAAE,UAA4B,EAAE,MAAwB;QACzG,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,yCAAyC;QACzC,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,sBAAsB,CAAC,SAA2B;QACjD,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,qBAAqB,CAAC,QAA+C;QACpE,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IAED,uBAAuB,CAAC,QAA+C;QACtE,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;IACb,CAAC;IAED,0BAA0B,CAAC,SAA2B,EAAE,UAA4B,EAAE,MAAwB;QAC7G,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IACb,CAAC;CACD"}
+{"version":3,"file":"modal-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/modal-transition.ios.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAiD,MAAM,GAAG,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAiC,gBAAgB,EAAiE,MAAM,qBAAqB,CAAC;AACvK,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAuB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErE,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAe9C,sBAAsB,CAAC,SAA2B,EAAE,UAA4B,EAAE,MAAwB;QACzG,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,yCAAyC;QACzC,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,sBAAsB,CAAC,SAA2B;QACjD,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,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,QAA+C;QACtE,gDAAgD;QAChD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,uBAAuB,CAAC,aAAyB,EAAE,IAAU;QAC5D,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC;QAC/C,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAChD,sGAAsG;QACtG,yHAAyH;QACzH,2CAA2C;QAC3C,wDAAwD;IACzD,CAAC;IAEO,iCAAiC,CAAC,IAAyB;QAClE,IAAI,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;YACpB,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjD,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,MAAM,GAAG,CAAC,CAAC,CAAC;YACnK,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,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/page-transition.android.d.ts

@@ -1,6 +1,6 @@
 import { BackstackEntry } from '../frame';
-import { Transition } from '.';
-export declare class PageTransition extends Transition {
-    createAndroidAnimator(transitionType: string): void;
-    test(fragmentTransaction: androidx.fragment.app.FragmentTransaction, currentEntry: BackstackEntry, newEntry: BackstackEntry): void;
+import { FadeTransition } from './fade-transition';
+export declare class PageTransition extends FadeTransition {
+    constructor(duration?: number, curve?: any);
+    androidFragmentTransactionCallback(fragmentTransaction: androidx.fragment.app.FragmentTransaction, currentEntry: BackstackEntry, newEntry: BackstackEntry): void;
 }

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

@@ -1,54 +1,65 @@
-import { Transition } from '.';
+import { FadeTransition } from './fade-transition';
 import { SharedTransition } from './shared-transition';
-export class PageTransition extends Transition {
-    createAndroidAnimator(transitionType) {
-        console.log('HELLO PageTransition', transitionType);
+var CustomInterpolator = /** @class */ (function (_super) {
+    __extends(CustomInterpolator, _super);
+    function CustomInterpolator() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    test(fragmentTransaction, currentEntry, newEntry) {
-        console.log('HELLO PageTransition', fragmentTransaction);
+    CustomInterpolator.prototype.getInterpolation = function (input) {
+        // HACK: we speed up the interpolation by 10% to fix the issue with the transition not being finished
+        // and the views shifting from their intended final position...
+        // this is really just a hack and should be fixed properly once we
+        // can figure out the root cause of the issue.
+        var res = _super.prototype.getInterpolation.call(this, input) * 1.1;
+        if (res > 1) {
+            return float(1);
+        }
+        return float(res);
+    };
+    return CustomInterpolator;
+}(android.view.animation.AnticipateOvershootInterpolator));
+function setTransitionName(view) {
+    if (!view.sharedTransitionTag) {
+        return;
+    }
+    try {
+        androidx.core.view.ViewCompat.setTransitionName(view.nativeView, view.sharedTransitionTag);
+    }
+    catch (err) {
+        // ignore
+    }
+}
+export class PageTransition extends FadeTransition {
+    constructor(duration, curve) {
+        // 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.');
+        }
+        super(duration);
+    }
+    androidFragmentTransactionCallback(fragmentTransaction, currentEntry, newEntry) {
         const fromPage = currentEntry.resolvedPage;
         const toPage = newEntry.resolvedPage;
-        const currentFragment = currentEntry ? currentEntry.fragment : null;
         const newFragment = newEntry.fragment;
-        const { sharedElements, presented, presenting } = SharedTransition.getSharedElements(fromPage, toPage);
-        // fragmentTransaction.addSharedElement();
-        toPage.on('loaded', () => {
-            presented.forEach((v) => {
-                console.log({
-                    presentedSharedElements: true,
-                    nativeView: !!v.nativeView,
-                    sharedTransitionTag: v.sharedTransitionTag,
-                });
-                androidx.core.view.ViewCompat.setTransitionName(v.nativeView, v.sharedTransitionTag);
-            });
-            // setTimeout(() => {
+        const { presented, presenting } = SharedTransition.getSharedElements(fromPage, toPage);
+        toPage.once('loaded', () => {
+            presented.forEach(setTransitionName);
             newFragment.startPostponedEnterTransition();
-            // }, 2000)
-        });
-        presenting.forEach((v) => {
-            console.log({
-                presentingSharedElements: true,
-                nativeView: !!v.nativeView,
-                sharedTransitionTag: v.sharedTransitionTag,
-            });
-            androidx.core.view.ViewCompat.setTransitionName(v.nativeView, v.sharedTransitionTag);
         });
         presenting.forEach((v) => {
+            setTransitionName(v);
             fragmentTransaction.addSharedElement(v.nativeView, v.sharedTransitionTag);
         });
         fragmentTransaction.setReorderingAllowed(true);
         const transitionSet = new androidx.transition.TransitionSet();
-        transitionSet.setDuration(2000);
+        transitionSet.setDuration(this.getDuration());
         transitionSet.addTransition(new androidx.transition.ChangeBounds());
         transitionSet.addTransition(new androidx.transition.ChangeTransform());
-        // transitionSet.addTransition(new androidx.transition.ChangeClipBounds());
+        transitionSet.setInterpolator(new CustomInterpolator());
         // postpone enter until we call "loaded" on the new page
         newFragment.postponeEnterTransition();
         newFragment.setSharedElementEnterTransition(transitionSet);
         newFragment.setSharedElementReturnTransition(transitionSet);
-        // newFragment.setSharedElementReturnTransition(new androidx.transition.ChangeBounds());
-        // currentFragment.setSharedElementEnterTransition(new androidx.transition.ChangeBounds());
-        // currentFragment.setSharedElementReturnTransition(new androidx.transition.ChangeBounds());
     }
 }
 //# sourceMappingURL=page-transition.android.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"page-transition.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"page-transition.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.android.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;AAmBvD,SAAS,iBAAiB,CAAC,IAAc;IACxC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;QAC9B,OAAO;KACP;IACD,IAAI;QACH,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;KAC3F;IAAC,OAAO,GAAG,EAAE;QACb,SAAS;KACT;AACF,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,cAAc;IACjD,YAAY,QAAiB,EAAE,KAAW;QACzC,qFAAqF;QACrF,IAAI,KAAK,EAAE;YACV,OAAO,CAAC,IAAI,CAAC,mGAAmG,CAAC,CAAC;SAClH;QACD,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC;IAED,kCAAkC,CAAC,mBAA8D,EAAE,YAA4B,EAAE,QAAwB;QACxJ,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC;QAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC;QACrC,MAAM,WAAW,GAAmC,QAAQ,CAAC,QAAQ,CAAC;QAEtE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEvF,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC1B,SAAS,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACrC,WAAW,CAAC,6BAA6B,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACxB,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACrB,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,mBAAmB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC9D,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC9C,aAAa,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;QACpE,aAAa,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,CAAC;QACvE,aAAa,CAAC,eAAe,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;QAExD,wDAAwD;QACxD,WAAW,CAAC,uBAAuB,EAAE,CAAC;QACtC,WAAW,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC;QAC3D,WAAW,CAAC,gCAAgC,CAAC,aAAa,CAAC,CAAC;IAC7D,CAAC;CACD"}

package/ui/transition/page-transition.ios.d.ts

@@ -1,25 +1,34 @@
 import type { View } from '../core/view';
-import { Transition } from '.';
+import { SharedElementSettings, Transition } from '.';
 export declare class PageTransition extends Transition {
+    transitionController: PageTransitionController;
+    interactiveController: UIPercentDrivenInteractiveTransition;
     presented: UIViewController;
     presenting: UIViewController;
+    navigationController: UINavigationController;
+    operation: number;
     sharedElements: {
-        presented?: Array<{
-            view: View;
-            startFrame?: CGRect;
-            endFrame?: CGRect;
-            snapshot?: UIImageView;
-            startOpacity?: number;
-            endOpacity?: number;
-        }>;
-        presenting?: Array<{
-            view: View;
-            startFrame: CGRect;
-            endFrame?: CGRect;
-            snapshot?: UIImageView;
-            startOpacity?: number;
-            endOpacity?: number;
+        presented?: Array<SharedElementSettings>;
+        presenting?: Array<SharedElementSettings>;
+        independent?: Array<SharedElementSettings & {
+            isPresented?: boolean;
         }>;
     };
-    animateIOSTransition(transitionContext: UIViewControllerContextTransitioning, fromViewCtrl: UIViewController, toViewCtrl: UIViewController, operation: UINavigationControllerOperation): void;
+    private _interactiveStartCallback;
+    private _interactiveDismissGesture;
+    private _interactiveGestureTeardown;
+    iosNavigatedController(navigationController: UINavigationController, operation: number, fromVC: UIViewController, toVC: UIViewController): UIViewControllerAnimatedTransitioning;
+    iosInteractionDismiss(animator: UIViewControllerAnimatedTransitioning): UIViewControllerInteractiveTransitioning;
+    setupInteractiveGesture(startCallback: () => void, view: View): () => void;
+    private _interactiveDismissGestureHandler;
+}
+declare class PageTransitionController extends NSObject implements UIViewControllerAnimatedTransitioning {
+    static ObjCProtocols: {
+        prototype: UIViewControllerAnimatedTransitioning;
+    }[];
+    owner: WeakRef<PageTransition>;
+    static initWithOwner(owner: WeakRef<PageTransition>): PageTransitionController;
+    transitionDuration(transitionContext: UIViewControllerContextTransitioning): number;
+    animateTransition(transitionContext: UIViewControllerContextTransitioning): void;
 }
+export {};