Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CancellationToken overloads. #77

Merged
merged 6 commits into from
Dec 31, 2024
Merged

Add CancellationToken overloads. #77

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebe8b40
Add CancellationToken overloads.
S-Luiten Dec 13, 2024
4d85713
Revert Interop's access modifier.
S-Luiten Dec 13, 2024
463006c
Fix async void.
S-Luiten Dec 31, 2024
cc6114a
Add example cancellationToken usage.
S-Luiten Dec 31, 2024
f94df26
Merge remote-tracking branch 'upstream/main' into fix/#76
S-Luiten Dec 31, 2024
063b860
Fix async void after merge.
S-Luiten Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions src/Blazored.TextEditor/BlazoredTextEditor.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,51 +101,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);
}

}
45 changes: 31 additions & 14 deletions src/Blazored.TextEditor/Interop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using System.Threading;
using System.Threading.Tasks;

namespace Blazored.TextEditor
{
public static class Interop
internal static class Interop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this required?

{
internal static ValueTask<object> CreateQuill(
IJSRuntime jsRuntime,
Expand All @@ -24,78 +25,94 @@ internal static ValueTask<object> CreateQuill(

internal static ValueTask<string> GetText(
IJSRuntime jsRuntime,
ElementReference quillElement)
ElementReference quillElement,
CancellationToken cancellationToken = default)
{
return jsRuntime.InvokeAsync<string>(
"QuillFunctions.getQuillText",
"QuillFunctions.getQuillText",
cancellationToken,
quillElement);
}

internal static ValueTask<string> GetHTML(
IJSRuntime jsRuntime,
ElementReference quillElement)
ElementReference quillElement,
CancellationToken cancellationToken = default)
{
return jsRuntime.InvokeAsync<string>(
"QuillFunctions.getQuillHTML",
"QuillFunctions.getQuillHTML",
cancellationToken,
quillElement);
}

internal static ValueTask<string> GetContent(
IJSRuntime jsRuntime,
ElementReference quillElement)
ElementReference quillElement,
CancellationToken cancellationToken = default)
{
return jsRuntime.InvokeAsync<string>(
"QuillFunctions.getQuillContent",
"QuillFunctions.getQuillContent",
cancellationToken,
quillElement);
}

internal static ValueTask<object> LoadQuillContent(
IJSRuntime jsRuntime,
ElementReference quillElement,
string Content)
string Content,
CancellationToken cancellationToken = default)
{
return jsRuntime.InvokeAsync<object>(
"QuillFunctions.loadQuillContent",
"QuillFunctions.loadQuillContent",
cancellationToken,
quillElement, Content);
}

internal static ValueTask<object> LoadQuillHTMLContent(
IJSRuntime jsRuntime,
ElementReference quillElement,
string quillHTMLContent)
string quillHTMLContent,
CancellationToken cancellationToken = default)
{
return jsRuntime.InvokeAsync<object>(
"QuillFunctions.loadQuillHTMLContent",
cancellationToken,
quillElement, quillHTMLContent);
}

internal static ValueTask<object> EnableQuillEditor(
IJSRuntime jsRuntime,
ElementReference quillElement,
bool mode)
bool mode,
CancellationToken cancellationToken = default)
{
return jsRuntime.InvokeAsync<object>(
"QuillFunctions.enableQuillEditor",
"QuillFunctions.enableQuillEditor",
cancellationToken,
quillElement, mode);
}

internal static ValueTask<object> InsertQuillImage(
IJSRuntime jsRuntime,
ElementReference quillElement,
string imageURL)
string imageURL,
CancellationToken cancellationToken = default)
{
return jsRuntime.InvokeAsync<object>(
"QuillFunctions.insertQuillImage",
cancellationToken,
quillElement, imageURL);
}

internal static ValueTask<object> InsertQuillText(
IJSRuntime jsRuntime,
ElementReference quillElement,
string text)
string text,
CancellationToken cancellationToken = default)
{
return jsRuntime.InvokeAsync<object>(
"QuillFunctions.insertQuillText",
cancellationToken,
quillElement, text);
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/Blazored.TextEditor/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
@using Microsoft.JSInterop
@using Microsoft.JSInterop
@using System.Threading