Skip to content

Commit 3531097

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Merge from master.
2 parents b14502f + e0087da commit 3531097

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export class IgxSplitBarComponent {
204204

205205
protected get resizeDisallowed() {
206206
const relatedTabs = this.siblings;
207-
return !!relatedTabs.find(x => x.resizable === false);
207+
return !!relatedTabs.find(x => x.resizable === false || x.collapsed === true);
208208
}
209209

210210
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ export class IgxSplitterPaneComponent {
192192
// reset sibling sizes when pane collapse state changes.
193193
this._getSiblings().forEach(sibling => sibling.size = 'auto');
194194
this.collapsed = !this.collapsed;
195-
this.resizable = !this.collapsed;
196195
this.onToggle.emit(this);
197196
}
198197

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

Lines changed: 9 additions & 1 deletion
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.collapsed).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();

0 commit comments

Comments
 (0)