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

fix(ui5-search): change growing button to footer button #11155

Merged
merged 3 commits into from
Mar 25, 2025
Merged

fix(ui5-search): change growing button to footer button #11155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e33ec09
fix(ui5-search): change growing list to footer button
Mar 21, 2025
f27d4dc
Merge remote-tracking branch 'origin/main' into search-popup-button
Mar 21, 2025
ad4ff25
fix: apply comments
Mar 25, 2025
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
19 changes: 9 additions & 10 deletions packages/fiori/cypress/specs/Search.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,12 @@ describe("Properties", () => {
cy.get("[ui5-search]")
.shadow()
.find("[ui5-responsive-popover]")
.find("[ui5-list]")
.as("list");
.find(".ui5-search-footer-button")
.as("button");

cy.get("@list")
.should("have.attr", "growing", "Button")
.and("have.attr", "growing-button-text", "Show All");
cy.get("@button")
.should("exist")
.and("have.text", "Show All");
});
});

Expand Down Expand Up @@ -610,12 +610,11 @@ describe("Events", () => {

cy.get("[ui5-search]")
.shadow()
.find("[ui5-list]")
.as("list");
.find("[ui5-responsive-popover]")
.as("popup");

cy.get("@list")
.shadow()
.find(".ui5-growing-button")
cy.get("@popup")
.find(".ui5-search-footer-button")
.realClick();

cy.get("@actionPressed")
Expand Down
34 changes: 27 additions & 7 deletions packages/fiori/src/Search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
isHome,
isEnd,
isRight,
isTabPrevious,
} from "@ui5/webcomponents-base/dist/Keys.js";

import SearchTemplate from "./SearchTemplate.js";
Expand All @@ -28,7 +29,7 @@ import type UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
import type SearchItem from "./SearchItem.js";
import { renderFinished } from "@ui5/webcomponents-base/dist/Render.js";
import jsxRenderer from "@ui5/webcomponents-base/dist/renderer/JsxRenderer.js";
import ListGrowingMode from "@ui5/webcomponents/dist/types/ListGrowingMode.js";
import type Button from "@ui5/webcomponents/dist/Button.js";

interface ISearchSuggestionItem extends UI5Element {
selected: boolean;
Expand Down Expand Up @@ -137,6 +138,7 @@ class Search extends SearchField {

/**
* Defines whether the popup footer action button is shown.
* Note: The footer action button is displayed only when the `popupMode` is set to `List`.
* @default false
* @public
*/
Expand Down Expand Up @@ -383,18 +385,32 @@ class Search extends SearchField {
this._openPickerOnInput = false;
}

_onFooterButtonKeyDown(e: KeyboardEvent) {
if (isUp(e)) {
this._flattenItems[this._flattenItems.length - 1].focus();
}
if (isTabPrevious(e)) {
this._getItemsList().focus();
}
}

_onItemKeydown(e: KeyboardEvent) {
const items = this._getItemsList()?.getSlottedNodes<ISearchSuggestionItem>("items");
const isFirstItemGroup = items[1] === e.target && items[0]?.hasAttribute("ui5-li-group");
const isFirstItem = items[0] === e.target || isFirstItemGroup;
const isFirstItem = this._flattenItems[0] === e.target;
const isLastItem = this._flattenItems[this._flattenItems.length - 1] === e.target;
const isArrowUp = isUp(e);
const isArrowDown = isDown(e);
const isTab = isTabNext(e);

e.preventDefault();

if (isFirstItem && isArrowUp) {
this.nativeInput?.focus();
this._shouldAutocomplete = true;
}

if ((isLastItem && isArrowDown) || isTab) {
this._getFooterButton()?.focus();
}
}

_onItemClick(e: CustomEvent) {
Expand Down Expand Up @@ -470,7 +486,7 @@ class Search extends SearchField {
this.fireDecoratorEvent("open");
}

_handleMore() {
_onFooterButtonClick() {
this.fireDecoratorEvent("popup-action-press");
}

Expand Down Expand Up @@ -503,6 +519,10 @@ class Search extends SearchField {
return this._getPicker().querySelector(".ui5-search-list") as List;
}

_getFooterButton(): Button {
return this._getPicker().querySelector(".ui5-search-footer-button") as Button;
}

get _flattenItems(): Array<ISearchSuggestionItem> {
return this.getSlottedNodes<ISearchSuggestionItem>("items").flatMap(item => {
return this._isGroupItem(item) ? [item, ...item.items!] : [item];
Expand All @@ -527,8 +547,8 @@ class Search extends SearchField {
return !!this.headerText;
}

get _effectiveGrowing() {
return this.showPopupAction ? ListGrowingMode.Button : ListGrowingMode.None;
get _showFooter() {
return !!this.showPopupAction && this.popupMode === SearchPopupMode.List;
}
}

Expand Down
16 changes: 13 additions & 3 deletions packages/fiori/src/SearchPopoverTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import ListSeparator from "@ui5/webcomponents/dist/types/ListSeparator.js";
import TitleLevel from "@ui5/webcomponents/dist/types/TitleLevel.js";
import PopoverHorizontalAlign from "@ui5/webcomponents/dist/types/PopoverHorizontalAlign.js";
import PopoverPlacement from "@ui5/webcomponents/dist/types/PopoverPlacement.js";
import Button from "@ui5/webcomponents/dist/Button.js";
import ButtonDesign from "@ui5/webcomponents/dist/types/ButtonDesign.js";

export default function SearchPopoverTemplate(this: Search) {
return (
Expand Down Expand Up @@ -41,15 +43,23 @@ export default function SearchPopoverTemplate(this: Search) {
<main>
<List
class="ui5-search-list"
onLoadMore={this._handleMore}
separators={ListSeparator.None}
growingButtonText={this.popupActionText}
growing={this._effectiveGrowing}
onKeyDown={this._onItemKeydown}
onItemClick={this._onItemClick}>
<slot></slot>
</List>
</main>

{this._showFooter &&
<Button
slot="footer"
design={ButtonDesign.Transparent}
class="ui5-search-footer-button"
onKeyDown={this._onFooterButtonKeyDown}
onClick={this._onFooterButtonClick}>
{this.popupActionText}
</Button>
}
</>
)
)}
Expand Down
11 changes: 5 additions & 6 deletions packages/fiori/src/themes/Search.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@
width: auto;
}

.ui5-search-list::part(growing-button-inner) {
border-radius: .5rem;
.ui5-search-popover::part(footer) {
padding-bottom: 0.25rem;
padding-top: 0.5rem;
}

.ui5-search-list::part(growing-button) {
border-bottom: none;
padding-top: .25rem;
box-sizing: border-box;
.ui5-search-footer-button {
width: 100%;
}
16 changes: 8 additions & 8 deletions packages/fiori/src/themes/SearchField.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,14 @@
}

/* copy paste all button styles - could be simplified */
[ui5-button][desktop]:not([active])::part(button):after,
[ui5-button]:not([active])::part(button):focus-visible:after,
[ui5-button][desktop][active][design="Emphasized"]::part(button):focus-within:after,
[ui5-button][active][design="Emphasized"]::part(button):focus-visible:after,
[ui5-button][desktop][active]::part(button):focus-within:before,
[ui5-button][active]::part(button):focus-visible:before,
[ui5-button][design="Emphasized"][desktop]::part(button):focus-within:before,
[ui5-button][design="Emphasized"]::part(button):focus-visible:before {
.ui5-shell-search-field-button[desktop]:not([active])::part(button):after,
.ui5-shell-search-field-button:not([active])::part(button):focus-visible:after,
.ui5-shell-search-field-button[desktop][active][design="Emphasized"]::part(button):focus-within:after,
.ui5-shell-search-field-button[active][design="Emphasized"]::part(button):focus-visible:after,
.ui5-shell-search-field-button[desktop][active]::part(button):focus-within:before,
.ui5-shell-search-field-button[active]::part(button):focus-visible:before,
.ui5-shell-search-field-button[design="Emphasized"][desktop]::part(button):focus-within:before,
.ui5-shell-search-field-button[design="Emphasized"]::part(button):focus-visible:before {
border-radius: var(--_ui5_search_icon_border_radius);
}

Expand Down