Skip to content

Commit 5dcd642

Browse files
committed
Merge branch 'master' of https://github.com/mathuo/dockview into 475-improved-docs
2 parents 50b6e14 + 70014a8 commit 5dcd642

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

packages/dockview-core/src/api/dockviewGroupPanelApi.ts

+8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export interface DockviewGroupPanelApi extends GridviewPanelApi {
1616
maximize(): void;
1717
isMaximized(): boolean;
1818
exitMaximized(): void;
19+
close(): void;
1920
}
2021

2122
export interface DockviewGroupPanelFloatingChangeEvent {
@@ -46,6 +47,13 @@ export class DockviewGroupPanelApiImpl extends GridviewPanelApiImpl {
4647
this.addDisposables(this._onDidLocationChange);
4748
}
4849

50+
close(): void {
51+
if (!this._group) {
52+
return;
53+
}
54+
return this.accessor.removeGroup(this._group);
55+
}
56+
4957
getWindow(): Window {
5058
return this.location.type === 'popout'
5159
? this.location.getWindow()

packages/dockview-core/src/dnd/droptarget.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ export class Droptarget extends CompositeDisposable {
333333
} else if (topClass) {
334334
box.height = `${100 * size}%`;
335335
} else if (bottomClass) {
336-
box.top = `${100 * size}%`;
336+
box.top = `${100 * (1 - size)}%`;
337337
box.height = `${100 * size}%`;
338338
}
339339

packages/dockview-core/src/dockview/dockviewComponent.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -272,16 +272,25 @@ export interface IDockviewComponent extends IBaseGrid<DockviewGroupPanel> {
272272
readonly activePanel: IDockviewPanel | undefined;
273273
readonly totalPanels: number;
274274
readonly panels: IDockviewPanel[];
275+
readonly orientation: Orientation;
275276
readonly onDidDrop: Event<DockviewDidDropEvent>;
276277
readonly onWillDrop: Event<DockviewWillDropEvent>;
277278
readonly onWillShowOverlay: Event<WillShowOverlayLocationEvent>;
278-
readonly orientation: Orientation;
279+
readonly onDidRemovePanel: Event<IDockviewPanel>;
280+
readonly onDidAddPanel: Event<IDockviewPanel>;
281+
readonly onDidLayoutFromJSON: Event<void>;
282+
readonly onDidActivePanelChange: Event<IDockviewPanel | undefined>;
283+
readonly onWillDragPanel: Event<TabDragEvent>;
284+
readonly onWillDragGroup: Event<GroupDragEvent>;
285+
readonly onDidRemoveGroup: Event<DockviewGroupPanel>;
286+
readonly onDidAddGroup: Event<DockviewGroupPanel>;
287+
readonly onDidActiveGroupChange: Event<DockviewGroupPanel | undefined>;
288+
readonly options: DockviewComponentOptions;
279289
updateOptions(options: DockviewComponentUpdateOptions): void;
280290
moveGroupOrPanel(options: MoveGroupOrPanelOptions): void;
281291
moveGroup(options: MoveGroupOptions): void;
282292
doSetGroupActive: (group: DockviewGroupPanel, skipFocus?: boolean) => void;
283293
removeGroup: (group: DockviewGroupPanel) => void;
284-
options: DockviewComponentOptions;
285294
addPanel<T extends object = Parameters>(
286295
options: AddPanelOptions<T>
287296
): IDockviewPanel;
@@ -299,12 +308,6 @@ export interface IDockviewComponent extends IBaseGrid<DockviewGroupPanel> {
299308
toJSON(): SerializedDockview;
300309
fromJSON(data: SerializedDockview): void;
301310
//
302-
readonly onDidRemovePanel: Event<IDockviewPanel>;
303-
readonly onDidAddPanel: Event<IDockviewPanel>;
304-
readonly onDidLayoutFromJSON: Event<void>;
305-
readonly onDidActivePanelChange: Event<IDockviewPanel | undefined>;
306-
readonly onWillDragPanel: Event<TabDragEvent>;
307-
readonly onWillDragGroup: Event<GroupDragEvent>;
308311
addFloatingGroup(
309312
item: IDockviewPanel | DockviewGroupPanel,
310313
coord?: { x: number; y: number }
@@ -318,9 +321,6 @@ export interface IDockviewComponent extends IBaseGrid<DockviewGroupPanel> {
318321
onWillClose?: (event: { id: string; window: Window }) => void;
319322
}
320323
): Promise<void>;
321-
readonly onDidRemoveGroup: Event<DockviewGroupPanel>;
322-
readonly onDidAddGroup: Event<DockviewGroupPanel>;
323-
readonly onDidActiveGroupChange: Event<DockviewGroupPanel | undefined>;
324324
}
325325

326326
export class DockviewComponent
@@ -1847,7 +1847,7 @@ export class DockviewComponent
18471847
const removedPanel: IDockviewPanel | undefined = this.movingLock(
18481848
() =>
18491849
sourceGroup.model.removePanel(sourceItemId, {
1850-
skipSetActive: true,
1850+
skipSetActive: false,
18511851
skipSetActiveGroup: true,
18521852
})
18531853
);

0 commit comments

Comments
 (0)