Skip to content

Commit 0211148

Browse files
authored
Merge pull request #655 from mathuo/654-resize
bug: fix layout force flag
2 parents 374bd2a + 973ecff commit 0211148

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

packages/dockview-core/src/__tests__/gridview/baseComponentGridview.spec.ts

+27
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ class TestPanel implements IGridPanelView {
6666
}
6767

6868
class ClassUnderTest extends BaseGrid<TestPanel> {
69+
readonly gridview = this.gridview;
70+
6971
constructor(options: BaseGridOptions) {
7072
super(options);
7173
}
@@ -103,6 +105,31 @@ class ClassUnderTest extends BaseGrid<TestPanel> {
103105
}
104106

105107
describe('baseComponentGridview', () => {
108+
test('that .layout(...) force flag works', () => {
109+
const cut = new ClassUnderTest({
110+
parentElement: document.createElement('div'),
111+
orientation: Orientation.HORIZONTAL,
112+
proportionalLayout: true,
113+
});
114+
115+
const spy = jest.spyOn(cut.gridview, 'layout');
116+
117+
cut.layout(100, 100);
118+
expect(spy).toHaveBeenCalledTimes(1);
119+
120+
cut.layout(100, 100, false);
121+
expect(spy).toHaveBeenCalledTimes(1);
122+
123+
cut.layout(100, 100, true);
124+
expect(spy).toHaveBeenCalledTimes(2);
125+
126+
cut.layout(150, 150, false);
127+
expect(spy).toHaveBeenCalledTimes(3);
128+
129+
cut.layout(150, 150, true);
130+
expect(spy).toHaveBeenCalledTimes(4);
131+
});
132+
106133
test('can add group', () => {
107134
const cut = new ClassUnderTest({
108135
parentElement: document.createElement('div'),

packages/dockview-core/src/gridview/baseComponentGridview.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ export abstract class BaseGrid<T extends IGridPanelView>
323323

324324
public layout(width: number, height: number, forceResize?: boolean): void {
325325
const different =
326-
forceResize ?? (width !== this.width || height !== this.height);
326+
forceResize || width !== this.width || height !== this.height;
327327

328328
if (!different) {
329329
return;

0 commit comments

Comments
 (0)