Skip to content

Commit 6d1d216

Browse files
committed
Update MultiSelectInput and InputContainer
1 parent 7a4a376 commit 6d1d216

File tree

5 files changed

+33
-18
lines changed

5 files changed

+33
-18
lines changed

packages/ui/src/components/InputContainer/styles.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
.input {
1313
padding-left:12px;
14-
height: 32px;
14+
height: 24px;
1515
}
1616
}
1717

packages/ui/src/components/SelectInputContainer/i18n.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"infoMessageMore":"more",
66
"buttonTitleSelect":"Select all",
77
"buttonTitleClear":"Clear",
8+
"buttonClearAll":"Clear All",
89
"buttonTitleClose":"Close",
910
"buttonTitleOpen":"Open",
1011
"selectInputPendingMessage":"Fetching options...",

packages/ui/src/components/SelectInputContainer/index.tsx

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import React, {
33
useRef,
44
} from 'react';
55
import {
6-
ArrowDownSmallFillIcon,
7-
ArrowUpSmallFillIcon,
86
CheckDoubleFillIcon,
7+
ChevronDownLineIcon,
8+
ChevronUpLineIcon,
99
CloseLineIcon,
1010
} from '@ifrc-go/icons';
1111
import {
@@ -304,17 +304,6 @@ function SelectInputContainer<
304304
<CheckDoubleFillIcon className={styles.icon} />
305305
</Button>
306306
)}
307-
{!readOnly && !nonClearable && hasValue && (
308-
<Button
309-
onClick={onClearButtonClick}
310-
disabled={disabled}
311-
variant="tertiary"
312-
name={undefined}
313-
title={strings.buttonTitleClear}
314-
>
315-
<CloseLineIcon className={styles.icon} />
316-
</Button>
317-
)}
318307
{!readOnly && (
319308
<Button
320309
onClick={handleToggleDropdown}
@@ -325,8 +314,8 @@ function SelectInputContainer<
325314
: strings.buttonTitleOpen}
326315
>
327316
{dropdownShownActual
328-
? <ArrowUpSmallFillIcon className={styles.icon} />
329-
: <ArrowDownSmallFillIcon className={styles.icon} />}
317+
? <ChevronUpLineIcon className={styles.icon} />
318+
: <ChevronDownLineIcon className={styles.icon} />}
330319
</Button>
331320
)}
332321
</>
@@ -355,6 +344,21 @@ function SelectInputContainer<
355344
parentRef={inputSectionRef}
356345
className={_cs(optionsPopupClassName, styles.popup)}
357346
>
347+
{!readOnly && !nonClearable && hasValue && !disabled && (
348+
<div className={styles.clearButton}>
349+
<Button
350+
onClick={onClearButtonClick}
351+
disabled={disabled}
352+
variant="secondary"
353+
name={undefined}
354+
title={strings.buttonTitleClear}
355+
>
356+
{strings.buttonClearAll}
357+
<CloseLineIcon className={styles.icon} />
358+
</Button>
359+
<div className={styles.clearAllBorder} />
360+
</div>
361+
)}
358362
<List<OPTION, OPTION_KEY, GenericOptionProps<RENDER_PROPS, OPTION_KEY, OPTION>>
359363
className={styles.list}
360364
data={options}

packages/ui/src/components/SelectInputContainer/styles.module.css

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
.popup {
2-
padding: var(--go-ui-spacing-sm) 0;
2+
padding: var(--go-ui-spacing-sm);
3+
4+
.clear-button {
5+
display: flex;
6+
flex-direction: column;
7+
gap: var(--go-ui-spacing-xs);
8+
9+
.clear-all-border {
10+
border: var(--go-ui-width-separator-sm) solid var(--go-ui-color-primary-red);
11+
}
12+
}
313

414
.list {
515
display: flex;

packages/ui/src/components/Tabs/Tab/styles.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989

9090
.step-circle {
9191
position: absolute;
92-
left: 40%;
92+
left: 45%;
9393
flex-shrink: 0;
9494
transition: var(--go-ui-duration-transition-slow) border-color ease-in-out;
9595
border: var(--border-width) solid transparent;

0 commit comments

Comments
 (0)