Skip to content

feat(DockView2): collapse panel to nearest edge #394

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
ArgoZhang merged 9 commits into from
Mar 29, 2025
Merged

feat(DockView2): collapse panel to nearest edge #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab8d438
feat: dockview添加就近隐藏
zhaijunlei955 Mar 27, 2025
4a48e47
feat: dockview添加就近隐藏
zhaijunlei955 Mar 27, 2025
eaebeeb
fix：修复浮动窗口收起时高度不准确
zhaijunlei955 Mar 27, 2025
0b3ed56
fix：修复tab前自定义图标在窗口删除重新添加后消失
zhaijunlei955 Mar 27, 2025
125d1ac
style: 更新样式
ArgoZhang Mar 28, 2025
abc87c0
refactor: 更新命名规范
ArgoZhang Mar 28, 2025
b07e7d6
refactor: 修改aside生成位置
zhaijunlei955 Mar 28, 2025
8e257c4
style: 调整样式
ArgoZhang Mar 29, 2025
d948148
chore: bump version 9.1.9
ArgoZhang Mar 29, 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
2 changes: 1 addition & 1 deletion src/components/BootstrapBlazor.DockView/BootstrapBlazor.DockView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.1.8</Version>
<Version>9.1.9</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
151 changes: 75 additions & 76 deletions src/components/BootstrapBlazor.DockView/wwwroot/css/dockview-bb.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,5 @@
@import './dockview.css';

[data-bs-theme='dark'] .bb-dockview {
--dv-background-color: black;
--dv-paneview-active-outline-color: dodgerblue;
--dv-tabs-and-actions-container-font-size: 13px;
--dv-tabs-and-actions-container-height: 35px;
--dv-drag-over-background-color: rgba(83, 89, 93, 0.5);
--dv-drag-over-border-color: white;
--dv-tabs-container-scrollbar-color: #888;
--dv-icon-hover-background-color: rgba(90, 93, 94, 0.31);
--dv-floating-box-shadow: 8px 8px 8px 0px rgba(83, 89, 93, 0.5);
--dv-group-view-background-color: #1e1e1e;
--dv-tabs-and-actions-container-background-color: #252526;
--dv-activegroup-visiblepanel-tab-background-color: #1e1e1e;
--dv-activegroup-hiddenpanel-tab-background-color: #2d2d2d;
--dv-inactivegroup-visiblepanel-tab-background-color: #1e1e1e;
--dv-inactivegroup-hiddenpanel-tab-background-color: #2d2d2d;
--dv-tab-divider-color: #1e1e1e;
--dv-activegroup-visiblepanel-tab-color: white;
--dv-activegroup-hiddenpanel-tab-color: #969696;
--dv-inactivegroup-visiblepanel-tab-color: #8f8f8f;
--dv-inactivegroup-hiddenpanel-tab-color: #626262;
--dv-separator-border: rgb(68, 68, 68);
--dv-paneview-header-border-color: rgba(204, 204, 204, 0.2);
--dv-active-sash-color: #595959;
}

.bb-dockview {
--bb-dockview-padding: .25rem;
--bb-dockview-tab-line-height: 21px;
Expand All @@ -36,6 +10,7 @@
--bb-dockview-control-dropdown-padding-y: .25rem;
--bb-dockview-control-dropdown-item-padding-x: 0;
--bb-dockview-control-dropdown-item-padding-y: 3px;
--bb-dockview-aside-width: calc(1.5em + .25rem);
--dv-tabs-and-actions-container-font-size: 13px;
--dv-tabs-and-actions-container-height: 35px;
--dv-active-sash-color: #bcbcbc;
Expand All @@ -45,12 +20,12 @@
position: relative;
}

.bb-dockview > div {
--dv-tabs-and-actions-container-height: 30px;
--bb-dockview-tab-line-height: 30px;
--bb-dockview-tab-padding: 0 3px;
--dv-tabs-and-actions-container-font-size: 12px;
}
.bb-dockview > div {
--dv-tabs-and-actions-container-height: 30px;
--bb-dockview-tab-line-height: 30px;
--bb-dockview-tab-padding: 0 3px;
--dv-tabs-and-actions-container-font-size: 12px;
}

.bb-dockview .bb-dockview-panel {
height: 100%;
Expand Down Expand Up @@ -208,68 +183,92 @@
transition-duration: .3s;
}

