Fix rebase

dotnet · Mar 24, 2021 · 4be75d3 · 4be75d3
1 parent 7bc4a77
commit 4be75d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
@@ -45,7 +45,7 @@ public static void MapIsTextPredictionEnabled(EditorHandler handler, IEditor edi
 
 		public static void MapFont(EditorHandler handler, IEditor editor)
 		{
-			var services = App.Current?.Services
+			var services = handler.Services
 				   ?? throw new InvalidOperationException($"Unable to find service provider, the App.Current.Services was null.");
 			var fontManager = services.GetRequiredService<IFontManager>();
 

diff --git a/src/Core/src/Handlers/Editor/EditorHandler.cs b/src/Core/src/Handlers/Editor/EditorHandler.cs
@@ -7,7 +7,7 @@ public partial class EditorHandler
 			[nameof(IEditor.Text)] = MapText,
 			[nameof(IEditor.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(IEditor.MaxLength)] = MapMaxLength,
-			[nameof(IEditor.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled
+			[nameof(IEditor.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled,
 			[nameof(IEditor.Font)] = MapFont
 		};
 

diff --git a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
@@ -80,7 +80,7 @@ bool OnShouldChangeText(UITextView textView, NSRange range, string replacementSt
 
 		public static void MapFont(EditorHandler handler, IEditor editor)
 		{
-			var services = App.Current?.Services ??
+			var services = handler.Services ??
 				throw new InvalidOperationException($"Unable to find service provider, the App.Current.Services was null.");
 			var fontManager = services.GetRequiredService<IFontManager>();