Skip to content
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

Jump to bottom

feat: overflow tabs widget #615

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: overflow tabs widget #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions packages/dockview-core/src/dockview/components/titlebar/tabPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.dv-dropdown-container {
position: absolute;
top: 100px;
left: 100px;
background-color: red;
margin: 10px;
z-index: 99;
}
24 changes: 15 additions & 9 deletions packages/dockview-core/src/dockview/components/titlebar/tabsContainer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
}

&.dv-single-tab.dv-full-width-single-tab {
.tabs-container {
flex-grow: 1;

.tab {
.tabs-container {
flex-grow: 1;
}
}

.void-container {
flex-grow: 0;
}
.tab {
flex-grow: 1;
}
}

.void-container {
flex-grow: 0;
}
}

.void-container {
Expand All @@ -30,6 +30,12 @@
cursor: grab;
}

.dv-tabs-list {
display: flex;
overflow-x: overlay;
overflow-y: hidden;
}

.tabs-container {
display: flex;
overflow-x: overlay;
Expand Down
213 changes: 85 additions & 128 deletions packages/dockview-core/src/dockview/components/titlebar/tabsContainer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import { addDisposableListener, Emitter, Event } from '../../../events';
import { Tab } from '../tab/tab';
import { DockviewGroupPanel } from '../../dockviewGroupPanel';
import { VoidContainer } from './voidContainer';
import { toggleClass } from '../../../dom';
import { OverflowObserver, toggleClass } from '../../../dom';
import { DockviewPanel, IDockviewPanel } from '../../dockviewPanel';
import { DockviewComponent } from '../../dockviewComponent';
import { WillShowOverlayLocationEvent } from '../../dockviewGroupPanelModel';
import { getPanelData } from '../../../dnd/dataTransfer';
import { TabsPanel } from './tabsPanel';

export interface TabDropIndexEvent {
readonly event: DragEvent;
Expand Down Expand Up @@ -56,14 +57,12 @@ export class TabsContainer
implements ITabsContainer
{
private readonly _element: HTMLElement;
private readonly tabContainer: HTMLElement;
private readonly tabContainer: TabsPanel;
private readonly rightActionsContainer: HTMLElement;
private readonly leftActionsContainer: HTMLElement;
private readonly preActionsContainer: HTMLElement;
private readonly voidContainer: VoidContainer;

private tabs: IValueDisposable<Tab>[] = [];
private selectedIndex = -1;
private rightActions: HTMLElement | undefined;
private leftActions: HTMLElement | undefined;
private preActions: HTMLElement | undefined;
Expand All @@ -86,11 +85,11 @@ export class TabsContainer
this._onWillShowOverlay.event;

get panels(): string[] {
return this.tabs.map((_) => _.value.panel.id);
return this.tabContainer.tabs.map((_) => _.panel.id);
}

get size(): number {
return this.tabs.length;
return this.tabContainer.tabs.length;
}

get hidden(): boolean {
Expand All @@ -102,73 +101,10 @@ export class TabsContainer
this.element.style.display = value ? 'none' : '';
}

show(): void {
if (!this.hidden) {
this.element.style.display = '';
}
}

hide(): void {
this._element.style.display = 'none';
}

setRightActionsElement(element: HTMLElement | undefined): void {
if (this.rightActions === element) {
return;
}
if (this.rightActions) {
this.rightActions.remove();
this.rightActions = undefined;
}
if (element) {
this.rightActionsContainer.appendChild(element);
this.rightActions = element;
}
}

setLeftActionsElement(element: HTMLElement | undefined): void {
if (this.leftActions === element) {
return;
}
if (this.leftActions) {
this.leftActions.remove();
this.leftActions = undefined;
}
if (element) {
this.leftActionsContainer.appendChild(element);
this.leftActions = element;
}
}

setPrefixActionsElement(element: HTMLElement | undefined): void {
if (this.preActions === element) {
return;
}
if (this.preActions) {
this.preActions.remove();
this.preActions = undefined;
}
if (element) {
this.preActionsContainer.appendChild(element);
this.preActions = element;
}
}

get element(): HTMLElement {
return this._element;
}

public isActive(tab: Tab): boolean {
return (
this.selectedIndex > -1 &&
this.tabs[this.selectedIndex].value === tab
);
}

public indexOf(id: string): number {
return this.tabs.findIndex((tab) => tab.value.panel.id === id);
}

constructor(
private readonly accessor: DockviewComponent,
private readonly group: DockviewGroupPanel
Expand All @@ -193,18 +129,18 @@ export class TabsContainer
this.preActionsContainer = document.createElement('div');
this.preActionsContainer.className = 'pre-actions-container';

this.tabContainer = document.createElement('div');
this.tabContainer.className = 'tabs-container';
this.tabContainer = new TabsPanel(this.accessor);

this.voidContainer = new VoidContainer(this.accessor, this.group);

this._element.appendChild(this.preActionsContainer);
this._element.appendChild(this.tabContainer);
this._element.appendChild(this.tabContainer.element);
this._element.appendChild(this.leftActionsContainer);
this._element.appendChild(this.voidContainer.element);
this._element.appendChild(this.rightActionsContainer);

this.addDisposables(
this.tabContainer,
this.accessor.onDidAddPanel((e) => {
if (e.api.group === this.group) {
toggleClass(
Expand Down Expand Up @@ -237,7 +173,7 @@ export class TabsContainer
this.voidContainer.onDrop((event) => {
this._onDrop.fire({
event: event.nativeEvent,
index: this.tabs.length,
index: this.tabContainer.tabs.length,
});
}),
this.voidContainer.onWillShowOverlay((event) => {
Expand Down Expand Up @@ -281,72 +217,104 @@ export class TabsContainer
}
}
),
addDisposableListener(this.tabContainer, 'mousedown', (event) => {
if (event.defaultPrevented) {
return;
}
addDisposableListener(
this.tabContainer.element,
'mousedown',
(event) => {
if (event.defaultPrevented) {
return;
}

const isLeftClick = event.button === 0;
const isLeftClick = event.button === 0;

if (isLeftClick) {
this.accessor.doSetGroupActive(this.group);
if (isLeftClick) {
this.accessor.doSetGroupActive(this.group);
}
}
})
)
);
}

public setActive(_isGroupActive: boolean) {
// noop
public isActive(tab: Tab): boolean {
return this.tabContainer.isActive(tab);
}

private addTab(
tab: IValueDisposable<Tab>,
index: number = this.tabs.length
): void {
if (index < 0 || index > this.tabs.length) {
throw new Error('invalid location');
}
public indexOf(id: string): number {
return this.tabContainer.tabs.findIndex((tab) => tab.panel.id === id);
}

this.tabContainer.insertBefore(
tab.value.element,
this.tabContainer.children[index]
);
show(): void {
if (!this.hidden) {
this.element.style.display = '';
}
}

this.tabs = [
...this.tabs.slice(0, index),
tab,
...this.tabs.slice(index),
];
hide(): void {
this._element.style.display = 'none';
}

if (this.selectedIndex < 0) {
this.selectedIndex = index;
setRightActionsElement(element: HTMLElement | undefined): void {
if (this.rightActions === element) {
return;
}
if (this.rightActions) {
this.rightActions.remove();
this.rightActions = undefined;
}
if (element) {
this.rightActionsContainer.appendChild(element);
this.rightActions = element;
}
}

public delete(id: string): void {
const index = this.tabs.findIndex((tab) => tab.value.panel.id === id);
setLeftActionsElement(element: HTMLElement | undefined): void {
if (this.leftActions === element) {
return;
}
if (this.leftActions) {
this.leftActions.remove();
this.leftActions = undefined;
}
if (element) {
this.leftActionsContainer.appendChild(element);
this.leftActions = element;
}
}

const tabToRemove = this.tabs.splice(index, 1)[0];
setPrefixActionsElement(element: HTMLElement | undefined): void {
if (this.preActions === element) {
return;
}
if (this.preActions) {
this.preActions.remove();
this.preActions = undefined;
}
if (element) {
this.preActionsContainer.appendChild(element);
this.preActions = element;
}
}

const { value, disposable } = tabToRemove;
public setActive(_isGroupActive: boolean) {
// noop
}

disposable.dispose();
value.dispose();
value.element.remove();
public delete(id: string): void {
this.tabContainer.removeTab(id);
}

public setActivePanel(panel: IDockviewPanel): void {
this.tabs.forEach((tab) => {
const isActivePanel = panel.id === tab.value.panel.id;
tab.value.setActive(isActivePanel);
this.tabContainer.tabs.forEach((tab) => {
const isActivePanel = panel.id === tab.panel.id;
tab.setActive(isActivePanel);
});
}

public openPanel(
panel: IDockviewPanel,
index: number = this.tabs.length
index: number = this.tabContainer.tabs.length
): void {
if (this.tabs.find((tab) => tab.value.panel.id === panel.id)) {
if (this.tabContainer.tabs.find((tab) => tab.panel.id === panel.id)) {
return;
}
const tab = new Tab(panel, this.accessor, this.group);
Expand All @@ -355,7 +323,7 @@ export class TabsContainer
}
tab.setContent(panel.view.tab);

const disposable = new CompositeDisposable(
const eventsDisposable = new CompositeDisposable(
tab.onDragStart((event) => {
this._onTabDragStart.fire({ nativeEvent: event, panel });
}),
Expand Down Expand Up @@ -404,7 +372,7 @@ export class TabsContainer
tab.onDrop((event) => {
this._onDrop.fire({
event: event.nativeEvent,
index: this.tabs.findIndex((x) => x.value === tab),
index: this.tabContainer.tabs.findIndex((x) => x === tab),
});
}),
tab.onWillShowOverlay((event) => {
Expand All @@ -420,23 +388,12 @@ export class TabsContainer
})
);

const value: IValueDisposable<Tab> = { value: tab, disposable };
tab.addDisposables(eventsDisposable);

this.addTab(value, index);
this.tabContainer.addTab(tab, index);
}

public closePanel(panel: IDockviewPanel): void {
this.delete(panel.id);
}

public dispose(): void {
super.dispose();

for (const { value, disposable } of this.tabs) {
disposable.dispose();
value.dispose();
}

this.tabs = [];
}
}
Loading
Loading