Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(app-modal-shell): update modal header #315

Merged
merged 1 commit into from
Apr 6, 2022
Merged

fix(app-modal-shell): update modal header #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 56 additions & 49 deletions src/app/modules/modal-shell/modal-shell.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,61 @@
<div id="{{'modalImplementation' + modalCount}}" class="ds-c-dialog-wrap" [attr.aria-modal]="true" [attr.aria-labelledby]="'dialog-title-' + modalCount" [attr.aria-describedby]="'dialog-body-' + modalCount" role="dialog" id="modalDialog" id="modal" (keyDown.esc)="onClose()" attr.data-auto-id="{{dataAutoId}}">
<div tabindex="0" class="focus-trap-hidden" id="firstModalTab" (focus)="findTab($event)" aria-hidden="true"></div>
<div class="tableClass">
<div class="cellClass">
<div class="ds-c-dialog {{modalClass}}" role="document">
<app-button
class="floatRight"
(callBack)="onClose()"
[ariaLabel]="'Close modal dialog'"
[buttonType]="'modalTabIndex ds-c-button--transparent ds-c-dialog__close'"
[buttonID]="'closeButton'+modalCount">
Close
</app-button>

<ng-template #defaultHeader let-modalHeader="modalHeader">
<h1 class="ds-h1" id="{{'dialog-title-' + modalHeader.modalCount}}">
{{modalHeader.modalTitle}}
</h1>
</ng-template>

<ng-container *ngTemplateOutlet="headerTemplate ? headerTemplate : defaultHeader; context: getTitle">
</ng-container>
<div id="{{'modalImplementation' + modalCount}}" class="ds-c-dialog-wrap" [attr.aria-modal]="true"
[attr.aria-labelledby]="'dialog-title-' + modalCount" [attr.aria-describedby]="'dialog-body-' + modalCount"
role="dialog" id="modalDialog" id="modal" (keyDown.esc)="onClose()" attr.data-auto-id="{{dataAutoId}}">
<div tabindex="0" class="focus-trap-hidden" id="firstModalTab" (focus)="findTab($event)" aria-hidden="true"></div>
<div class="tableClass">
<div class="cellClass">
<div class="ds-c-dialog {{modalClass}}" role="document">
<div class="modal-header-wrapper ds-u-display--flex ds-u-margin-bottom--2">
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actual changes are here...(the rest is mostly just reformatting...sorry, it's a habit!)

Wrap the title and close button in .modal-header-wrapper
Change defaultHeader template to use h2 instead of h1

<div class="modal-header-content">
<ng-container
*ngTemplateOutlet="headerTemplate ? headerTemplate : defaultHeader; context: getTitle">
</ng-container>

<main [id]="jawsBody ? 'dialog-body-' + modalCount : ''">
<ng-template #defaultHeader let-modalHeader="modalHeader">
<h2 class="ds-h2"
id="{{'dialog-title-' + modalHeader.modalCount}}">
{{modalHeader.modalTitle}}
</h2>
</ng-template>
</div>
<app-button
class="modal-header-close-button ds-u-margin-left--1"
(callBack)="onClose()"
[ariaLabel]="'Close modal dialog'"
[buttonType]="'modalTabIndex ds-c-button--transparent ds-c-dialog__close'"
[buttonID]="'closeButton'+modalCount">
Close
</app-button>
</div>

<ng-template #defaultBody let-modalBody="modalBody">
<p>
{{modalBody.modalData}}
</p>
</ng-template>
<main [id]="jawsBody ? 'dialog-body-' + modalCount : ''">

<ng-container *ngTemplateOutlet="bodyTemplate ? bodyTemplate : defaultBody; context: getBody">
</ng-container>
<ng-template #defaultBody let-modalBody="modalBody">
<p>
{{modalBody.modalData}}
</p>
</ng-template>

<aside class="ds-c-dialog__actions">
<ng-template #defaultFooter>
<app-button
(callBack)="onClose()"
[ariaLabel]="'Cancel modal'"
[buttonType]="'modalTabIndex'"
[buttonID]="'cancelButton'+modalCount">
Cancel
</app-button>
</ng-template>
<ng-container *ngTemplateOutlet="bodyTemplate ? bodyTemplate : defaultBody; context: getBody">
</ng-container>

<ng-container *ngTemplateOutlet="footerTemplate ? footerTemplate : defaultFooter">
</ng-container>
</aside>
</main>
</div>
</div>
</div>
<div tabindex="0" class="focus-trap-hidden" id="lastModalTab" (focus)="findTab($event)" aria-hidden="true"></div>
</div>
<aside class="ds-c-dialog__actions">
<ng-template #defaultFooter>
<app-button
(callBack)="onClose()"
[ariaLabel]="'Cancel modal'"
[buttonType]="'modalTabIndex'"
[buttonID]="'cancelButton'+modalCount">
Cancel
</app-button>
</ng-template>

<ng-container *ngTemplateOutlet="footerTemplate ? footerTemplate : defaultFooter">
</ng-container>
</aside>
</main>
</div>
</div>
</div>
<div tabindex="0" class="focus-trap-hidden" id="lastModalTab" (focus)="findTab($event)" aria-hidden="true"></div>
</div>
23 changes: 22 additions & 1 deletion ...les/modal-shell/modal-shell.component.css → ...es/modal-shell/modal-shell.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,25 @@ h1 {
.ds-c-dialog {
max-height: 100vh;
overflow-y:auto;
}
}

.modal-header-content {
flex: 1;

::ng-deep {
// Override to ensure the first element (which will likely be a header element) doesn't have the default space
// at the top, so that it aligns with the close button
:first-child {
margin-top: 0;
padding-top: 0;
}
}
}

.modal-header-close-button {
::ng-deep {
button {
text-decoration: none;
}
}
}
4 changes: 2 additions & 2 deletions src/app/modules/modal-shell/modal-shell.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
@Component({
selector: 'app-modal-shell',
templateUrl: './modal-shell.component.html',
styleUrls: ['./modal-shell.component.css']
styleUrls: ['./modal-shell.component.scss']
mcelestini marked this conversation as resolved.
Show resolved Hide resolved
})
export class AppModalShellComponent {

Expand Down Expand Up @@ -56,4 +56,4 @@ export class AppModalShellComponent {
}
};
}
}
}