Text needs to be set before other properties

src/Core/src/Handlers/Editor/EditorHandler.Android.cs

@@ -102,8 +102,12 @@ public static void MapHorizontalTextAlignment(IEditorHandler handler, IEditor ed
 		public static void MapVerticalTextAlignment(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateVerticalTextAlignment(editor);
 
-		public static void MapKeyboard(IEditorHandler handler, IEditor editor) =>
+		public static void MapKeyboard(IEditorHandler handler, IEditor editor)
+		{
+			handler.UpdateValue(nameof(IEditor.Text));
+
 			handler.PlatformView?.UpdateKeyboard(editor);
+		}
 
 		public static void MapCursorPosition(IEditorHandler handler, ITextInput editor) =>
 			handler.PlatformView?.UpdateCursorPosition(editor);

src/Core/src/Handlers/Entry/EntryHandler.Android.cs

@@ -73,8 +73,12 @@ public static void MapText(IEntryHandler handler, IEntry entry) =>
 		public static void MapTextColor(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateTextColor(entry);
 
-		public static void MapIsPassword(IEntryHandler handler, IEntry entry) =>
+		public static void MapIsPassword(IEntryHandler handler, IEntry entry)
+		{
+			handler.UpdateValue(nameof(IEntry.Text));
+
 			handler.PlatformView?.UpdateIsPassword(entry);
+		}
 
 		public static void MapHorizontalTextAlignment(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateHorizontalTextAlignment(entry);
@@ -103,11 +107,19 @@ public static void MapPlaceholderColor(IEntryHandler handler, IEntry entry)
 		public static void MapFont(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateFont(entry, handler.GetRequiredService<IFontManager>());
 
-		public static void MapIsReadOnly(IEntryHandler handler, IEntry entry) =>
+		public static void MapIsReadOnly(IEntryHandler handler, IEntry entry)
+		{
+			handler.UpdateValue(nameof(IEntry.Text));
+
 			handler.PlatformView?.UpdateIsReadOnly(entry);
+		}
+
+		public static void MapKeyboard(IEntryHandler handler, IEntry entry)
+		{
+			handler.UpdateValue(nameof(IEntry.Text));
 
-		public static void MapKeyboard(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateKeyboard(entry);
+		}
 
 		public static void MapReturnType(IEntryHandler handler, IEntry entry) =>
 			handler.PlatformView?.UpdateReturnType(entry);

src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs

@@ -121,6 +121,8 @@ public static void MapCancelButtonColor(ISearchBarHandler handler, ISearchBar se
 
 		public static void MapKeyboard(ISearchBarHandler handler, ISearchBar searchBar)
 		{
+			handler.UpdateValue(nameof(ISearchBar.Text));
+
 			handler.PlatformView?.UpdateKeyboard(searchBar);
 		}
 

src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBasementOfT.cs

@@ -74,6 +74,26 @@ protected Task<TValue> GetValueAsync<TValue>(IView view, Func<THandler, Task<TVa
 			});
 		}
 
+		protected Task<TValue> GetValueAsync<TValue, TCustomHandler>(IView view, Func<TCustomHandler, TValue> func)
+			where TCustomHandler : IElementHandler, new()
+		{
+			return InvokeOnMainThreadAsync(() =>
+			{
+				var handler = CreateHandler<TCustomHandler>(view);
+				return func(handler);
+			});
+		}
+
+		protected Task<TValue> GetValueAsync<TValue, TCustomHandler>(IView view, Func<TCustomHandler, Task<TValue>> func)
+			where TCustomHandler : IElementHandler, new()
+		{
+			return InvokeOnMainThreadAsync(() =>
+			{
+				var handler = CreateHandler<TCustomHandler>(view);
+				return func(handler);
+			});
+		}
+
 		protected Task SetValueAsync<TValue>(IView view, TValue value, Action<THandler, TValue> func)
 		{
 			return SetValueAsync<TValue, THandler>(view, value, func);
@@ -98,6 +118,26 @@ async protected Task ValidatePropertyInitValue<TValue>(
 			Assert.Equal(expectedValue, values.PlatformViewValue);
 		}
 
+		async protected Task ValidatePropertyInitValue<TValue, TCustomHandler>(
+			IView view,
+			Func<TValue> GetValue,
+			Func<TCustomHandler, TValue> GetPlatformValue,
+			TValue expectedValue)
+			where TCustomHandler : IElementHandler, new()
+		{
+			var values = await GetValueAsync(view, (TCustomHandler handler) =>
+			{
+				return new
+				{
+					ViewValue = GetValue(),
+					PlatformViewValue = GetPlatformValue(handler)
+				};
+			});
+
+			Assert.Equal(expectedValue, values.ViewValue);
+			Assert.Equal(expectedValue, values.PlatformViewValue);
+		}
+
 		async protected Task ValidatePropertyInitValue<TValue>(
 			IView view,
 			Func<TValue> GetValue,
@@ -118,6 +158,27 @@ async protected Task ValidatePropertyInitValue<TValue>(
 			Assert.Equal(expectedPlatformValue, values.PlatformViewValue);
 		}
 
+		async protected Task ValidatePropertyInitValue<TValue, TCustomHandler>(
+			IView view,
+			Func<TValue> GetValue,
+			Func<TCustomHandler, TValue> GetPlatformValue,
+			TValue expectedValue,
+			TValue expectedPlatformValue)
+			where TCustomHandler : IElementHandler, new()
+		{
+			var values = await GetValueAsync(view, (TCustomHandler handler) =>
+			{
+				return new
+				{
+					ViewValue = GetValue(),
+					PlatformViewValue = GetPlatformValue(handler)
+				};
+			});
+
+			Assert.Equal(expectedValue, values.ViewValue);
+			Assert.Equal(expectedPlatformValue, values.PlatformViewValue);
+		}
+
 		async protected Task ValidatePropertyUpdatesValue<TValue>(
 			IView view,
 			string property,

src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.cs

@@ -21,6 +21,23 @@ public async Task TextInitializesCorrectly()
 			await ValidatePropertyInitValue(editor, () => editor.Text, GetNativeText, editor.Text);
 		}
 
+		[Fact(DisplayName = "Text Property Initializes Correctly when Keyboard Mapper is Executed Before Text Mapper")]
+		public async Task TextInitializesCorrectlyWhenKeyboardIsBeforeText()
+		{
+			var editor = new EditorStub()
+			{
+				Text = "Test Text Here"
+			};
+
+			CustomEditorHandler.TestMapper = new PropertyMapper<IEditor, IEditorHandler>(EditorHandler.Mapper)
+			{
+				// this mapper is run first and then the ones in the ctor arg (EditorHandler.Mapper)
+				[nameof(IEditor.Keyboard)] = EditorHandler.MapKeyboard
+			};
+
+			await ValidatePropertyInitValue<string, CustomEditorHandler>(editor, () => editor.Text, GetNativeText, editor.Text);
+		}
+
 		[Theory(DisplayName = "Text Updates Correctly")]
 		[InlineData(null, null)]
 		[InlineData(null, "Hello")]
@@ -515,5 +532,18 @@ protected override int GetCursorStartPosition(EditorHandler editorHandler) =>
 			protected override void UpdateCursorStartPosition(EditorHandler editorHandler, int position) =>
 				EditorHandlerTests.UpdateCursorStartPosition(editorHandler, position);
 		}
+
+		class CustomEditorHandler : EditorHandler
+		{
+			// make a copy of the Core mappers because we don't want any Controls changes or to override us
+			public static PropertyMapper<IEditor, IEditorHandler> TestMapper = new(Mapper);
+			public static CommandMapper<IEditor, IEditorHandler> TestCommandMapper = new(CommandMapper);
+
+			// make sure to use our mappers
+			public CustomEditorHandler()
+				: base(TestMapper, TestCommandMapper)
+			{
+			}
+		}
 	}
 }

src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs

@@ -23,6 +23,57 @@ public async Task TextInitializesCorrectly()
 			await ValidatePropertyInitValue(entry, () => entry.Text, GetNativeText, entry.Text);
 		}
 
+		[Fact(DisplayName = "Text Property Initializes Correctly when Keyboard Mapper is Executed Before Text Mapper")]
+		public async Task TextInitializesCorrectlyWhenKeyboardIsBeforeText()
+		{
+			var entry = new EntryStub()
+			{
+				Text = "Test Text Here"
+			};
+
+			CustomEntryHandler.TestMapper = new PropertyMapper<IEntry, IEntryHandler>(EntryHandler.Mapper)
+			{
+				// this mapper is run first and then the ones in the ctor arg (EntryHandler.Mapper)
+				[nameof(IEntry.Keyboard)] = EntryHandler.MapKeyboard
+			};
+
+			await ValidatePropertyInitValue<string, CustomEntryHandler>(entry, () => entry.Text, GetNativeText, entry.Text);
+		}
+
+		[Fact(DisplayName = "Text Property Initializes Correctly when IsReadOnly Mapper is Executed Before Text Mapper")]
+		public async Task TextInitializesCorrectlyWhenIsReadOnlyIsBeforeText()
+		{
+			var entry = new EntryStub()
+			{
+				Text = "Test Text Here"
+			};
+
+			CustomEntryHandler.TestMapper = new PropertyMapper<IEntry, IEntryHandler>(EntryHandler.Mapper)
+			{
+				// this mapper is run first and then the ones in the ctor arg (EntryHandler.Mapper)
+				[nameof(IEntry.IsReadOnly)] = EntryHandler.MapIsReadOnly
+			};
+
+			await ValidatePropertyInitValue<string, CustomEntryHandler>(entry, () => entry.Text, GetNativeText, entry.Text);
+		}
+
+		[Fact(DisplayName = "Text Property Initializes Correctly when IsPassword Mapper is Executed Before Text Mapper")]
+		public async Task TextInitializesCorrectlyWhenIsPasswordIsBeforeText()
+		{
+			var entry = new EntryStub()
+			{
+				Text = "Test Text Here"
+			};
+
+			CustomEntryHandler.TestMapper = new PropertyMapper<IEntry, IEntryHandler>(EntryHandler.Mapper)
+			{
+				// this mapper is run first and then the ones in the ctor arg (EntryHandler.Mapper)
+				[nameof(IEntry.IsPassword)] = EntryHandler.MapIsPassword
+			};
+
+			await ValidatePropertyInitValue<string, CustomEntryHandler>(entry, () => entry.Text, GetNativeText, entry.Text);
+		}
+
 		[Fact(DisplayName = "TextColor Initializes Correctly")]
 		public async Task TextColorInitializesCorrectly()
 		{
@@ -734,5 +785,18 @@ protected override int GetCursorStartPosition(EntryHandler entryHandler) =>
 			protected override void UpdateCursorStartPosition(EntryHandler entryHandler, int position) =>
 				EntryHandlerTests.UpdateCursorStartPosition(entryHandler, position);
 		}
+
+		class CustomEntryHandler : EntryHandler
+		{
+			// make a copy of the Core mappers because we don't want any Controls changes or to override us
+			public static PropertyMapper<IEntry, IEntryHandler> TestMapper = new(Mapper);
+			public static CommandMapper<IEntry, IEntryHandler> TestCommandMapper = new(CommandMapper);
+
+			// make sure to use our mappers
+			public CustomEntryHandler()
+				: base(TestMapper, TestCommandMapper)
+			{
+			}
+		}
 	}
 }

src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs

@@ -41,6 +41,23 @@ public async Task TextInitializesCorrectly()
 			await ValidatePropertyInitValue(searchBar, () => searchBar.Text, GetNativeText, searchBar.Text);
 		}
 
