feat(dragdrop): Fix WASM support of Drag and drop

unoplatform · Oct 16, 2020 · c4cb3a7 · c4cb3a7
1 parent 0e3db7a
commit c4cb3a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Uno.UI/UI/Xaml/DragDropManager.cs b/src/Uno.UI/UI/Xaml/DragDropManager.cs
@@ -25,7 +25,11 @@ public DragDropManager(Window window)
 		/// <inheritdoc />
 		public void BeginDragAndDrop(CoreDragInfo info, ICoreDropOperationTarget? target = null)
 		{
-			if (!_window.Dispatcher.HasThreadAccess)
+			if (
+#if __WASM__
+				_window.Dispatcher.IsThreadingSupported &&
+#endif
+				!_window.Dispatcher.HasThreadAccess)
 			{
 				_window.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => BeginDragAndDrop(info, target));
 				return;

diff --git a/src/Uno.UWP/UI/Core/CoreDispatcher.wasm.cs b/src/Uno.UWP/UI/Core/CoreDispatcher.wasm.cs
@@ -11,7 +11,8 @@ namespace Windows.UI.Core
 {
 	public sealed partial class CoreDispatcher
 	{
-		private readonly bool ThreadingSupported = Environment.GetEnvironmentVariable("UNO_BOOTSTRAP_MONO_RUNTIME_CONFIGURATION").StartsWith("threads", StringComparison.OrdinalIgnoreCase);
+		internal bool IsThreadingSupported { get; } = Environment.GetEnvironmentVariable("UNO_BOOTSTRAP_MONO_RUNTIME_CONFIGURATION").StartsWith("threads", StringComparison.OrdinalIgnoreCase);
+
 		private Timer _backgroundWakeupTimer;
 
 		/// <summary>
@@ -31,7 +32,7 @@ private static int DispatcherCallback()
 
 		partial void Initialize()
 		{
-			if (ThreadingSupported)
+			if (IsThreadingSupported)
 			{
 				if(Thread.CurrentThread.ManagedThreadId != 1)
 				{
@@ -48,7 +49,7 @@ partial void Initialize()
 
 		private bool GetHasThreadAccess()
 		{
-			if (ThreadingSupported)
+			if (IsThreadingSupported)
 			{
 				return Thread.CurrentThread.ManagedThreadId == 1;
 			}
@@ -64,7 +65,7 @@ partial void EnqueueNative()
 		{
 			if (DispatchOverride == null)
 			{
-				if (!ThreadingSupported)
+				if (!IsThreadingSupported)
 				{
 					WebAssemblyRuntime.InvokeJSUnmarshalled("CoreDispatcher:WakeUp", IntPtr.Zero);
 				}