Revert "chore: Failling trial for Android/iOS. Keeping the commit just for future reference"

This reverts commit 02eada5.

Author: Youssef1313

src/Uno.UI/Controls/BindableUIView.iOS.cs

@@ -47,27 +47,16 @@ public override void AddSubview(UIView view)
 			// Instead we have to pre-update the _shadowChildren so handlers of the Loaded event will be able
 			// to properly walk the tree up and down (cf. EffectiveViewport).
 			_shadowChildren.Add(view);
-			TryRegisterName(view);
 			base.AddSubview(view);
 		}
 
 		public override void InsertSubview(UIView view, nint atIndex)
 		{
 			// cf. AddSubview comment!
 			_shadowChildren.Insert((int)atIndex, view);
-			TryRegisterName(view);
 			base.InsertSubview(view, atIndex);
 		}
 
-		private void TryRegisterName(UIView view)
-		{
-			if (view is FrameworkElement { Name: { Length: > 0 } name } fe &&
-				FindNameScope(fe) is { } nameScope)
-			{
-				nameScope.RegisterName(name, fe);
-			}
-		}
-
 		public override void WillRemoveSubview(UIView uiview)
 		{
 			// cf. AddSubview comment!

src/Uno.UI/UI/Xaml/EnterParams.cs

@@ -1,4 +1,5 @@
-namespace Uno.UI.Xaml;
+#if UNO_HAS_ENHANCED_LIFECYCLE
+namespace Uno.UI.Xaml;
 
 internal struct EnterParams
 {
@@ -14,3 +15,4 @@ public EnterParams(bool isLive)
 		IsLive = isLive;
 	}
 }
+#endif

src/Uno.UI/UI/Xaml/FrameworkElement.Layout.crossruntime.cs

@@ -902,6 +902,14 @@ private void ArrangeNative(Point offset, Rect? clippedFrame)
 #endif
 		}
 
+		private void AdjustNameScope(ref INameScope? nameScope)
+		{
+			if (NameScope.GetNameScope(this) is { } currentNameScope)
+			{
+				nameScope = currentNameScope;
+			}
+		}
+
 		internal override void Enter(INameScope? nameScope, EnterParams @params, int depth)
 		{
 			// This should happen regardless of whether Name is null or not.
@@ -914,9 +922,11 @@ internal override void Enter(INameScope? nameScope, EnterParams @params, int dep
 			{
 				var name = this.Name;
 
-				if (!string.IsNullOrEmpty(name))
+				if (!string.IsNullOrEmpty(name) && nameScope.FindName(name) is null)
 				{
-					// NOTE: Multiple RegisterName calls can happen.
+					// Ideally, we shouldn't be checking for null FindName.
+					// But it's currently needed due to the way we
+					// register names in namescopes which don't yet match WinUI completely.
 					// Right now, XAML generator will do RegisterName calls, then, when we
 					// enter the visual tree, we will be trying to register the name again.
 					// However, registering in Enter is also very necessary in case C# is used
@@ -925,7 +935,7 @@ internal override void Enter(INameScope? nameScope, EnterParams @params, int dep
 					// The RegisterName calls in XAML generator should probably happen via something
 					// similar to WinUI's PostParseRegisterNames which will basically just do an "Enter" with
 					// isLive being false. Then, the Enter happening in VisualTree.AddRoot should skip name registration.
-					((NameScope)nameScope).RegisterNameNoWarn(name, this);
+					nameScope.RegisterName(name, this);
 				}
 			}
 

src/Uno.UI/UI/Xaml/FrameworkElement.cs

@@ -28,8 +28,6 @@
 using Uno.UI.Xaml.Controls;
 using Uno.UI.Xaml.Core;
 using Uno.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Markup;
-
 
 #if __ANDROID__
 using View = Android.Views.View;
@@ -943,67 +941,6 @@ internal virtual void UpdateThemeBindings(ResourceUpdateReason updateReason)
 			}
 		}
 
-		private void AdjustNameScope(ref INameScope nameScope)
-		{
-			if (NameScope.GetNameScope(this) is { } currentNameScope)
-			{
-				nameScope = currentNameScope;
-			}
-		}
-
-#if !UNO_HAS_ENHANCED_LIFECYCLE
-		internal override void Enter(INameScope nameScope, EnterParams @params, int depth)
-		{
-			// This should happen regardless of whether Name is null or not.
-			// What we need here is that once we find an element being entered that
-			// has its own NameScope, then we start using this namescope and use it for entering its children.
-			// For example, elements in a template where the template root will have its own NameScope.
-			AdjustNameScope(ref nameScope);
-
-			if (nameScope is not null)
-			{
-				var name = this.Name;
-
-				if (!string.IsNullOrEmpty(name))
-				{
-					// NOTE: Multiple RegisterName calls can happen.
-					// Right now, XAML generator will do RegisterName calls, then, when we
-					// enter the visual tree, we will be trying to register the name again.
-					// However, registering in Enter is also very necessary in case C# is used
-					// instead of XAML (be it "regular" C# code or C# Markup).
-					// So, we need to have RegisterName here.
-					// The RegisterName calls in XAML generator should probably happen via something
-					// similar to WinUI's PostParseRegisterNames which will basically just do an "Enter" with
-					// isLive being false. Then, the Enter happening in VisualTree.AddRoot should skip name registration.
-					((NameScope)nameScope).RegisterNameNoWarn(name, this);
-				}
-			}
-
-			base.Enter(nameScope, @params, depth);
-		}
-
-		internal override void Leave(INameScope nameScope, LeaveParams @params)
-		{
-			// This should happen regardless of whether Name is null or not.
-			// What we need here is that once we find an element leaving that
-			// has its own NameScope, then we start using this namescope and use it for leaving its children.
-			// For example, elements in a template where the template root will have its own NameScope.
-			AdjustNameScope(ref nameScope);
-
-			if (nameScope is not null)
-			{
-				var name = this.Name;
-
-				if (!string.IsNullOrEmpty(name))
-				{
-					nameScope.UnregisterName(name);
-				}
-			}
-
-			base.Leave(nameScope, @params);
-		}
-#endif
-
 		#region AutomationPeer
 #if !__IOS__ && !__ANDROID__ && !__MACOS__ // This code is generated in FrameworkElementMixins
 		private AutomationPeer _automationPeer;

src/Uno.UI/UI/Xaml/Internal/VisualTree.cs

@@ -457,13 +457,15 @@ private void AddRoot(UIElement? root)
 				MUX_ASSERT(RootElement != null);
 				RootElement!.AddChild(root);
 
+#if UNO_HAS_ENHANCED_LIFECYCLE
 				EnterParams enterParams = new(
 					isLive: true
 				);
 
 				// In WinUI, this is called only under IsMainVisualTree condition.
 				// This might be needed for now in Uno because RootVisual does not *yet* have XamlIslandRootCollection
 				root.Enter(NameScope.GetNameScope(root), enterParams, 0);
+#endif
 			}
 		}
 

