feat(PdfReader): add OnPageChangedAsync parameter #715
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| // Website: https://www.blazor.zone or https://argozhang.github.io/ | ||
|
|
||
| using Microsoft.AspNetCore.Components; | ||
| using System.Globalization; | ||
|
|
||
| namespace BootstrapBlazor.Components; | ||
|
|
||
|
|
@@ -13,38 +14,43 @@ namespace BootstrapBlazor.Components; | |
| public partial class PdfReader | ||
| { | ||
| /// <summary> | ||
| /// 获得/设置 <see cref="PdfReaderOptions"/> 配置项实例 | ||
| /// </summary> | ||
| [Parameter] | ||
| [NotNull] | ||
| public PdfReaderOptions? Options { get; set; } | ||
|
|
||
| private string? ClassString => CssBuilder.Default("bb-pdf-reader") | ||
| .AddClassFromAttributes(AdditionalAttributes) | ||
| .Build(); | ||
|
|
||
| private string? StyleString => CssBuilder.Default() | ||
| .AddClass($"--bb-pdf-view-height: {Options.ViewHeight};", !string.IsNullOrEmpty(Options.ViewHeight)) | ||
| .AddClassFromAttributes(AdditionalAttributes) | ||
| .Build(); | ||
|
|
||
| private string? ViewBodyString => CssBuilder.Default("bb-view-body") | ||
| .AddClass("fit-page", Options.IsFitToPage) | ||
| .Build(); | ||
|
|
||
| private string? _docTitle; | ||
| private bool _isFitToPage; | ||
| private uint _currentPage; | ||
| private string? _url; | ||
|
|
||
| private string CurrentPageString | ||
| { | ||
| get => Options.CurrentPage.ToString(CultureInfo.InvariantCulture); | ||
| set => SetCurrentPage(value); | ||
| } | ||
|
|
||
| private void SetCurrentPage(string value) | ||
| { | ||
| if (uint.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var num)) | ||
| { | ||
| Options.CurrentPage = num; | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// <inheritdoc/> | ||
|
|
@@ -53,7 +59,13 @@ protected override void OnParametersSet() | |
| { | ||
| base.OnParametersSet(); | ||
|
|
||
| Options ??= new PdfReaderOptions(); | ||
|
|
||
| if (Options.CurrentPage == 0) | ||
| { | ||
| Options.CurrentPage = 1; | ||
| } | ||
| _docTitle = Path.GetFileName(Options.Url); | ||
| } | ||
|
|
||
| /// <summary> | ||
|
|
@@ -67,38 +79,57 @@ protected override async Task OnAfterRenderAsync(bool firstRender) | |
|
|
||
| if (firstRender) | ||
| { | ||
| _isFitToPage = Options.IsFitToPage; | ||
| _currentPage = Options.CurrentPage; | ||
| _url = Options.Url; | ||
| } | ||
|
|
||
| if (_url != Options.Url) | ||
| { | ||
| _url = Options.Url; | ||
| await InvokeInitAsync(); | ||
| } | ||
|
|
||
| if (_isFitToPage != Options.IsFitToPage) | ||
| { | ||
| _isFitToPage = Options.IsFitToPage; | ||
| await TriggerFit(_isFitToPage ? "fitToPage" : "fitToWidth"); | ||
| } | ||
| if (_currentPage != Options.CurrentPage) | ||
| { | ||
| _currentPage = Options.CurrentPage; | ||
| await NavigateToPageAsync(_currentPage); | ||
| } | ||
|
Comment on lines
+98
to
102
There was a problem hiding this comment. There's a potential race condition here. If |
||
| } | ||
|
|
||
| /// <summary> | ||
| /// <inheritdoc/> | ||
| /// </summary> | ||
| /// <returns></returns> | ||
| protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, new | ||
| { | ||
| Options.Url, | ||
| Options.IsFitToPage, | ||
| TriggerPagesInit = Options.OnInitAsync != null, | ||
| TriggerPageChanged = Options.OnPageChangedAsync != null | ||
| }); | ||
|
|
||
| /// <summary> | ||
| /// 跳转到指定页码方法 | ||
| /// </summary> | ||
| /// <param name="pageNumber"></param> | ||
| /// <returns></returns> | ||
| public Task NavigateToPageAsync(uint pageNumber) => InvokeVoidAsync("navigateToPage", Id, pageNumber); | ||
|
There was a problem hiding this comment. suggestion (bug_risk): CurrentPage/initial page support is only applied after changes, so the initial page value on first load is effectively ignored. Because Suggested implementation: TriggerPagesInit = Options.OnInitAsync != null,
TriggerPageChanged = Options.OnPageChangedAsync != null
});
// Honor an initial non-default CurrentPage by navigating after initialization completes
if (Options is not null && Options.CurrentPage > 1)
{
await NavigateToPageAsync((uint)Options.CurrentPage);
}I assumed this block is inside an async initialization method (likely OnAfterRenderAsync or a similar lifecycle/initialization method) where:
You may need to:
|
||
|
|
||
| /// <summary> | ||
| /// 适应页面宽度 | ||
| /// </summary> | ||
| public void FitToPage() => Options.IsFitToPage = true; | ||
|
|
||
| /// <summary> | ||
| /// 适应文档宽度 | ||
| /// </summary> | ||
| public void FitToWidth() => Options.IsFitToPage = false; | ||
|
|
||
| /// <summary> | ||
| /// 旋转页面方法 | ||
|
|
@@ -125,18 +156,27 @@ public async Task RotateRight() | |
| /// </summary> | ||
| /// <returns></returns> | ||
| [JSInvokable] | ||
| public async Task PagesInit(int pagesCount) | ||
| { | ||
| if (Options.OnInitAsync != null) | ||
| { | ||
| await Options.OnInitAsync(pagesCount); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// 改变页码时回调方法 | ||
| /// </summary> | ||
| /// <returns></returns> | ||
| [JSInvokable] | ||
| public async Task PageChanged(uint pageIndex) | ||
| { | ||
| _currentPage = pageIndex; | ||
| Options.CurrentPage = pageIndex; | ||
|
|
||
| if (Options.OnPageChangedAsync != null) | ||
| { | ||
| await Options.OnPageChangedAsync(pageIndex); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
SetCurrentPagemethod silently ignores invalid input without providing feedback. Consider adding validation error handling or at least logging when the parse fails, so developers and users understand why page navigation might not work as expected.