Skip to content
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ internal static class BitAppShellJsRuntimeExtensions
{
internal static ValueTask BitAppShellInitScroll(this IJSRuntime jsRuntime, ElementReference container, string url)
{
return jsRuntime.InvokeVoid("BitBlazorUI.AppShell.initScroll", container, url);
return jsRuntime.FastInvokeVoid("BitBlazorUI.AppShell.initScroll", container, url);
}

internal static ValueTask BitAppShellLocationChangedScroll(this IJSRuntime jsRuntime, string url)
{
return jsRuntime.InvokeVoid("BitBlazorUI.AppShell.locationChangedScroll", url);
return jsRuntime.FastInvokeVoid("BitBlazorUI.AppShell.locationChangedScroll", url);
}

internal static ValueTask BitAppShellAfterRenderScroll(this IJSRuntime jsRuntime, string url)
{
return jsRuntime.InvokeVoid("BitBlazorUI.AppShell.afterRenderScroll", url);
return jsRuntime.FastInvokeVoid("BitBlazorUI.AppShell.afterRenderScroll", url);
}

internal static ValueTask BitAppShellDisposeScroll(this IJSRuntime jsRuntime)
{
return jsRuntime.InvokeVoid("BitBlazorUI.AppShell.disposeScroll");
return jsRuntime.FastInvokeVoid("BitBlazorUI.AppShell.disposeScroll");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,19 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
await _js.BitExtrasInitScripts(DateAdapterScripts);
}

if (Config is not null)
var chartReady = Config is null || await _js.BitChartJsSetupChart(Config) is true;

if (chartReady)
{
await _js.BitChartJsSetupChart(Config);
await SetupCompletedCallback.InvokeAsync(this);
}
Comment thread
msynk marked this conversation as resolved.
Outdated

await SetupCompletedCallback.InvokeAsync(this);
return;
}

