Merge branch 'dev' of https://github.com/microsoft/fluentui-blazor into dev

Author: vnbaaij

examples/Demo/Shared/Components/TableOfContents.razor.cs

@@ -204,7 +204,8 @@ async ValueTask IAsyncDisposable.DisposeAsync()
                 await _jsModule.DisposeAsync();
             }
         }
-        catch (JSDisconnectedException)
+        catch (Exception ex) when (ex is JSDisconnectedException ||
+                                   ex is OperationCanceledException)
         {
             // The JSRuntime side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.

src/Core/Components/Anchor/FluentAnchor.razor.cs

@@ -151,7 +151,8 @@ public async ValueTask DisposeAsync()
                 await _jsModule.DisposeAsync();
             }
         }
-        catch (JSDisconnectedException)
+        catch (Exception ex) when (ex is JSDisconnectedException ||
+                                   ex is OperationCanceledException)
         {
             // The JSRuntime side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.

src/Core/Components/DataGrid/FluentDataGrid.razor.cs

@@ -516,7 +516,8 @@ public async ValueTask DisposeAsync()
                 await Module.DisposeAsync();
             }
         }
-        catch (JSDisconnectedException)
+        catch (Exception ex) when (ex is JSDisconnectedException ||
+                                   ex is OperationCanceledException)
         {
             // The JSRuntime side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.

src/Core/Components/Divider/FluentDivider.razor.cs

@@ -49,7 +49,8 @@ public async ValueTask DisposeAsync()
                 await _jsModule.DisposeAsync();
             }
         }
-        catch (JSDisconnectedException)
+        catch (Exception ex) when (ex is JSDisconnectedException ||
+                                   ex is OperationCanceledException)
         {
             // The JSRuntime side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.

src/Core/Components/HorizontalScroll/FluentHorizontalScroll.razor.cs

@@ -84,7 +84,8 @@ public async ValueTask DisposeAsync()
                 await _jsModule.DisposeAsync();
             }
         }
-        catch (JSDisconnectedException)
+        catch (Exception ex) when (ex is JSDisconnectedException ||
+                                   ex is OperationCanceledException)
         {
             // The JSRuntime side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.

src/Core/Components/List/ListComponentBase.razor.cs

@@ -595,7 +595,8 @@ public async ValueTask DisposeAsync()
                 await Module.DisposeAsync();
             }
         }
-        catch (JSDisconnectedException)
+        catch (Exception ex) when (ex is JSDisconnectedException ||
+                                   ex is OperationCanceledException)
         {
             // The JSRuntime side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.

src/Core/Components/Overflow/FluentOverflow.razor.cs

@@ -144,7 +144,8 @@ public async ValueTask DisposeAsync()
                 await _jsModule.DisposeAsync();
             }
         }
-        catch (JSDisconnectedException)
+        catch (Exception ex) when (ex is JSDisconnectedException ||
+                                   ex is OperationCanceledException)
         {
             // The JSRuntime side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.

src/Core/DesignTokens/DesignToken.razor.cs

@@ -145,7 +145,8 @@ public async ValueTask DisposeAsync()
             }
 
         }
-        catch (JSDisconnectedException)
+        catch (Exception ex) when (ex is JSDisconnectedException ||
+                                   ex is OperationCanceledException)
         {
             // The JSRuntime side may routinely be gone already if the reason we're disposing is that
             // the client disconnected. This is not an error.

src/Core/Utilities/JSModule.cs

@@ -79,7 +79,8 @@ protected virtual async ValueTask DisposeCoreAsync()
             {
                 // This can be called too early when using prerendering
             }
-            catch (JSDisconnectedException)
+            catch (Exception ex) when (ex is JSDisconnectedException ||
+                                       ex is OperationCanceledException)
             {
                 // The JSRuntime side may routinely be gone already if the reason we're disposing is that
                 // the client disconnected. This is not an error.