Merge pull request #77 from S-Luiten/fix/#76

ADefWebserver · web-flow · commit 4ab96a939b3f · 2024-12-31T06:23:31.000-08:00
Add CancellationToken overloads.
diff --git a/README.md b/README.md
@@ -146,20 +146,18 @@ Below is a list of all the options available on the Text Editor.
 BlazoredTextEditor QuillHtml;
 string QuillHTMLContent;
 
-    public async void GetHTML()
+    public async Task GetHTML()
     {
         QuillHTMLContent = await this.QuillHtml.GetHTML();
-        StateHasChanged();
     }
 
-    public async void SetHTML()
+    public async Task SetHTML()
     {
         string QuillContent =
             @"<a href='http://BlazorHelpWebsite.com/'>" +
             "<img src='images/BlazorHelpWebsite.gif' /></a>";
 
         await this.QuillHtml.LoadHTMLContent(QuillContent);
-        StateHasChanged();
     }
 }
 ```
diff --git a/samples/BlazorClientSide/Pages/Index.razor b/samples/BlazorClientSide/Pages/Index.razor
@@ -220,51 +220,53 @@ console.<span class="hljs-built_in">log</span>("I love " <span class="hljs-opera
 
     bool mode = false;
 
-    public async void GetHTML()
+    public async Task GetHTML()
     {
-        QuillHTMLContent = await this.QuillHtml.GetHTML();
-        StateHasChanged();
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1));
+
+        try
+        {
+            QuillHTMLContent = await this.QuillHtml.GetHTML(cts.Token);
+        }
+        catch (TaskCanceledException e)
+        {
+            QuillHTMLContent = "<p>ERROR: Timeout</p>";
+        }
     }
 
-    public async void SetHTML()
+    public async Task SetHTML()
     {
         string QuillContent =
             @"<a href='http://BlazorHelpWebsite.com/'>" +
             "<img src='images/BlazorHelpWebsite.gif' /></a>";
 
         await this.QuillHtml.LoadHTMLContent(QuillContent);
-        StateHasChanged();
     }
 
-    public async void GetContent()
+    public async Task GetContent()
     {
         QuillContent = await this.QuillNative.GetContent();
-        StateHasChanged();
     }
-    public async void LoadContent()
+    public async Task LoadContent()
     {
         await this.QuillNative.LoadContent(QuillContent);
-        StateHasChanged();
     }
-    public async void InsertImage()
+    public async Task InsertImage()
     {
         await this.QuillNative.InsertImage("images/BlazorHelpWebsite.gif");
-        StateHasChanged();
     }
-    public async void InsertText()
+    public async Task InsertText()
     {
         await this.QuillNative.InsertText("Some Text");
-        StateHasChanged();
     }
     async Task ToggleQuillEditor()
     {
         mode = (mode) ? false : true;
         await this.QuillReadOnly.EnableEditor(mode);
     }
 
-    public async void GetHTMLCode()
+    public async Task GetHTMLCode()
     {
         QuillHTMLCodeContent = await this.QuillCode.GetHTML();
-        StateHasChanged();
     }
 }
diff --git a/samples/BlazorClientSide/_Imports.razor b/samples/BlazorClientSide/_Imports.razor
@@ -1,4 +1,5 @@
 ﻿@using System.Net.Http
+@using System.Threading
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
diff --git a/samples/BlazorServerSide/Pages/Index.razor b/samples/BlazorServerSide/Pages/Index.razor
@@ -212,49 +212,52 @@ console.<span class="hljs-built_in">log</span>("I love " <span class="hljs-opera
 
     string QuillHTMLContent;
     string QuillContent;
-    string QuillReadOnlyContent = 
+    string QuillReadOnlyContent =
         @"<span><b>Read Only</b> <u>Content</u></span>";
     string QuillHTMLCodeContent;
 
     bool mode = false;
 
-    public async void GetHTML()
+    public async Task GetHTML()
     {
-        QuillHTMLContent = await this.QuillHtml.GetHTML();
-        StateHasChanged();
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1));
+
+        try
+        {
+            QuillHTMLContent = await this.QuillHtml.GetHTML(cts.Token);
+        }
+        catch (TaskCanceledException e)
+        {
+            QuillHTMLContent = "<p>ERROR: Timeout</p>";
+        }
     }
 
-    public async void SetHTML()
+    public async Task SetHTML()
     {
         string QuillContent =
             @"<a href='http://BlazorHelpWebsite.com/'>" +
             "<img src='images/BlazorHelpWebsite.gif' /></a>";
 
         await this.QuillHtml.LoadHTMLContent(QuillContent);
-        StateHasChanged();
     }
 
-    public async void GetContent()
+    public async Task GetContent()
     {
         QuillContent = await this.QuillNative.GetContent();
-        StateHasChanged();
     }
-    public async void LoadContent()
+    public async Task LoadContent()
     {
         await this.QuillNative.LoadContent(QuillContent);
-        StateHasChanged();
     }
 
-    public async void InsertImage()
+    public async Task InsertImage()
     {
         await this.QuillNative.InsertImage("images/BlazorHelpWebsite.gif");
-        StateHasChanged();
     }
 
-    public async void InsertText()
+    public async Task InsertText()
     {
         await this.QuillNative.InsertText("Some Text");
-        StateHasChanged();
     }
 
     async Task ToggleQuillEditor()
@@ -263,9 +266,8 @@ console.<span class="hljs-built_in">log</span>("I love " <span class="hljs-opera
         await this.QuillReadOnly.EnableEditor(mode);
     }
 
-    public async void GetHTMLCode()
+    public async Task GetHTMLCode()
     {
         QuillHTMLCodeContent = await this.QuillCode.GetHTML();
-        StateHasChanged();
     }
 }
diff --git a/samples/BlazorServerSide/_Imports.razor b/samples/BlazorServerSide/_Imports.razor
@@ -1,4 +1,5 @@
 ﻿@using System.Net.Http
+@using System.Threading
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.Forms
diff --git a/src/Blazored.TextEditor/BlazoredTextEditor.razor b/src/Blazored.TextEditor/BlazoredTextEditor.razor
@@ -106,51 +106,104 @@
             JSRuntime, QuillElement);
     }
 
+    public async Task<string> GetText(CancellationToken cancellationToken)
+    {
+        return await Interop.GetText(
+            JSRuntime, QuillElement, cancellationToken);
+    }
+
     public async Task<string> GetHTML()
     {
         return await Interop.GetHTML(
             JSRuntime, QuillElement);
     }
 
+    public async Task<string> GetHTML(CancellationToken cancellationToken)
+    {
+        return await Interop.GetHTML(
+            JSRuntime, QuillElement, cancellationToken);
+    }
+
     public async Task<string> GetContent()
     {
         return await Interop.GetContent(
             JSRuntime, QuillElement);
     }
 
+    public async Task<string> GetContent(CancellationToken cancellationToken)
+    {
+        return await Interop.GetContent(
+            JSRuntime, QuillElement, cancellationToken);
+    }
+
     public async Task LoadContent(string Content)
     {
         var QuillDelta =
             await Interop.LoadQuillContent(
                 JSRuntime, QuillElement, Content);
     }
 
+    public async Task LoadContent(string Content, CancellationToken cancellationToken)
+    {
+        var QuillDelta =
+            await Interop.LoadQuillContent(
+                JSRuntime, QuillElement, Content, cancellationToken);
+    }
+
     public async Task LoadHTMLContent(string quillHTMLContent)
     {
         var QuillDelta =
             await Interop.LoadQuillHTMLContent(
                 JSRuntime, QuillElement, quillHTMLContent);
     }
 
+    public async Task LoadHTMLContent(string quillHTMLContent, CancellationToken cancellationToken)
+    {
+        var QuillDelta =
+            await Interop.LoadQuillHTMLContent(
+                JSRuntime, QuillElement, quillHTMLContent, cancellationToken);
+    }
+
     public async Task InsertImage(string ImageURL)
     {
         var QuillDelta =
             await Interop.InsertQuillImage(
                 JSRuntime, QuillElement, ImageURL);
     }
 
+    public async Task InsertImage(string ImageURL, CancellationToken cancellationToken)
+    {
+        var QuillDelta =
+            await Interop.InsertQuillImage(
+                JSRuntime, QuillElement, ImageURL, cancellationToken);
+    }
+
     public async Task InsertText(string text)
     {
         var QuillDelta =
             await Interop.InsertQuillText(
                 JSRuntime, QuillElement, text);
     }
 
+    public async Task InsertText(string text, CancellationToken cancellationToken)
+    {
+        var QuillDelta =
+            await Interop.InsertQuillText(
+                JSRuntime, QuillElement, text, cancellationToken);
+    }
+
     public async Task EnableEditor(bool mode)
     {
         var QuillDelta =
             await Interop.EnableQuillEditor(
                 JSRuntime, QuillElement, mode);
     }
 
+    public async Task EnableEditor(bool mode, CancellationToken cancellationToken)
+    {
+        var QuillDelta =
+            await Interop.EnableQuillEditor(
+                JSRuntime, QuillElement, mode, cancellationToken);
+    }
+
 }
diff --git a/src/Blazored.TextEditor/Interop.cs b/src/Blazored.TextEditor/Interop.cs
diff --git a/src/Blazored.TextEditor/_Imports.razor b/src/Blazored.TextEditor/_Imports.razor

Original file line number	Diff line number	Diff line change
`@@ -146,20 +146,18 @@ Below is a list of all the options available on the Text Editor.`
`146`	`146`	`BlazoredTextEditor QuillHtml;`
`147`	`147`	`string QuillHTMLContent;`
`148`	`148`
`149`		`- public async void GetHTML()`
	`149`	`+ public async Task GetHTML()`
`150`	`150`	`{`
`151`	`151`	`QuillHTMLContent = await this.QuillHtml.GetHTML();`
`152`		`- StateHasChanged();`
`153`	`152`	`}`
`154`	`153`
`155`		`- public async void SetHTML()`
	`154`	`+ public async Task SetHTML()`
`156`	`155`	`{`
`157`	`156`	`string QuillContent =`
`158`	`157`	`@"<a href='http://BlazorHelpWebsite.com/'>" +`
`159`	`158`	`"<img src='images/BlazorHelpWebsite.gif' /></a>";`
`160`	`159`
`161`	`160`	`await this.QuillHtml.LoadHTMLContent(QuillContent);`
`162`		`- StateHasChanged();`
`163`	`161`	`}`
`164`	`162`	`}`
`165`	`163`	```
Original file line number	Diff line number	Diff line change
`@@ -220,51 +220,53 @@ console.<span class="hljs-built_in">log</span>("I love " <span class="hljs-opera`
`220`	`220`
`221`	`221`	`bool mode = false;`
`222`	`222`
`223`		`- public async void GetHTML()`
	`223`	`+ public async Task GetHTML()`