if (Config is not null)
{
await _js.BitChartJsSetupChart(Config);
_ = await _js.BitChartJsSetupChart(Config);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace BitBlazorUI {

public static updateChart(config: BitChartConfiguration): boolean {
if (!BitChart._bitCharts.has(config.canvasId))
throw `Could not find a chart with the given id. ${config.canvasId}`;
throw `Could not find a chart with the given id: ${config.canvasId}`;

let myChart = BitChart._bitCharts.get(config.canvasId);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,39 @@ internal static class BitChartJsInterop

public static ValueTask BitChartJsRemoveChart(this IJSRuntime jsRuntime, string? canvasId)
{
return jsRuntime.InvokeVoid("BitBlazorUI.BitChart.removeChart", canvasId);
return jsRuntime.FastInvokeVoid("BitBlazorUI.BitChart.removeChart", canvasId);
}

/// <summary>
/// Set up a new chart. Call only once.
/// </summary>
/// <param name="jsRuntime"></param>
/// <param name="chartConfig">The config for the new chart.</param>
/// <returns></returns>
public static ValueTask<bool> BitChartJsSetupChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
/// <returns>
/// <see langword="true"/> when setup succeeded, <see langword="false"/> when the chart could not be updated in place,
/// or <see langword="null"/> when interop could not run or an error was swallowed on the in-process (WASM) path.
/// </returns>
public static ValueTask<bool?> BitChartJsSetupChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
{
var dynParam = StripNulls(chartConfig);
Dictionary<string, object> param = ConvertExpandoObjectToDictionary(dynParam!);
return jsRuntime.Invoke<bool>("BitBlazorUI.BitChart.setupChart", param);
return jsRuntime.FastInvoke<bool?>("BitBlazorUI.BitChart.setupChart", param);
}

/// <summary>
/// Update an existing chart. Make sure that the Chart with this <see cref="BitChartConfigBase.CanvasId"/> already exists.
/// </summary>
/// <param name="jsRuntime"></param>
/// <param name="chartConfig">The updated config of the chart you want to update.</param>
/// <returns></returns>
public static ValueTask<bool> BitChartJsUpdateChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
/// <returns>
/// <see langword="true"/> when the chart was updated, <see langword="false"/> when the chart instance was missing,
/// or <see langword="null"/> when interop could not run or an error was swallowed on the in-process (WASM) path.
/// </returns>
public static ValueTask<bool?> BitChartJsUpdateChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
{
var dynParam = StripNulls(chartConfig);
var param = ConvertExpandoObjectToDictionary(dynParam!);
return jsRuntime.Invoke<bool>("BitBlazorUI.BitChart.updateChart", param);
return jsRuntime.FastInvoke<bool?>("BitBlazorUI.BitChart.updateChart", param);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace BitBlazorUI {
colOptions.style.transform = `translateX(${applyOffset}px)`;
}

colOptions.scrollIntoViewIfNeeded();
colOptions.scrollIntoViewIfNeeded?.();

const autoFocusElem = colOptions.querySelector('[autofocus]');
if (autoFocusElem) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,22 @@

internal static class BitDataGridJsRuntimeExtensions
{
public static async ValueTask<IJSObjectReference> BitDataGridInit(this IJSRuntime jsRuntime, ElementReference tableElement)
// FastInvoke returns default (null) when the runtime can't service interop or a JSON/JS interop
// error is swallowed on the in-process (WASM) path. Callers must null-check before using the
// reference; a null result means DataGrid JS hooks were not initialized.
public static async ValueTask<IJSObjectReference?> BitDataGridInit(this IJSRuntime jsRuntime, ElementReference tableElement)
{
return await jsRuntime.Invoke<IJSObjectReference>("BitBlazorUI.DataGrid.init", tableElement);
const string identifier = "BitBlazorUI.DataGrid.init";
var result = await jsRuntime.FastInvoke<IJSObjectReference>(identifier, tableElement);
return jsRuntime.ReportIfUnexpectedNull(identifier, result);
}

// This is a fire-and-forget call from OnAfterRenderAsync that runs DOM-heavy positioning logic
// (getBoundingClientRect, scrollIntoViewIfNeeded, focus). It deliberately uses the regular async
// invocation rather than FastInvokeVoid: on WebAssembly FastInvokeVoid runs synchronously and only
// swallows JsonException, so a JS-side failure (e.g. scrollIntoViewIfNeeded being unsupported) would
// throw synchronously and escape the discarded task into the render loop. The async path keeps any
// such failure contained within the returned task instead.
Comment thread
msynk marked this conversation as resolved.
Outdated
public static async ValueTask BitDataGridCheckColumnOptionsPosition(this IJSRuntime jsRuntime, ElementReference tableElement)
{
await jsRuntime.InvokeVoid("BitBlazorUI.DataGrid.checkColumnOptionsPosition", tableElement);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ public static ValueTask BitInfiniteScrollingSetup<T>(this IJSRuntime jsRuntime,
decimal? threshold,
DotNetObjectReference<BitInfiniteScrolling<T>> dotnetObj)
{
return jsRuntime.InvokeVoid("BitBlazorUI.InfiniteScrolling.setup", id, scrollerSelector, rootElement, lastElement, threshold, dotnetObj);
return jsRuntime.FastInvokeVoid("BitBlazorUI.InfiniteScrolling.setup", id, scrollerSelector, rootElement, lastElement, threshold, dotnetObj);
}

public static ValueTask BitInfiniteScrollingReobserve(this IJSRuntime jsRuntime,
string id,
ElementReference lastElement)
{
return jsRuntime.InvokeVoid("BitBlazorUI.InfiniteScrolling.reobserve", id, lastElement);
return jsRuntime.FastInvokeVoid("BitBlazorUI.InfiniteScrolling.reobserve", id, lastElement);
}

public static ValueTask BitInfiniteScrollingDispose(this IJSRuntime jsRuntime, string id)
{
return jsRuntime.InvokeVoid("BitBlazorUI.InfiniteScrolling.dispose", id);
return jsRuntime.FastInvokeVoid("BitBlazorUI.InfiniteScrolling.dispose", id);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

internal static class BitMarkdownViewerJsRuntimeExtensions
{
public static ValueTask<bool> BitMarkdownViewerCheckScriptLoaded(this IJSRuntime jsRuntime, string script)
// FastInvoke returns null when the runtime can't service interop or a JSON/JS interop error is
// swallowed on the in-process (WASM) path. Nullable distinguishes that from a legitimate false.
public static ValueTask<bool?> BitMarkdownViewerCheckScriptLoaded(this IJSRuntime jsRuntime, string script)
{
return jsRuntime.FastInvoke<bool>("BitBlazorUI.MarkdownViewer.checkScriptLoaded", script);
return jsRuntime.FastInvoke<bool?>("BitBlazorUI.MarkdownViewer.checkScriptLoaded", script);
}

public static ValueTask<string> BitMarkdownViewerParse(this IJSRuntime jsRuntime, string markdown, string? middleware)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ public static ValueTask<int> BitPdfReaderSetup(this IJSRuntime jsRuntime, BitPdf

public static ValueTask BitPdfReaderRenderPage(this IJSRuntime jsRuntime, string id, int pageNumber)
{
// The JS renderPage is async (awaits pdf.js page rendering). FastInvoke would use the
// synchronous in-process path in WASM, discarding the returned Promise (fire-and-forget),
// so callers would proceed/raise events before rendering completes and errors would be lost.
return jsRuntime.InvokeVoid("BitBlazorUI.PdfReader.renderPage", id, pageNumber);
}

public static ValueTask BitPdfReaderRefreshPage(this IJSRuntime jsRuntime, BitPdfReaderConfig config, int pageNumber)
{
// The JS refreshPage is async (awaits renderPage). See BitPdfReaderRenderPage for why
// the asynchronous invocation must be used instead of the synchronous fast-invoke.
return jsRuntime.InvokeVoid("BitBlazorUI.PdfReader.refreshPage", config, pageNumber);
}

public static ValueTask BitPdfReaderDispose(this IJSRuntime jsRuntime, string id)
{
return jsRuntime.InvokeVoid("BitBlazorUI.PdfReader.dispose", id);
return jsRuntime.FastInvokeVoid("BitBlazorUI.PdfReader.dispose", id);
}
Comment thread
msynk marked this conversation as resolved.
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
public partial class BitProModal : BitComponentBase
{
private bool _internalIsOpen;
private float _offsetTop;
private float? _offsetTop;



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ internal static class ExtrasJsRuntimeExtensions
{
internal static ValueTask BitExtrasApplyRootClasses(this IJSRuntime jsRuntime, List<string> cssClasses, Dictionary<string, string> cssVariables)
{
return jsRuntime.InvokeVoid("BitBlazorUI.Extras.applyRootClasses", cssClasses, cssVariables);
return jsRuntime.FastInvokeVoid("BitBlazorUI.Extras.applyRootClasses", cssClasses, cssVariables);
}

internal static ValueTask BitExtrasGoToTop(this IJSRuntime jsRuntime, ElementReference element, BitScrollBehavior? behavior = null)
{
return jsRuntime.InvokeVoid("BitBlazorUI.Extras.goToTop", element, behavior?.ToString().ToLowerInvariant());
return jsRuntime.FastInvokeVoid("BitBlazorUI.Extras.goToTop", element, behavior?.ToString().ToLowerInvariant());
}

internal static ValueTask BitExtrasScrollBy(this IJSRuntime jsRuntime, ElementReference element, decimal x, decimal y)
{
return jsRuntime.InvokeVoid("BitBlazorUI.Extras.scrollBy", element, x, y);
return jsRuntime.FastInvokeVoid("BitBlazorUI.Extras.scrollBy", element, x, y);
}

public static ValueTask BitExtrasInitScripts(this IJSRuntime jsRuntime, IEnumerable<string> scripts, bool isModule = false)
Expand Down
Loading
Loading