Skip to content

Commit cc22929

Browse files
authored
Merge branch 'master' into SKrastev/grid-disabled-pin-row
2 parents 2c2e89f + e0087da commit cc22929

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ export class IgxSplitBarComponent {
200200

201201
protected get resizeDisallowed() {
202202
const relatedTabs = this.siblings;
203-
return !!relatedTabs.find(x => x.resizable === false);
203+
return !!relatedTabs.find(x => x.resizable === false || x.hidden === true);
204204
}
205205

206206
public onCollapsing(next: boolean) {

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,19 @@ describe('IgxSplitter pane toggle', () => {
297297
const pane1 = splitter.panes.toArray()[0];
298298
const splitterBarComponent = fixture.debugElement.query(By.css(SPLITTERBAR_CLASS)).context;
299299

300+
pane1.size = '340';
301+
const pane1_originalSize = pane1.size;
302+
const splitterBarComponentDebug: DebugElement = fixture.debugElement.query(By.css(SPLITTERBAR_CLASS));
303+
300304
// collapse left sibling pane
301305
splitterBarComponent.onCollapsing(0);
302306
fixture.detectChanges();
303307
expect(pane1.hidden).toBeTruthy();
304-
expect(pane1.resizable).toBeFalsy();
308+
expect(pane1.resizable).toBeTruthy();
309+
splitterBarComponentDebug.nativeElement.focus();
310+
UIInteractions.triggerEventHandlerKeyDown('ArrowRight', splitterBarComponentDebug);
311+
fixture.detectChanges();
312+
expect(pane1.size).toEqual(pane1_originalSize);
305313

306314
splitterBarComponent.onCollapsing(1);
307315
fixture.detectChanges();

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,10 @@ export class IgxSplitterComponent implements AfterContentInit {
173173
return;
174174
}
175175
// reset sibling sizes when pane is collapsed.
176-
this._getSiblings(pane).forEach(sibling => sibling.size = 'auto');
176+
this._getSiblings(pane).forEach(sibling => { if (sibling.resizable) {
177+
sibling.size = 'auto';
178+
}});
177179
pane.hidden = !pane.hidden;
178-
pane.resizable = !pane.hidden;
179180
pane.onPaneToggle.emit(pane);
180181
}
181182

0 commit comments

Comments
 (0)