`224`	`224`	`{`
`225`		`- QuillHTMLContent = await this.QuillHtml.GetHTML();`
`226`		`- StateHasChanged();`
	`225`	`+ using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1));`
	`226`	`+`
	`227`	`+ try`
	`228`	`+ {`
	`229`	`+ QuillHTMLContent = await this.QuillHtml.GetHTML(cts.Token);`
	`230`	`+ }`
	`231`	`+ catch (TaskCanceledException e)`
	`232`	`+ {`
	`233`	`+ QuillHTMLContent = "<p>ERROR: Timeout</p>";`
	`234`	`+ }`
`227`	`235`	`}`
`228`	`236`
`229`		`- public async void SetHTML()`
	`237`	`+ public async Task SetHTML()`
`230`	`238`	`{`
`231`	`239`	`string QuillContent =`
`232`	`240`	`@"<a href='http://BlazorHelpWebsite.com/'>" +`
`233`	`241`	`"<img src='images/BlazorHelpWebsite.gif' /></a>";`
`234`	`242`
`235`	`243`	`await this.QuillHtml.LoadHTMLContent(QuillContent);`
`236`		`- StateHasChanged();`
`237`	`244`	`}`
`238`	`245`
`239`		`- public async void GetContent()`
	`246`	`+ public async Task GetContent()`
