Skip to content

feat(Tab): improve AllowDrag function #5684

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

Merged
merged 7 commits into from
Mar 21, 2025
Merged

feat(Tab): improve AllowDrag function #5684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3883822
refactor: 更新样式
ArgoZhang Mar 21, 2025
775f382
refactor: 精简代码统一 DOM 结构
ArgoZhang Mar 21, 2025
4d7a8e1
refactor: 更改 DOM 操作节点
ArgoZhang Mar 21, 2025
ba77dbf
refactor: 精简代码
ArgoZhang Mar 21, 2025
6051f9b
refactor: 移除 active 冗余样式
ArgoZhang Mar 21, 2025
5bf7d67
doc: 更新示例
ArgoZhang Mar 21, 2025
88490eb
refactor: 更新拖动控制逻辑
ArgoZhang Mar 21, 2025
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
4 changes: 2 additions & 2 deletions src/BootstrapBlazor.Server/Components/Samples/Tabs.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ private void Navigation()
</DemoBlock>

<DemoBlock Title="@Localizer["TabsChromeStyleTitle"]" Introduction="@Localizer["TabsChromeStyleIntro"]" Name="Chrome">
<Tab IsCard="true" ShowClose="true" TabStyle="TabStyle.Chrome">
<Tab IsCard="true" ShowClose="true" TabStyle="TabStyle.Chrome" AllowDrag="true">
<TabItem Text="@Localizer["TabItem1Text"]" Icon="fa-solid fa-user">
<div>@Localizer["TabItem1Content"]</div>
</TabItem>
Expand All @@ -454,7 +454,7 @@ private void Navigation()
</DemoBlock>

<DemoBlock Title="@Localizer["TabsCapsuleStyleTitle"]" Introduction="@Localizer["TabsCapsuleStyleIntro"]" Name="Capsule">
<Tab IsCard="true" ShowClose="true" TabStyle="TabStyle.Capsule">
<Tab IsCard="true" ShowClose="true" TabStyle="TabStyle.Capsule" AllowDrag="true">
<TabItem Text="@Localizer["TabItem1Text"]" Icon="fa-solid fa-user">
<div>@Localizer["TabItem1Content"]</div>
</TabItem>
Expand Down
22 changes: 6 additions & 16 deletions src/BootstrapBlazor/Components/Tab/Tab.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ else
}
else if (item.IsDisabled)
{
@RenderDisabledHeaderByStyle(item)
@RenderDisabledHeader(item)
}
else
{
@RenderHeaderByStyle(item)
@RenderHeader(item)
}
}
@if (IsCard || IsBorderCard)
Expand Down Expand Up @@ -124,7 +124,7 @@ else
@RenderTabItemContent(item)
</CascadingValue>;

RenderFragment RenderChromeDisabledHeader(TabItem item) =>
RenderFragment RenderDisabledHeader(TabItem item) =>
@<div @key="@item" class="@GetItemWrapClassString(item)">
<div role="tab" class="@GetClassString(item)">
@RenderHeaderContent(item)
Expand All @@ -136,14 +136,9 @@ else
}
</div>;

RenderFragment RenderDefaultDisabledHeader(TabItem item) =>
@<div @key="item" role="tab" class="@GetClassString(item)">
@RenderHeaderContent(item)
</div>;

RenderFragment RenderChromeHeader(TabItem item) =>
@<div @key="@item" class="@GetItemWrapClassString(item)">
<a href="@item.Url" role="tab" tabindex="-1" class="@GetClassString(item)" @onclick="@(() => OnClickTabItem(item))" @onclick:preventDefault="@(!ClickTabToNavigation)" draggable="@DraggableString">
RenderFragment RenderHeader(TabItem item) =>
@<div @key="@item" class="@GetItemWrapClassString(item)" draggable="@DraggableString">
<a href="@item.Url" role="tab" tabindex="-1" class="@GetClassString(item)" @onclick="@(() => OnClickTabItem(item))" @onclick:preventDefault="@(!ClickTabToNavigation)">
@RenderHeaderContent(item)
</a>
@if (TabStyle == TabStyle.Chrome)
Expand All @@ -153,11 +148,6 @@ else
}
</div>;

RenderFragment RenderDefaultHeader(TabItem item) =>
@<a @key="item" href="@item.Url" role="tab" tabindex="-1" class="@GetClassString(item)" @onclick="@(() => OnClickTabItem(item))" @onclick:preventDefault="@(!ClickTabToNavigation)" draggable="@DraggableString">
@RenderHeaderContent(item)
</a>;

RenderFragment RenderHeaderContent(TabItem item) =>
@<div class="tabs-item-body">
@if (!string.IsNullOrEmpty(item.Icon))
Expand Down
7 changes: 1 addition & 6 deletions src/BootstrapBlazor/Components/Tab/Tab.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public partial class Tab : IHandlerException
.Build();

private string? GetClassString(TabItem item) => CssBuilder.Default("tabs-item")
.AddClass("active", TabStyle == TabStyle.Default && item.IsActive && !item.IsDisabled)
.AddClass("disabled", item.IsDisabled)
.AddClass(item.CssClass)
.AddClass("is-closeable", ShowClose)
Expand Down Expand Up @@ -329,7 +328,7 @@ public partial class Tab : IHandlerException

private Placement LastPlacement { get; set; }

