Skip to content

Commit 87ac560

Browse files
authored
Merge pull request #157 from assureclaims/feature/RMA-100989
Feature/rma 100989
2 parents 5c63aa5 + 968eb0a commit 87ac560

15 files changed

+440
-38
lines changed

projects/dxc-ngx-cdk/src/assets/scss/core.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
// width: 1150px;
2626
// margin: 4px;
2727
// flex: 1 0 150px;
28+
// flex: 1 0 150px;
2829
// }
29-
dxc-dialog::ng-deep .container {
30-
width: 600px;
31-
margin: 30px auto;
32-
}
30+

projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog-body/dxc-dialog-body.component.css

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<ng-content></ng-content>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
3+
import { DxcDialogBodyComponent } from './dxc-dialog-body.component';
4+
5+
describe('DxcDialogBodyComponent', () => {
6+
let component: DxcDialogBodyComponent;
7+
let fixture: ComponentFixture<DxcDialogBodyComponent>;
8+
9+
beforeEach(async () => {
10+
await TestBed.configureTestingModule({
11+
declarations: [ DxcDialogBodyComponent ]
12+
})
13+
.compileComponents();
14+
});
15+
16+
beforeEach(() => {
17+
fixture = TestBed.createComponent(DxcDialogBodyComponent);
18+
component = fixture.componentInstance;
19+
fixture.detectChanges();
20+
});
21+
22+
it('should create', () => {
23+
expect(component).toBeTruthy();
24+
});
25+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { Component, OnInit } from '@angular/core';
2+
3+
@Component({
4+
selector: 'dxc-dialog-body',
5+
templateUrl: './dxc-dialog-body.component.html',
6+
styleUrls: ['./dxc-dialog-body.component.css']
7+
})
8+
export class DxcDialogBodyComponent implements OnInit {
9+
10+
constructor() { }
11+
12+
ngOnInit(): void {
13+
}
14+
15+
}

projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog-header/dxc-dialog-header.component.css

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<ng-content></ng-content>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
3+
import { DxcDialogHeaderComponent } from './dxc-dialog-header.component';
4+
5+
describe('DxcDialogHeaderComponent', () => {
6+
let component: DxcDialogHeaderComponent;
7+
let fixture: ComponentFixture<DxcDialogHeaderComponent>;
8+
9+
beforeEach(async () => {
10+
await TestBed.configureTestingModule({
11+
declarations: [ DxcDialogHeaderComponent ]
12+
})
13+
.compileComponents();
14+
});
15+
16+
beforeEach(() => {
17+
fixture = TestBed.createComponent(DxcDialogHeaderComponent);
18+
component = fixture.componentInstance;
19+
fixture.detectChanges();
20+
});
21+
22+
it('should create', () => {
23+
expect(component).toBeTruthy();
24+
});
25+
});
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { Component, OnInit } from '@angular/core';
2+
3+
@Component({
4+
selector: 'dxc-dialog-header',
5+
templateUrl: './dxc-dialog-header.component.html',
6+
styleUrls: ['./dxc-dialog-header.component.css']
7+
})
8+
export class DxcDialogHeaderComponent implements OnInit {
9+
10+
constructor() { }
11+
12+
ngOnInit(): void {
13+
}
14+
15+
}

projects/dxc-ngx-cdk/src/lib/dxc-dialog/dxc-dialog.component.html

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
1-
<div class="dialog">
1+
<div class="dialog h-100 w-100 d-flex align-items-center justify-content-center">
22
<div class="backOverlay" role="overlay" (click)="onBackgroundClickHandler($event)" [class.backVisible]="overlay">
33
</div>
4-
<div class="container">
5-
<div class="dialogContainer">
6-
<div class="content" tabindex="0" role="dialog" (keydown)="startKeyPress($event)" [attr.aria-label]="ariaLabel" [attr.aria-labelledby]="ariaLabelledBy"
7-
[attr.aria-describedby]="ariaDescribedBy" #dialogboxstart>
8-
<a href="javascript:void(0);" class="closeIcon" *ngIf="isCloseVisible" [attr.aria-label]="closeButtonLabel" [matTooltip]="closeButtonLabel"
9-
(click)="onCloseHandler($event)" [tabindex]="tabIndexValue" role="button">
10-
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
11-
<path
12-
d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" />
13-
<path d="M0 0h24v24H0z" fill="none" />
14-
</svg>
15-
</a>
16-
<ng-content></ng-content>
4+
<div [ngClass]="'container p-0 mw-100 mph-' + height + ' mpw-'+ width">
5+
<div class="dialogContainer h-100 w-100" #dialogboxstart>
6+
<div #dialogHeader [style.height.px]="headerHeight" class="dialog-header d-flex align-items-center justify-content-between px-2">
7+
<span>
8+
<ng-content select="dxc-dialog-header"></ng-content>
9+
</span>
10+
<span *ngIf="isCloseVisible" >
11+
<a href="javascript:void(0);" class="closeIcon" [attr.aria-label]="closeButtonLabel"
12+
[matTooltip]="closeButtonLabel" (click)="onCloseHandler($event)" [tabindex]="tabIndexValue" role="button">
13+
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
14+
<path
15+
d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" />
16+
<path d="M0 0h24v24H0z" fill="none" />
17+
</svg>
18+
</a>
19+
</span>
20+
</div>
21+
<div class="content" tabindex="0" role="dialog" (keydown)="startKeyPress($event)" [attr.aria-label]="ariaLabel"
22+
[attr.aria-labelledby]="ariaLabelledBy" [attr.aria-describedby]="ariaDescribedBy">
23+
<ng-content select="dxc-dialog-body"></ng-content>
1724
<span #dialogboxreturn tabindex="-1" (onblur)="returnFocusOut($event)"></span>
1825
<span #dialogboxend tabindex="0" (focus)="endFocus($event)"></span>
1926
</div>

0 commit comments

Comments
 (0)