Merge pull request #183 from gaelj/release

Release 0.8.9
gaelj · Jul 13, 2024 · 8cd1569 · 8cd1569
2 parents 068098b + 6d63ec4
commit 8cd1569
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.8.9 - 2024-07-13
+
+### 🔇 Remove logs
+
+- Remove the loggings
+
+### 🐛 Fix bugs
+
+- Better manage to the lifecycle cancellation token source
+- Prevent a null  reference on CmJsInterop: don't nullify it on component disposal
+
 ## 0.8.8 - 2024-06-16
 
 ### ⬆️ Upgrade dependencies

diff --git a/CodeMirror6/CodeMirror6.csproj b/CodeMirror6/CodeMirror6.csproj
@@ -9,7 +9,7 @@
     <AssemblyName>GaelJ.BlazorCodeMirror6</AssemblyName>
     <IsPackable>true</IsPackable>
     <PackageId>GaelJ.BlazorCodeMirror6</PackageId>
-    <Version>0.8.8</Version>
+    <Version>0.8.9</Version>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/CodeMirror6/CodeMirror6WrapperInternal.razor.cs b/CodeMirror6/CodeMirror6WrapperInternal.razor.cs
@@ -270,7 +270,7 @@ public partial class CodeMirror6WrapperInternal : ComponentBase, IAsyncDisposabl
     internal CodeMirrorConfiguration Config = null!;
     private bool shouldRender = true;
     private bool IsCodeMirrorInitialized;
-    private readonly CancellationTokenSource LifeCycleCancellationTokenSource = new();
+    private CancellationTokenSource LifeCycleCancellationTokenSource = new();
 
     /// <summary>
     /// Life-cycle method invoked when the component is initialized.
@@ -335,20 +335,38 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
     private async Task InitializeJsInterop()
     {
-        if (CmJsInterop is null) {
-            Logger.LogDebug("Initializing CodeMirror JS Interop with id {id}", Setup.Id);
-            if (LifeCycleCancellationTokenSource.IsCancellationRequested) return;
-            CmJsInterop = new CodeMirrorJsInterop(JSRuntime, this);
-            if (LifeCycleCancellationTokenSource.IsCancellationRequested) return;
-            if (!await CmJsInterop.PropertySetters.InitCodeMirror()) return;
-            if (GetMentionCompletions is not null) {
-                var mentionCompletions = await GetMentionCompletions();
-                if (!await CmJsInterop.PropertySetters.SetMentionCompletions(mentionCompletions)) return;
+        if (CmJsInterop is null || !IsCodeMirrorInitialized) {
+            try {
+                try {
+                    LifeCycleCancellationTokenSource.Cancel();
+                }
+                catch (ObjectDisposedException) {
+                    return;
+                }
+                LifeCycleCancellationTokenSource = new();
+
+                var token = LifeCycleCancellationTokenSource.Token;
+                Logger.LogInformation("Initializing CodeMirror JS Interop with id {id}...", Setup.Id);
+                if (token.IsCancellationRequested) return;
+                CmJsInterop = new CodeMirrorJsInterop(JSRuntime, this);
+
+                if (token.IsCancellationRequested) return;
+                if (!await CmJsInterop.PropertySetters.InitCodeMirror()) return;
+
+                if (GetMentionCompletions is not null) {
+                    var mentionCompletions = await GetMentionCompletions();
+                    if (token.IsCancellationRequested) return;
+                    if (!await CmJsInterop.PropertySetters.SetMentionCompletions(mentionCompletions)) return;
+                }
+                if (token.IsCancellationRequested) return;
+                IsCodeMirrorInitialized = true;
+                await InvokeAsync(StateHasChanged);
+                await OnParametersSetAsync();
+            }
+            catch (OperationCanceledException) {
+            }
+            catch (ObjectDisposedException) {
             }
-            if (LifeCycleCancellationTokenSource.IsCancellationRequested) return;
-            IsCodeMirrorInitialized = true;
-            await InvokeAsync(StateHasChanged);
-            await OnParametersSetAsync();
         }
     }
 
@@ -519,7 +537,6 @@ public async ValueTask DisposeAsync()
         catch (ObjectDisposedException) {}
         if (CmJsInterop?.IsJSReady == true)
             await CmJsInterop.DisposeAsync();
-        CmJsInterop = null;
         try {
             LinterCancellationTokenSource.Cancel();
             LinterCancellationTokenSource.Dispose();

diff --git a/Examples.BlazorServer/Examples.BlazorServer.csproj b/Examples.BlazorServer/Examples.BlazorServer.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>0.8.8</Version>
+    <Version>0.8.9</Version>
   </PropertyGroup>
   <ItemGroup>
     <SupportedPlatform Include="browser" />

diff --git a/Examples.BlazorServerInteractive/Examples.BlazorServerInteractive.csproj b/Examples.BlazorServerInteractive/Examples.BlazorServerInteractive.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
-    <Version>0.8.8</Version>
+    <Version>0.8.9</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Sentry.AspNetCore" Version="4.7.0" />

diff --git a/Examples.BlazorWasm/Examples.BlazorWasm.csproj b/Examples.BlazorWasm/Examples.BlazorWasm.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
-    <Version>0.8.8</Version>
+    <Version>0.8.9</Version>
   </PropertyGroup>
   <ItemGroup>
     <SupportedPlatform Include="browser-wasm" />

diff --git a/Examples.Common/Examples.Common.csproj b/Examples.Common/Examples.Common.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <Version>0.8.8</Version>
+    <Version>0.8.9</Version>
   </PropertyGroup>
   <ItemGroup>
     <SupportedPlatform Include="browser" />

diff --git a/NEW_CHANGELOG.md b/NEW_CHANGELOG.md
@@ -1,3 +1,8 @@
-### ⬆️ Upgrade dependencies
+### 🔇 Remove logs
 
-- Update nuget packages
+- Remove the loggings
+
+### 🐛 Fix bugs
+
+- Better manage to the lifecycle cancellation token source
+- Prevent a null  reference on CmJsInterop: don't nullify it on component disposal