Fix OnFirstRender early invoked issue

BattlefieldDuck · Mar 22, 2023 · f4aa83b · f4aa83b
1 parent e45cdf5
commit f4aa83b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/XtermBlazor/Xterm.razor.cs b/XtermBlazor/Xterm.razor.cs
@@ -168,8 +168,6 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
                 await JSRuntime.InvokeVoidAsync($"{NAMESPACE_PREFIX}.registerTerminal", Id, ElementReference, Options, AddonIds);
 
                 IsRendered = true;
-
-                await OnFirstRender.InvokeAsync();
             }
         }
 
@@ -281,7 +279,7 @@ public ValueTask Resize(int columns, int rows)
         /// <returns></returns>
         public ValueTask<bool> HasSelection()
         {
-           return JSRuntime.InvokeAsync<bool>($"{NAMESPACE_PREFIX}.hasSelection", Id);
+            return JSRuntime.InvokeAsync<bool>($"{NAMESPACE_PREFIX}.hasSelection", Id);
         }
 
         /// <summary>

diff --git a/XtermBlazor/XtermBlazor.csproj b/XtermBlazor/XtermBlazor.csproj
@@ -17,7 +17,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <Description>Brings xterm.js to Blazor</Description>
     <PackageIcon>icon.png</PackageIcon>
-    <Version>1.8.0</Version>
+    <Version>1.8.1</Version>
     <PackageTags>xterm, xterm-js, blazor, blazor-server, blazor-webassembly, blazor-wasm, xtermblazor</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/XtermBlazor/XtermHandler.cs b/XtermBlazor/XtermHandler.cs
@@ -33,6 +33,17 @@ public static void DisposeTerminal(string id)
             }
         }
 
+        /// <summary>
+        /// Adds an event listener for when the terminal is rendered.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [JSInvokable]
+        public static Task OnFirstRender(string id)
+        {
+            return GetTerminalById(id)?.OnFirstRender.InvokeAsync() ?? Task.CompletedTask;
+        }
+
         /// <summary>
         /// Adds an event listener for when a binary event fires. This is used to
         /// enable non UTF-8 conformant binary messages to be sent to the backend.

diff --git a/XtermBlazor/scripts/XtermBlazor.ts b/XtermBlazor/scripts/XtermBlazor.ts
@@ -64,6 +64,9 @@ class XtermBlazor {
 			addons: addons,
 			customKeyEventHandler: undefined,
 		});
+
+		// Invoke OnFirstRender
+		DotNet.invokeMethodAsync(this._ASSEMBLY_NAME, 'OnFirstRender', id);
 	}
 
 	/**

diff --git a/XtermBlazor/wwwroot/XtermBlazor.min.js b/XtermBlazor/wwwroot/XtermBlazor.min.js