.bb-dockview .bb-dockview-btn-wrapper {
cursor: pointer;
float: left;
position: absolute;
left: 0;
top: 0;
transform: translate(-100%);
user-select: none;
.ribbon-body.ribbon-body > div,
.bb-dockview .dv-split-view-container,
.bb-dockview .dv-split-view-container .dv-view-container .dv-view {
overflow: initial;
}

.bb-dockview .bb-dockview-btn-wrapper > div {
width: 20px;
padding: 2px 0;
margin-bottom: 10px;
position: relative;
writing-mode: vertical-lr;
text-orientation: sideways;
color: var(--dv-inactivegroup-visiblepanel-tab-color);
.bb-dockview .dv-split-view-container .dv-view-container > .dv-view > .dv-groupview:has(.dv-resize-container) {
overflow: initial !important;
}

.bb-dockview .bb-dockview-btn-wrapper > div:hover,
.bb-dockview .bb-dockview-btn-wrapper > div.active {
color: var(--dv-activegroup-visiblepanel-tab-color);
}

.bb-dockview .bb-dockview-btn-wrapper > div:hover::after,
.bb-dockview .bb-dockview-btn-wrapper > div.active::after {
content: '';
position: absolute;
left: -3px;
top: 0;
width: 3px;
height: 100%;
background-color: var(--bb-ribbon-menu-bg);
}
.bb-dockview > div:has(> .bb-dockview-aside-left > div) {
padding-left: var(--bb-dockview-aside-width);
}

.bb-dockview .bb-dockview-btn-wrapper > div span {
display: block;
margin-bottom: -5px;
}
.bb-dockview > div:has(> .bb-dockview-aside-right > div) {
padding-right: var(--bb-dockview-aside-width);
}

.bb-dockview .bb-dockview-aside {
position: absolute;
height: 100%;
top: 0;
width: var(--bb-dockview-aside-width);
display: flex;
align-items: flex-start;
justify-content: center;
}

.bb-dockview:has(>.bb-dockview-btn-wrapper>div) {
margin-left: 23px;
width: calc(100% - 23px);
.bb-dockview .bb-dockview-aside-left {
left: 0
}

.bb-dockview .dv-resize-container.dv-resize-container-drawer > div:not(.dv-resize-handle-right):not(.dv-groupview-floating),
.bb-dockview .dv-resize-container.dv-resize-container-drawer > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-float,
.bb-dockview .dv-resize-container.dv-resize-container-drawer > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-dock,
.bb-dockview .dv-resize-container.dv-resize-container-drawer > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-down,
.bb-dockview .dv-resize-container:not(.dv-resize-container-drawer) > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-pin,
.bb-dockview .dv-resize-container:not(.dv-resize-container-drawer) > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-pushpin {
display: none;
.bb-dockview .bb-dockview-aside-right {
right: 0
}

.bb-dockview .bb-dockview-aside > .bb-dockview-aside-button {
position: relative;
margin-inline: .25rem;
padding-inline: .5rem;
cursor: pointer;
user-select: none;
writing-mode: vertical-lr;
text-orientation: sideways;
color: var(--dv-inactivegroup-visiblepanel-tab-color);
border-radius: 5px;
}

.bb-dockview .bb-dockview-aside > .bb-dockview-aside-button:hover,
.bb-dockview .bb-dockview-aside > .bb-dockview-aside-button.active {
color: var(--dv-activegroup-visiblepanel-tab-color);
background-color: var(--dv-icon-hover-background-color);
}

.bb-dockview .bb-dockview-aside-right > .bb-dockview-aside-button:hover::after,
.bb-dockview .bb-dockview-aside-right > .bb-dockview-aside-button.active::after {
right: 0;
}

.bb-dockview .dv-resize-container-drawer {
height: 100% !important;
}

.bb-dockview .dv-resize-container-drawer:not(.active) {
z-index: -1 !important;
}

.bb-dockview .dv-resize-container.dv-resize-container-drawer.bb-resize-container-right {
box-shadow: -8px 8px 8px 0px rgba(83, 89, 93, 0.5);
}

.bb-dockview .dv-resize-container.dv-resize-container-drawer.bb-resize-container-right > div:not(.dv-resize-handle-left):not(.dv-groupview-floating),
.bb-dockview .dv-resize-container.dv-resize-container-drawer.bb-resize-container-left > div:not(.dv-resize-handle-right):not(.dv-groupview-floating),
.bb-dockview .dv-resize-container.dv-resize-container-drawer > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-float,
.bb-dockview .dv-resize-container.dv-resize-container-drawer > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-dock,
.bb-dockview .dv-resize-container.dv-resize-container-drawer > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-down,
.bb-dockview .dv-resize-container:not(.dv-resize-container-drawer) > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-pin,
.bb-dockview .dv-resize-container:not(.dv-resize-container-drawer) > .dv-groupview-floating > .dv-tabs-and-actions-container .bb-dockview-control-icon-pushpin {
display: none;
}

.bb-dockview .dv-tabs-and-actions-container:has(.dropdown-item) .dv-scrollbar-horizontal {
display: none;
}

.bb-dockview .dv-tab.dv-inactive-tab .dv-default-tab .dv-default-tab-action {
visibility: visible;
}
4 changes: 2 additions & 2 deletions src/components/BootstrapBlazor.DockView/wwwroot/js/dockview-core.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7229,6 +7229,7 @@ class Overlay extends CompositeDisposable {
this.onDidChangeEnd = this._onDidChangeEnd.event;
this.addDisposables(this._onDidChange, this._onDidChangeEnd);
this._element.className = 'dv-resize-container';
this.options.className && this._element.classList.add(this.options.className);
this._isVisible = true;
this.setupResize('top');
this.setupResize('bottom');
Expand Down Expand Up @@ -8802,8 +8803,7 @@ class DockviewComponent extends BaseGrid {
};
}
const anchoredBox = getAnchoredBox();
const overlay = new Overlay(Object.assign(Object.assign({ container: this.gridview.element, content: group.element }, anchoredBox), {
minimumInViewportWidth: this.options.floatingGroupBounds === 'boundedWithinViewport'
const overlay = new Overlay(Object.assign(Object.assign({ container: this.gridview.element, content: group.element, className: options === null || options === void 0 ? void 0 : options.className }, anchoredBox), { minimumInViewportWidth: this.options.floatingGroupBounds === 'boundedWithinViewport'
? undefined
: (_c = (_b = this.options.floatingGroupBounds) === null || _b === void 0 ? void 0 : _b.minimumWidthWithinViewport) !== null && _c !== void 0 ? _c : DEFAULT_FLOATING_GROUP_OVERFLOW_SIZE, minimumInViewportHeight: this.options.floatingGroupBounds === 'boundedWithinViewport'
? undefined
Expand Down
Loading