src/Uno.UI/UI/Xaml/LeaveParams.cs

@@ -1,4 +1,5 @@
-namespace Uno.UI.Xaml;
+#if UNO_HAS_ENHANCED_LIFECYCLE
+namespace Uno.UI.Xaml;
 
 internal struct LeaveParams
 {
@@ -14,3 +15,4 @@ public LeaveParams(bool isLive)
 		IsLive = isLive;
 	}
 }
+#endif

src/Uno.UI/UI/Xaml/NameScope.cs

@@ -42,23 +42,14 @@ public object FindName(string name)
 
 		public void RegisterName(string name, object scopedElement)
 		{
-			if (this.Log().IsEnabled(LogLevel.Warning) && _names.ContainsKey(name))
+			if (_names.ContainsKey(name))
 			{
 				this.Log().Warn($"The name [{name}] already exists in the current XAML scope");
 			}
 
 			_names[name] = WeakReferencePool.RentWeakReference(this, scopedElement);
 		}
 
-		internal void RegisterNameNoWarn(string name, object scopedElement)
-		{
-			if (name == "textBox")
-			{
-
-			}
-			_names[name] = WeakReferencePool.RentWeakReference(this, scopedElement);
-		}
-
 		public void UnregisterName(string name)
 		{
 			_names.Remove(name);

src/Uno.UI/UI/Xaml/UIElement.Android.cs

@@ -18,7 +18,6 @@
 using Rect = Windows.Foundation.Rect;
 using Java.Interop;
 using Microsoft.UI.Xaml.Markup;
-using Uno.UI.Xaml;
 
 namespace Microsoft.UI.Xaml
 {
@@ -66,7 +65,6 @@ protected override void OnChildViewAdded(View view)
 			if (view is UIElement uiElement)
 			{
 				OnChildManagedViewAddedOrRemoved(uiElement);
-				uiElement.Enter(FindNameScope(uiElement), default, default);
 			}
 			else
 			{
@@ -82,7 +80,6 @@ protected override void OnChildViewRemoved(View view)
 			if (view is UIElement uiElement)
 			{
 				OnChildManagedViewAddedOrRemoved(uiElement);
-				uiElement.Leave(FindNameScope(uiElement), default);
 			}
 			else
 			{

src/Uno.UI/UI/Xaml/UIElement.crossruntime.cs

@@ -118,6 +118,25 @@ internal Point GetPosition(Point position, UIElement relativeTo)
 			=> TransformToVisual(relativeTo).TransformPoint(position);
 
 #if UNO_HAS_ENHANCED_LIFECYCLE
+		internal static INameScope FindNameScope(DependencyObject dependencyObject)
+		{
+			// In many cases, this will not traverse the entire visual tree, as the NameScope is often
+			// present on each element as the DP is inherited. However, it can happen that the DP inheritance
+			// didn't yet happen, in which case we'll traverse the tree up.
+			var current = dependencyObject;
+			while (current is not null)
+			{
+				if (NameScope.GetNameScope(current) is { } nameScope)
+				{
+					return nameScope;
+				}
+
+				current = VisualTreeHelper.GetParent(current);
+			}
+
+			return null;
+		}
+
 		private void ChildEnter(UIElement child, EnterParams @params)
 		{
 			// Uno TODO: WinUI has much more complex logic than this.

src/Uno.UI/UI/Xaml/UIElement.cs

@@ -1434,25 +1434,6 @@ internal void SetProtectedCursor(Microsoft /* UWP don't rename */.UI.Input.Input
 			ProtectedCursor = cursor;
 		}
 
-		internal static INameScope FindNameScope(DependencyObject dependencyObject)
-		{
-			// In many cases, this will not traverse the entire visual tree, as the NameScope is often
-			// present on each element as the DP is inherited. However, it can happen that the DP inheritance
-			// didn't yet happen, in which case we'll traverse the tree up.
-			var current = dependencyObject;
-			while (current is not null)
-			{
-				if (NameScope.GetNameScope(current) is { } nameScope)
-				{
-					return nameScope;
-				}
-
-				current = VisualTreeHelper.GetParent(current);
-			}
-
-			return null;
-		}
-
 		/// <summary>
 		/// This event is not yet implemented in Uno Platform.
 		/// </summary>

src/Uno.UI/UI/Xaml/UIElement.mux.cs

@@ -616,27 +616,18 @@ internal Rect GetGlobalBoundsWithOptions(bool ignoreClipping, bool ignoreClippin
 			return new Rect();
 		}
 
+#if UNO_HAS_ENHANCED_LIFECYCLE
 		// Doesn't exactly match WinUI code.
 		internal virtual void Enter(INameScope? nameScope, EnterParams @params, int depth)
 		{
-			// Enter does nothing on platforms with non-enhanced lifecycle.
-			// Its only purpose is to register names via the FrameworkElement override.
-#if UNO_HAS_ENHANCED_LIFECYCLE
 			Depth = depth;
 
 			if (@params.IsLive)
 			{
 				IsActiveInVisualTree = true;
 			}
-#endif
-
-#if UNO_HAS_ENHANCED_LIFECYCLE
-			var children = _children;
-#else
-			var children = this.GetChildren();
-#endif
 
-			foreach (var child in children)
+			foreach (var child in _children)
 			{
 				if (child == this)
 				{
@@ -648,14 +639,9 @@ internal virtual void Enter(INameScope? nameScope, EnterParams @params, int dept
 					continue;
 				}
 
-#if UNO_HAS_ENHANCED_LIFECYCLE
 				child.Enter(nameScope, @params, depth + 1);
-#else
-				(child as UIElement)?.Enter(nameScope, @params, depth + 1);
-#endif
 			}
 
-#if UNO_HAS_ENHANCED_LIFECYCLE
 			if (@params.IsLive)
 			{
 				var core = this.GetContext();
@@ -664,19 +650,11 @@ internal virtual void Enter(INameScope? nameScope, EnterParams @params, int dept
 
 			// Make sure that we propagate OnDirtyPath bits to the new parent.
 			SetLayoutFlags(LayoutFlag.MeasureDirty | LayoutFlag.ArrangeDirty);
-#endif
 		}
 
 		internal virtual void Leave(INameScope? nameScope, LeaveParams @params)
 		{
-			var children =
-#if UNO_HAS_ENHANCED_LIFECYCLE
-				_children;
-#else
-				this.GetChildren();
-#endif
-
-			foreach (var child in children)
+			foreach (var child in _children)
 			{
 				if (child == this)
 				{
@@ -688,14 +666,9 @@ internal virtual void Leave(INameScope? nameScope, LeaveParams @params)
 					continue;
 				}
 
-#if UNO_HAS_ENHANCED_LIFECYCLE
 				child.Leave(nameScope, @params);
-#else
-				(child as UIElement)?.Leave(nameScope, @params);
-#endif
 			}
 
-#if UNO_HAS_ENHANCED_LIFECYCLE
 			if (IsActiveInVisualTree)
 			{
 				if (IsLoaded)
@@ -716,7 +689,8 @@ internal virtual void Leave(INameScope? nameScope, LeaveParams @params)
 
 				var eventManager = this.GetContext().EventManager;
 				eventManager.RemoveRequest(this);
-#endif
+			}
 		}
+#endif
 	}
 }