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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/core",
-  "version": "8.5.0-alpha.3",
+  "version": "8.5.0-alpha.4",
   "description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
   "main": "index",
   "types": "index.d.ts",

package/ui/index.d.ts

@@ -71,5 +71,6 @@ export { PageTransition } from './transition/page-transition';
 export { FadeTransition } from './transition/fade-transition';
 export { SlideTransition } from './transition/slide-transition';
 export { SharedTransition, SharedTransitionAnimationType } from './transition/shared-transition';
+export type { SharedTransitionConfig } from './transition/shared-transition';
 export { WebView } from './web-view';
 export type { LoadEventData, WebViewNavigationType } from './web-view';

package/ui/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/ui/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/ui/index.ts"],"names":[],"mappings":"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"}

package/ui/transition/index.d.ts

@@ -1,7 +1,26 @@
-import type { BackstackEntry } from '../frame';
+import type { View } from '../core/view';
+import type { BackstackEntry } from '../frame';
+export type SharedElementSettings = { view: View; startFrame: any; endFrame?: any; startOpacity?: number; endOpacity?: number; scale?: { x?: number; y?: number }; startTransform?: any; snapshot?: any };
+export type SharedTransitionType = 'page' | 'modal';
+export interface SharedInteractiveState {
+	started?: false;
+	added?: boolean;
+	transitionContext?: any;
+	propertyAnimator?: any;
+}
 
 export declare class Transition {
 	id: number;
+	transitionController?: any;
+	interactiveController?: any;
+	presented?: any;
+	presenting?: any;
+	sharedElements?: {
+		presented?: Array<SharedElementSettings>;
+		presenting?: Array<SharedElementSettings>;
+		// independent sharedTransitionTags which are part of the shared transition but only on one page
+		independent?: Array<SharedElementSettings & { isPresented?: boolean }>;
+	};
 	static AndroidTransitionType?: { enter?: string; exit?: string; popEnter?: string; popExit?: string };
 	constructor(duration?: number, nativeCurve?: any /* UIViewAnimationCurve | string | CubicBezierAnimationCurve | android.view.animation.Interpolator | android.view.animation.LinearInterpolator */);
 	getDuration(): number;

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

@@ -1,5 +1,5 @@
 import type { View } from '../core/view';
-import { Transition } from '.';
+import { Transition, SharedElementSettings } from '.';
 export declare class ModalTransition extends Transition {
     transitionController: ModalTransitionController;
     interactiveController: UIPercentDrivenInteractiveTransition;
@@ -7,21 +7,10 @@ export declare class ModalTransition extends Transition {
     presented: UIViewController;
     presenting: UIViewController;
     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;
         }>;
     };
     private _interactiveStartCallback;

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

@@ -1,8 +1,7 @@
-import { Screen } from '../../platform';
-import { iOSNativeHelper } from '../../utils/native-helper';
 import { isNumber } from '../../utils/types';
 import { Transition } from '.';
-import { SharedTransition, SharedTransitionAnimationType, DEFAULT_DURATION, DEFAULT_SPRING } from './shared-transition';
+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) {
@@ -37,10 +36,6 @@ export class ModalTransition extends Transition {
     _interactiveDismissGestureHandler(args) {
         if (args?.ios?.view) {
             const state = SharedTransition.getState(this.id);
-            // SharedTransition.updateState(this.id, {
-            // 	interactiveBegan: true,
-            // 	interactiveCancelled: false
-            // });
             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);
@@ -84,9 +79,7 @@ export class ModalTransition extends Transition {
 var PercentInteractiveController = /** @class */ (function (_super) {
     __extends(PercentInteractiveController, _super);
     function PercentInteractiveController() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.started = false;
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     PercentInteractiveController.initWithOwner = function (owner) {
         var ctrl = PercentInteractiveController.new();
@@ -94,99 +87,43 @@ var PercentInteractiveController = /** @class */ (function (_super) {
         return ctrl;
     };
     PercentInteractiveController.prototype.startInteractiveTransition = function (transitionContext) {
+        var _a;
         // console.log('startInteractiveTransition');
-        this.transitionContext = transitionContext;
+        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) {
-            if (!this.started) {
-                this.started = 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 toProps = state.toPageStart;
-                var startY_1 = isNumber(toProps === null || toProps === void 0 ? void 0 : toProps.y) ? toProps === null || toProps === void 0 ? void 0 : toProps.y : Screen.mainScreen.heightDIPs;
-                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 = 0;
-                    owner.presented.view.frame = CGRectMake(0, startY_1, owner.presented.view.bounds.size.width, owner.presented.view.bounds.size.height);
-                });
-            }
-            this.backgroundAnimation.fractionComplete = percentComplete;
+            var state = SharedTransition.getState(owner.id);
+            SharedTransitionHelper.interactiveUpdate(state, this.interactiveState, 'modal', 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.started) {
+        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 : DEFAULT_DURATION;
-                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.started = false;
-                    _this.transitionContext.cancelInteractiveTransition();
-                    _this.transitionContext.completeTransition(false);
-                }, duration * 1000);
-            }
+            SharedTransitionHelper.interactiveCancel(state, this.interactiveState, 'modal');
         }
     };
     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.started) {
-            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 : DEFAULT_DURATION;
-                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;
-                    }
-                    SharedTransition.finishState(owner.id);
-                    _this.transitionContext.finishInteractiveTransition();
-                    _this.transitionContext.completeTransition(true);
-                }, duration * 1000);
-            }
+        if (owner) {
+            var state = SharedTransition.getState(owner.id);
+            SharedTransitionHelper.interactiveFinish(state, this.interactiveState, 'modal');
         }
     };
     PercentInteractiveController.ObjCProtocols = [UIViewControllerInteractiveTransitioning];
@@ -210,246 +147,11 @@ var ModalTransitionController = /** @class */ (function (_super) {
         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 _a = SharedTransition.getSharedElements(state_1.page, state_1.toPage), sharedElements = _a.sharedElements, presented = _a.presented;
-                    if (SharedTransition.DEBUG) {
-                        console.log('  ModalTransition: Present');
-                        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 = 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,
-                        });
-                        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 : 0;
-                    var startY = isNumber(toProps === null || toProps === void 0 ? void 0 : toProps.y) ? toProps === null || toProps === void 0 ? void 0 : toProps.y : Screen.mainScreen.heightDIPs;
-                    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 SharedTransitionAnimationType.dismiss: {
-                    // console.log('-- Transition dismiss --');
-                    // console.log('transitionContext.containerView.subviews.count:', transitionContext.containerView.subviews.count);
-                    if (SharedTransition.DEBUG) {
-                        console.log('  ModalTransition: Dismiss');
-                        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;
-                        }
-                        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 : 0;
-                        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 : Screen.mainScreen.heightDIPs;
-                        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, '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":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACxH,OAAO,EAAuB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErE,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAa9C,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,0CAA0C;YAC1C,2BAA2B;YAC3B,+BAA+B;YAC/B,MAAM;YACN,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"}
+{"version":3,"file":"modal-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/modal-transition.ios.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,5 @@
 import type { View } from '../core/view';
-import { Transition } from '.';
+import { SharedElementSettings, Transition } from '.';
 export declare class PageTransition extends Transition {
     transitionController: PageTransitionController;
     interactiveController: UIPercentDrivenInteractiveTransition;
@@ -8,21 +8,10 @@ export declare class PageTransition extends Transition {
     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;
         }>;
     };
     private _interactiveStartCallback;