Skip to content

Commit 57f3f97

Browse files
committed
fix(split-pane): rtf support
fixes #10903
1 parent 74f90e6 commit 57f3f97

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed

src/components/split-pane/split-pane.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Split Pane
55
// --------------------------------------------------
66

7-
ion-split-pane {
7+
.split-pane {
88
position: absolute;
99
top: 0;
1010
right: 0;
@@ -13,11 +13,16 @@ ion-split-pane {
1313

1414
display: flex;
1515

16+
flex-direction: row;
1617
flex-wrap: nowrap;
1718

1819
contain: strict;
1920
}
2021

22+
.split-pane.split-pane-rtl {
23+
flex-direction: row-reverse;
24+
}
25+
2126
.split-pane-side:not(ion-menu) {
2227
display: none;
2328
}

src/components/split-pane/split-pane.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,14 @@ export class SplitPane extends Ion implements RootNode {
200200
private _plt: Platform,
201201
config: Config,
202202
elementRef: ElementRef,
203-
renderer: Renderer,
203+
renderer: Renderer
204204
) {
205205
super(config, elementRef, renderer, 'split-pane');
206+
if (_plt.isRTL()) {
207+
this.setElementClass('split-pane-rtl', true);
208+
}
206209
}
207210

208-
209211
/**
210212
* @hidden
211213
*/

src/components/split-pane/test/menus/pages/page-one/page-one.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ <h1>Page 1</h1>
1212
<button ion-button (click)="menu1Active()">Enable menu 1</button>
1313
<button ion-button (click)="menu2Active()">Enable menu 2</button>
1414
<button ion-button (click)="menu3Active()">Enable menu 3</button>
15+
<button ion-button (click)="menu4Active()">Enable menu 4 (right)</button>
1516
<button ion-button (click)="disableAll()">Disable all</button>
1617

1718
<div f></div>

src/components/split-pane/test/menus/pages/page-one/page-one.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,34 @@ export class PageOne {
88
constructor(
99
public navCtrl: NavController,
1010
public menuCtrl: MenuController,
11-
) { }
11+
) {
12+
this.menuCtrl.enable(false, 'menu4');
13+
}
1214

1315
push() {
1416
this.navCtrl.push('PageTwo');
1517
}
18+
1619
menu1Active() {
20+
this.menuCtrl.enable(false, 'menu4');
1721
this.menuCtrl.enable(true, 'menu1');
1822
}
1923
menu2Active() {
24+
this.menuCtrl.enable(false, 'menu4');
2025
this.menuCtrl.enable(true, 'menu2');
2126
}
2227
menu3Active() {
28+
this.menuCtrl.enable(false, 'menu4');
2329
this.menuCtrl.enable(true, 'menu3');
2430
}
31+
menu4Active() {
32+
this.menuCtrl.enable(false, 'menu1');
33+
this.menuCtrl.enable(false, 'menu2');
34+
this.menuCtrl.enable(false, 'menu3');
35+
36+
this.menuCtrl.enable(true, 'menu4');
37+
}
38+
2539
disableAll() {
2640
this.menuCtrl.enable(false);
2741
}

0 commit comments

Comments
 (0)