From f8d773b9eb08164571b31c58488621ebe8500016 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sun, 19 Feb 2023 13:20:23 -0600
Subject: [PATCH 01/16] Semantic OrderView

---
 .../AppShell.xaml.cs                          |  1 +
 .../MauiProgram.cs                            |  1 +
 .../SemanticOrderViewPage.xaml                | 25 ++++++++
 .../SemanticOrderViewPage.xaml.cs             | 13 ++++
 .../SemanticOrderViewPageViewModel.cs         |  5 ++
 .../ViewModels/Views/ViewsGalleryViewModel.cs |  1 +
 .../SemanticOrderViewHandler.android.cs       | 18 ++++++
 .../SemanticOrderViewHandler.macios.cs        | 16 +++++
 .../SemanticOrderViewHandler.net.cs           | 10 +++
 .../SemanticOrderViewHandler.shared.cs        | 64 +++++++++++++++++++
 .../SemanticOrderViewHandler.tizen.cs         | 13 ++++
 .../SemanticOrderViewHandler.windows.cs       | 16 +++++
 .../Interfaces/ISemanticOrderView.shared.cs   | 19 ++++++
 .../MauiSemanticOrderView.android.cs          | 62 ++++++++++++++++++
 .../MauiSemanticOrderView.ios.cs              | 55 ++++++++++++++++
 .../MauiSemanticOrderView.windows.cs          | 44 +++++++++++++
 .../AppBuilderExtensions.shared.cs            |  1 +
 .../SemanticOrderView.shared.cs               | 33 ++++++++++
 18 files changed, 397 insertions(+)
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Views/SemanticOrderView/SemanticOrderViewPageViewModel.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.android.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.macios.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.net.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.windows.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Interfaces/ISemanticOrderView.shared.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
 create mode 100644 src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
 create mode 100644 src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
index 8173f266f..db32d4197 100644
--- a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
@@ -115,6 +115,7 @@ public partial class AppShell : Shell
 		CreateViewModelMapping<PopupAnchorPage, PopupAnchorViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<PopupPositionPage, PopupPositionViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<ShowPopupInOnAppearingPage, ShowPopupInOnAppearingPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+		CreateViewModelMapping<SemanticOrderViewPage, SemanticOrderViewPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 	});
 
 	public AppShell() => InitializeComponent();
diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index e74166826..ac9b9348a 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -168,6 +168,7 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientWithShellRoute<PopupAnchorPage, PopupAnchorViewModel>();
 		services.AddTransientWithShellRoute<PopupPositionPage, PopupPositionViewModel>();
 		services.AddTransientWithShellRoute<ShowPopupInOnAppearingPage, ShowPopupInOnAppearingPageViewModel>();
