Skip to content

Commit ba08fdc

Browse files
Merge pull request #16222 from IgniteUI/mkirkova/fix-16219-19.2.x
Ensure panes resize correctly on window resize - 19.2.x
2 parents 502776c + 71bb96f commit ba08fdc

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

projects/igniteui-angular/src/lib/splitter/splitter.component.spec.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -490,27 +490,22 @@ describe('IgxSplitter resizing with minSize and browser window is shrinked', ()
490490
const minSize = parseInt(pane1.minSize);
491491
spyOn(splitter, 'onMoveEnd').and.callThrough();
492492

493-
pane1.size = (splitter.getTotalSize() - parseInt(pane2.size)) + 'px';
494-
fixture.detectChanges();
495-
496493
splitterBarComponent.moveStart.emit(pane1);
497494
fixture.detectChanges();
498495
splitterBarComponent.movingEnd.emit(splitter.getTotalSize() -minSize);
499496
fixture.detectChanges();
500497

501498
splitter.elementRef.nativeElement.style.width = '500px';
502-
pane2.size = (splitter.getTotalSize() - minSize) + 'px';
503499
fixture.detectChanges();
504500

505501
splitterBarComponent.moveStart.emit(pane1);
506502
fixture.detectChanges();
507-
splitterBarComponent.movingEnd.emit(-400);
503+
splitterBarComponent.movingEnd.emit(-200);
508504
fixture.detectChanges();
509505

510-
const isFullSize = pane1.size === '100%' || pane1.size === (splitter.getTotalSize() + 'px');
511-
512506
expect(splitter.onMoveEnd).toHaveBeenCalled();
513-
expect(isFullSize).toBeTruthy();
507+
expect(pane1.size).toEqual('80%');
508+
expect(pane2.size).toEqual('100px');
514509
});
515510
});
516511

projects/igniteui-angular/src/lib/splitter/splitter.component.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,9 @@ export class IgxSplitterComponent implements AfterContentInit {
245245
let [ paneSize, siblingSize ] = this.calcNewSizes(delta);
246246

247247
if (paneSize + siblingSize > this.getTotalSize() && delta < 0) {
248-
paneSize = this.getTotalSize();
249-
siblingSize = 0;
250-
} else if(paneSize + siblingSize > this.getTotalSize() && delta > 0) {
251-
paneSize = 0;
252-
siblingSize = this.getTotalSize();
248+
siblingSize = this.getTotalSize() - paneSize;
249+
} else if (paneSize + siblingSize > this.getTotalSize() && delta > 0) {
250+
paneSize = this.getTotalSize() - siblingSize;
253251
}
254252

255253
if (this.pane.isPercentageSize) {

0 commit comments

Comments
 (0)