`240`	`247`	`{`
`241`	`248`	`QuillContent = await this.QuillNative.GetContent();`
`242`		`- StateHasChanged();`
`243`	`249`	`}`
`244`		`- public async void LoadContent()`
	`250`	`+ public async Task LoadContent()`
`245`	`251`	`{`
`246`	`252`	`await this.QuillNative.LoadContent(QuillContent);`
`247`		`- StateHasChanged();`
`248`	`253`	`}`
`249`		`- public async void InsertImage()`
	`254`	`+ public async Task InsertImage()`
`250`	`255`	`{`
`251`	`256`	`await this.QuillNative.InsertImage("images/BlazorHelpWebsite.gif");`
`252`		`- StateHasChanged();`
`253`	`257`	`}`
`254`		`- public async void InsertText()`
	`258`	`+ public async Task InsertText()`
`255`	`259`	`{`
`256`	`260`	`await this.QuillNative.InsertText("Some Text");`
`257`		`- StateHasChanged();`
`258`	`261`	`}`
`259`	`262`	`async Task ToggleQuillEditor()`
`260`	`263`	`{`
`261`	`264`	`mode = (mode) ? false : true;`
`262`	`265`	`await this.QuillReadOnly.EnableEditor(mode);`
`263`	`266`	`}`
`264`	`267`
`265`		`- public async void GetHTMLCode()`
	`268`	`+ public async Task GetHTMLCode()`