private string DraggableString => AllowDrag ? "true" : "false";
private string? DraggableString => AllowDrag ? "true" : null;

/// <summary>
/// <inheritdoc/>
Expand Down Expand Up @@ -879,10 +878,6 @@ public async Task DragItemCallback(int originIndex, int currentIndex)

private string? GetIdByTabItem(TabItem item) => (ShowFullScreen && item.ShowFullScreen) ? ComponentIdGenerator.Generate(item) : null;

private RenderFragment RenderDisabledHeaderByStyle(TabItem item) => TabStyle == TabStyle.Default ? RenderDefaultDisabledHeader(item) : RenderChromeDisabledHeader(item);

private RenderFragment RenderHeaderByStyle(TabItem item) => TabStyle == TabStyle.Default ? RenderDefaultHeader(item) : RenderChromeHeader(item);

/// <summary>
/// <inheritdoc/>
/// </summary>
Expand Down
18 changes: 11 additions & 7 deletions src/BootstrapBlazor/Components/Tab/Tab.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ const resize = tab => {
}

const scroll = tab.scroll
const lastItem = [...tabNav.querySelectorAll('.tabs-item')].pop()
const lastItem = [...tabNav.querySelectorAll('.tabs-item-wrap')].pop()
if (lastItem) {
if (tab.vertical) {
const tabHeight = scroll.offsetHeight
let itemHeight = 0
tabNav.querySelectorAll('.tabs-item').forEach(v => {
tabNav.querySelectorAll('.tabs-item-wrap').forEach(v => {
itemHeight += v.offsetHeight
})
if (itemHeight > tabHeight) {
Expand All @@ -39,7 +39,7 @@ const resize = tab => {
// Item 总宽度大于 Nav 宽度
const tabWidth = scroll.offsetWidth
let itemWidth = 0
tabNav.querySelectorAll('.tabs-item').forEach(v => {
tabNav.querySelectorAll('.tabs-item-wrap').forEach(v => {
itemWidth += v.offsetWidth
})
if (itemWidth > tabWidth) {
Expand All @@ -55,7 +55,7 @@ const resize = tab => {
const active = tab => {
resize(tab)

const activeTab = tab.tabNav.querySelector('.tabs-item.active')
const activeTab = tab.tabNav.querySelector('.tabs-item-wrap.active')
if (activeTab) {
if (tab.vertical) {
const top = getPosition(activeTab).top - getPosition(activeTab.parentNode).top + activeTab.offsetHeight
Expand Down Expand Up @@ -103,17 +103,21 @@ const active = tab => {
}

const setDraggable = tab => {
disposeDragItems(tab.dragItems)
disposeDragItems(tab.dragItems);

if (tab.el.querySelector('.tabs-item-wrap[draggable="true"]') === null) {
return;
}

let dragItem = null;
let index = 0

tab.dragItems = [...tab.el.firstChild.querySelectorAll('.tabs-item')]
tab.dragItems = [...tab.el.firstChild.querySelectorAll('.tabs-item-wrap')]
tab.dragItems.forEach(item => {
EventHandler.on(item, 'dragstart', e => {
item.parentNode.classList.add('tab-dragging')
item.classList.add('tab-drag')
tab.dragItems = [...tab.el.firstChild.querySelectorAll('.tabs-item')]
tab.dragItems = [...tab.el.firstChild.querySelectorAll('.tabs-item-wrap')]
index = tab.dragItems.indexOf(item)
dragItem = item
e.dataTransfer.effectAllowed = 'move'
Expand Down
34 changes: 20 additions & 14 deletions src/BootstrapBlazor/Components/Tab/Tab.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@

.tabs.tabs-card > .tabs-header .tabs-item.active,
.tabs.tabs-border-card > .tabs-header .tabs-item.active {
background-color: var(--bs-body-bg);
border-width: 0 1px 0px 0;
}

Expand Down Expand Up @@ -470,21 +469,23 @@
min-height: calc(100% + 2rem);
}

.tab-drag-over {
animation: drag-tab-item 1s linear infinite;
}
.tab-dragging {
.tabs-item-wrap:not(:hover) .tabs-item {
pointer-events: none;
}

.tab-dragging th[draggable] * {
pointer-events: none;
}
.tab-drag-over .tabs-item {
animation: drag-tab-item 1s linear infinite;
}

.tab-drag {
background-color: var(--bs-secondary);
.tab-drag {
background-color: var(--bs-secondary);
}
}

@keyframes drag-tab-item {
50% {
background-color: var(--bs-primary);
background-color: var(--bs-primary) !important;
}
}

Expand All @@ -496,10 +497,7 @@
--bb-tabs-item-active-color: var(--bs-body-color);
--bb-tabs-item-hover-color: var(--bs-body-color);
--bb-tabs-item-bg-color: rgba(var(--bs-body-color-rgb), 0.08);

.tabs-nav {
background-color: var(--bb-tabs-header-bg-color);
}
background-color: var(--bb-tabs-header-bg-color);

.tabs-item-fix {
border: none;
Expand Down Expand Up @@ -540,6 +538,14 @@
}
}
}

.tab-drag-over .tabs-item {
animation: none;
}

.tab-drag-over .tabs-item .tabs-item-body {
animation: drag-tab-item 1s linear infinite;
}
}

.tabs-chrome > .tabs-header {
Expand Down