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(ui5-notification-list-item): busy item no longer traps focus #8840

Closed
wants to merge 1 commit into from
+23 −30
Closed

fix(ui5-notification-list-item): busy item no longer traps focus #8840

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 18 additions & 12 deletions packages/fiori/src/NotificationListItem.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,23 @@
tabindex="{{forcedTabIndex}}"
aria-labelledby="{{ariaLabelledBy}}"
>
{{#if busy}}
<ui5-busy-indicator
delay="{{busyDelay}}"
active
class="ui5-nli-busy"
>
{{> liContent}}
</ui5-busy-indicator>
{{else}}
<span>Hello world</span>
{{> liContent}}
{{/if}}
</li>

{{>include "./NotificationOverflowActionsPopover.hbs"}}

{{#*inline "liContent"}}
<div class="ui5-nli-actions">
{{#if showOverflow}}
<ui5-button
Expand Down Expand Up @@ -92,15 +109,4 @@
<div class="ui5-nli-avatar">
<slot name="avatar"></slot>
</div>

{{#if busy}}
<ui5-busy-indicator
delay="{{busyDelay}}"
active
class="ui5-nli-busy"
data-sap-focus-ref
></ui5-busy-indicator>
{{/if}}
</li>

{{>include "./NotificationOverflowActionsPopover.hbs"}}
{{/inline}}
12 changes: 3 additions & 9 deletions packages/fiori/src/themes/NotificationListItemBase.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,10 @@
pointer-events: none;
}

:host([busy]) {
opacity: 0.6;
pointer-events: none;
}

:host([busy]) .ui5-nli-busy {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
/* position: absolute;
inset: 0; */
pointer-events: none;
}

.ui5-nli-action {
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/BusyIndicator.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="{{classes.root}}">
<div class="ui5-busy-indicator-root">
{{#if _isBusy}}
<div
class="ui5-busy-indicator-busy-area"
Expand Down
7 changes: 0 additions & 7 deletions packages/main/src/BusyIndicator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,6 @@ class BusyIndicator extends UI5Element {
return this.text ? `${this._id}-label` : undefined;
}

get classes() {
return {
root: {
"ui5-busy-indicator-root": true,
},
};
}
get textPosition() {
return {
top: this.text && this.textPlacement === BusyIndicatorTextPlacement.Top,
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/themes/BusyIndicator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
align-items: center;
position: relative;
background-color: inherit;
height: inherit;
height: 100%;
}

.ui5-busy-indicator-busy-area {
Expand Down