diff --git a/api-goldens/element-ng/application-header/index.api.md b/api-goldens/element-ng/application-header/index.api.md index 865c9d70df..0d2ddf0bd8 100644 --- a/api-goldens/element-ng/application-header/index.api.md +++ b/api-goldens/element-ng/application-header/index.api.md @@ -137,7 +137,8 @@ export class SiLaunchpadFactoryComponent { readonly favoriteAppsText: _angular_core.InputSignal; // (undocumented) readonly favoriteChange: _angular_core.OutputEmitterRef; - readonly showLessAppsText: _angular_core.InputSignal; + // @deprecated (undocumented) + readonly showLessAppsText: _angular_core.InputSignal; readonly showMoreAppsText: _angular_core.InputSignal; readonly subtitleText: _angular_core.InputSignal; readonly titleText: _angular_core.InputSignal; diff --git a/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories-element-examples-chromium-dark-linux.png index 943aa611e2..0fddcfc501 100644 --- a/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories-element-examples-chromium-dark-linux.png +++ b/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories-element-examples-chromium-dark-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38b8038b2f333d2acab1edd4b416c98e52477c1bb05032adb96a963c91624041 -size 31159 +oid sha256:bbecc29656a7d40cbd0e7387bf1c3ebe0a56142fd14c9139192daf1c299201e4 +size 31218 diff --git a/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories-element-examples-chromium-light-linux.png index 4b1fb26284..f597d98bf4 100644 --- a/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories-element-examples-chromium-light-linux.png +++ b/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories-element-examples-chromium-light-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dea7cb3a6bd3bb7112bd4efdaa99528a0a573ba42ffeabe25291ca6c3de0bc78 -size 30063 +oid sha256:5ea54967ad9d20f3862a2978058f68f4a6ef758073a134c94684bee2d4789789 +size 30141 diff --git a/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories.yaml b/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories.yaml index 408be01e1b..34fbaf80af 100644 --- a/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories.yaml +++ b/playwright/snapshots/navbar-launchpad.spec.ts-snapshots/si-navbar--si-navbar-launchpad-categories.yaml @@ -17,7 +17,7 @@ - text: Favorites - link "Water": - /url: . - - button "Show less" + - button "Show more" [expanded] - text: Phishing Apps - link "Water": - /url: . diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile-element-examples-chromium-dark-linux.png b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile-element-examples-chromium-dark-linux.png index 7d15653498..b64eeaf2a9 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile-element-examples-chromium-dark-linux.png +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile-element-examples-chromium-dark-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba5859f0364902ce031bc6ffe5e555bbd3b48815ee27941d9e3759dae17a9141 -size 32080 +oid sha256:d00f58b2568178adf12207ccfcfad7ff403cab2541502bf7d82ca7cdf246383f +size 32135 diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile-element-examples-chromium-light-linux.png b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile-element-examples-chromium-light-linux.png index 34ae627abf..801938a638 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile-element-examples-chromium-light-linux.png +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile-element-examples-chromium-light-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d295aec8ca9e306cbb20fed6414d46d26973c067741a2f03fbf2a00f191fc55e -size 31239 +oid sha256:dc03d626c85b8ed43e78c72f8c8604bd40e9855bf2177e1b9065ad4f1a6b8544 +size 31316 diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile.yaml b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile.yaml index f300374670..8fff45753c 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile.yaml +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--mobile.yaml @@ -14,7 +14,7 @@ - /url: "#/viewer/viewer/stats" - link "Rocket System name": - /url: . - - button "Show less" + - button "Show more" [expanded] - link "Assets System name": - /url: . - link "Fischbach System name": diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite-element-examples-chromium-dark-linux.png b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite-element-examples-chromium-dark-linux.png index a9cfe0c2a6..564fa77fbb 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite-element-examples-chromium-dark-linux.png +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite-element-examples-chromium-dark-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86e61dc611361b0f7a968a51467b7ef42c31fe3b609dfe7cf95a77acc21dc5a6 -size 41034 +oid sha256:04b663f1c57b8c2339c212ca582a3638363847444b51976efe595d9691b7bebd +size 41116 diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite-element-examples-chromium-light-linux.png b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite-element-examples-chromium-light-linux.png index e37be6e02b..d4de5ca9fc 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite-element-examples-chromium-light-linux.png +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite-element-examples-chromium-light-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54df795283dbae5db0055c8e818848855754e87f312b6132b57d9a4f43cd860d -size 40236 +oid sha256:32d33c3b1e8f3b4dd4a450ed97d040e98f753dadb815189acddf0936bd7c1de7 +size 40280 diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite.yaml b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite.yaml index 0bc32d2547..2d1fec25b8 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite.yaml +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad--new-favorite.yaml @@ -12,7 +12,7 @@ - /url: "#/viewer/viewer/stats" - link "Rocket System name": - /url: . - - button "Show less" + - button "Show more" [expanded] - link "Assets System name": - /url: . - link "Fischbach System name": diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad-element-examples-chromium-dark-linux.png b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad-element-examples-chromium-dark-linux.png index b11fca0004..c90dfd692f 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad-element-examples-chromium-dark-linux.png +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad-element-examples-chromium-dark-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:006ff3e57e9247d070f7825f6530a0b5545ed779c5628575a431ea85a53c1e00 -size 42650 +oid sha256:d836b942d7c8bb582ecdfef6a215053564f27858ec2a39941fcfefb303c22548 +size 42710 diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad-element-examples-chromium-light-linux.png b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad-element-examples-chromium-light-linux.png index 46602805ef..ba129ebc06 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad-element-examples-chromium-light-linux.png +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad-element-examples-chromium-light-linux.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae63fba0efeb01dc2ff71512a83d8e75f12661a2ee8c1eef0df7cb5cbd2ba382 -size 41853 +oid sha256:5adf50ec57b86ec5cf102d9814da2791cc626795bf6dc4b5fb220f64bbec9024 +size 41931 diff --git a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad.yaml b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad.yaml index f300374670..8fff45753c 100644 --- a/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad.yaml +++ b/playwright/snapshots/si-launchpad.spec.ts-snapshots/si-application-header--si-launchpad.yaml @@ -14,7 +14,7 @@ - /url: "#/viewer/viewer/stats" - link "Rocket System name": - /url: . - - button "Show less" + - button "Show more" [expanded] - link "Assets System name": - /url: . - link "Fischbach System name": diff --git a/projects/element-ng/application-header/launchpad/si-launchpad-factory.component.html b/projects/element-ng/application-header/launchpad/si-launchpad-factory.component.html index c8e339b7a5..a949085cb0 100644 --- a/projects/element-ng/application-header/launchpad/si-launchpad-factory.component.html +++ b/projects/element-ng/application-header/launchpad/si-launchpad-factory.component.html @@ -93,9 +93,10 @@ type="button" class="btn btn-link btn-show-all dropdown-toggle text-decoration-none" [class.show]="showAllApps" + [attr.aria-expanded]="showAllApps" (click)="showAllApps = !showAllApps" > - {{ (showAllApps ? showLessAppsText() : showMoreAppsText()) | translate }} + {{ showMoreAppsText() | translate }} } diff --git a/projects/element-ng/application-header/launchpad/si-launchpad-factory.component.ts b/projects/element-ng/application-header/launchpad/si-launchpad-factory.component.ts index 159990dd15..4798314129 100644 --- a/projects/element-ng/application-header/launchpad/si-launchpad-factory.component.ts +++ b/projects/element-ng/application-header/launchpad/si-launchpad-factory.component.ts @@ -90,15 +90,8 @@ export class SiLaunchpadFactoryComponent { */ readonly showMoreAppsText = input(t(() => $localize`:@@SI_LAUNCHPAD.SHOW_MORE:Show more`)); - /** - * Title of the show less apps button. - * - * @defaultValue - * ``` - * t(() => $localize`:@@SI_LAUNCHPAD.SHOW_LESS:Show less`) - * ``` - */ - readonly showLessAppsText = input(t(() => $localize`:@@SI_LAUNCHPAD.SHOW_LESS:Show less`)); + /** @deprecated This input no longer has an effect. {@link showMoreAppsText} is shown in all cases. */ + readonly showLessAppsText = input(); readonly favoriteChange = output(); diff --git a/projects/element-ng/application-header/launchpad/si-launchpad.spec.ts b/projects/element-ng/application-header/launchpad/si-launchpad.spec.ts index f31b7337e0..536a0b301f 100644 --- a/projects/element-ng/application-header/launchpad/si-launchpad.spec.ts +++ b/projects/element-ng/application-header/launchpad/si-launchpad.spec.ts @@ -55,8 +55,10 @@ describe('SiLaunchpad', () => { } ]); expect(await harness.hasToggle()).toBe(true); + expect(await harness.isExpanded()).toBe(false); expect(await harness.getCategories()).toHaveLength(1); await harness.toggleMore(); + expect(await harness.isExpanded()).toBe(true); expect(await harness.getCategories()).toHaveLength(2); expect(await harness.getCategory('C-1').then(category => category.getApps())).toHaveLength( 2 diff --git a/projects/element-ng/application-header/testing/si-launchpad.harness.ts b/projects/element-ng/application-header/testing/si-launchpad.harness.ts index 6de2db6ffb..dc44cd5262 100644 --- a/projects/element-ng/application-header/testing/si-launchpad.harness.ts +++ b/projects/element-ng/application-header/testing/si-launchpad.harness.ts @@ -32,6 +32,12 @@ export class SiLaunchpadHarness extends ComponentHarness { return this.toggleButton().then(toggle => !!toggle); } + async isExpanded(): Promise { + return (await this.toggleButton())! + .getAttribute('aria-expanded') + .then(value => value === 'true'); + } + async toggleMore(): Promise { return this.toggleButton().then(toggle => toggle!.click()); }