feat(iOS): Add support for InvokeScriptAsync on WebView

unoplatform · Sep 3, 2020 · 8c8fdb8 · 8c8fdb8
1 parent bbe26b3
commit 8c8fdb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/WebView.cs b/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/WebView.cs
@@ -299,7 +299,7 @@ public  void Stop()
 			throw new global::System.NotImplementedException("The member IAsyncAction WebView.CapturePreviewToStreamAsync(IRandomAccessStream stream) is not implemented in Uno.");
 		}
 		#endif
-		#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
+		#if __ANDROID__ || false || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		public  global::Windows.Foundation.IAsyncOperation<string> InvokeScriptAsync( string scriptName,  global::System.Collections.Generic.IEnumerable<string> arguments)
 		{

diff --git a/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.iOSmacOS.cs b/src/Uno.UI/UI/Xaml/Controls/WebView/WebView.iOSmacOS.cs
@@ -13,6 +13,7 @@
 using System.Threading;
 using Windows.UI.Core;
 using Uno.Logging;
+using Windows.Foundation;
 
 #if XAMARIN_IOS_UNIFIED
 using MessageUI;
@@ -72,6 +73,9 @@ public async Task<string> InvokeScriptAsync(CancellationToken ct, string script,
 			return await _nativeWebView.EvaluateJavascriptAsync(ct, string.Format(CultureInfo.InvariantCulture, "javascript:{0}(\"{1}\")", script, argumentString));
 		}
 
+		public IAsyncOperation<string> InvokeScriptAsync(string scriptName, IEnumerable<string> arguments) =>
+			InvokeScriptAsync(CancellationToken.None, scriptName, arguments).AsAsyncOperation();
+
 		partial void NavigateWithHttpRequestMessagePartial(HttpRequestMessage requestMessage)
 		{
 			if (requestMessage == null)