feat(Clipboard): Support Flush, Clear, ContentChanged on WASM

unoplatform · May 19, 2020 · 920304e · 920304e
1 parent 2e6932b
commit 920304e
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 51 deletions.
diff --git a/src/Uno.UI.Wasm/ts/Clipboard.ts b/src/Uno.UI.Wasm/ts/Clipboard.ts
@@ -1,10 +1,27 @@
 namespace Uno.Utils {
 	export class Clipboard {
+		private static dispatchContentChanged: () => number;
+
+		public static startContentChanged() {
+			['cut', 'copy', 'paste'].forEach(function (event) {
+				document.addEventListener(event, Clipboard.onClipboardChanged);
+			});
+		}
+
+		public static stopContentChanged() {
+			['cut', 'copy', 'paste'].forEach(function (event) {
+				document.removeEventListener(event, Clipboard.onClipboardChanged);
+			});
+		}
+
 		public static setText(text: string): string {
 			const nav = navigator as any;
 			if (nav.clipboard) {
 				// Use clipboard object when available
-				nav.clipboard.setText(text);
+				nav.clipboard.writeText(text);
+				// Trigger change notification, as clipboard API does
+				// not execute "copy".
+				Clipboard.onClipboardChanged();
 			} else {
 				// Hack when the clipboard is not available
 				const textarea = document.createElement("textarea");
@@ -17,5 +34,12 @@
 
 			return "ok";
 		}
+
+		private static onClipboardChanged() {
+			if (!Clipboard.dispatchContentChanged) {
+				Clipboard.dispatchContentChanged = (<any>Module).mono_bind_static_method("[Uno] Windows.ApplicationModel.DataTransfer.Clipboard:DispatchContentChanged");
+			}
+			Clipboard.dispatchContentChanged();
+		}
 	}
-}
+}
diff --git a/src/Uno.UI.Wasm/ts/Windows/ApplicationModel/DataTransfer/Clipboard.ts b/src/Uno.UI.Wasm/ts/Windows/ApplicationModel/DataTransfer/Clipboard.ts
diff --git a/src/Uno.UI/LinkerDefinition.Wasm.xml b/src/Uno.UI/LinkerDefinition.Wasm.xml
@@ -16,6 +16,9 @@
   </assembly>
 
   <assembly fullname="Uno">
+    <type fullname="Windows.ApplicationModel.DataTransfer.Clipboard">
+      <method name="DispatchContentChanged" />
+    </type>
     <type fullname="Windows.UI.Core.CoreDispatcher" />
     <type fullname="Windows.UI.Core.SystemNavigationManager" />
     <type fullname="Windows.Devices.Sensors.Accelerometer">

diff --git a/src/Uno.UWP/ApplicationModel/DataTransfer/Clipboard.wasm.cs b/src/Uno.UWP/ApplicationModel/DataTransfer/Clipboard.wasm.cs
@@ -4,15 +4,42 @@ namespace Windows.ApplicationModel.DataTransfer
 {
 	public static partial class Clipboard
 	{
+		private const string JsType = "Uno.Utils.Clipboard";
+
+		public static void Clear() => SetClipboardText(string.Empty);
+
 		public static void SetContent(DataPackage content)
 		{
 			if (content?.Text != null)
 			{
-				var text = WebAssemblyRuntime.EscapeJs(content.Text);
-				var command = $"Uno.Utils.Clipboard.setText(\"{text}\");";
-
-				WebAssemblyRuntime.InvokeJS(command);
+				SetClipboardText(content.Text);
 			}
 		}
+
+		private static void SetClipboardText(string text)
+		{
+			var escapedText = WebAssemblyRuntime.EscapeJs(text);
+			var command = $"{JsType}.setText(\"{escapedText}\");";
+
+			WebAssemblyRuntime.InvokeJS(command);
+		}
+
+		private static void StartContentChanged()
+		{
+			var command = $"{JsType}.startContentChanged()";
+			WebAssemblyRuntime.InvokeJS(command);
+		}
+
+		private static void StopContentChanged()
+		{
+			var command = $"{JsType}.stopContentChanged()";
+			WebAssemblyRuntime.InvokeJS(command);
+		}
+
+		public static int DispatchContentChanged()
+		{
+			OnContentChanged();
+			return 0;
+		}
 	}
 }
diff --git a/src/Uno.UWP/ApplicationModel/DataTransfer/DataPackageView.macOS.cs b/src/Uno.UWP/ApplicationModel/DataTransfer/DataPackageView.macOS.cs
@@ -1,17 +1,17 @@
-#if __MACOS__
+#if __MACOS__
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Windows.ApplicationModel.DataTransfer
-{
+namespace Windows.ApplicationModel.DataTransfer
+{
 	public partial class DataPackageView
-	{
-		private List<string> _availableFormats = new List<string>();
-		private string _text = null;
-
-		public IReadOnlyList<string> AvailableFormats => _availableFormats.AsReadOnly();
-
+	{
+		private List<string> _availableFormats = new List<string>();
+		private string _text = null;
+
+		public IReadOnlyList<string> AvailableFormats => _availableFormats.AsReadOnly();
+
 		internal void SetText(string text)
 		{
 			_text = text;
@@ -23,16 +23,16 @@ internal void SetText(string text)
 			{
 				_availableFormats.Remove(StandardDataFormats.Text);
 			}
-		}
-
-		public Foundation.IAsyncOperation<string> GetTextAsync()
-		{
+		}
+
+		public Foundation.IAsyncOperation<string> GetTextAsync()
+		{
 			if (!_availableFormats.Contains(StandardDataFormats.Text))
 			{
 				throw new InvalidOperationException("DataPackage does not contain Text data.");
-			}
-			return Task.FromResult(_text).AsAsyncOperation();
-		}
-	}
+			}
+			return Task.FromResult(_text).AsAsyncOperation();
+		}
+	}
 }
 #endif
diff --git a/src/Uno.UWP/Generated/3.0.0.0/Windows.ApplicationModel.DataTransfer/Clipboard.cs b/src/Uno.UWP/Generated/3.0.0.0/Windows.ApplicationModel.DataTransfer/Clipboard.cs
@@ -76,14 +76,14 @@ public static void SetContent( global::Windows.ApplicationModel.DataTransfer.Dat
 			global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.ApplicationModel.DataTransfer.Clipboard", "void Clipboard.SetContent(DataPackage content)");
 		}
 		#endif
-		#if __ANDROID__ || false || NET461 || __WASM__ || __MACOS__
+		#if false || false || NET461 || false || false
 		[global::Uno.NotImplemented]
 		public static void Flush()
 		{
 			global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.ApplicationModel.DataTransfer.Clipboard", "void Clipboard.Flush()");
 		}
 		#endif
-		#if __ANDROID__ || false || NET461 || __WASM__ || __MACOS__
+		#if __ANDROID__ || false || NET461 || false || false
 		[global::Uno.NotImplemented]
 		public static void Clear()
 		{
@@ -140,7 +140,7 @@ public static void Clear()
 			}
 		}
 		#endif
-		#if __ANDROID__ || false || NET461 || __WASM__ || __MACOS__
+		#if __ANDROID__ || false || NET461 || false || __MACOS__
 		[global::Uno.NotImplemented]
 		public static event global::System.EventHandler<object> ContentChanged
 		{