-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Add loading indicator to composition picker modal #21086
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.
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
Open
Copilot
wants to merge
5
commits into
main
Choose a base branch
from
copilot/add-loading-indicator-to-modal
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ff7842a
Initial plan
Copilot 6d31276
Add loading indicator to composition picker modal
Copilot d8bceac
Document implementation and verify changes
Copilot 99127ab
Address code review feedback - add accessibility and documentation
Copilot d62c4fc
Merge branch 'main' into copilot/add-loading-indicator-to-modal
nielslyngsoe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -42,6 +42,14 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement< | |||||||
| @state() | ||||||||
| private _usedForComposition: Array<string> = []; | ||||||||
|
|
||||||||
| /** | ||||||||
| * Loading state for the composition data fetch. | ||||||||
| * Initialized to true to show loader immediately when modal opens. | ||||||||
| * Set to false when data is successfully loaded or an error occurs. | ||||||||
| */ | ||||||||
| @state() | ||||||||
| private _loading = true; | ||||||||
|
|
||||||||
| override connectedCallback() { | ||||||||
| super.connectedCallback(); | ||||||||
|
|
||||||||
|
|
@@ -113,14 +121,19 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement< | |||||||
| currentPropertyAliases: currentPropertyAliases, | ||||||||
| }); | ||||||||
|
|
||||||||
| if (!data) return; | ||||||||
| if (!data) { | ||||||||
| this._loading = false; | ||||||||
| return; | ||||||||
| } | ||||||||
|
|
||||||||
| // eslint-disable-next-line @typescript-eslint/ban-ts-comment | ||||||||
| // @ts-expect-error | ||||||||
| const grouped = Object.groupBy(data, (item) => '/' + item.folderPath.join('/')); | ||||||||
| this._compatibleCompositions = Object.keys(grouped) | ||||||||
| .sort((a, b) => a.localeCompare(b)) | ||||||||
| .map((key) => ({ path: key, compositions: grouped[key] })); | ||||||||
|
|
||||||||
| this._loading = false; | ||||||||
| } | ||||||||
|
|
||||||||
| #onSelectionAdd(unique: string) { | ||||||||
|
|
@@ -183,6 +196,12 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement< | |||||||
| } | ||||||||
|
|
||||||||
| #renderAvailableCompositions() { | ||||||||
| if (this._loading) { | ||||||||
| return html`<div id="loader" role="status" aria-live="polite" aria-label="Loading compositions"> | ||||||||
| <uui-loader></uui-loader> | ||||||||
| </div>`; | ||||||||
| } | ||||||||
|
|
||||||||
| if (this._compatibleCompositions) { | ||||||||
| return html` | ||||||||
| <umb-localize key="contentTypeEditor_compositionsDescription"> | ||||||||
|
|
@@ -242,6 +261,14 @@ export class UmbCompositionPickerModalElement extends UmbModalBaseElement< | |||||||
|
|
||||||||
| static override styles = [ | ||||||||
| css` | ||||||||
| #loader { | ||||||||
| display: flex; | ||||||||
| justify-content: center; | ||||||||
| align-items: center; | ||||||||
| padding: var(--uui-size-layout-1); | ||||||||
| min-height: 200px; | ||||||||
|
Comment on lines
+267
to
+269
|
||||||||
| align-items: center; | |
| padding: var(--uui-size-layout-1); | |
| min-height: 200px; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The loader div includes accessibility attributes
role="status",aria-live="polite", andaria-label="Loading compositions". While these attributes improve accessibility, they differ from the reference implementation inblock-catalogue-modal.element.ts(line 208), which doesn't include any accessibility attributes.For consistency and better accessibility across the application, consider:
The current attributes are appropriate and follow WCAG guidelines for live regions.