Skip to content

Commit 05836e3

Browse files
committed
fix: assistive text, search button focus, mol item height
1 parent 3d8aa0d commit 05836e3

File tree

9 files changed

+11
-1
lines changed

9 files changed

+11
-1
lines changed

packages/react/src/components/dropdownComponents/modularOptionList/ModularOptionList.module.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
display: flex;
8989
flex-grow: 1;
9090
justify-content: space-between;
91+
min-height: 24px;
9192

9293
> span.selected {
9394
color: var(--computed-menu-item-icon-color-selected);

packages/react/src/components/dropdownComponents/search/Search.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ const SearchField = forwardRef<SearchInputHandle, SearchFieldProps>(
114114
searchInputLabel: `${containerId}-search-input-label`,
115115
clearButton: `${containerId}-clear-button`,
116116
label: `${containerId}-label`,
117+
assistiveText: `${containerId}-assistive-text`,
117118
},
118119
textProvider: createTextProvider(texts),
119120
getOptionId: (option: Option) => {

packages/react/src/components/dropdownComponents/search/__snapshots__/Search.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ exports[`<Search /> spec renders the component 1`] = `
1818
class="inputWrapper"
1919
>
2020
<input
21+
aria-describedby="hds-search-1-assistive-text"
2122
aria-label="Hae"
2223
class="input hasClearButton"
2324
id="hds-search-1-search-input"

packages/react/src/components/dropdownComponents/search/components/AssistiveText.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ import {
1313

1414
function createAssistiveTextProps(dataHandlers: SearchDataHandlers): DivElementProps & { children: string | null } {
1515
const assistive = getTextFromDataHandlers('assistive', dataHandlers);
16+
const { getMetaData } = useSearchDataHandlers();
17+
const { elementIds } = getMetaData();
1618
return {
1719
className: styles.assistiveText,
1820
children: assistive || null,
21+
id: elementIds.assistiveText,
1922
};
2023
}
2124

packages/react/src/components/dropdownComponents/search/components/SearchInput.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ export const SearchInput = forwardRef<
197197
buttonIcon={onSend ? <IconSearch className={styles.searchButtonIcon} /> : undefined}
198198
onButtonClick={handleSearch}
199199
buttonAriaLabel={getTextKey('searchButtonAriaLabel', metaData)}
200+
aria-describedby={metaData.elementIds.assistiveText}
200201
/>
201202
);
202203
});

packages/react/src/components/dropdownComponents/search/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ export type SearchMetaData = Pick<SearchProps, 'icon'> &
9696
container: string;
9797
searchContainer: string;
9898
clearButton: string;
99+
assistiveText: string;
99100
};
100101
textProvider: TextProvider;
101102
search: string;

packages/react/src/components/header/components/headerActionBarItem/HeaderActionBarItem.module.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@
144144
:focus-visible,
145145
:focus {
146146
border: none;
147-
outline: none;
148147
outline-offset: none;
149148
}
150149
}

packages/react/src/components/header/components/headerSearch/HeaderSearch.module.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
}
5252

5353
> button {
54+
border: 0;
5455
padding: var(--spacing-s) var(--spacing-m);
5556
white-space: nowrap;
5657
}

packages/react/src/components/header/components/headerSearch/__snapshots__/HeaderSearch.test.tsx.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ exports[`<Header.HeaderSearch /> spec renders the component 1`] = `
139139
class="inputWrapper"
140140
>
141141
<input
142+
aria-describedby="header-search-search-component-assistive-text"
142143
aria-label="Hae"
143144
class="input hasClearButton"
144145
id="header-search-search-component-search-input"
@@ -181,6 +182,7 @@ exports[`<Header.HeaderSearch /> spec renders the component 1`] = `
181182
</div>
182183
<div
183184
class="assistiveText"
185+
id="header-search-search-component-assistive-text"
184186
>
185187
Avustava teksti
186188
</div>

0 commit comments

Comments
 (0)