Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.1.6-beta02</Version>
<Version>9.1.6-beta03</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/GoTop/GoTop.razor
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
@inherits BootstrapModuleComponentBase
@attribute [BootstrapModuleAutoLoader]

<a @attributes="AdditionalAttributes" id="@Id" href="#" class="layout-gotop" data-bb-target="@Target" data-bs-toggle="tooltip" data-bs-placement="left" data-bs-title="@TooltipText">
<a @attributes="AdditionalAttributes" id="@Id" href="#" class="layout-gotop" data-bb-target="@Target" data-bb-behavior="@ScrollBehaviorString" data-bs-toggle="tooltip" data-bs-placement="left" data-bs-title="@TooltipText">
<i class="@Icon"></i>
</a>
8 changes: 8 additions & 0 deletions src/BootstrapBlazor/Components/GoTop/GoTop.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ public partial class GoTop
[Parameter]
public string? Target { get; set; }

/// <summary>
/// 获得/设置 滚动行为 默认 ScrollIntoViewBehavior.Smooth
/// </summary>
[Parameter]
public ScrollIntoViewBehavior ScrollBehavior { get; set; }

/// <summary>
/// 获得/设置 鼠标悬停提示文字信息
/// </summary>
Expand All @@ -39,6 +45,8 @@ public partial class GoTop
[NotNull]
private IIconTheme? IconTheme { get; set; }

private string? ScrollBehaviorString => ScrollBehavior == ScrollIntoViewBehavior.Smooth ? null : ScrollBehavior.ToString().ToLowerInvariant();

/// <summary>
/// <inheritdoc/>
/// </summary>
Expand Down
3 changes: 2 additions & 1 deletion src/BootstrapBlazor/Components/GoTop/GoTop.razor.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ export function init(id, target) {
e.preventDefault();

const target = el.getAttribute('data-bb-target');
const behavior = el.getAttribute('data-bb-behavior') || 'smooth';
const element = (target && document.querySelector(target)) || getScrollElement(el)
element.scrollTop = 0
element.scrollTo({ top: 0, left: 0, behavior: behavior });
go.tip.hide()
})
}
Expand Down
17 changes: 17 additions & 0 deletions test/UnitTest/Components/GoTopTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public void Target_Ok()
pb.Add(c => c.Target, "#top");
});
Assert.Equal("#top", cut.Instance.Target);
Assert.Contains("data-bb-target", cut.Markup);
}

[Fact]
Expand All @@ -31,4 +32,20 @@ public void TooltipText_Ok()
});
Assert.Contains("TooltipText", cut.Markup);
}

[Fact]
public void Behavior_Ok()
{
var cut = Context.RenderComponent<GoTop>(pb =>
{
pb.Add(c => c.ScrollBehavior, ScrollIntoViewBehavior.Smooth);
});
Assert.DoesNotContain("data-bb-behavior", cut.Markup);

cut.SetParametersAndRender(pb =>
{
pb.Add(a => a.ScrollBehavior, ScrollIntoViewBehavior.Auto);
});
Assert.Contains("data-bb-behavior=\"auto\"", cut.Markup);
}
}
6 changes: 6 additions & 0 deletions test/UnitTest/Components/LayoutTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ public void ShowFooter_OK()
{
pb.Add(a => a.ShowFooter, true);
pb.Add(a => a.Footer, CreateFooter());
pb.Add(a => a.ShowGotoTop, true);
});
Assert.Contains("Footer", cut.Markup);
cut.SetParametersAndRender(pb =>
{
pb.Add(a => a.IsFixedTabHeader, true);
});
cut.Contains("data-bb-target=\".tabs-body\"");

cut.SetParametersAndRender(pb => pb.Add(a => a.ShowFooter, false));
cut.WaitForAssertion(() => Assert.DoesNotContain("Footer", cut.Markup));
Expand Down
1 change: 1 addition & 0 deletions test/UnitTest/Components/SelectTreeTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public void Items_Ok()
var cut = Context.RenderComponent<SelectTree<string>>(builder =>
{
builder.Add(p => p.ShowIcon, true);
builder.Add(p => p.IsReset, false);
builder.Add(p => p.ModelEqualityComparer, (s1, s2) => { return true; });
builder.Add(p => p.OnExpandNodeAsync, (s) => { return Task.FromResult(new List<TreeViewItem<string>>().AsEnumerable()); });
builder.Add(p => p.CustomKeyAttribute, typeof(string));
Expand Down
Loading