Skip to content

Commit 27f55f2

Browse files
crisbetovictoriaaa234
authored andcommitted
fix(card): don't override vertical divider styles (#11899)
1 parent d9a1d48 commit 27f55f2

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

src/lib/card/card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $mat-card-header-size: 40px !default;
1616
padding: $mat-card-default-padding;
1717
border-radius: $mat-card-border-radius;
1818

19-
.mat-divider {
19+
.mat-divider-horizontal {
2020
position: absolute;
2121
left: 0;
2222
width: 100%;

src/lib/divider/divider.spec.ts

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
1+
import {fakeAsync, ComponentFixture, TestBed} from '@angular/core/testing';
22
import {Component} from '@angular/core';
33
import {By} from '@angular/platform-browser';
44
import {MatDividerModule} from './divider-module';
@@ -8,12 +8,10 @@ describe('MatDivider', () => {
88

99
let fixture: ComponentFixture<MatDividerTestComponent>;
1010

11-
beforeEach(async(() => {
11+
beforeEach(fakeAsync(() => {
1212
TestBed.configureTestingModule({
1313
imports: [MatDividerModule],
14-
declarations: [
15-
MatDividerTestComponent
16-
],
14+
declarations: [MatDividerTestComponent],
1715
});
1816

1917
TestBed.compileComponents();
@@ -25,17 +23,27 @@ describe('MatDivider', () => {
2523
fixture.detectChanges();
2624

2725
const divider = fixture.debugElement.query(By.css('mat-divider'));
28-
expect(divider.nativeElement.className).toContain('mat-divider');
29-
expect(divider.nativeElement.className).toContain('mat-divider-vertical');
26+
expect(divider.nativeElement.classList).toContain('mat-divider');
27+
expect(divider.nativeElement.classList).toContain('mat-divider-vertical');
28+
});
29+
30+
it('should apply horizontal class to horizontal divider', () => {
31+
fixture.componentInstance.vertical = false;
32+
fixture.detectChanges();
33+
34+
const divider = fixture.debugElement.query(By.css('mat-divider'));
35+
expect(divider.nativeElement.classList).toContain('mat-divider');
36+
expect(divider.nativeElement.classList).not.toContain('mat-divider-vertical');
37+
expect(divider.nativeElement.classList).toContain('mat-divider-horizontal');
3038
});
3139

3240
it('should apply inset class to inset divider', () => {
3341
fixture.componentInstance.inset = true;
3442
fixture.detectChanges();
3543

3644
const divider = fixture.debugElement.query(By.css('mat-divider'));
37-
expect(divider.nativeElement.className).toContain('mat-divider');
38-
expect(divider.nativeElement.className).toContain('mat-divider-inset');
45+
expect(divider.nativeElement.classList).toContain('mat-divider');
46+
expect(divider.nativeElement.classList).toContain('mat-divider-inset');
3947
});
4048

4149
it('should apply inset and vertical classes to vertical inset divider', () => {
@@ -44,9 +52,9 @@ describe('MatDivider', () => {
4452
fixture.detectChanges();
4553

4654
const divider = fixture.debugElement.query(By.css('mat-divider'));
47-
expect(divider.nativeElement.className).toContain('mat-divider');
48-
expect(divider.nativeElement.className).toContain('mat-divider-inset');
49-
expect(divider.nativeElement.className).toContain('mat-divider-vertical');
55+
expect(divider.nativeElement.classList).toContain('mat-divider');
56+
expect(divider.nativeElement.classList).toContain('mat-divider-inset');
57+
expect(divider.nativeElement.classList).toContain('mat-divider-vertical');
5058
});
5159

5260
it('should add aria roles properly', () => {

src/lib/divider/divider.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
1616
'role': 'separator',
1717
'[attr.aria-orientation]': 'vertical ? "vertical" : "horizontal"',
1818
'[class.mat-divider-vertical]': 'vertical',
19+
'[class.mat-divider-horizontal]': '!vertical',
1920
'[class.mat-divider-inset]': 'inset',
2021
'class': 'mat-divider'
2122
},

0 commit comments

Comments
 (0)