fix(GoTop): should not throw exception when Target is null or empty (#…

…1594) * refactor: 更新 GoTop 组件 * refactor: 更新 GoTop 脚本 * chore: bump version 7.8.10-beta02
dotnetcore · Jul 20, 2023 · 6ce6637 · 6ce6637
1 parent d78e9de
commit 6ce6637
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
  <PropertyGroup>
- <Version>7.8.10-beta01</Version>
+ <Version>7.8.10-beta02</Version>
  </PropertyGroup>
 
  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

diff --git a/src/BootstrapBlazor/Components/GoTop/GoTop.razor.cs b/src/BootstrapBlazor/Components/GoTop/GoTop.razor.cs
@@ -53,6 +53,6 @@ protected override void OnParametersSet()
  /// <inheritdoc/>
  /// </summary>
  /// <returns></returns>
- protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Target ?? "");
+ protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Target);
 
 }
diff --git a/src/BootstrapBlazor/Components/GoTop/GoTop.razor.js b/src/BootstrapBlazor/Components/GoTop/GoTop.razor.js
@@ -1,6 +1,14 @@
 import Data from "../../modules/data.js?v=$version"
 import EventHandler from "../../modules/event-handler.js?v=$version"
 
+const getScrollElement = el => {
+ let ele = el
+ while (ele && ele.scrollHeight <= ele.clientHeight) {
+ ele = ele.parentNode
+ }
+ return ele || window
+}
+
 export function init(id, target) {
  const el = document.getElementById(id)
  if (el === null) {
@@ -12,7 +20,8 @@ export function init(id, target) {
  go.tip = new bootstrap.Tooltip(el)
  EventHandler.on(el, 'click', e => {
  e.preventDefault();
- const element = document.querySelector(target) || window
+
+ const element = (target && document.querySelector(target)) || getScrollElement(el)
  element.scrollTop = 0
  go.tip.hide()
  })