Skip to content

Commit 6aab670

Browse files
authored
fix(ui5-search): visual issues (#12061)
FIXES: #11982 FIXES: #11964 FIXES: #11981 FIXES: #11999 FIXES: #12042 FIXES: #11955
1 parent 583f89f commit 6aab670

File tree

8 files changed

+62
-28
lines changed

8 files changed

+62
-28
lines changed

packages/fiori/src/SearchItem.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import SearchItemCss from "./generated/themes/SearchItem.css.js";
77
import generateHighlightedMarkup from "@ui5/webcomponents-base/dist/util/generateHighlightedMarkup.js";
88
import jsxRenderer from "@ui5/webcomponents-base/dist/renderer/JsxRenderer.js";
99
import event from "@ui5/webcomponents-base/dist/decorators/event-strict.js";
10+
import { SEARCH_ITEM_DELETE_BUTTON } from "./generated/i18n/i18n-defaults.js";
11+
import { i18n } from "@ui5/webcomponents-base/dist/decorators.js";
12+
import type I18nBundle from "@ui5/webcomponents-base/dist/i18nBundle.js";
1013

1114
/**
1215
* @class
@@ -112,6 +115,9 @@ class SearchItem extends ListItemBase {
112115

113116
_markupText = "";
114117

118+
@i18n("@ui5/webcomponents-fiori")
119+
static i18nBundle: I18nBundle;
120+
115121
_onfocusin(e: FocusEvent) {
116122
super._onfocusin(e);
117123

@@ -132,6 +138,10 @@ class SearchItem extends ListItemBase {
132138
// bold the matched text
133139
this._markupText = this.highlightText ? generateHighlightedMarkup((this.text || ""), this.highlightText) : (this.text || "");
134140
}
141+
142+
get _deleteButtonTooltip() {
143+
return SearchItem.i18nBundle.getText(SEARCH_ITEM_DELETE_BUTTON);
144+
}
135145
}
136146

137147
SearchItem.define();

packages/fiori/src/SearchItemTemplate.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function SearchFieldTemplate(this: SearchItem) {
4545
</div>
4646

4747
{this.deletable &&
48-
<Button class="ui5-search-item-selected-delete" design={ButtonDesign.Transparent} icon={decline} onClick={this._onDeleteButtonClick}></Button>
48+
<Button class="ui5-search-item-selected-delete" design={ButtonDesign.Transparent} icon={decline} onClick={this._onDeleteButtonClick} tooltip={this._deleteButtonTooltip}></Button>
4949
}
5050
</div>
5151
</div>

packages/fiori/src/i18n/messagebundle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ SHELLBAR_SEARCH_FIELD = Search Field
191191
#XACT: ARIA announcement for the search button
192192
SHELLBAR_SEARCH_BTN_OPEN = Open Search
193193

194+
#XACT: ARIA announcement for the search item delete button
195+
SEARCH_ITEM_DELETE_BUTTON=Remove Suggestion
194196

195197
#XACT: ARIA announcement for the more button
196198
SHELLBAR_OVERFLOW = More

packages/fiori/src/themes/Search.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@
9797
border-radius: var(--_ui5_popup_border_radius);
9898
}
9999

100-
.ui5-search-list {
101-
margin: .25rem;
102-
width: calc(100% - 0.5rem);
103-
}
104-
105100
.ui5-search-popover-phone .ui5-search-popover-content {
106101
position: relative;
107102
width: 100%;

packages/fiori/src/themes/SearchField.css

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@
9797
color: var(--sapShell_InteractiveTextColor);
9898
}
9999

100-
[ui5-select]::part(icon):hover {
101-
background-color: var(--sapShell_Hover_Background);
102-
}
103-
104100
[ui5-select]::part(popover) {
105101
background-color: var(--sapShellColor);
106102
}
@@ -196,8 +192,6 @@
196192
min-width: var(--_ui5_search_icon_size);
197193
height: var(--_ui5_search_icon_size);
198194
border-radius: var(--_ui5_search_icon_border_radius);
199-
margin-inline-end: 0.25rem;
200-
margin-inline-start: 0.1875rem;
201195
box-sizing: border-box;
202196
cursor: pointer;
203197
}
@@ -275,4 +269,31 @@
275269

276270
.ui5-search-field-select {
277271
--_ui5_input_focus_border_radius: var(--_ui5_search_input_border_radius);
272+
}
273+
274+
.ui5-search-field-select:hover,
275+
.ui5-search-field-select[focused] {
276+
background: var(--_ui5-search-wrapper-hover-background-color);
277+
}
278+
279+
.ui5-search-field-select::part(icon-wrapper) {
280+
border-radius: var(--_ui5_search_input_border_radius);
281+
height: 100%;
282+
}
283+
284+
.ui5-search-field-select[focused]::part(icon-wrapper) {
285+
box-shadow: var(--sapField_Hover_Shadow);
286+
}
287+
288+
:host(:not([collapsed]):hover):has([ui5-select]:hover) {
289+
background: var(--_ui5-search-wrapper-background);
290+
}
291+
292+
:host(:not([collapsed])):has([ui5-select][focused]) {
293+
background: var(--_ui5-search-wrapper-background);
294+
}
295+
296+
.ui5-search-field-inner-input::selection {
297+
background: var(--sapSelectedColor);
298+
color: var(--sapContent_ContrastTextColor);
278299
}
Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
[ui5-li-group-header]::part(native-li) {
2-
height: 100%;
3-
padding: 0.5625rem .5rem;
1+
:host {
2+
height: 2.75rem;
3+
background: var(--sapList_GroupHeaderBackground);
4+
color: var(--sapList_TableGroupHeaderTextColor);
45
}
56

6-
[ui5-li-group-header] {
7-
height: 2rem;
7+
.ui5-group-li-root {
8+
width: 100%;
9+
height: 100%;
10+
position: relative;
11+
box-sizing: border-box;
12+
padding: 0;
13+
margin: 0;
14+
list-style-type: none;
815
}
916

10-
[ui5-li-group-header]::part(native-li):focus:after {
11-
inset: 0 !important;
12-
border-radius: 8px;
17+
18+
[ui5-li-group-header] {
19+
border-bottom: var(--sapList_BorderWidth) solid var(--sapList_GroupHeaderBorderColor);
1320
}

packages/fiori/src/themes/SearchMessageArea.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
:host {
2-
width: calc(100% - 0.5rem);
2+
width: 100%;
33
border-bottom: 1px solid var(--sapGroup_TitleBorderColor);
44
box-sizing: border-box;
55
display: inline-block;
6-
margin-left: .25rem;
7-
margin-right: .25rem;
86
}
97

108
.ui5-search-message-area-wrapper {

packages/main/src/SelectTemplate.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ export default function SelectTemplate(this: Select) {
6262
}
6363

6464
{!this.icon && !this.readonly &&
65-
<div class={{
66-
"ui5-select-icon-root": true,
67-
"inputIcon": true,
68-
"inputIcon--pressed": this._iconPressed,
69-
}}>
65+
<div part="icon-wrapper"
66+
class={{
67+
"ui5-select-icon-root": true,
68+
"inputIcon": true,
69+
"inputIcon--pressed": this._iconPressed,
70+
}}>
7071
<Icon
7172
part="icon"
7273
name={slimArrowDown}

0 commit comments

Comments
 (0)