`266`	`269`	`{`
`267`	`270`	`QuillHTMLCodeContent = await this.QuillCode.GetHTML();`
`268`		`- StateHasChanged();`
`269`	`271`	`}`
`270`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@using System.Net.Http`
	`2`	`+@using System.Threading`
`2`	`3`	`@using Microsoft.AspNetCore.Components.Forms`
`3`	`4`	`@using Microsoft.AspNetCore.Components.Routing`
`4`	`5`	`@using Microsoft.AspNetCore.Components.Web`
Original file line number	Diff line number	Diff line change
`@@ -212,49 +212,52 @@ console.<span class="hljs-built_in">log</span>("I love " <span class="hljs-opera`
`212`	`212`
`213`	`213`	`string QuillHTMLContent;`
`214`	`214`	`string QuillContent;`
`215`		`- string QuillReadOnlyContent =`
	`215`	`+ string QuillReadOnlyContent =`
`216`	`216`	`@"<span><b>Read Only</b> <u>Content</u></span>";`
`217`	`217`	`string QuillHTMLCodeContent;`
`218`	`218`
`219`	`219`	`bool mode = false;`
`220`	`220`
`221`		`- public async void GetHTML()`
	`221`	`+ public async Task GetHTML()`
`222`	`222`	`{`
`223`		`- QuillHTMLContent = await this.QuillHtml.GetHTML();`
`224`		`- StateHasChanged();`
	`223`	`+ using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1));`
	`224`	`+`
	`225`	`+ try`
	`226`	`+ {`
	`227`	`+ QuillHTMLContent = await this.QuillHtml.GetHTML(cts.Token);`
	`228`	`+ }`
	`229`	`+ catch (TaskCanceledException e)`
	`230`	`+ {`
	`231`	`+ QuillHTMLContent = "<p>ERROR: Timeout</p>";`
	`232`	`+ }`
`225`	`233`	`}`
`226`	`234`
`227`		`- public async void SetHTML()`
	`235`	`+ public async Task SetHTML()`
`228`	`236`	`{`
`229`	`237`	`string QuillContent =`
`230`	`238`	`@"<a href='http://BlazorHelpWebsite.com/'>" +`
`231`	`239`	`"<img src='images/BlazorHelpWebsite.gif' /></a>";`
`232`	`240`
`233`	`241`	`await this.QuillHtml.LoadHTMLContent(QuillContent);`
`234`		`- StateHasChanged();`
`235`	`242`	`}`
`236`	`243`
`237`		`- public async void GetContent()`
	`244`	`+ public async Task GetContent()`
`238`	`245`	`{`
`239`	`246`	`QuillContent = await this.QuillNative.GetContent();`
`240`		`- StateHasChanged();`
`241`	`247`	`}`
`242`		`- public async void LoadContent()`
	`248`	`+ public async Task LoadContent()`
`243`	`249`	`{`
`244`	`250`	`await this.QuillNative.LoadContent(QuillContent);`
`245`		`- StateHasChanged();`
`246`	`251`	`}`
`247`	`252`
`248`		`- public async void InsertImage()`
	`253`	`+ public async Task InsertImage()`
`249`	`254`	`{`
`250`	`255`	`await this.QuillNative.InsertImage("images/BlazorHelpWebsite.gif");`
`251`		`- StateHasChanged();`
`252`	`256`	`}`
`253`	`257`
`254`		`- public async void InsertText()`
	`258`	`+ public async Task InsertText()`
`255`	`259`	`{`
`256`	`260`	`await this.QuillNative.InsertText("Some Text");`
`257`		`- StateHasChanged();`
`258`	`261`	`}`
`259`	`262`
`260`	`263`	`async Task ToggleQuillEditor()`
`@@ -263,9 +266,8 @@ console.<span class="hljs-built_in">log</span>("I love " <span class="hljs-opera`
`263`	`266`	`await this.QuillReadOnly.EnableEditor(mode);`
`264`	`267`	`}`
`265`	`268`
`266`		`- public async void GetHTMLCode()`
	`269`	`+ public async Task GetHTMLCode()`
`267`	`270`	`{`
`268`	`271`	`QuillHTMLCodeContent = await this.QuillCode.GetHTML();`
`269`		`- StateHasChanged();`
`270`	`272`	`}`
`271`	`273`	`}`