From 44de0d13bf9fd79516ebb82f3999062477b0a3c3 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Fri, 10 Mar 2023 20:42:13 -0800
Subject: [PATCH] chore: cleanup

---
 apps/toolbox/src/pages/transitions.ts              |  8 ++------
 packages/core/ui/frame/index.ios.ts                |  7 -------
 packages/core/ui/transition/page-transition.ios.ts | 13 ++++++-------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/apps/toolbox/src/pages/transitions.ts b/apps/toolbox/src/pages/transitions.ts
index 334819aff..db9b59a9e 100644
--- a/apps/toolbox/src/pages/transitions.ts
+++ b/apps/toolbox/src/pages/transitions.ts
@@ -18,14 +18,10 @@ export class TransitionsModel extends Observable {
 					page,
 					instance: new PageTransition(),
 					incomingViewStart: {
-						x: Screen.mainScreen.widthDIPs,
-						y: 0,
-						duration: 1000,
+						duration: 5000,
 					},
 					dismissViewEnd: {
-						x: Screen.mainScreen.widthDIPs,
-						y: 0,
-						duration: 500,
+						duration: 5000,
 					},
 				}),
 			},
diff --git a/packages/core/ui/frame/index.ios.ts b/packages/core/ui/frame/index.ios.ts
index d5724a73e..b457c37d4 100644
--- a/packages/core/ui/frame/index.ios.ts
+++ b/packages/core/ui/frame/index.ios.ts
@@ -409,13 +409,6 @@ class UINavigationControllerAnimatedDelegate extends NSObject implements UINavig
 			Trace.write(`UINavigationControllerImpl.navigationControllerAnimationControllerForOperationFromViewControllerToViewController(${operation}, ${fromVC}, ${toVC}), transition: ${JSON.stringify(navigationTransition)}`, Trace.categories.NativeLifecycle);
 		}
 
-		// // Shared element transitions
-		// if (operation === UINavigationControllerOperation.Push && navigationTransition.instance?.iosPresentedController) {
-		// 	return navigationTransition.instance?.iosPresentedController(toVC, fromVC, navigationController);
-		// } else if (operation === UINavigationControllerOperation.Pop && navigationTransition.instance?.iosDismissedController) {
-		// 	return navigationTransition.instance?.iosDismissedController(viewController);
-		// }
-
 		const curve = _getNativeCurve(navigationTransition);
 		const animationController = _createIOSAnimatedTransitioning(navigationTransition, curve, operation, fromVC, toVC);
 
diff --git a/packages/core/ui/transition/page-transition.ios.ts b/packages/core/ui/transition/page-transition.ios.ts
index 6e363fec4..5e0c501a7 100644
--- a/packages/core/ui/transition/page-transition.ios.ts
+++ b/packages/core/ui/transition/page-transition.ios.ts
@@ -175,8 +175,8 @@ export class PageTransition extends Transition {
 				// starting page properties
 				this.presented.view.alpha = typeof state.incomingViewStart?.opacity === 'number' ? state.incomingViewStart?.opacity : 0;
 
-				const startX = typeof state.incomingViewStart?.x === 'number' ? state.incomingViewStart?.x : 0;
-				const startY = typeof state.incomingViewStart?.y === 'number' ? state.incomingViewStart?.y : Screen.mainScreen.heightDIPs;
+				const startX = typeof state.incomingViewStart?.x === 'number' ? state.incomingViewStart?.x : Screen.mainScreen.widthDIPs;
+				const startY = typeof state.incomingViewStart?.y === 'number' ? state.incomingViewStart?.y : 0;
 				const startWidth = typeof state.incomingViewStart?.width === 'number' ? state.incomingViewStart?.width : Screen.mainScreen.widthDIPs;
 				const startHeight = typeof state.incomingViewStart?.height === 'number' ? state.incomingViewStart?.height : Screen.mainScreen.heightDIPs;
 				this.presented.view.frame = CGRectMake(startX, startY, startWidth, startHeight);
@@ -206,7 +206,7 @@ export class PageTransition extends Transition {
 				break;
 			}
 			case UINavigationControllerOperation.Pop: {
-				this.presented = fromViewCtrl;
+				// this.presented = fromViewCtrl;
 				console.log('-- Transition dismiss --', this.presented);
 
 				// console.log('transitionContext.containerView.subviews.count:', transitionContext.containerView.subviews.count);
@@ -229,8 +229,7 @@ export class PageTransition extends Transition {
 
 				const cleanupDismiss = () => {
 					for (const presenting of this.sharedElements.presenting) {
-						// presenting.view.opacity = presenting.startOpacity;
-						presenting.snapshot.removeFromSuperview();
+						presenting.view.opacity = presenting.startOpacity;
 					}
 					SharedTransition.finishState(this.id);
 					transitionContext.completeTransition(true);
@@ -256,8 +255,8 @@ export class PageTransition extends Transition {
 					() => {
 						this.presented.view.alpha = typeof state.dismissViewEnd?.opacity === 'number' ? state.dismissViewEnd?.opacity : 0;
 
-						const endX = typeof state.dismissViewEnd?.x === 'number' ? state.dismissViewEnd?.x : 0;
-						const endY = typeof state.dismissViewEnd?.y === 'number' ? state.dismissViewEnd?.y : Screen.mainScreen.heightDIPs;
+						const endX = typeof state.dismissViewEnd?.x === 'number' ? state.dismissViewEnd?.x : Screen.mainScreen.widthDIPs;
+						const endY = typeof state.dismissViewEnd?.y === 'number' ? state.dismissViewEnd?.y : 0;
 						const endWidth = typeof state.dismissViewEnd?.width === 'number' ? state.dismissViewEnd?.width : Screen.mainScreen.widthDIPs;
 						const endHeight = typeof state.dismissViewEnd?.height === 'number' ? state.dismissViewEnd?.height : Screen.mainScreen.heightDIPs;
 						this.presented.view.frame = CGRectMake(endX, endY, endWidth, endHeight);