+		[Fact(DisplayName = "Text Property Initializes Correctly when Keyboard Mapper is Executed Before Text Mapper")]
+		public async Task TextInitializesCorrectlyWhenKeyboardIsBeforeText()
+		{
+			var searchBar = new SearchBarStub()
+			{
+				Text = "Test Text Here"
+			};
+
+			CustomSearchBarHandler.TestMapper = new PropertyMapper<ISearchBar, ISearchBarHandler>(SearchBarHandler.Mapper)
+			{
+				// this mapper is run first and then the ones in the ctor arg (SearchBarHandler.Mapper)
+				[nameof(ISearchBar.Keyboard)] = SearchBarHandler.MapKeyboard
+			};
+
+			await ValidatePropertyInitValue<string, CustomSearchBarHandler>(searchBar, () => searchBar.Text, GetNativeText, searchBar.Text);
+		}
+
 		[Theory(DisplayName = "Query Text Updates Correctly")]
 		[InlineData(null, null)]
 		[InlineData(null, "Query")]
@@ -451,5 +468,18 @@ public SearchBarFocusTests()
 			}
 		}
 #endif
+
+		class CustomSearchBarHandler : SearchBarHandler
+		{
+			// make a copy of the Core mappers because we don't want any Controls changes or to override us
+			public static PropertyMapper<ISearchBar, ISearchBarHandler> TestMapper = new(Mapper);
+			public static CommandMapper<ISearchBar, ISearchBarHandler> TestCommandMapper = new(CommandMapper);
+
+			// make sure to use our mappers
+			public CustomSearchBarHandler()
+				: base(TestMapper, TestCommandMapper)
+			{
+			}
+		}
 	}
 }