Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions src/organisms/Filter/Filter.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ export const Section = styled.section`
}
min-height: calc(48px - (2 * ${spacings.medium_small}));
align-items: center;
flex-grow: 1;
display: flex;
flex-wrap: wrap;
flex-grow: 1;
gap: ${spacings.x_small};
padding: ${spacings.medium_small} ${spacings.small};
cursor: text;
Expand All @@ -78,6 +77,13 @@ export const Section = styled.section`
}
`;

export const SearchAndValuesWrapper = styled.span`
display: flex;
flex-wrap: wrap;
flex-grow: 1;
gap: ${spacings.x_small};
`;

export const SearchField = styled.input`
background: transparent;
width: 0;
Expand Down
67 changes: 35 additions & 32 deletions src/organisms/Filter/Filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
import {
Container,
Content,
SearchAndValuesWrapper,
SearchField,
SearchFieldWrapper,
Section,
Expand Down Expand Up @@ -133,39 +134,41 @@ export function Filter<T extends string>({
data={search_icon}
color={colors.text.static_icons__tertiary.rgba}
/>
{(Object.keys(values) as Array<T>).flatMap((key) =>
values[key].map(({ label, icon }, index, list) => (
<StyledChip
key={`${label}-${index}-${key}`}
onDelete={() => onClearFilter(key, index)}
leadingIconData={icon}
$tryingToRemove={
attemptingToRemove === key && index === list.length - 1
}
>
{label}
</StyledChip>
))
)}
<SearchFieldWrapper>
{'autoCompleteOptions' in rest && rest.autoCompleteOptions && (
<AutoCompleteText
search={search}
autoCompleteOptions={rest.autoCompleteOptions}
/>
<SearchAndValuesWrapper>
{(Object.keys(values) as Array<T>).flatMap((key) =>
values[key].map(({ label, icon }, index, list) => (
<StyledChip
key={`${label}-${index}-${key}`}
onDelete={() => onClearFilter(key, index)}
leadingIconData={icon}
$tryingToRemove={
attemptingToRemove === key && index === list.length - 1
}
>
{label}
</StyledChip>
))
)}
<SearchField
ref={searchRef}
id={`filter-search-${id}`}
type="search"
autoComplete="off"
value={search}
placeholder={hasAnyValues ? undefined : placeholder}
onChange={onSearchChange}
onKeyDownCapture={handleOnKeyDown}
onFocus={handleOnFocus}
/>
</SearchFieldWrapper>
<SearchFieldWrapper>
{'autoCompleteOptions' in rest && rest.autoCompleteOptions && (
<AutoCompleteText
search={search}
autoCompleteOptions={rest.autoCompleteOptions}
/>
)}
<SearchField
ref={searchRef}
id={`filter-search-${id}`}
type="search"
autoComplete="off"
value={search}
placeholder={hasAnyValues ? undefined : placeholder}
onChange={onSearchChange}
onKeyDownCapture={handleOnKeyDown}
onFocus={handleOnFocus}
/>
</SearchFieldWrapper>
</SearchAndValuesWrapper>
{(Object.values(values) as SelectOptionRequired[][]).some(
(list) => list.length > 0
) && (
Expand Down
Loading