fix(blazorui): resolve issues of disposing BitDataGrid and BitFileUpl…

…oad #8986 (#8987)
bitfoundation · Oct 23, 2024 · 565b70f · 565b70f
1 parent f411c4b
commit 565b70f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/BitDataGrid.razor.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/BitDataGrid.razor.cs
@@ -416,6 +416,12 @@ public async ValueTask DisposeAsync()
             // The JS side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.
         }
+        catch(JSException ex)
+        {
+            // it seems it's safe to just ignore this exception here.
+            // otherwise it will blow up the MAUI app in a page refresh for example.
+            Console.WriteLine(ex.Message);
+        }
     }
 
     private void CloseColumnOptions()

diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/FileUpload/BitFileUpload.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/FileUpload/BitFileUpload.razor.cs
@@ -692,6 +692,12 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
                 await _dropZoneRef.DisposeAsync();
             }
             catch (JSDisconnectedException) { } // we can ignore this exception here
+            catch (JSException ex)
+            {
+                // it seems it's safe to just ignore this exception here.
+                // otherwise it will blow up the MAUI app in a page refresh for example.
+                Console.WriteLine(ex.Message);
+            }
         }
 
         if (_dotnetObj is not null)

diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Platforms/Android/MainActivity.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Platforms/Android/MainActivity.cs
@@ -3,7 +3,7 @@
 
 namespace Bit.BlazorUI.Demo.Client.Maui.Platforms.Android;
 
-[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true,
+[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTask,
     ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
 public class MainActivity : MauiAppCompatActivity
 {