Skip to content

Commit ad4d5b4

Browse files
authored
fix(multiple): fix broken rtl examples (#31527)
* Add missing imports to the Dir directive * Switch tabs rtl example to horizontal
1 parent 50a6d6c commit ad4d5b4

File tree

10 files changed

+49
-44
lines changed

10 files changed

+49
-44
lines changed

src/components-examples/cdk-experimental/listbox/cdk-listbox-rtl-horizontal/cdk-listbox-rtl-horizontal-example.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {Component} from '@angular/core';
2+
import {Dir} from '@angular/cdk/bidi';
23
import {CdkListbox, CdkOption} from '@angular/cdk-experimental/listbox';
34
import {MatPseudoCheckbox} from '@angular/material/core';
45

@@ -11,7 +12,7 @@ import {MatPseudoCheckbox} from '@angular/material/core';
1112
templateUrl: 'cdk-listbox-rtl-horizontal-example.html',
1213
styleUrl: '../cdk-listbox-configurable/cdk-listbox-configurable-example.css',
1314
standalone: true,
14-
imports: [CdkListbox, CdkOption, MatPseudoCheckbox],
15+
imports: [CdkListbox, CdkOption, Dir, MatPseudoCheckbox],
1516
})
1617
export class CdkListboxRtlHorizontalExample {
1718
fruits = [
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {Component} from '@angular/core';
2+
import {Dir} from '@angular/cdk/bidi';
23
import {FormsModule} from '@angular/forms';
34
import {CdkRadioGroup, CdkRadioButton} from '@angular/cdk-experimental/radio-group';
45

@@ -9,7 +10,7 @@ import {CdkRadioGroup, CdkRadioButton} from '@angular/cdk-experimental/radio-gro
910
templateUrl: 'cdk-radio-group-rtl-horizontal-example.html',
1011
styleUrl: '../radio-common.css',
1112
standalone: true,
12-
imports: [CdkRadioGroup, CdkRadioButton, FormsModule],
13+
imports: [CdkRadioGroup, CdkRadioButton, Dir, FormsModule],
1314
})
1415
export class CdkRadioGroupRtlHorizontalExample {
1516
fruits = [

src/components-examples/cdk-experimental/radio-group/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export {CdkRadioGroupStandardExample} from './cdk-radio-group-standard/cdk-radio-group-standard-example';
22
export {CdkRadioGroupHorizontalExample} from './cdk-radio-group-horizontal/cdk-radio-group-horizontal-example';
3-
export {CdkRadioGroupRtlHorizontalExample} from './cdk-radio-rtl-group-horizontal/cdk-radio-group-rtl-horizontal-example';
3+
export {CdkRadioGroupRtlHorizontalExample} from './cdk-radio-group-rtl-horizontal/cdk-radio-group-rtl-horizontal-example';
44
export {CdkRadioGroupActiveDescendantExample} from './cdk-radio-group-active-descendant/cdk-radio-group-active-descendant-example';
55
export {CdkRadioGroupDisabledFocusableExample} from './cdk-radio-group-disabled-focusable/cdk-radio-group-disabled-focusable-example';
66
export {CdkRadioGroupDisabledSkippedExample} from './cdk-radio-group-disabled-skipped/cdk-radio-group-disabled-skipped-example';

src/components-examples/cdk-experimental/tabs/cdk-rtl-vertical/cdk-tabs-rtl-vertical-example.html

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<div class="example-container" dir="rtl">
2+
<div cdkTabs class="example-tabs">
3+
<ul cdkTabList class="example-tablist" tab="tab-1">
4+
<li cdkTab value="tab-1" class="example-tab">tab 1</li>
5+
<li cdkTab value="tab-2" class="example-tab">tab 2</li>
6+
<li cdkTab value="tab-3" class="example-tab">tab 3</li>
7+
<li cdkTab value="tab-4" class="example-tab">tab 4</li>
8+
<li cdkTab value="tab-5" class="example-tab">tab 5</li>
9+
</ul>
10+
11+
<div cdkTabPanel value="tab-1" class="example-tabpanel">
12+
<ng-template cdkTabContent>Tabpanel 1</ng-template>
13+
</div>
14+
15+
<div cdkTabPanel value="tab-2" class="example-tabpanel">
16+
<ng-template cdkTabContent>Tabpanel 2</ng-template>
17+
</div>
18+
19+
<div cdkTabPanel value="tab-3" class="example-tabpanel">
20+
<ng-template cdkTabContent>Tabpanel 3</ng-template>
21+
</div>
22+
23+
<div cdkTabPanel value="tab-4" class="example-tabpanel">
24+
<ng-template cdkTabContent>Tabpanel 4</ng-template>
25+
</div>
26+
27+
<div cdkTabPanel value="tab-5" class="example-tabpanel">
28+
<ng-template cdkTabContent>Tabpanel 5</ng-template>
29+
</div>
30+
</div>
31+
</div>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {Component} from '@angular/core';
2+
import {Dir} from '@angular/cdk/bidi';
23
import {
34
CdkTab,
45
CdkTabs,
@@ -7,15 +8,15 @@ import {
78
CdkTabContent,
89
} from '@angular/cdk-experimental/tabs';
910

10-
/** * @title RTL & Vertical */
11+
/** * @title RTL */
1112
@Component({
12-
selector: 'cdk-tabs-rtl-vertical-example',
13-
exportAs: 'cdkTabsRtlVerticalExample',
14-
templateUrl: 'cdk-tabs-rtl-vertical-example.html',
13+
selector: 'cdk-tabs-rtl-example',
14+
exportAs: 'cdkTabsRtlExample',
15+
templateUrl: 'cdk-tabs-rtl-example.html',
1516
styleUrls: ['../cdk-tabs-common.css'],
1617
standalone: true,
17-
imports: [CdkTabList, CdkTab, CdkTabs, CdkTabPanel, CdkTabContent],
18+
imports: [CdkTabList, CdkTab, CdkTabs, CdkTabPanel, CdkTabContent, Dir],
1819
})
19-
export class CdkTabsRtlVerticalExample {
20+
export class CdkTabsRtlExample {
2021
selectedIndex = 0;
2122
}

src/components-examples/cdk-experimental/tabs/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export {CdkTabsConfigurableExample} from './cdk-tabs-configurable/cdk-tabs-confi
22
export {CdkTabsExplicitSelectionExample} from './cdk-explicit-selection/cdk-tabs-explicit-selection-example';
33
export {CdkTabsSelectionFollowsFocusExample} from './cdk-selection-follows-focus/cdk-tabs-selection-follows-focus-example';
44
export {CdkTabsVerticalExample} from './cdk-vertical-orientation/cdk-tabs-vertical-example';
5-
export {CdkTabsRtlVerticalExample} from './cdk-rtl-vertical/cdk-tabs-rtl-vertical-example';
5+
export {CdkTabsRtlExample} from './cdk-rtl/cdk-tabs-rtl-example';
66
export {CdkTabsActiveDescendantExample} from './cdk-active-descendant/cdk-tabs-active-descendant-example';
77
export {CdkTabsDisabledFocusableExample} from './cdk-disabled-focusable/cdk-tabs-disabled-focusable-example';
88
export {CdkTabsDisabledSkippedExample} from './cdk-disabled-skipped/cdk-tabs-disabled-skipped-example';

src/dev-app/cdk-experimental-tabs/cdk-tabs-demo.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ <h4>Selection Follows Focus</h4>
1010
</div>
1111

1212
<div class="example-tabs-container">
13-
<h4>Horizontal Orientation</h4>
13+
<h4>Vertical Orientation</h4>
1414
<cdk-tabs-vertical-example></cdk-tabs-vertical-example>
1515
</div>
1616

1717
<div class="example-tabs-container">
18-
<h4>RTL & Horizontal Orientation</h4>
19-
<cdk-tabs-rtl-vertical-example></cdk-tabs-rtl-vertical-example>
18+
<h4>RTL</h4>
19+
<cdk-tabs-rtl-example></cdk-tabs-rtl-example>
2020
</div>
2121

2222
<div class="example-tabs-container">

src/dev-app/cdk-experimental-tabs/cdk-tabs-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
CdkTabsExplicitSelectionExample,
1313
CdkTabsSelectionFollowsFocusExample,
1414
CdkTabsVerticalExample,
15-
CdkTabsRtlVerticalExample,
15+
CdkTabsRtlExample,
1616
CdkTabsActiveDescendantExample,
1717
CdkTabsDisabledFocusableExample,
1818
CdkTabsDisabledSkippedExample,
@@ -28,7 +28,7 @@ import {
2828
CdkTabsExplicitSelectionExample,
2929
CdkTabsSelectionFollowsFocusExample,
3030
CdkTabsVerticalExample,
31-
CdkTabsRtlVerticalExample,
31+
CdkTabsRtlExample,
3232
CdkTabsActiveDescendantExample,
3333
CdkTabsDisabledFocusableExample,
3434
CdkTabsDisabledSkippedExample,

0 commit comments

Comments
 (0)