rei-mirrors/dockview
1
0
Fork 0
mirror of https://github.com/mathuo/dockview synced 2025-09-01 15:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #225 from mathuo/224-bug-close-button-on-default-watermark-doesnt-work

Browse Source 
bug: fix close button on default watermark
This commit is contained in:
mathuo 2023-03-26 19:34:29 +01:00 committed by GitHub
commit 551731ffd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/dockview-core/src/__tests__/dockview/components/watermark/watermark.spec.ts Normal file
View File

@ -0,0 +1,27 @@
import { DockviewApi } from '../../../../api/component.api';
import { Watermark } from '../../../../dockview/components/watermark/watermark';
describe('watermark', () => {
test('that the group is closed when the close button is clicked', () => {
const cut = new Watermark();
const mockApi = jest.fn<Partial<DockviewApi>, any[]>(() => {
return {
removeGroup: jest.fn(),
};
});
const api = <DockviewApi>new mockApi();
const group = jest.fn() as any;
cut.init({ containerApi: api });
cut.updateParentGroup(group, true);
const closeEl = cut.element.querySelector('.close-action')!;
expect(closeEl).toBeTruthy();
closeEl.dispatchEvent(new Event('click'));
expect(api.removeGroup).toHaveBeenCalledWith(group);
});
});

17
packages/dockview-core/src/dockview/components/watermark/watermark.ts
View File

@ -1,5 +1,4 @@
import {
GroupPanelPartInitParameters,
IWatermarkRenderer,
WatermarkRendererInitParameters,
} from '../../types';
@ -9,14 +8,15 @@ import { CompositeDisposable } from '../../../lifecycle';
import { DockviewGroupPanel } from '../../dockviewGroupPanel';
import { PanelUpdateEvent } from '../../../panel/types';
import { createCloseButton } from '../../../svg';
import { DockviewApi } from '../../../api/component.api';
export class Watermark
extends CompositeDisposable
implements IWatermarkRenderer
{
private _element: HTMLElement;
private group: DockviewGroupPanel | undefined;
private params: GroupPanelPartInitParameters | undefined;
private _group: DockviewGroupPanel | undefined;
private _api: DockviewApi | undefined;
get element(): HTMLElement {
return this._element;
@ -54,8 +54,8 @@ export class Watermark
this.addDisposables(
addDisposableListener(closeAnchor, 'click', (ev) => {
ev.preventDefault();
if (this.group) {
this.params?.containerApi.removeGroup(this.group);
if (this._group) {
this._api?.removeGroup(this._group);
}
})
);
@ -74,11 +74,12 @@ export class Watermark
}
init(_params: WatermarkRendererInitParameters): void {
this._api = _params.containerApi;
this.render();
}
updateParentGroup(group: DockviewGroupPanel, _visible: boolean): void {
this.group = group;
this._group = group;
this.render();
}
@ -87,9 +88,7 @@ export class Watermark
}
private render(): void {
const isOneGroup = !!(
this.params && this.params.containerApi.size <= 1
);
const isOneGroup = !!(this._api && this._api.size <= 1);
toggleClass(this.element, 'has-actions', isOneGroup);
}
}