+		services.AddTransientWithShellRoute<SemanticOrderViewPage, SemanticOrderViewPageViewModel>();
 
 		// Add Popups
 		services.AddTransient<CsharpBindingPopup, CsharpBindingPopupViewModel>();
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
new file mode 100644
index 000000000..1531860d4
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+                x:Class="CommunityToolkit.Maui.Sample.Pages.Views.SemanticOrderViewPage"
+                xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
+                Title="Semantic Order View"
+                xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
+                x:TypeArguments="viewModels:SemanticOrderViewPageViewModel"
+                x:DataType="viewModels:SemanticOrderViewPageViewModel">
+    <ContentPage.Content>
+        <StackLayout Margin="20">
+            <Button Text="Element outside the Semantic View"></Button>
+            <mct:SemanticOrderView x:Name="acv">
+                <StackLayout>
+                    <Label x:Name="second" Text="Second" Margin="0,20" />
+                    <Button x:Name="third" Text="Third" Margin="0,20" />
+                    <Label x:Name="fourth" Text="Fourth" Margin="0,20" />
+                    <Button x:Name="fifth" Text="Fifth and last" Margin="0,20" />
+                    <Button x:Name="first" Text="First" Margin="0,20" />
+                </StackLayout>
+            </mct:SemanticOrderView>
+        </StackLayout>
+    </ContentPage.Content>
+</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
new file mode 100644
index 000000000..85506a9a5
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+using CommunityToolkit.Maui.Sample.ViewModels.Views;
+namespace CommunityToolkit.Maui.Sample.Pages.Views;
+
+public partial class SemanticOrderViewPage : BasePage<SemanticOrderViewPageViewModel>
+{
+	public SemanticOrderViewPage(SemanticOrderViewPageViewModel vm) : base(vm)
+	{
+		InitializeComponent();
+		acv.ViewOrder = new List<View> { first, second, third, fourth, fifth };
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/SemanticOrderView/SemanticOrderViewPageViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/SemanticOrderView/SemanticOrderViewPageViewModel.cs
new file mode 100644
index 000000000..4e715bcaf
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/SemanticOrderView/SemanticOrderViewPageViewModel.cs
@@ -0,0 +1,5 @@
+namespace CommunityToolkit.Maui.Sample.ViewModels.Views;
+
+public class SemanticOrderViewPageViewModel : BaseViewModel
+{
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
index c37b93918..20396e46a 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
@@ -26,6 +26,7 @@ public ViewsGalleryViewModel()
 			SectionModel.Create<PopupPositionViewModel>("Custom Positioning Popup", Colors.Red, "Displays a basic popup anywhere on the screen using VerticalOptions and HorizontalOptions"),
 			SectionModel.Create<PopupAnchorViewModel>("Anchor Popup", Colors.Red, "Popups can be anchored to other view's on the screen"),
 			SectionModel.Create<ShowPopupInOnAppearingPageViewModel>("Show Popup in OnAppearing", Colors.Red, "Proves that we now support showing a popup before the platform is even ready."),
+			SectionModel.Create<SemanticOrderViewPageViewModel>("Semantic Order View", Colors.Red, "Set accessiblity ordering on views."),
 		})
 	{
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.android.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.android.cs
new file mode 100644
index 000000000..190d5cd89
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.android.cs
@@ -0,0 +1,18 @@
+using CommunityToolkit.Maui.Core.Views;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+using AView = Android.Views.View;
+
+namespace CommunityToolkit.Maui.Core.Handlers;
+
+public partial class SemanticOrderViewHandler
+{
+	/// <inheritdoc/>
+	protected override ContentViewGroup CreatePlatformView()
+	{
+		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
+		_ = MauiContext.Context ?? throw new InvalidOperationException("Android Context is null, please check your MauiApplication.");
+
+		return new MauiSemanticOrderView(MauiContext.Context);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.macios.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.macios.cs
new file mode 100644
index 000000000..eb73b58fd
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.macios.cs
@@ -0,0 +1,16 @@
+using CommunityToolkit.Maui.Core.Views;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+
+namespace CommunityToolkit.Maui.Core.Handlers;
+
+public partial class SemanticOrderViewHandler
+{
+	/// <inheritdoc/>
+	protected override ContentView CreatePlatformView()
+	{
+		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
+
+		return new MauiSemanticOrderView();
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.net.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.net.cs
new file mode 100644
index 000000000..8032ebe83
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.net.cs
@@ -0,0 +1,10 @@
+using Microsoft.Maui.Handlers;
+
+namespace CommunityToolkit.Maui.Core.Handlers;
+
+public partial class SemanticOrderViewHandler
+{
+	/// <inheritdoc/>
+	protected override object CreatePlatformView() => throw new NotSupportedException();
+
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
new file mode 100644
index 000000000..9c3695862
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
@@ -0,0 +1,64 @@
+using CommunityToolkit.Maui.Core.Views;
+using Microsoft.Maui.Handlers;
+
+namespace CommunityToolkit.Maui.Core.Handlers;
+
+/// <summary>
+/// Handler SemanticOrderView control
+/// </summary>
+public partial class SemanticOrderViewHandler : ContentViewHandler
+{
+	/// <summary>
+	/// PropertyMapper for SemanticOrderView Control
+	/// </summary>
+	public static IPropertyMapper<ISemanticOrderView, SemanticOrderViewHandler> SemanticOrderViewMapper = new PropertyMapper<ISemanticOrderView, SemanticOrderViewHandler>(ContentViewHandler.Mapper)
+	{
+		[nameof(ISemanticOrderView.ViewOrder)] = MapViewOrder,
+	};
+	/// <summary>
+	/// <see cref ="CommandMapper"/> for SemanticOrderView Control.
+	/// </summary>
+	public static CommandMapper<ISemanticOrderView, SemanticOrderViewHandler> SemanticOrderViewCommandMapper = new(ContentViewHandler.CommandMapper)
+	{
+	};
+
+	/// <summary>
+	/// Constructor for <see cref="SemanticOrderViewHandler"/>.
+	/// </summary>
+	/// <param name="mapper">Custom instance of <see cref="PropertyMapper"/>, if it's null the <see cref="SemanticOrderViewMapper"/> will be used</param>
+	/// <param name="commandMapper">Custom instance of <see cref="CommandMapper"/>, if it's null the <see cref="SemanticOrderViewCommandMapper"/> will be used</param>
+	public SemanticOrderViewHandler(IPropertyMapper? mapper, CommandMapper? commandMapper)
+		: base(mapper ?? SemanticOrderViewMapper, commandMapper ?? SemanticOrderViewCommandMapper)
+	{
+	}
+
+	/// <summary>
+	/// Default Constructor for <see cref="SemanticOrderViewHandler"/>.
+	/// </summary>
+	public SemanticOrderViewHandler()
+		: base(SemanticOrderViewMapper, SemanticOrderViewCommandMapper)
+	{
+	}
+
+	static void MapViewOrder(SemanticOrderViewHandler arg1, ISemanticOrderView arg2)
+	{
+#if WINDOWS || IOS || MACCATALYST || ANDROID
+		if (arg1.PlatformView is MauiSemanticOrderView mso)
+		{
+			mso.UpdateViewOrder();
+		}
+#endif
+	}
+
+	/// <inheritdoc/>
+	public override void SetVirtualView(IView view)
+	{
+		base.SetVirtualView(view);
+#if WINDOWS || IOS || MACCATALYST || ANDROID
+		if (PlatformView is MauiSemanticOrderView mso)
+		{
+			mso.VirtualView = (ISemanticOrderView)VirtualView;
+		}
+#endif
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
new file mode 100644
index 000000000..382430005
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
@@ -0,0 +1,13 @@
+using CommunityToolkit.Maui.Core.Views;
+using Tizen.UIExtensions.NUI;
+
+namespace CommunityToolkit.Maui.Core.Handlers;
+
+public partial class SemanticOrderViewHandler : Microsoft.Maui.Handlers.ElementHandler<ISemanticOrderView, object>
+{
+	/// <inheritdoc/>
+	protected override object CreatePlatformElement()
+	{
+		throw new System.NotImplementedException();
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.windows.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.windows.cs
new file mode 100644
index 000000000..78d70eccd
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.windows.cs
@@ -0,0 +1,16 @@
+using CommunityToolkit.Maui.Core.Views;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+
+namespace CommunityToolkit.Maui.Core.Handlers;
+
+public partial class SemanticOrderViewHandler
+{
+	/// <inheritdoc/>
+	protected override ContentPanel CreatePlatformView()
+	{
+		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
+
+		return new MauiSemanticOrderView();
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Interfaces/ISemanticOrderView.shared.cs b/src/CommunityToolkit.Maui.Core/Interfaces/ISemanticOrderView.shared.cs
new file mode 100644
index 000000000..f43794fb5
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Interfaces/ISemanticOrderView.shared.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CommunityToolkit.Maui.Core;
+
+/// <summary>
+/// Allows users to specify the semantic order of child views.
+/// </summary>
+public interface ISemanticOrderView : IContentView
+{
+	/// <summary>
+	/// The semantic order to traverse child views
+	/// </summary>
+	IEnumerable<IView> ViewOrder { get; }
+}
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
new file mode 100644
index 000000000..2a5a6f90e
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
@@ -0,0 +1,62 @@
+using System.Linq;
+using Android.Content;
+using Android.Views;
+using Microsoft.Maui.Platform;
+
+namespace CommunityToolkit.Maui.Core.Views;
+
+/// <summary>
+/// The native implementation of the SemanticOrderView control.
+/// </summary>
+public class MauiSemanticOrderView : ContentViewGroup
+{
+	ISemanticOrderView? virtualView;
+
+	public MauiSemanticOrderView(Context context)
+		: base(context)
+	{
+	}
+
+	internal ISemanticOrderView? VirtualView
+	{
+		get => virtualView;
+		set
+		{
+			virtualView = value;
+			UpdateViewOrder();
+		}
+	}
+
+	protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
+	{
+		UpdateViewOrder();
+		base.OnLayout(changed, left, top, right, bottom);
+	}
+
+	internal void UpdateViewOrder()
+	{
+		if (VirtualView is null)
+		{
+			return;
+		}
+
+		var viewOrder = VirtualView.ViewOrder.ToList();
+
+		for (var i = 1; i < viewOrder.Count; i++)
+		{
+			var view1 = (viewOrder[i - 1]?.Handler as IPlatformViewHandler)?.PlatformView;
+			var view2 = (viewOrder[i]?.Handler as IPlatformViewHandler)?.PlatformView;
+
+			if (view1 is null || view2 is null)
+			{
+				return;
+			}
+
+			if (OperatingSystem.IsAndroidVersionAtLeast(22))
+			{
+				view2.AccessibilityTraversalAfter = view1.Id;
+				view1.AccessibilityTraversalBefore = view2.Id;
+			}
+		}
+	}
+}
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
new file mode 100644
index 000000000..36f7decc1
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using Foundation;
+using Microsoft.Maui.Platform;
+using UIKit;
+
+namespace CommunityToolkit.Maui.Core.Views;
+
+/// <summary>
+/// The native implementation of the SemanticOrderView control.
+/// </summary>
+public class MauiSemanticOrderView : ContentView, IUIAccessibilityContainer
+{
+	ISemanticOrderView? virtualView;
+	internal ISemanticOrderView? VirtualView
+	{
+		get => virtualView;
+		set
+		{
+			virtualView = value;
+			UpdateViewOrder();
+		}
+	}
+
+	internal void UpdateViewOrder()
+	{
+		var result = GetAccessibilityElements();
+
+		if (result != null)
+		{
+			this.SetAccessibilityElements(NSArray.FromNSObjects(result.ToArray()));
+		}
+	}
+
+	List<NSObject>? GetAccessibilityElements()
+	{
+		if (VirtualView is null)
+		{
+			return null;
+		}
+
+		var viewOrder = VirtualView.ViewOrder;
+
+		var returnValue = new List<NSObject>();
+		foreach (var view in viewOrder)
+		{
+			if (view.Handler is IPlatformViewHandler pvh &&
+				pvh.PlatformView is not null)
+			{
+				returnValue.Add(pvh.PlatformView);
+			}
+		}
+
+		return returnValue.Count == 0 ? null : returnValue;
+	}
+}
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
new file mode 100644
index 000000000..8d1232834
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using Microsoft.Maui.Platform;
+using Windows.UI.Xaml;
+
+namespace CommunityToolkit.Maui.Core.Views;
+
+/// <summary>
+/// The native implementation of the SemanticOrderView control.
+/// </summary>
+public class MauiSemanticOrderView : ContentPanel
+{
+	ISemanticOrderView? virtualView;
+
+	internal ISemanticOrderView? VirtualView
+	{
+		get => virtualView;
+		set
+		{
+			virtualView = value;
+			UpdateViewOrder();
+		}
+	}
+
+	internal void UpdateViewOrder()
+	{
+		if (VirtualView is null)
+		{
+			return;
+		}
+
+		var i = 1;
+		foreach (var element in VirtualView.ViewOrder)
+		{
+			if (element.Handler is IPlatformViewHandler pvh &&
+				pvh.PlatformView is not null)
+			{
+				pvh.PlatformView.TabIndex = i++;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
index 0bfd315ac..9d151eb7d 100644
--- a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
+++ b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs
@@ -27,6 +27,7 @@ public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder
 		{
 			h.AddHandler<DrawingView, DrawingViewHandler>();
 			h.AddHandler<Popup, PopupHandler>();
+			h.AddHandler<SemanticOrderView, SemanticOrderViewHandler>();
 		});
 
 		Popup.RemapForControls();
diff --git a/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs b/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
new file mode 100644
index 000000000..c59c5cd2d
--- /dev/null
+++ b/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using CommunityToolkit.Maui.Core;
+
+namespace CommunityToolkit.Maui.Views;
+
+/// <inheritdoc cref="ISemanticOrderView"/>
+public class SemanticOrderView : ContentView, ISemanticOrderView
+{
+	/// <summary>
+	/// Backing BindableProperty for the <see cref="ViewOrder"/> property.
+	/// </summary>
+	public static readonly BindableProperty ViewOrderProperty =
+		BindableProperty.Create(nameof(ViewOrder), typeof(IEnumerable), typeof(SemanticOrderView), new View[0]);
+
+	/// <inheritdoc />
+	public IEnumerable ViewOrder
+	{
+		get => (IEnumerable)GetValue(ViewOrderProperty);
+		set => SetValue(ViewOrderProperty, value);
+	}
+
+	IEnumerable<IView> ISemanticOrderView.ViewOrder => ViewOrder.OfType<IView>();
+
+	/// <summary>
+	/// Initialize a new instance of <see cref="SemanticOrderView"/>.
+	/// </summary>
+	public SemanticOrderView()
+	{
+	}
+}
\ No newline at end of file

From 8d5b9be75f2726805784c28543287a6afdabec42 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sun, 19 Feb 2023 13:58:59 -0600
Subject: [PATCH 02/16] - address comments

---
 .../SemanticOrderView/SemanticOrderViewPage.xaml    |  4 ++--
 .../SemanticOrderViewHandler.shared.cs              |  4 ++--
 .../MauiSemanticOrderView.android.cs                |  2 +-
 .../SemanticOrderView/MauiSemanticOrderView.ios.cs  | 13 +++++--------
 .../MauiSemanticOrderView.windows.cs                |  2 +-
 .../SemanticOrderView/SemanticOrderView.shared.cs   |  2 +-
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
index 1531860d4..3788347e6 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
@@ -9,7 +9,7 @@
                 x:TypeArguments="viewModels:SemanticOrderViewPageViewModel"
                 x:DataType="viewModels:SemanticOrderViewPageViewModel">
     <ContentPage.Content>
-        <StackLayout Margin="20">
+        <VerticalStackLayout Margin="20">
             <Button Text="Element outside the Semantic View"></Button>
             <mct:SemanticOrderView x:Name="acv">
                 <StackLayout>
@@ -20,6 +20,6 @@
                     <Button x:Name="first" Text="First" Margin="0,20" />
                 </StackLayout>
             </mct:SemanticOrderView>
-        </StackLayout>
+        </VerticalStackLayout>
     </ContentPage.Content>
 </pages:BasePage>
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
index 9c3695862..ba32f1ba6 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
@@ -40,10 +40,10 @@ public SemanticOrderViewHandler()
 	{
 	}
 
-	static void MapViewOrder(SemanticOrderViewHandler arg1, ISemanticOrderView arg2)
+	static void MapViewOrder(SemanticOrderViewHandler handler, ISemanticOrderView view)
 	{
 #if WINDOWS || IOS || MACCATALYST || ANDROID
-		if (arg1.PlatformView is MauiSemanticOrderView mso)
+		if (handler.PlatformView is MauiSemanticOrderView mso)
 		{
 			mso.UpdateViewOrder();
 		}
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
index 2a5a6f90e..2e6846530 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
@@ -6,7 +6,7 @@
 namespace CommunityToolkit.Maui.Core.Views;
 
 /// <summary>
-/// The native implementation of the SemanticOrderView control.
+/// The native implementation of the <see href="SemanticOrderView"/> control.
 /// </summary>
 public class MauiSemanticOrderView : ContentViewGroup
 {
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
index 36f7decc1..3317ca638 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
@@ -6,7 +6,7 @@
 namespace CommunityToolkit.Maui.Core.Views;
 
 /// <summary>
-/// The native implementation of the SemanticOrderView control.
+/// The native implementation of the <see href="SemanticOrderView"/> control.
 /// </summary>
 public class MauiSemanticOrderView : ContentView, IUIAccessibilityContainer
 {
@@ -25,31 +25,28 @@ internal void UpdateViewOrder()
 	{
 		var result = GetAccessibilityElements();
 
-		if (result != null)
+		if (result is not null)
 		{
 			this.SetAccessibilityElements(NSArray.FromNSObjects(result.ToArray()));
 		}
 	}
 
-	List<NSObject>? GetAccessibilityElements()
+	IEnumerable<NSObject> GetAccessibilityElements()
 	{
 		if (VirtualView is null)
 		{
-			return null;
+			yield break;
 		}
 
 		var viewOrder = VirtualView.ViewOrder;
 
-		var returnValue = new List<NSObject>();
 		foreach (var view in viewOrder)
 		{
 			if (view.Handler is IPlatformViewHandler pvh &&
 				pvh.PlatformView is not null)
 			{
-				returnValue.Add(pvh.PlatformView);
+				yield return pvh.PlatformView;
 			}
 		}
-
-		return returnValue.Count == 0 ? null : returnValue;
 	}
 }
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
index 8d1232834..1e96c8a91 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
@@ -8,7 +8,7 @@
 namespace CommunityToolkit.Maui.Core.Views;
 
 /// <summary>
-/// The native implementation of the SemanticOrderView control.
+/// The native implementation of the <see href="SemanticOrderView"/> control.
 /// </summary>
 public class MauiSemanticOrderView : ContentPanel
 {
diff --git a/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs b/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
index c59c5cd2d..1d277f8d9 100644
--- a/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
@@ -13,7 +13,7 @@ public class SemanticOrderView : ContentView, ISemanticOrderView
 	/// Backing BindableProperty for the <see cref="ViewOrder"/> property.
 	/// </summary>
 	public static readonly BindableProperty ViewOrderProperty =
-		BindableProperty.Create(nameof(ViewOrder), typeof(IEnumerable), typeof(SemanticOrderView), new View[0]);
+		BindableProperty.Create(nameof(ViewOrder), typeof(IEnumerable), typeof(SemanticOrderView), Enumerable.Empty<View>());
 
 	/// <inheritdoc />
 	public IEnumerable ViewOrder

From b89867c88344ced093d4199f7bb672aba9b56c20 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Sun, 19 Feb 2023 19:23:47 -0600
Subject: [PATCH 03/16] - fix tizen and iOS check

---
 .../SemanticOrderView/SemanticOrderViewHandler.tizen.cs    | 4 ++--
 .../Views/SemanticOrderView/MauiSemanticOrderView.ios.cs   | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
index 382430005..3cdf2f219 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
@@ -3,10 +3,10 @@
 
 namespace CommunityToolkit.Maui.Core.Handlers;
 
-public partial class SemanticOrderViewHandler : Microsoft.Maui.Handlers.ElementHandler<ISemanticOrderView, object>
+public partial class SemanticOrderViewHandler
 {
 	/// <inheritdoc/>
-	protected override object CreatePlatformElement()
+	protected override ContentViewGroup CreatePlatformElement()
 	{
 		throw new System.NotImplementedException();
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
index 3317ca638..680257cae 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
@@ -23,12 +23,7 @@ internal ISemanticOrderView? VirtualView
 
 	internal void UpdateViewOrder()
 	{
-		var result = GetAccessibilityElements();
-
-		if (result is not null)
-		{
-			this.SetAccessibilityElements(NSArray.FromNSObjects(result.ToArray()));
-		}
+		this.SetAccessibilityElements(NSArray.FromNSObjects(GetAccessibilityElements().ToArray()));
 	}
 
 	IEnumerable<NSObject> GetAccessibilityElements()

From 12212ba94fef4096624e2e33c63e0b9fd3a9ed3d Mon Sep 17 00:00:00 2001
From: Shane Neuville <shane94@hotmail.com>
Date: Mon, 20 Feb 2023 10:26:09 -0600
Subject: [PATCH 04/16] Update SemanticOrderViewHandler.tizen.cs

---
 .../SemanticOrderView/SemanticOrderViewHandler.tizen.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
index 3cdf2f219..b4d39e11f 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
@@ -6,8 +6,8 @@ namespace CommunityToolkit.Maui.Core.Handlers;
 public partial class SemanticOrderViewHandler
 {
 	/// <inheritdoc/>
-	protected override ContentViewGroup CreatePlatformElement()
+	protected override ContentViewGroup CreatePlatformView()
 	{
 		throw new System.NotImplementedException();
 	}
-}
\ No newline at end of file
+}

From 03da7e2b76eaba1045d9456fc211390a075eb4d7 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 20 Feb 2023 12:04:52 -0600
Subject: [PATCH 05/16] - Set View.Id on platform views

---
 .../SemanticOrderView/MauiSemanticOrderView.android.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
index 2e6846530..0baec5e58 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
@@ -52,6 +52,16 @@ internal void UpdateViewOrder()
 				return;
 			}
 
+			if (view1.Id <= 0)
+			{
+				view1.Id = View.GenerateViewId();
+			}
+
+			if (view2.Id <= 0)
+			{
+				view2.Id = View.GenerateViewId();
+			}
+
 			if (OperatingSystem.IsAndroidVersionAtLeast(22))
 			{
 				view2.AccessibilityTraversalAfter = view1.Id;

From d8e13c4bed6bf567e42ef1b76912abc4b8497447 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Mon, 20 Feb 2023 12:33:58 -0600
Subject: [PATCH 06/16] - add namespace

---
 .../Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
index b4d39e11f..78cd191b8 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui.Core.Views;
+using Microsoft.Maui.Platform;
 using Tizen.UIExtensions.NUI;
 
 namespace CommunityToolkit.Maui.Core.Handlers;

From b8655112f78dd03004f5bc75a18427f3ad81e205 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 21 Feb 2023 12:40:51 -0600
Subject: [PATCH 07/16] - add basic unit test

---
 .../Mocks/MockSemanticOrderViewHandler.cs     | 29 +++++++++++++++
 .../SemanticOrderViewTests.cs                 | 37 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/Mocks/MockSemanticOrderViewHandler.cs
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs

diff --git a/src/CommunityToolkit.Maui.UnitTests/Mocks/MockSemanticOrderViewHandler.cs b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockSemanticOrderViewHandler.cs
new file mode 100644
index 000000000..1ecdc8fa1
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Mocks/MockSemanticOrderViewHandler.cs
@@ -0,0 +1,29 @@
+using CommunityToolkit.Maui.Core;
+using Microsoft.Maui.Handlers;
+
+namespace CommunityToolkit.Maui.UnitTests.Mocks;
+
+public class MockSemanticOrderViewHandler : ViewHandler<ISemanticOrderView, object>
+{
+	public static PropertyMapper<ISemanticOrderView, MockSemanticOrderViewHandler> SemanticOrderViewPropertyMapper = new()
+	{
+		[nameof(ISemanticOrderView.ViewOrder)] = MapViewOrder
+	};
+
+	public MockSemanticOrderViewHandler() : base(SemanticOrderViewPropertyMapper)
+	{
+
+	}
+
+	public int OnViewOrderCount { get; private set; }
+
+	protected override object CreatePlatformView()
+	{
+		return new object();
+	}
+
+	static void MapViewOrder(MockSemanticOrderViewHandler handler, ISemanticOrderView view)
+	{
+		handler.OnViewOrderCount++;
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
new file mode 100644
index 000000000..70b283309
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
@@ -0,0 +1,37 @@
+using CommunityToolkit.Maui.Core;
+using CommunityToolkit.Maui.UnitTests.Mocks;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Views;
+
+public class SemanticOrderViewTests : BaseHandlerTest
+{
+	const string resultWhenUserTapsOutsideOfSemanticOrderView = "User Tapped Outside of SemanticOrderView";
+	readonly ISemanticOrderView semanticOrderView = new MockSemanticOrderView();
+
+	public SemanticOrderViewTests()
+	{
+		Assert.IsAssignableFrom<ISemanticOrderView>(new MockSemanticOrderView());
+	}
+
+	[Fact]
+	public void OnViewOrderIsCalled()
+	{
+		var semanticOrderViewHandler = CreateViewHandler<MockSemanticOrderViewHandler>(semanticOrderView);
+		Assert.NotNull(semanticOrderView.Handler);
+		Assert.Equal(1, semanticOrderViewHandler.OnViewOrderCount);
+		var button = new Button();
+		((MockSemanticOrderView)semanticOrderView).ViewOrder = new[] { button };
+		Assert.Single(semanticOrderView.ViewOrder);
+		Assert.Equal(button, semanticOrderView.ViewOrder.First());
+		Assert.Equal(2, semanticOrderViewHandler.OnViewOrderCount);
+	}
+
+	class MockSemanticOrderView : Maui.Views.SemanticOrderView
+	{
+		public MockSemanticOrderView()
+		{
+
+		}
+	}
+}
\ No newline at end of file

From 88028ececf6604e620b6617554555b167cced593 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 21 Feb 2023 12:49:01 -0600
Subject: [PATCH 08/16] - additional tests

---
 .../SemanticOrderViewTests.cs                 | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
index 70b283309..72b77745e 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
@@ -6,7 +6,6 @@ namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class SemanticOrderViewTests : BaseHandlerTest
 {
-	const string resultWhenUserTapsOutsideOfSemanticOrderView = "User Tapped Outside of SemanticOrderView";
 	readonly ISemanticOrderView semanticOrderView = new MockSemanticOrderView();
 
 	public SemanticOrderViewTests()
@@ -14,17 +13,37 @@ public SemanticOrderViewTests()
 		Assert.IsAssignableFrom<ISemanticOrderView>(new MockSemanticOrderView());
 	}
 
+	[Fact]
+	public void HandlerSetsOnVirtualView()
+	{
+		var semanticOrderViewHandler = CreateViewHandler<MockSemanticOrderViewHandler>(semanticOrderView);
+		Assert.NotNull(semanticOrderView.Handler);
+		Assert.Equal(semanticOrderViewHandler, semanticOrderView.Handler);
+	}
+
 	[Fact]
 	public void OnViewOrderIsCalled()
 	{
 		var semanticOrderViewHandler = CreateViewHandler<MockSemanticOrderViewHandler>(semanticOrderView);
 		Assert.NotNull(semanticOrderView.Handler);
 		Assert.Equal(1, semanticOrderViewHandler.OnViewOrderCount);
+		((MockSemanticOrderView)semanticOrderView).ViewOrder = new[] { new Button() };
+		Assert.Equal(2, semanticOrderViewHandler.OnViewOrderCount);
+	}
+
+	[Fact]
+	public void ISemanticOrderViewViewOrderReturnsCorrectViews()
+	{
+		_ = CreateViewHandler<MockSemanticOrderViewHandler>(semanticOrderView);
+
 		var button = new Button();
-		((MockSemanticOrderView)semanticOrderView).ViewOrder = new[] { button };
-		Assert.Single(semanticOrderView.ViewOrder);
+		var entry = new Entry();
+
+		((MockSemanticOrderView)semanticOrderView).ViewOrder = new IView[] { button, entry };
+
+		Assert.Equal(2, semanticOrderView.ViewOrder.Count());
 		Assert.Equal(button, semanticOrderView.ViewOrder.First());
-		Assert.Equal(2, semanticOrderViewHandler.OnViewOrderCount);
+		Assert.Equal(entry, semanticOrderView.ViewOrder.Skip(1).First());
 	}
 
 	class MockSemanticOrderView : Maui.Views.SemanticOrderView

From 1135b86c832770a25554ace45944fa9ff9f142f1 Mon Sep 17 00:00:00 2001
From: Jay Cho <chojoong@gmail.com>
Date: Mon, 27 Feb 2023 18:33:16 +0900
Subject: [PATCH 09/16] Add Tizen implementation

---
 .../SemanticOrderViewHandler.shared.cs        |  4 --
 .../SemanticOrderViewHandler.tizen.cs         |  6 +-
 .../MauiSemanticOrderView.tizen.cs            | 60 +++++++++++++++++++
 3 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs

diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
index ba32f1ba6..f6f5b25b6 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
@@ -42,23 +42,19 @@ public SemanticOrderViewHandler()
 
 	static void MapViewOrder(SemanticOrderViewHandler handler, ISemanticOrderView view)
 	{
-#if WINDOWS || IOS || MACCATALYST || ANDROID
 		if (handler.PlatformView is MauiSemanticOrderView mso)
 		{
 			mso.UpdateViewOrder();
 		}
-#endif
 	}
 
 	/// <inheritdoc/>
 	public override void SetVirtualView(IView view)
 	{
 		base.SetVirtualView(view);
-#if WINDOWS || IOS || MACCATALYST || ANDROID
 		if (PlatformView is MauiSemanticOrderView mso)
 		{
 			mso.VirtualView = (ISemanticOrderView)VirtualView;
 		}
-#endif
 	}
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
index 78cd191b8..d669bd6b5 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
@@ -1,6 +1,5 @@
 using CommunityToolkit.Maui.Core.Views;
 using Microsoft.Maui.Platform;
-using Tizen.UIExtensions.NUI;
 
 namespace CommunityToolkit.Maui.Core.Handlers;
 
@@ -9,6 +8,9 @@ public partial class SemanticOrderViewHandler
 	/// <inheritdoc/>
 	protected override ContentViewGroup CreatePlatformView()
 	{
-		throw new System.NotImplementedException();
+		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
+
+		return new MauiSemanticOrderView(VirtualView);
 	}
+
 }
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs
new file mode 100644
index 000000000..6a409a570
--- /dev/null
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs
@@ -0,0 +1,60 @@
+using Microsoft.Maui.Platform;
+using Tizen.NUI.Accessibility;
+
+namespace CommunityToolkit.Maui.Core.Views;
+
+/// <summary>
+/// The native implementation of the <see href="SemanticOrderView"/> control.
+/// </summary>
+public class MauiSemanticOrderView : ContentViewGroup
+{
+	ISemanticOrderView? virtualView;
+
+	/// <summary>
+	/// Constructor for MauiSemanticOrderView.
+	/// </summary>
+	public MauiSemanticOrderView(IView virtualView)
+		: base(virtualView)
+	{
+	}
+
+	internal ISemanticOrderView? VirtualView
+	{
+		get => virtualView;
+		set
+		{
+			virtualView = value;
+			UpdateViewOrder();
+		}
+	}
+
+	internal void UpdateViewOrder()
+	{
+		if (VirtualView is null)
+		{
+			return;
+		}
+
+		var accessibilityManager = AccessibilityManager.Instance;
+		var order = accessibilityManager.GenerateNewFocusOrder();
+
+		foreach (var view in VirtualView.ViewOrder)
+		{
+			if (view.Handler is IPlatformViewHandler pvh && pvh.PlatformView is not null)
+			{
+				if (pvh.PlatformView is WrapperView wv)
+				{
+					if (wv.Content is not null)
+					{
+						accessibilityManager.SetFocusOrder(wv.Content, (uint)order);
+					}
+				}
+				else
+				{
+					accessibilityManager.SetFocusOrder(pvh.PlatformView, (uint)order);
+				}
+				order++;
+			}
+		}
+	}
+}

From 163d895e6f51c591bdbe45690af29bcc6b426380 Mon Sep 17 00:00:00 2001
From: Jay Cho <chojoong@gmail.com>
Date: Mon, 27 Feb 2023 18:43:47 +0900
Subject: [PATCH 10/16] Remove unnecessary cast

---
 .../Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs
index 6a409a570..99889935a 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs
@@ -46,12 +46,12 @@ internal void UpdateViewOrder()
 				{
 					if (wv.Content is not null)
 					{
-						accessibilityManager.SetFocusOrder(wv.Content, (uint)order);
+						accessibilityManager.SetFocusOrder(wv.Content, order);
 					}
 				}
 				else
 				{
-					accessibilityManager.SetFocusOrder(pvh.PlatformView, (uint)order);
+					accessibilityManager.SetFocusOrder(pvh.PlatformView, order);
 				}
 				order++;
 			}

From fad85554889ccef76a0ab9151e4e27d24ee3f237 Mon Sep 17 00:00:00 2001
From: Jay Cho <chojoong@gmail.com>
Date: Mon, 27 Feb 2023 20:51:35 +0900
Subject: [PATCH 11/16] Bring back if-endif

---
 .../SemanticOrderView/SemanticOrderViewHandler.shared.cs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
index f6f5b25b6..b6d655b0d 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
@@ -42,19 +42,23 @@ public SemanticOrderViewHandler()
 
 	static void MapViewOrder(SemanticOrderViewHandler handler, ISemanticOrderView view)
 	{
+#if WINDOWS || IOS || MACCATALYST || ANDROID || TIZEN
 		if (handler.PlatformView is MauiSemanticOrderView mso)
 		{
 			mso.UpdateViewOrder();
 		}
+#endif
 	}
 
 	/// <inheritdoc/>
 	public override void SetVirtualView(IView view)
 	{
 		base.SetVirtualView(view);
+#if WINDOWS || IOS || MACCATALYST || ANDROID || TIZEN
 		if (PlatformView is MauiSemanticOrderView mso)
 		{
 			mso.VirtualView = (ISemanticOrderView)VirtualView;
 		}
+#endif
 	}
 }
\ No newline at end of file

From de620086b674d5d39b41885ba5daf22b01624878 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:04:20 -0800
Subject: [PATCH 12/16] Update Variable Names

---
 .../SemanticOrderView/SemanticOrderViewPage.xaml     | 12 ++++++------
 .../SemanticOrderView/SemanticOrderViewPage.xaml.cs  |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
index 3788347e6..fe8d15bf2 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
@@ -11,13 +11,13 @@
     <ContentPage.Content>
         <VerticalStackLayout Margin="20">
             <Button Text="Element outside the Semantic View"></Button>
-            <mct:SemanticOrderView x:Name="acv">
+            <mct:SemanticOrderView x:Name="SemanticOrderView">
                 <StackLayout>
-                    <Label x:Name="second" Text="Second" Margin="0,20" />
-                    <Button x:Name="third" Text="Third" Margin="0,20" />
-                    <Label x:Name="fourth" Text="Fourth" Margin="0,20" />
-                    <Button x:Name="fifth" Text="Fifth and last" Margin="0,20" />
-                    <Button x:Name="first" Text="First" Margin="0,20" />
+                    <Label x:Name="Second" Text="Second" Margin="0,20" />
+                    <Button x:Name="Third" Text="Third" Margin="0,20" />
+                    <Label x:Name="Fourth" Text="Fourth" Margin="0,20" />
+                    <Button x:Name="Fifth" Text="Fifth and last" Margin="0,20" />
+                    <Button x:Name="First" Text="First" Margin="0,20" />
                 </StackLayout>
             </mct:SemanticOrderView>
         </VerticalStackLayout>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
index 85506a9a5..b44868166 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
@@ -1,6 +1,5 @@
-using System.Collections.Generic;
+using CommunityToolkit.Maui.Sample.ViewModels.Views;
 
-using CommunityToolkit.Maui.Sample.ViewModels.Views;
 namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
 public partial class SemanticOrderViewPage : BasePage<SemanticOrderViewPageViewModel>
@@ -8,6 +7,6 @@ public partial class SemanticOrderViewPage : BasePage<SemanticOrderViewPageViewM
 	public SemanticOrderViewPage(SemanticOrderViewPageViewModel vm) : base(vm)
 	{
 		InitializeComponent();
-		acv.ViewOrder = new List<View> { first, second, third, fourth, fifth };
+		SemanticOrderView.ViewOrder = new List<View> { First, Second, Third, Fourth, Fifth };
 	}
 }
\ No newline at end of file

From 0a7ca4b04fbeff3c33dfac30152a59dc2672377f Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:19:20 -0800
Subject: [PATCH 13/16] Update formatting

---
 .../SemanticOrderViewHandler.android.cs       |  8 +++----
 .../SemanticOrderViewHandler.macios.cs        |  8 +------
 .../SemanticOrderViewHandler.net.cs           |  4 +---
 .../SemanticOrderViewHandler.shared.cs        | 22 +++++++++---------
 .../SemanticOrderViewHandler.tizen.cs         |  8 +------
 .../SemanticOrderViewHandler.windows.cs       |  8 +------
 .../Interfaces/ISemanticOrderView.shared.cs   |  9 +-------
 .../MauiSemanticOrderView.android.cs          | 23 ++++++++-----------
 .../MauiSemanticOrderView.ios.cs              | 12 ++++------
 .../MauiSemanticOrderView.tizen.cs            | 14 +++++------
 .../MauiSemanticOrderView.windows.cs          |  6 ++---
 .../SemanticOrderViewTests.cs                 |  2 +-
 .../SemanticOrderView.shared.cs               | 12 +---------
 13 files changed, 47 insertions(+), 89 deletions(-)

diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.android.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.android.cs
index 190d5cd89..1a54155ae 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.android.cs
@@ -1,7 +1,5 @@
 using CommunityToolkit.Maui.Core.Views;
-using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
-using AView = Android.Views.View;
 
 namespace CommunityToolkit.Maui.Core.Handlers;
 
@@ -10,8 +8,10 @@ public partial class SemanticOrderViewHandler
 	/// <inheritdoc/>
 	protected override ContentViewGroup CreatePlatformView()
 	{
-		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
-		_ = MauiContext.Context ?? throw new InvalidOperationException("Android Context is null, please check your MauiApplication.");
+		if (MauiContext?.Context is null)
+		{
+			throw new InvalidOperationException("Android Context is null, please ensure your MauiApplication is initialized.");
+		}
 
 		return new MauiSemanticOrderView(MauiContext.Context);
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.macios.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.macios.cs
index eb73b58fd..74621f3e7 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.macios.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.macios.cs
@@ -1,5 +1,4 @@
 using CommunityToolkit.Maui.Core.Views;
-using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
 
 namespace CommunityToolkit.Maui.Core.Handlers;
@@ -7,10 +6,5 @@ namespace CommunityToolkit.Maui.Core.Handlers;
 public partial class SemanticOrderViewHandler
 {
 	/// <inheritdoc/>
-	protected override ContentView CreatePlatformView()
-	{
-		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
-
-		return new MauiSemanticOrderView();
-	}
+	protected override ContentView CreatePlatformView() => new MauiSemanticOrderView();
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.net.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.net.cs
index 8032ebe83..b3c419f49 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.net.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.net.cs
@@ -1,6 +1,4 @@
-using Microsoft.Maui.Handlers;
-
-namespace CommunityToolkit.Maui.Core.Handlers;
+namespace CommunityToolkit.Maui.Core.Handlers;
 
 public partial class SemanticOrderViewHandler
 {
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
index b6d655b0d..3f2160a69 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.shared.cs
@@ -18,7 +18,7 @@ public partial class SemanticOrderViewHandler : ContentViewHandler
 	/// <summary>
 	/// <see cref ="CommandMapper"/> for SemanticOrderView Control.
 	/// </summary>
-	public static CommandMapper<ISemanticOrderView, SemanticOrderViewHandler> SemanticOrderViewCommandMapper = new(ContentViewHandler.CommandMapper)
+	public static CommandMapper<ISemanticOrderView, SemanticOrderViewHandler> SemanticOrderViewCommandMapper = new(CommandMapper)
 	{
 	};
 
@@ -35,29 +35,29 @@ public SemanticOrderViewHandler(IPropertyMapper? mapper, CommandMapper? commandM
 	/// <summary>
 	/// Default Constructor for <see cref="SemanticOrderViewHandler"/>.
 	/// </summary>
-	public SemanticOrderViewHandler()
-		: base(SemanticOrderViewMapper, SemanticOrderViewCommandMapper)
+	public SemanticOrderViewHandler() : base(SemanticOrderViewMapper, SemanticOrderViewCommandMapper)
 	{
+
 	}
 
-	static void MapViewOrder(SemanticOrderViewHandler handler, ISemanticOrderView view)
+	/// <inheritdoc/>
+	public override void SetVirtualView(IView view)
 	{
+		base.SetVirtualView(view);
 #if WINDOWS || IOS || MACCATALYST || ANDROID || TIZEN
-		if (handler.PlatformView is MauiSemanticOrderView mso)
+		if (PlatformView is MauiSemanticOrderView semanticOrderView)
 		{
-			mso.UpdateViewOrder();
+			semanticOrderView.VirtualView = (ISemanticOrderView)VirtualView;
 		}
 #endif
 	}
 
-	/// <inheritdoc/>
-	public override void SetVirtualView(IView view)
+	static void MapViewOrder(SemanticOrderViewHandler handler, ISemanticOrderView view)
 	{
-		base.SetVirtualView(view);
 #if WINDOWS || IOS || MACCATALYST || ANDROID || TIZEN
-		if (PlatformView is MauiSemanticOrderView mso)
+		if (handler.PlatformView is MauiSemanticOrderView semanticOrderView)
 		{
-			mso.VirtualView = (ISemanticOrderView)VirtualView;
+			semanticOrderView.UpdateViewOrder();
 		}
 #endif
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
index d669bd6b5..239c3d463 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.tizen.cs
@@ -6,11 +6,5 @@ namespace CommunityToolkit.Maui.Core.Handlers;
 public partial class SemanticOrderViewHandler
 {
 	/// <inheritdoc/>
-	protected override ContentViewGroup CreatePlatformView()
-	{
-		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
-
-		return new MauiSemanticOrderView(VirtualView);
-	}
-
+	protected override ContentViewGroup CreatePlatformView() => new MauiSemanticOrderView(VirtualView);
 }
diff --git a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.windows.cs b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.windows.cs
index 78d70eccd..ea59abd7d 100644
--- a/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Handlers/SemanticOrderView/SemanticOrderViewHandler.windows.cs
@@ -1,5 +1,4 @@
 using CommunityToolkit.Maui.Core.Views;
-using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
 
 namespace CommunityToolkit.Maui.Core.Handlers;
@@ -7,10 +6,5 @@ namespace CommunityToolkit.Maui.Core.Handlers;
 public partial class SemanticOrderViewHandler
 {
 	/// <inheritdoc/>
-	protected override ContentPanel CreatePlatformView()
-	{
-		_ = MauiContext ?? throw new InvalidOperationException("MauiContext is null, please check your MauiApplication.");
-
-		return new MauiSemanticOrderView();
-	}
+	protected override ContentPanel CreatePlatformView() => new MauiSemanticOrderView();
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.Core/Interfaces/ISemanticOrderView.shared.cs b/src/CommunityToolkit.Maui.Core/Interfaces/ISemanticOrderView.shared.cs
index f43794fb5..d7a42f3a6 100644
--- a/src/CommunityToolkit.Maui.Core/Interfaces/ISemanticOrderView.shared.cs
+++ b/src/CommunityToolkit.Maui.Core/Interfaces/ISemanticOrderView.shared.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CommunityToolkit.Maui.Core;
+namespace CommunityToolkit.Maui.Core;
 
 /// <summary>
 /// Allows users to specify the semantic order of child views.
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
index 0baec5e58..da981b5f2 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.android.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-using Android.Content;
-using Android.Views;
+using Android.Content;
 using Microsoft.Maui.Platform;
 
 namespace CommunityToolkit.Maui.Core.Views;
@@ -12,8 +10,7 @@ public class MauiSemanticOrderView : ContentViewGroup
 {
 	ISemanticOrderView? virtualView;
 
-	public MauiSemanticOrderView(Context context)
-		: base(context)
+	public MauiSemanticOrderView(Context context) : base(context)
 	{
 	}
 
@@ -27,12 +24,6 @@ internal ISemanticOrderView? VirtualView
 		}
 	}
 
-	protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
-	{
-		UpdateViewOrder();
-		base.OnLayout(changed, left, top, right, bottom);
-	}
-
 	internal void UpdateViewOrder()
 	{
 		if (VirtualView is null)
@@ -54,12 +45,12 @@ internal void UpdateViewOrder()
 
 			if (view1.Id <= 0)
 			{
-				view1.Id = View.GenerateViewId();
+				view1.Id = GenerateViewId();
 			}
 
 			if (view2.Id <= 0)
 			{
-				view2.Id = View.GenerateViewId();
+				view2.Id = GenerateViewId();
 			}
 
 			if (OperatingSystem.IsAndroidVersionAtLeast(22))
@@ -69,4 +60,10 @@ internal void UpdateViewOrder()
 			}
 		}
 	}
+
+	protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
+	{
+		UpdateViewOrder();
+		base.OnLayout(changed, left, top, right, bottom);
+	}
 }
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
index 680257cae..60cb30d29 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.ios.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using Foundation;
-using Microsoft.Maui.Platform;
-using UIKit;
+using Microsoft.Maui.Platform;
 
 namespace CommunityToolkit.Maui.Core.Views;
 
@@ -11,6 +8,7 @@ namespace CommunityToolkit.Maui.Core.Views;
 public class MauiSemanticOrderView : ContentView, IUIAccessibilityContainer
 {
 	ISemanticOrderView? virtualView;
+
 	internal ISemanticOrderView? VirtualView
 	{
 		get => virtualView;
@@ -37,10 +35,10 @@ IEnumerable<NSObject> GetAccessibilityElements()
 
 		foreach (var view in viewOrder)
 		{
-			if (view.Handler is IPlatformViewHandler pvh &&
-				pvh.PlatformView is not null)
+			if (view.Handler is IPlatformViewHandler platformViewHandler
+				&& platformViewHandler.PlatformView is not null)
 			{
-				yield return pvh.PlatformView;
+				yield return platformViewHandler.PlatformView;
 			}
 		}
 	}
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs
index 99889935a..fd731f7a7 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.tizen.cs
@@ -13,8 +13,7 @@ public class MauiSemanticOrderView : ContentViewGroup
 	/// <summary>
 	/// Constructor for MauiSemanticOrderView.
 	/// </summary>
-	public MauiSemanticOrderView(IView virtualView)
-		: base(virtualView)
+	public MauiSemanticOrderView(IView virtualView) : base(virtualView)
 	{
 	}
 
@@ -40,19 +39,20 @@ internal void UpdateViewOrder()
 
 		foreach (var view in VirtualView.ViewOrder)
 		{
-			if (view.Handler is IPlatformViewHandler pvh && pvh.PlatformView is not null)
+			if (view.Handler is IPlatformViewHandler platformViewHandler && platformViewHandler.PlatformView is not null)
 			{
-				if (pvh.PlatformView is WrapperView wv)
+				if (platformViewHandler.PlatformView is WrapperView wrapperView)
 				{
-					if (wv.Content is not null)
+					if (wrapperView.Content is not null)
 					{
-						accessibilityManager.SetFocusOrder(wv.Content, order);
+						accessibilityManager.SetFocusOrder(wrapperView.Content, order);
 					}
 				}
 				else
 				{
-					accessibilityManager.SetFocusOrder(pvh.PlatformView, order);
+					accessibilityManager.SetFocusOrder(platformViewHandler.PlatformView, order);
 				}
+
 				order++;
 			}
 		}
diff --git a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
index 1e96c8a91..7641ace90 100644
--- a/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
+++ b/src/CommunityToolkit.Maui.Core/Views/SemanticOrderView/MauiSemanticOrderView.windows.cs
@@ -34,10 +34,10 @@ internal void UpdateViewOrder()
 		var i = 1;
 		foreach (var element in VirtualView.ViewOrder)
 		{
-			if (element.Handler is IPlatformViewHandler pvh &&
-				pvh.PlatformView is not null)
+			if (element.Handler is IPlatformViewHandler platformViewHandler
+				&& platformViewHandler.PlatformView is not null)
 			{
-				pvh.PlatformView.TabIndex = i++;
+				platformViewHandler.PlatformView.TabIndex = i++;
 			}
 		}
 	}
diff --git a/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs b/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
index 72b77745e..75ecf1f58 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Views/SemanticOrderView/SemanticOrderViewTests.cs
@@ -34,7 +34,7 @@ public void OnViewOrderIsCalled()
 	[Fact]
 	public void ISemanticOrderViewViewOrderReturnsCorrectViews()
 	{
-		_ = CreateViewHandler<MockSemanticOrderViewHandler>(semanticOrderView);
+		CreateViewHandler<MockSemanticOrderViewHandler>(semanticOrderView);
 
 		var button = new Button();
 		var entry = new Entry();
diff --git a/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs b/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
index 1d277f8d9..21754e923 100644
--- a/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections;
 using CommunityToolkit.Maui.Core;
 
 namespace CommunityToolkit.Maui.Views;
@@ -23,11 +20,4 @@ public IEnumerable ViewOrder
 	}
 
 	IEnumerable<IView> ISemanticOrderView.ViewOrder => ViewOrder.OfType<IView>();
-
-	/// <summary>
-	/// Initialize a new instance of <see cref="SemanticOrderView"/>.
-	/// </summary>
-	public SemanticOrderView()
-	{
-	}
 }
\ No newline at end of file

From 6b8140192a5afec94fc0e0d1f7dc106ad870ee91 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Tue, 28 Feb 2023 14:55:34 -0800
Subject: [PATCH 14/16] Use `IEnumerable<IView>`

---
 .../Views/SemanticOrderView/SemanticOrderView.shared.cs     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs b/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
index 21754e923..ad3de4cfd 100644
--- a/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/SemanticOrderView/SemanticOrderView.shared.cs
@@ -13,11 +13,9 @@ public class SemanticOrderView : ContentView, ISemanticOrderView
 		BindableProperty.Create(nameof(ViewOrder), typeof(IEnumerable), typeof(SemanticOrderView), Enumerable.Empty<View>());
 
 	/// <inheritdoc />
-	public IEnumerable ViewOrder
+	public IEnumerable<IView> ViewOrder
 	{
-		get => (IEnumerable)GetValue(ViewOrderProperty);
+		get => (IEnumerable<IView>)GetValue(ViewOrderProperty);
 		set => SetValue(ViewOrderProperty, value);
 	}
-
-	IEnumerable<IView> ISemanticOrderView.ViewOrder => ViewOrder.OfType<IView>();
 }
\ No newline at end of file

From 71261e4ecd360e37b39f6d2b49993f5fbbc55d55 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Tue, 28 Feb 2023 15:04:21 -0800
Subject: [PATCH 15/16] Update Sample App

---
 .../SemanticOrderView/SemanticOrderViewPage.xaml    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
index fe8d15bf2..ecf4b5917 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
@@ -10,14 +10,15 @@
                 x:DataType="viewModels:SemanticOrderViewPageViewModel">
     <ContentPage.Content>
         <VerticalStackLayout Margin="20">
-            <Button Text="Element outside the Semantic View"></Button>
+            <Label Text="SemanticOrderView allows developers to indicate the focus order of the controls when a user is navigating via TalkBack (Android), VoiceOver (iOS) or Narrator (Windows)" />
+            <Button Text="This Button outside the SemanticOrderView"></Button>
             <mct:SemanticOrderView x:Name="SemanticOrderView">
                 <StackLayout>
-                    <Label x:Name="Second" Text="Second" Margin="0,20" />
-                    <Button x:Name="Third" Text="Third" Margin="0,20" />
-                    <Label x:Name="Fourth" Text="Fourth" Margin="0,20" />
-                    <Button x:Name="Fifth" Text="Fifth and last" Margin="0,20" />
-                    <Button x:Name="First" Text="First" Margin="0,20" />
+                    <Label x:Name="Second" Text="This Button text is read 2nd by TalkBack/VoiceOver" Margin="0,20" />
+                    <Button x:Name="Third" Text="This Button text is read 3rd by TalkBack/VoiceOver" Margin="0,20" />
+                    <Label x:Name="Fourth" Text="This Button text is read 4th by TalkBack/VoiceOver" Margin="0,20" />
+                    <Button x:Name="Fifth" Text="This Button text is read 5th by TalkBack/VoiceOver" Margin="0,20" />
+                    <Button x:Name="First" Text="This Button text is read 1st by TalkBack/VoiceOver" Margin="0,20" />
                 </StackLayout>
             </mct:SemanticOrderView>
         </VerticalStackLayout>

From 4bc06d56e5e150840ce60f9024d9cc9ff2f16716 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Tue, 28 Feb 2023 15:24:00 -0800
Subject: [PATCH 16/16] Update Sample App

---
 .../SemanticOrderViewPage.xaml                | 26 ++++++++++++-------
 .../SemanticOrderViewPage.xaml.cs             |  2 +-
 .../ViewModels/Views/ViewsGalleryViewModel.cs |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
index ecf4b5917..c0a70d013 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml
@@ -9,17 +9,23 @@
                 x:TypeArguments="viewModels:SemanticOrderViewPageViewModel"
                 x:DataType="viewModels:SemanticOrderViewPageViewModel">
     <ContentPage.Content>
-        <VerticalStackLayout Margin="20">
-            <Label Text="SemanticOrderView allows developers to indicate the focus order of the controls when a user is navigating via TalkBack (Android), VoiceOver (iOS) or Narrator (Windows)" />
-            <Button Text="This Button outside the SemanticOrderView"></Button>
+        <VerticalStackLayout Margin="20" Spacing="12">
+            <Label Text="SemanticOrderView allows developers to indicate the focus order of visible controls when a user is navigating via TalkBack (Android), VoiceOver (iOS) or Narrator (Windows)" />
+            <Button Text="This Button is not included in the SemanticOrderView"></Button>
             <mct:SemanticOrderView x:Name="SemanticOrderView">
-                <StackLayout>
-                    <Label x:Name="Second" Text="This Button text is read 2nd by TalkBack/VoiceOver" Margin="0,20" />
-                    <Button x:Name="Third" Text="This Button text is read 3rd by TalkBack/VoiceOver" Margin="0,20" />
-                    <Label x:Name="Fourth" Text="This Button text is read 4th by TalkBack/VoiceOver" Margin="0,20" />
-                    <Button x:Name="Fifth" Text="This Button text is read 5th by TalkBack/VoiceOver" Margin="0,20" />
-                    <Button x:Name="First" Text="This Button text is read 1st by TalkBack/VoiceOver" Margin="0,20" />
-                </StackLayout>
+                <Border StrokeThickness="2" Stroke="#C0C0C0" Padding="8,0,8,8">
+                    <Border.StrokeShape>
+                        <RoundRectangle CornerRadius="10" />
+                    </Border.StrokeShape>
+                    <VerticalStackLayout Spacing="6" Padding="0">
+                        <Label Text="SemanticOrderView" HorizontalTextAlignment="Center" HorizontalOptions="Center" FontAttributes="Bold" VerticalOptions="Start" VerticalTextAlignment="Start" Padding="0"/>
+                        <Label x:Name="Second" Text="This Label text is read 2nd by TalkBack/ VoiceOver / Narrator" />
+                        <Button x:Name="Third" Text="This Button text is read 3rd by TalkBack/ VoiceOver / Narrator" />
+                        <Label x:Name="Fourth" Text="This Label text is read 4th by TalkBack/ VoiceOver / Narrator" />
+                        <Button x:Name="Fifth" Text="This Button text is read 5th by TalkBack/ VoiceOver / Narrator" />
+                        <Button x:Name="First" Text="This Button text is read 1st by TalkBack/ VoiceOver / Narrator" />
+                    </VerticalStackLayout>
+                </Border>
             </mct:SemanticOrderView>
         </VerticalStackLayout>
     </ContentPage.Content>
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
index b44868166..2fdd91220 100644
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Views/SemanticOrderView/SemanticOrderViewPage.xaml.cs
@@ -4,7 +4,7 @@ namespace CommunityToolkit.Maui.Sample.Pages.Views;
 
 public partial class SemanticOrderViewPage : BasePage<SemanticOrderViewPageViewModel>
 {
-	public SemanticOrderViewPage(SemanticOrderViewPageViewModel vm) : base(vm)
+	public SemanticOrderViewPage(SemanticOrderViewPageViewModel semanticOrderViewPageViewModel) : base(semanticOrderViewPageViewModel)
 	{
 		InitializeComponent();
 		SemanticOrderView.ViewOrder = new List<View> { First, Second, Third, Fourth, Fifth };
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
index 20396e46a..72e953f78 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
@@ -26,7 +26,7 @@ public ViewsGalleryViewModel()
 			SectionModel.Create<PopupPositionViewModel>("Custom Positioning Popup", Colors.Red, "Displays a basic popup anywhere on the screen using VerticalOptions and HorizontalOptions"),
 			SectionModel.Create<PopupAnchorViewModel>("Anchor Popup", Colors.Red, "Popups can be anchored to other view's on the screen"),
 			SectionModel.Create<ShowPopupInOnAppearingPageViewModel>("Show Popup in OnAppearing", Colors.Red, "Proves that we now support showing a popup before the platform is even ready."),
-			SectionModel.Create<SemanticOrderViewPageViewModel>("Semantic Order View", Colors.Red, "Set accessiblity ordering on views."),
+			SectionModel.Create<SemanticOrderViewPageViewModel>("Semantic Order View", Colors.Red, "SemanticOrderView allows developers to indicate the focus order of visible controls when a user is navigating via TalkBack (Android), VoiceOver (iOS) or Narrator (Windows)."),
 		})
 	{
 	}