[iOS] ViewCells with Accessories will be properly laid out again (#338)

* Add repro for 43161

* [iOS] Don't adjust ViewCell Bounds when there is an Accessory

* [iOS] Fix spacing

2 files changed, 65 insertions, 0 deletions

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs
new file mode 100644
index 00000000..159c793d
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs
@@ -0,0 +1,64 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+using System.Linq;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+#endif
+
+namespace Xamarin.Forms.Controls
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Bugzilla, 43161, "[iOS] Setting Accessory in ViewCellRenderer breaks layout", PlatformAffected.iOS)]
+	public class Bugzilla43161 : TestContentPage
+	{
+		const string Instructions = "On iOS, all three of the following ListViews should have ListItems labeled with numbers and a right arrow. If any of the ListViews does not contain numbers, this test has failed.";
+		const string ListView1 = "Accessory with Context Actions";
+		const string ListView2 = "Accessory with RecycleElement";
+		const string ListView3 = "Accessory with RetainElement";
+
+		public class AccessoryViewCell : ViewCell
+		{
+			public AccessoryViewCell()
+			{
+				var label = new Label();
+				label.SetBinding(Label.TextProperty, ".");
+				View = label;
+			}
+		}
+
+		public class AccessoryViewCellWithContextActions : AccessoryViewCell
+		{
+			public AccessoryViewCellWithContextActions()
+			{
+				var label = new Label();
+				label.SetBinding(Label.TextProperty, ".");
+				View = label; 
+				
+				var delete = new MenuItem { Text = "Delete" };
+				ContextActions.Add(delete);
+			}
+		}
+
+		protected override void Init()
+		{
+			var label = new Label { Text = Instructions };
+			var listView = new ListView { ItemTemplate = new DataTemplate(typeof(AccessoryViewCellWithContextActions)), ItemsSource = Enumerable.Range(0, 9), Header = ListView1 };
+			var listView2 = new ListView(ListViewCachingStrategy.RecycleElement) { ItemTemplate = new DataTemplate(typeof(AccessoryViewCell)), ItemsSource = Enumerable.Range(10, 19), Header = ListView2 };
+			var listView3 = new ListView { ItemTemplate = new DataTemplate(typeof(AccessoryViewCell)), ItemsSource = Enumerable.Range(20, 29), Header = ListView3 };
+
+			Content = new StackLayout { Children = { label, listView, listView2, listView3 } };
+		}
+
+#if UITEST
+		[Test]
+		public void Bugzilla43161Test()
+		{
+			RunningApp.WaitForElement(q => q.Marked("0"));
+			RunningApp.WaitForElement(q => q.Marked("10"));
+			RunningApp.WaitForElement(q => q.Marked("20"));
+		}
+#endif
+	}
+}
\ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index adf173df..364b3c44 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -181,6 +181,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ImageLoadingErrorHandling.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla33561.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla43214.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla43161.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)_Template.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue1028.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue1075.cs" />