@transferwise/components 46.130.2 → 46.130.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/dateInput/DateInput.js +12 -5
- package/build/dateInput/DateInput.js.map +1 -1
- package/build/dateInput/DateInput.mjs +11 -4
- package/build/dateInput/DateInput.mjs.map +1 -1
- package/build/expressiveMoneyInput/currencySelector/CurrencySelector.js +16 -8
- package/build/expressiveMoneyInput/currencySelector/CurrencySelector.js.map +1 -1
- package/build/expressiveMoneyInput/currencySelector/CurrencySelector.mjs +14 -6
- package/build/expressiveMoneyInput/currencySelector/CurrencySelector.mjs.map +1 -1
- package/build/index.js +12 -7
- package/build/index.js.map +1 -1
- package/build/index.mjs +9 -3
- package/build/index.mjs.map +1 -1
- package/build/inputs/{_BottomSheet.js → SelectInput/BottomSheet/SelectInputBottomSheet.js} +7 -7
- package/build/inputs/SelectInput/BottomSheet/SelectInputBottomSheet.js.map +1 -0
- package/build/inputs/{_BottomSheet.mjs → SelectInput/BottomSheet/SelectInputBottomSheet.mjs} +7 -7
- package/build/inputs/SelectInput/BottomSheet/SelectInputBottomSheet.mjs.map +1 -0
- package/build/inputs/{_ButtonInput.js → SelectInput/ButtonInput/SelectInputButtonInput.js} +5 -5
- package/build/inputs/SelectInput/ButtonInput/SelectInputButtonInput.js.map +1 -0
- package/build/inputs/{_ButtonInput.mjs → SelectInput/ButtonInput/SelectInputButtonInput.mjs} +5 -5
- package/build/inputs/SelectInput/ButtonInput/SelectInputButtonInput.mjs.map +1 -0
- package/build/inputs/SelectInput/ClearButton/SelectInputClearButton.js +26 -0
- package/build/inputs/SelectInput/ClearButton/SelectInputClearButton.js.map +1 -0
- package/build/inputs/SelectInput/ClearButton/SelectInputClearButton.mjs +24 -0
- package/build/inputs/SelectInput/ClearButton/SelectInputClearButton.mjs.map +1 -0
- package/build/inputs/SelectInput/DefaultRenderTrigger/SelectInputDefaultRenderTrigger.js +59 -0
- package/build/inputs/SelectInput/DefaultRenderTrigger/SelectInputDefaultRenderTrigger.js.map +1 -0
- package/build/inputs/SelectInput/DefaultRenderTrigger/SelectInputDefaultRenderTrigger.mjs +56 -0
- package/build/inputs/SelectInput/DefaultRenderTrigger/SelectInputDefaultRenderTrigger.mjs.map +1 -0
- package/build/inputs/SelectInput/ItemView/GroupItemView/SelectInputGroupItemView.js +50 -0
- package/build/inputs/SelectInput/ItemView/GroupItemView/SelectInputGroupItemView.js.map +1 -0
- package/build/inputs/SelectInput/ItemView/GroupItemView/SelectInputGroupItemView.mjs +48 -0
- package/build/inputs/SelectInput/ItemView/GroupItemView/SelectInputGroupItemView.mjs.map +1 -0
- package/build/inputs/SelectInput/ItemView/SelectInputItemView.js +47 -0
- package/build/inputs/SelectInput/ItemView/SelectInputItemView.js.map +1 -0
- package/build/inputs/SelectInput/ItemView/SelectInputItemView.mjs +45 -0
- package/build/inputs/SelectInput/ItemView/SelectInputItemView.mjs.map +1 -0
- package/build/inputs/SelectInput/Option/SelectInputOption.js +42 -0
- package/build/inputs/SelectInput/Option/SelectInputOption.js.map +1 -0
- package/build/inputs/SelectInput/Option/SelectInputOption.mjs +40 -0
- package/build/inputs/SelectInput/Option/SelectInputOption.mjs.map +1 -0
- package/build/inputs/SelectInput/OptionContent/SelectInputOptionContent.js +40 -0
- package/build/inputs/SelectInput/OptionContent/SelectInputOptionContent.js.map +1 -0
- package/build/inputs/SelectInput/OptionContent/SelectInputOptionContent.mjs +38 -0
- package/build/inputs/SelectInput/OptionContent/SelectInputOptionContent.mjs.map +1 -0
- package/build/inputs/SelectInput/Options/OptionsContainer/SelectInputOptionsContainer.js +48 -0
- package/build/inputs/SelectInput/Options/OptionsContainer/SelectInputOptionsContainer.js.map +1 -0
- package/build/inputs/SelectInput/Options/OptionsContainer/SelectInputOptionsContainer.mjs +46 -0
- package/build/inputs/SelectInput/Options/OptionsContainer/SelectInputOptionsContainer.mjs.map +1 -0
- package/build/inputs/SelectInput/Options/SelectInputOptions.js +300 -0
- package/build/inputs/SelectInput/Options/SelectInputOptions.js.map +1 -0
- package/build/inputs/SelectInput/Options/SelectInputOptions.mjs +298 -0
- package/build/inputs/SelectInput/Options/SelectInputOptions.mjs.map +1 -0
- package/build/inputs/{_Popover.js → SelectInput/Popover/SelectInputPopover.js} +7 -7
- package/build/inputs/SelectInput/Popover/SelectInputPopover.js.map +1 -0
- package/build/inputs/{_Popover.mjs → SelectInput/Popover/SelectInputPopover.mjs} +7 -7
- package/build/inputs/SelectInput/Popover/SelectInputPopover.mjs.map +1 -0
- package/build/inputs/SelectInput/SelectInput.contexts.js +29 -0
- package/build/inputs/SelectInput/SelectInput.contexts.js.map +1 -0
- package/build/inputs/SelectInput/SelectInput.contexts.mjs +24 -0
- package/build/inputs/SelectInput/SelectInput.contexts.mjs.map +1 -0
- package/build/inputs/SelectInput/SelectInput.js +222 -0
- package/build/inputs/SelectInput/SelectInput.js.map +1 -0
- package/build/inputs/SelectInput/SelectInput.messages.js.map +1 -0
- package/build/inputs/SelectInput/SelectInput.messages.mjs.map +1 -0
- package/build/inputs/SelectInput/SelectInput.mjs +216 -0
- package/build/inputs/SelectInput/SelectInput.mjs.map +1 -0
- package/build/inputs/SelectInput/SelectInput.utils.js +164 -0
- package/build/inputs/SelectInput/SelectInput.utils.js.map +1 -0
- package/build/inputs/SelectInput/SelectInput.utils.mjs +154 -0
- package/build/inputs/SelectInput/SelectInput.utils.mjs.map +1 -0
- package/build/inputs/SelectInput/TriggerButton/SelectInputTriggerButton.js +42 -0
- package/build/inputs/SelectInput/TriggerButton/SelectInputTriggerButton.js.map +1 -0
- package/build/inputs/SelectInput/TriggerButton/SelectInputTriggerButton.mjs +36 -0
- package/build/inputs/SelectInput/TriggerButton/SelectInputTriggerButton.mjs.map +1 -0
- package/build/main.css +90 -90
- package/build/moneyInput/MoneyInput.js +9 -2
- package/build/moneyInput/MoneyInput.js.map +1 -1
- package/build/moneyInput/MoneyInput.mjs +8 -1
- package/build/moneyInput/MoneyInput.mjs.map +1 -1
- package/build/phoneNumberInput/PhoneNumberInput.js +10 -3
- package/build/phoneNumberInput/PhoneNumberInput.js.map +1 -1
- package/build/phoneNumberInput/PhoneNumberInput.mjs +9 -2
- package/build/phoneNumberInput/PhoneNumberInput.mjs.map +1 -1
- package/build/styles/inputs/SelectInput/BottomSheet/SelectInputBottomSheet.css +96 -0
- package/build/styles/inputs/SelectInput/ButtonInput/SelectInputButtonInput.css +16 -0
- package/build/styles/inputs/SelectInput/ClearButton/SelectInputClearButton.css +46 -0
- package/build/styles/inputs/SelectInput/ItemView/SelectInputItemView.css +16 -0
- package/build/styles/inputs/SelectInput/Option/SelectInputOption.css +33 -0
- package/build/styles/inputs/SelectInput/OptionContent/SelectInputOptionContent.css +37 -0
- package/build/styles/inputs/SelectInput/Options/SelectInputOptions.css +81 -0
- package/build/styles/inputs/SelectInput/Popover/SelectInputPopover.css +46 -0
- package/build/styles/main.css +90 -90
- package/build/types/index.d.ts +1 -1
- package/build/types/index.d.ts.map +1 -1
- package/build/types/inputs/{_BottomSheet.d.ts → SelectInput/BottomSheet/SelectInputBottomSheet.d.ts} +3 -3
- package/build/types/inputs/SelectInput/BottomSheet/SelectInputBottomSheet.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/BottomSheet/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/BottomSheet/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/ButtonInput/SelectInputButtonInput.d.ts +5 -0
- package/build/types/inputs/SelectInput/ButtonInput/SelectInputButtonInput.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/ButtonInput/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/ButtonInput/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/ClearButton/SelectInputClearButton.d.ts +7 -0
- package/build/types/inputs/SelectInput/ClearButton/SelectInputClearButton.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/ClearButton/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/ClearButton/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/DefaultRenderTrigger/SelectInputDefaultRenderTrigger.d.ts +16 -0
- package/build/types/inputs/SelectInput/DefaultRenderTrigger/SelectInputDefaultRenderTrigger.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/DefaultRenderTrigger/index.d.ts +2 -0
- package/build/types/inputs/SelectInput/DefaultRenderTrigger/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/ItemView/GroupItemView/SelectInputGroupItemView.d.ts +9 -0
- package/build/types/inputs/SelectInput/ItemView/GroupItemView/SelectInputGroupItemView.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/ItemView/GroupItemView/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/ItemView/GroupItemView/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/ItemView/SelectInputItemView.d.ts +11 -0
- package/build/types/inputs/SelectInput/ItemView/SelectInputItemView.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/ItemView/index.d.ts +4 -0
- package/build/types/inputs/SelectInput/ItemView/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/Option/SelectInputOption.d.ts +11 -0
- package/build/types/inputs/SelectInput/Option/SelectInputOption.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/Option/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/Option/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/OptionContent/SelectInputOptionContent.d.ts +13 -0
- package/build/types/inputs/SelectInput/OptionContent/SelectInputOptionContent.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/OptionContent/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/OptionContent/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/Options/OptionsContainer/SelectInputOptionsContainer.d.ts +9 -0
- package/build/types/inputs/SelectInput/Options/OptionsContainer/SelectInputOptionsContainer.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/Options/OptionsContainer/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/Options/OptionsContainer/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/Options/SelectInputOptions.d.ts +21 -0
- package/build/types/inputs/SelectInput/Options/SelectInputOptions.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/Options/index.d.ts +4 -0
- package/build/types/inputs/SelectInput/Options/index.d.ts.map +1 -0
- package/build/types/inputs/{_Popover.d.ts → SelectInput/Popover/SelectInputPopover.d.ts} +3 -3
- package/build/types/inputs/SelectInput/Popover/SelectInputPopover.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/Popover/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/Popover/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/SelectInput.contexts.d.ts +33 -0
- package/build/types/inputs/SelectInput/SelectInput.contexts.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/SelectInput.d.ts +10 -0
- package/build/types/inputs/SelectInput/SelectInput.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/SelectInput.messages.d.ts.map +1 -0
- package/build/types/inputs/{SelectInput.d.ts → SelectInput/SelectInput.types.d.ts} +12 -38
- package/build/types/inputs/SelectInput/SelectInput.types.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/SelectInput.utils.d.ts +60 -0
- package/build/types/inputs/SelectInput/SelectInput.utils.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/TriggerButton/SelectInputTriggerButton.d.ts +12 -0
- package/build/types/inputs/SelectInput/TriggerButton/SelectInputTriggerButton.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/TriggerButton/index.d.ts +3 -0
- package/build/types/inputs/SelectInput/TriggerButton/index.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/components.d.ts +10 -0
- package/build/types/inputs/SelectInput/components.d.ts.map +1 -0
- package/build/types/inputs/SelectInput/index.d.ts +10 -0
- package/build/types/inputs/SelectInput/index.d.ts.map +1 -0
- package/package.json +1 -1
- package/src/index.ts +0 -1
- package/src/inputs/SelectInput/BottomSheet/SelectInputBottomSheet.css +96 -0
- package/src/inputs/{_BottomSheet.tsx → SelectInput/BottomSheet/SelectInputBottomSheet.tsx} +7 -7
- package/src/inputs/SelectInput/BottomSheet/index.ts +2 -0
- package/src/inputs/SelectInput/ButtonInput/SelectInputButtonInput.css +16 -0
- package/src/inputs/{_ButtonInput.tsx → SelectInput/ButtonInput/SelectInputButtonInput.tsx} +5 -5
- package/src/inputs/SelectInput/ButtonInput/index.ts +2 -0
- package/src/inputs/SelectInput/ClearButton/SelectInputClearButton.css +46 -0
- package/src/inputs/SelectInput/ClearButton/SelectInputClearButton.less +39 -0
- package/src/inputs/SelectInput/ClearButton/SelectInputClearButton.tsx +27 -0
- package/src/inputs/SelectInput/ClearButton/index.ts +2 -0
- package/src/inputs/SelectInput/DefaultRenderTrigger/SelectInputDefaultRenderTrigger.tsx +74 -0
- package/src/inputs/SelectInput/DefaultRenderTrigger/index.ts +5 -0
- package/src/inputs/SelectInput/ItemView/GroupItemView/SelectInputGroupItemView.tsx +61 -0
- package/src/inputs/SelectInput/ItemView/GroupItemView/index.ts +2 -0
- package/src/inputs/SelectInput/ItemView/SelectInputItemView.css +16 -0
- package/src/inputs/SelectInput/ItemView/SelectInputItemView.less +17 -0
- package/src/inputs/SelectInput/ItemView/SelectInputItemView.tsx +48 -0
- package/src/inputs/SelectInput/ItemView/index.ts +3 -0
- package/src/inputs/SelectInput/Option/SelectInputOption.css +33 -0
- package/src/inputs/SelectInput/Option/SelectInputOption.less +32 -0
- package/src/inputs/SelectInput/Option/SelectInputOption.tsx +57 -0
- package/src/inputs/SelectInput/Option/index.ts +2 -0
- package/src/inputs/SelectInput/OptionContent/SelectInputOptionContent.css +37 -0
- package/src/inputs/SelectInput/OptionContent/SelectInputOptionContent.less +38 -0
- package/src/inputs/SelectInput/OptionContent/SelectInputOptionContent.tsx +72 -0
- package/src/inputs/SelectInput/OptionContent/index.ts +2 -0
- package/src/inputs/SelectInput/Options/OptionsContainer/SelectInputOptionsContainer.tsx +59 -0
- package/src/inputs/SelectInput/Options/OptionsContainer/index.ts +2 -0
- package/src/inputs/SelectInput/Options/SelectInputOptions.css +81 -0
- package/src/inputs/SelectInput/Options/SelectInputOptions.less +77 -0
- package/src/inputs/SelectInput/Options/SelectInputOptions.tsx +411 -0
- package/src/inputs/SelectInput/Options/index.ts +3 -0
- package/src/inputs/SelectInput/Popover/SelectInputPopover.css +46 -0
- package/src/inputs/{_Popover.tsx → SelectInput/Popover/SelectInputPopover.tsx} +7 -7
- package/src/inputs/SelectInput/Popover/index.ts +2 -0
- package/src/inputs/SelectInput/SelectInput.contexts.tsx +40 -0
- package/src/inputs/SelectInput/SelectInput.less +22 -0
- package/src/inputs/{SelectInput.test.tsx → SelectInput/SelectInput.test.tsx} +9 -11
- package/src/inputs/SelectInput/SelectInput.tsx +257 -0
- package/src/inputs/SelectInput/SelectInput.types.ts +113 -0
- package/src/inputs/SelectInput/SelectInput.utils.ts +205 -0
- package/src/inputs/SelectInput/TriggerButton/SelectInputTriggerButton.tsx +36 -0
- package/src/inputs/SelectInput/TriggerButton/index.ts +5 -0
- package/src/inputs/{SelectInput.docs.mdx → SelectInput/_stories/SelectInput.docs.mdx} +0 -1
- package/src/inputs/{SelectInput.story.tsx → SelectInput/_stories/SelectInput.story.tsx} +11 -8
- package/src/inputs/{SelectInput.test.story.tsx → SelectInput/_stories/SelectInput.test.story.tsx} +6 -10
- package/src/inputs/SelectInput/components.ts +10 -0
- package/src/inputs/SelectInput/index.ts +12 -0
- package/src/main.css +90 -90
- package/src/main.less +1 -1
- package/build/inputs/SelectInput.js +0 -890
- package/build/inputs/SelectInput.js.map +0 -1
- package/build/inputs/SelectInput.messages.js.map +0 -1
- package/build/inputs/SelectInput.messages.mjs.map +0 -1
- package/build/inputs/SelectInput.mjs +0 -881
- package/build/inputs/SelectInput.mjs.map +0 -1
- package/build/inputs/_BottomSheet.js.map +0 -1
- package/build/inputs/_BottomSheet.mjs.map +0 -1
- package/build/inputs/_ButtonInput.js.map +0 -1
- package/build/inputs/_ButtonInput.mjs.map +0 -1
- package/build/inputs/_Popover.js.map +0 -1
- package/build/inputs/_Popover.mjs.map +0 -1
- package/build/types/inputs/SelectInput.d.ts.map +0 -1
- package/build/types/inputs/SelectInput.messages.d.ts.map +0 -1
- package/build/types/inputs/_BottomSheet.d.ts.map +0 -1
- package/build/types/inputs/_ButtonInput.d.ts +0 -5
- package/build/types/inputs/_ButtonInput.d.ts.map +0 -1
- package/build/types/inputs/_Popover.d.ts.map +0 -1
- package/src/inputs/SelectInput.less +0 -219
- package/src/inputs/SelectInput.tsx +0 -1269
- package/build/inputs/{SelectInput.messages.js → SelectInput/SelectInput.messages.js} +0 -0
- package/build/inputs/{SelectInput.messages.mjs → SelectInput/SelectInput.messages.mjs} +0 -0
- package/build/styles/inputs/{SelectInput.css → SelectInput/SelectInput.css} +90 -90
- package/build/types/inputs/{SelectInput.messages.d.ts → SelectInput/SelectInput.messages.d.ts} +0 -0
- package/src/inputs/{_BottomSheet.less → SelectInput/BottomSheet/SelectInputBottomSheet.less} +0 -0
- package/src/inputs/{_ButtonInput.less → SelectInput/ButtonInput/SelectInputButtonInput.less} +0 -0
- package/src/inputs/{_Popover.less → SelectInput/Popover/SelectInputPopover.less} +0 -0
- package/src/inputs/{SelectInput.css → SelectInput/SelectInput.css} +90 -90
- /package/src/inputs/{SelectInput.messages.ts → SelectInput/SelectInput.messages.ts} +0 -0
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { Cross } from '@transferwise/icons';
|
|
2
|
+
import { clsx } from 'clsx';
|
|
3
|
+
import { useIntl } from 'react-intl';
|
|
4
|
+
import dateTriggerMessages from '../../../dateLookup/dateTrigger/DateTrigger.messages';
|
|
5
|
+
|
|
6
|
+
export interface SelectInputClearButtonProps extends Pick<
|
|
7
|
+
React.ComponentPropsWithoutRef<'button'>,
|
|
8
|
+
'className' | 'onClick'
|
|
9
|
+
> {}
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* A button component used to clear the selected value in a SelectInput.
|
|
13
|
+
*/
|
|
14
|
+
export function SelectInputClearButton({ className, onClick }: SelectInputClearButtonProps) {
|
|
15
|
+
const intl = useIntl();
|
|
16
|
+
|
|
17
|
+
return (
|
|
18
|
+
<button
|
|
19
|
+
type="button"
|
|
20
|
+
aria-label={intl.formatMessage(dateTriggerMessages.ariaLabel)}
|
|
21
|
+
className={clsx(className, 'np-select-input-addon np-select-input-addon--interactive')}
|
|
22
|
+
onClick={onClick}
|
|
23
|
+
>
|
|
24
|
+
<Cross size={16} />
|
|
25
|
+
</button>
|
|
26
|
+
);
|
|
27
|
+
}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { ChevronDown } from '@transferwise/icons';
|
|
2
|
+
import { clsx } from 'clsx';
|
|
3
|
+
import React from 'react';
|
|
4
|
+
|
|
5
|
+
import { InputGroup } from '../../InputGroup';
|
|
6
|
+
import { SelectInputClearButton } from '../ClearButton';
|
|
7
|
+
import { SelectInputTriggerButton } from '../TriggerButton';
|
|
8
|
+
import { SelectInputProps } from '../SelectInput.types';
|
|
9
|
+
import { SelectInputButtonInput } from '../ButtonInput';
|
|
10
|
+
|
|
11
|
+
export interface SelectInputDefaultRenderTriggerProps {
|
|
12
|
+
content: React.ReactNode;
|
|
13
|
+
placeholderShown: boolean;
|
|
14
|
+
clear: (() => void) | undefined;
|
|
15
|
+
disabled: boolean;
|
|
16
|
+
size: 'sm' | 'md' | 'lg';
|
|
17
|
+
className: string | undefined;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Default render function for the SelectInput trigger.
|
|
22
|
+
* Displays the selected value or placeholder with clear button and dropdown indicator.
|
|
23
|
+
*/
|
|
24
|
+
export function SelectInputDefaultRenderTrigger({
|
|
25
|
+
content,
|
|
26
|
+
placeholderShown,
|
|
27
|
+
clear,
|
|
28
|
+
disabled,
|
|
29
|
+
size,
|
|
30
|
+
className,
|
|
31
|
+
}: SelectInputDefaultRenderTriggerProps) {
|
|
32
|
+
return (
|
|
33
|
+
<InputGroup
|
|
34
|
+
addonEnd={{
|
|
35
|
+
content: (
|
|
36
|
+
<span className={clsx('np-select-input-addon-container', disabled && 'disabled')}>
|
|
37
|
+
{clear != null && !placeholderShown ? (
|
|
38
|
+
<>
|
|
39
|
+
<SelectInputClearButton
|
|
40
|
+
onClick={(event) => {
|
|
41
|
+
event.preventDefault();
|
|
42
|
+
clear();
|
|
43
|
+
}}
|
|
44
|
+
/>
|
|
45
|
+
<span className="np-select-input-addon-separator" />
|
|
46
|
+
</>
|
|
47
|
+
) : null}
|
|
48
|
+
<span className="np-select-input-addon">
|
|
49
|
+
<ChevronDown size={16} />
|
|
50
|
+
</span>
|
|
51
|
+
</span>
|
|
52
|
+
),
|
|
53
|
+
initialContentWidth: 24 + 4,
|
|
54
|
+
padding: 'sm',
|
|
55
|
+
}}
|
|
56
|
+
disabled={disabled}
|
|
57
|
+
className={className}
|
|
58
|
+
>
|
|
59
|
+
<SelectInputTriggerButton as={SelectInputButtonInput} size={size}>
|
|
60
|
+
<span
|
|
61
|
+
className={clsx(
|
|
62
|
+
'np-select-input-content',
|
|
63
|
+
placeholderShown && 'np-select-input-placeholder',
|
|
64
|
+
)}
|
|
65
|
+
>
|
|
66
|
+
{content}
|
|
67
|
+
</span>
|
|
68
|
+
</SelectInputTriggerButton>
|
|
69
|
+
</InputGroup>
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export const DefaultRenderTrigger =
|
|
74
|
+
SelectInputDefaultRenderTrigger satisfies SelectInputProps['renderTrigger'];
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { clsx } from 'clsx';
|
|
2
|
+
import { useId } from 'react';
|
|
3
|
+
import Header from '../../../../header';
|
|
4
|
+
import Section from '../../../../section';
|
|
5
|
+
import { SelectInputGroupItem } from '../../SelectInput.types';
|
|
6
|
+
import { SelectInputItemView, SelectInputItemViewProps } from '..';
|
|
7
|
+
|
|
8
|
+
export interface SelectInputGroupItemViewProps<T = string> extends SelectInputItemViewProps<
|
|
9
|
+
T,
|
|
10
|
+
SelectInputGroupItem<T | undefined>
|
|
11
|
+
> {}
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Component that renders a group of SelectInput options with a header.
|
|
15
|
+
*/
|
|
16
|
+
export function SelectInputGroupItemView<T = string>({
|
|
17
|
+
item,
|
|
18
|
+
renderValue,
|
|
19
|
+
needle,
|
|
20
|
+
}: SelectInputGroupItemViewProps<T>) {
|
|
21
|
+
const headerId = useId();
|
|
22
|
+
|
|
23
|
+
const header = (
|
|
24
|
+
<Header
|
|
25
|
+
as="header"
|
|
26
|
+
role="none"
|
|
27
|
+
id={headerId}
|
|
28
|
+
title={item.label}
|
|
29
|
+
// @ts-expect-error when we migrate ActionButton to new Button this should be sorted
|
|
30
|
+
action={
|
|
31
|
+
item.action && {
|
|
32
|
+
text: item.action.label,
|
|
33
|
+
onClick: item.action.onClick,
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
className="np-select-input-group-item-header p-x-1"
|
|
37
|
+
/>
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
return (
|
|
41
|
+
// An empty container may be rendered when no options match `needle`
|
|
42
|
+
// However, pre-filtering would result in worse performance overall
|
|
43
|
+
<Section
|
|
44
|
+
as="section"
|
|
45
|
+
role="group"
|
|
46
|
+
aria-labelledby={headerId}
|
|
47
|
+
className={clsx('m-y-0', needle === null && 'np-select-input-group-item--without-needle')}
|
|
48
|
+
>
|
|
49
|
+
{needle == null ? header : null}
|
|
50
|
+
{item.options.map((option, index) => (
|
|
51
|
+
<SelectInputItemView
|
|
52
|
+
// eslint-disable-next-line react/no-array-index-key
|
|
53
|
+
key={index}
|
|
54
|
+
item={option}
|
|
55
|
+
renderValue={renderValue}
|
|
56
|
+
needle={needle}
|
|
57
|
+
/>
|
|
58
|
+
))}
|
|
59
|
+
</Section>
|
|
60
|
+
);
|
|
61
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
.np-select-input-group-item--without-needle:first-child {
|
|
2
|
+
margin-top: calc(-1 * 8px);
|
|
3
|
+
margin-top: calc(-1 * var(--size-8));
|
|
4
|
+
}
|
|
5
|
+
.np-select-input-group-item-header {
|
|
6
|
+
position: sticky;
|
|
7
|
+
top: 0px;
|
|
8
|
+
z-index: 10;
|
|
9
|
+
background-color: #ffffff;
|
|
10
|
+
background-color: var(--color-background-elevated);
|
|
11
|
+
}
|
|
12
|
+
.np-select-input-separator-item {
|
|
13
|
+
margin: 8px;
|
|
14
|
+
margin: var(--size-8);
|
|
15
|
+
border-top-width: 1px;
|
|
16
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
.np-select-input-group-item {
|
|
2
|
+
&--without-needle:first-child {
|
|
3
|
+
margin-top: calc(-1 * var(--size-8));
|
|
4
|
+
}
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
.np-select-input-group-item-header {
|
|
8
|
+
position: sticky;
|
|
9
|
+
top: 0px;
|
|
10
|
+
z-index: 10;
|
|
11
|
+
background-color: var(--color-background-elevated);
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
.np-select-input-separator-item {
|
|
15
|
+
margin: var(--size-8);
|
|
16
|
+
border-top-width: 1px;
|
|
17
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { selectInputOptionItemIncludesNeedle } from '../SelectInput.utils';
|
|
2
|
+
import { SelectInputItem, SelectInputProps } from '../SelectInput.types';
|
|
3
|
+
import { SelectInputOption } from '../Option';
|
|
4
|
+
import { SelectInputGroupItemView } from './GroupItemView';
|
|
5
|
+
|
|
6
|
+
export interface SelectInputItemViewProps<
|
|
7
|
+
T = string,
|
|
8
|
+
I extends SelectInputItem<T | undefined> = SelectInputItem<T | undefined>,
|
|
9
|
+
> extends Required<Pick<SelectInputProps<T>, 'renderValue'>> {
|
|
10
|
+
item: I;
|
|
11
|
+
needle: string | null | undefined;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Component that renders different types of SelectInput items:
|
|
16
|
+
* options, groups, or separators.
|
|
17
|
+
*/
|
|
18
|
+
export function SelectInputItemView<T = string>({
|
|
19
|
+
item,
|
|
20
|
+
renderValue,
|
|
21
|
+
needle,
|
|
22
|
+
}: SelectInputItemViewProps<T>) {
|
|
23
|
+
switch (item.type) {
|
|
24
|
+
case 'option': {
|
|
25
|
+
if (
|
|
26
|
+
item.value != null &&
|
|
27
|
+
(needle == null || selectInputOptionItemIncludesNeedle(item, needle))
|
|
28
|
+
) {
|
|
29
|
+
return (
|
|
30
|
+
<SelectInputOption value={item.value} disabled={item.disabled}>
|
|
31
|
+
{renderValue(item.value, false)}
|
|
32
|
+
</SelectInputOption>
|
|
33
|
+
);
|
|
34
|
+
}
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
case 'group': {
|
|
38
|
+
return <SelectInputGroupItemView item={item} renderValue={renderValue} needle={needle} />;
|
|
39
|
+
}
|
|
40
|
+
case 'separator': {
|
|
41
|
+
if (needle == null) {
|
|
42
|
+
return <hr className="np-select-input-separator-item" />;
|
|
43
|
+
}
|
|
44
|
+
break;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return null;
|
|
48
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
.np-select-input-option-container {
|
|
2
|
+
display: flex;
|
|
3
|
+
cursor: default;
|
|
4
|
+
-webkit-user-select: none;
|
|
5
|
+
-moz-user-select: none;
|
|
6
|
+
user-select: none;
|
|
7
|
+
align-items: center;
|
|
8
|
+
-moz-column-gap: 8px;
|
|
9
|
+
column-gap: 8px;
|
|
10
|
+
-moz-column-gap: var(--size-8);
|
|
11
|
+
column-gap: var(--size-8);
|
|
12
|
+
border-radius: 10px;
|
|
13
|
+
border-radius: var(--radius-small);
|
|
14
|
+
padding: 12px 16px;
|
|
15
|
+
padding: var(--size-12) var(--size-16);
|
|
16
|
+
color: var(--color-interactive-primary);
|
|
17
|
+
}
|
|
18
|
+
.np-select-input-option-container:focus {
|
|
19
|
+
outline: none;
|
|
20
|
+
}
|
|
21
|
+
.np-select-input-option-container--active {
|
|
22
|
+
box-shadow: inset 0 0 0 1px #c9cbce;
|
|
23
|
+
box-shadow: inset 0 0 0 1px var(--color-interactive-secondary);
|
|
24
|
+
}
|
|
25
|
+
.np-select-input-option-container--disabled {
|
|
26
|
+
opacity: 0.45;
|
|
27
|
+
}
|
|
28
|
+
.np-select-input-option-check--not-selected {
|
|
29
|
+
visibility: hidden;
|
|
30
|
+
}
|
|
31
|
+
.np-select-input-option {
|
|
32
|
+
flex: 1;
|
|
33
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
.np-select-input-option-container {
|
|
2
|
+
display: flex;
|
|
3
|
+
cursor: default;
|
|
4
|
+
user-select: none;
|
|
5
|
+
align-items: center;
|
|
6
|
+
column-gap: var(--size-8);
|
|
7
|
+
border-radius: var(--radius-small);
|
|
8
|
+
padding: var(--size-12) var(--size-16);
|
|
9
|
+
color: var(--color-interactive-primary);
|
|
10
|
+
|
|
11
|
+
&:focus {
|
|
12
|
+
outline: none;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
&--active {
|
|
16
|
+
box-shadow: inset 0 0 0 1px var(--color-interactive-secondary);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
&--disabled {
|
|
20
|
+
opacity: 0.45;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
.np-select-input-option-check {
|
|
25
|
+
&--not-selected {
|
|
26
|
+
visibility: hidden;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
.np-select-input-option {
|
|
31
|
+
flex: 1;
|
|
32
|
+
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { Check } from '@transferwise/icons';
|
|
2
|
+
import { clsx } from 'clsx';
|
|
3
|
+
import { useContext } from 'react';
|
|
4
|
+
import { ListboxOption } from '@headlessui/react';
|
|
5
|
+
import {
|
|
6
|
+
SelectInputItemsCountContext,
|
|
7
|
+
SelectInputItemPositionContext,
|
|
8
|
+
} from '../SelectInput.contexts';
|
|
9
|
+
|
|
10
|
+
export interface SelectInputOptionProps<T = string> {
|
|
11
|
+
value: T;
|
|
12
|
+
disabled?: boolean;
|
|
13
|
+
children?: React.ReactNode;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* A selectable option in a SelectInput dropdown.
|
|
18
|
+
* Includes accessibility support and styling for selected, active, and disabled states.
|
|
19
|
+
*/
|
|
20
|
+
export function SelectInputOption<T = string>({
|
|
21
|
+
value,
|
|
22
|
+
disabled,
|
|
23
|
+
children,
|
|
24
|
+
}: SelectInputOptionProps<T>) {
|
|
25
|
+
const itemsCount = useContext(SelectInputItemsCountContext);
|
|
26
|
+
const itemPosition = useContext(SelectInputItemPositionContext);
|
|
27
|
+
|
|
28
|
+
return (
|
|
29
|
+
<ListboxOption
|
|
30
|
+
as="div"
|
|
31
|
+
value={value}
|
|
32
|
+
aria-setsize={itemsCount}
|
|
33
|
+
aria-posinset={itemPosition}
|
|
34
|
+
disabled={disabled}
|
|
35
|
+
className={({ active, disabled: uiDisabled }) =>
|
|
36
|
+
clsx(
|
|
37
|
+
'np-select-input-option-container np-text-body-large',
|
|
38
|
+
active && 'np-select-input-option-container--active',
|
|
39
|
+
uiDisabled && 'np-select-input-option-container--disabled',
|
|
40
|
+
)
|
|
41
|
+
}
|
|
42
|
+
>
|
|
43
|
+
{({ selected }) => (
|
|
44
|
+
<>
|
|
45
|
+
<div className="np-select-input-option">{children}</div>
|
|
46
|
+
<Check
|
|
47
|
+
size={16}
|
|
48
|
+
className={clsx(
|
|
49
|
+
'np-select-input-option-check',
|
|
50
|
+
!selected && 'np-select-input-option-check--not-selected',
|
|
51
|
+
)}
|
|
52
|
+
/>
|
|
53
|
+
</>
|
|
54
|
+
)}
|
|
55
|
+
</ListboxOption>
|
|
56
|
+
);
|
|
57
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
.np-select-input-option-content-container {
|
|
2
|
+
display: flex;
|
|
3
|
+
align-items: center;
|
|
4
|
+
-moz-column-gap: 8px;
|
|
5
|
+
column-gap: 8px;
|
|
6
|
+
-moz-column-gap: var(--size-8);
|
|
7
|
+
column-gap: var(--size-8);
|
|
8
|
+
color: #37517e;
|
|
9
|
+
color: var(--color-content-primary);
|
|
10
|
+
}
|
|
11
|
+
.np-select-input-option-content-icon {
|
|
12
|
+
display: flex;
|
|
13
|
+
}
|
|
14
|
+
.np-select-input-option-content-icon--not-within-trigger {
|
|
15
|
+
align-self: flex-start;
|
|
16
|
+
}
|
|
17
|
+
.np-select-input-option-content-text {
|
|
18
|
+
display: flex;
|
|
19
|
+
flex: 1;
|
|
20
|
+
flex-direction: column;
|
|
21
|
+
overflow: hidden;
|
|
22
|
+
}
|
|
23
|
+
.np-select-input-option-content-text-secondary {
|
|
24
|
+
color: #5d7079;
|
|
25
|
+
color: var(--color-content-secondary);
|
|
26
|
+
}
|
|
27
|
+
.np-select-input-option-content-text-within-trigger {
|
|
28
|
+
overflow: hidden;
|
|
29
|
+
text-overflow: ellipsis;
|
|
30
|
+
white-space: nowrap;
|
|
31
|
+
}
|
|
32
|
+
.np-select-input-option-content-text-line-1 > :not([hidden]) ~ :not([hidden]) {
|
|
33
|
+
margin-right: 8px;
|
|
34
|
+
margin-right: var(--size-8);
|
|
35
|
+
margin-left: 8px;
|
|
36
|
+
margin-left: var(--size-8);
|
|
37
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
.np-select-input-option-content-container {
|
|
2
|
+
display: flex;
|
|
3
|
+
align-items: center;
|
|
4
|
+
column-gap: var(--size-8);
|
|
5
|
+
color: var(--color-content-primary);
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
.np-select-input-option-content-icon {
|
|
9
|
+
display: flex;
|
|
10
|
+
|
|
11
|
+
&--not-within-trigger {
|
|
12
|
+
align-self: flex-start;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
.np-select-input-option-content-text {
|
|
17
|
+
display: flex;
|
|
18
|
+
flex: 1;
|
|
19
|
+
flex-direction: column;
|
|
20
|
+
overflow: hidden;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
.np-select-input-option-content-text-secondary {
|
|
24
|
+
color: var(--color-content-secondary);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
.np-select-input-option-content-text-within-trigger {
|
|
28
|
+
overflow: hidden;
|
|
29
|
+
text-overflow: ellipsis;
|
|
30
|
+
white-space: nowrap;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
.np-select-input-option-content-text-line-1 {
|
|
34
|
+
> :not([hidden]) ~ :not([hidden]) {
|
|
35
|
+
margin-right: var(--size-8);
|
|
36
|
+
margin-left: var(--size-8);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { clsx } from 'clsx';
|
|
2
|
+
import { useContext } from 'react';
|
|
3
|
+
import { SelectInputOptionContentWithinTriggerContext } from '../SelectInput.contexts';
|
|
4
|
+
|
|
5
|
+
export interface SelectInputOptionContentProps {
|
|
6
|
+
title: React.ReactNode;
|
|
7
|
+
note?: string;
|
|
8
|
+
description?: string;
|
|
9
|
+
icon?: React.ReactNode;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Component for rendering structured content within a SelectInput option.
|
|
14
|
+
* Supports title, optional note, description, and icon with different styling
|
|
15
|
+
* based on whether it's rendered within the trigger button or the dropdown.
|
|
16
|
+
*/
|
|
17
|
+
export function SelectInputOptionContent({
|
|
18
|
+
title,
|
|
19
|
+
note,
|
|
20
|
+
description,
|
|
21
|
+
icon,
|
|
22
|
+
}: SelectInputOptionContentProps) {
|
|
23
|
+
const withinTrigger = useContext(SelectInputOptionContentWithinTriggerContext);
|
|
24
|
+
|
|
25
|
+
return (
|
|
26
|
+
<div
|
|
27
|
+
className={clsx(
|
|
28
|
+
'np-select-input-option-content-container',
|
|
29
|
+
(note || description) && 'np-text-body-large',
|
|
30
|
+
)}
|
|
31
|
+
>
|
|
32
|
+
{icon ? (
|
|
33
|
+
<div
|
|
34
|
+
className={clsx(
|
|
35
|
+
'np-select-input-option-content-icon',
|
|
36
|
+
!withinTrigger && 'np-select-input-option-content-icon--not-within-trigger',
|
|
37
|
+
)}
|
|
38
|
+
>
|
|
39
|
+
{icon}
|
|
40
|
+
</div>
|
|
41
|
+
) : null}
|
|
42
|
+
|
|
43
|
+
<div className="np-select-input-option-content-text">
|
|
44
|
+
<div
|
|
45
|
+
className={clsx(
|
|
46
|
+
'np-select-input-option-content-text-line-1',
|
|
47
|
+
withinTrigger && 'np-select-input-option-content-text-within-trigger',
|
|
48
|
+
)}
|
|
49
|
+
>
|
|
50
|
+
<div className="d-inline">{title}</div>
|
|
51
|
+
{note ? (
|
|
52
|
+
<span className="np-select-input-option-content-text-secondary np-text-body-default">
|
|
53
|
+
{note}
|
|
54
|
+
</span>
|
|
55
|
+
) : null}
|
|
56
|
+
</div>
|
|
57
|
+
|
|
58
|
+
{description ? (
|
|
59
|
+
<div
|
|
60
|
+
className={clsx(
|
|
61
|
+
'np-select-input-option-content-text-secondary np-text-body-default',
|
|
62
|
+
withinTrigger &&
|
|
63
|
+
'np-select-input-option-content-text-within-trigger np-select-input-option-description-in-trigger',
|
|
64
|
+
)}
|
|
65
|
+
>
|
|
66
|
+
{description}
|
|
67
|
+
</div>
|
|
68
|
+
) : null}
|
|
69
|
+
</div>
|
|
70
|
+
</div>
|
|
71
|
+
);
|
|
72
|
+
}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { forwardRef, useEffect } from 'react';
|
|
2
|
+
import { useEffectEvent } from '../../../../common/hooks/useEffectEvent';
|
|
3
|
+
|
|
4
|
+
export interface SelectInputOptionsContainerProps extends React.ComponentPropsWithRef<'div'> {
|
|
5
|
+
onAriaActiveDescendantChange: (value: React.AriaAttributes['aria-activedescendant']) => void;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Container component for SelectInput options.
|
|
10
|
+
* Handles keyboard navigation and accessibility features.
|
|
11
|
+
*/
|
|
12
|
+
export const SelectInputOptionsContainer = forwardRef(function SelectInputOptionsContainer(
|
|
13
|
+
{
|
|
14
|
+
'aria-orientation': ariaOrientation,
|
|
15
|
+
'aria-activedescendant': ariaActiveDescendant,
|
|
16
|
+
role,
|
|
17
|
+
tabIndex,
|
|
18
|
+
onAriaActiveDescendantChange,
|
|
19
|
+
onKeyDown,
|
|
20
|
+
...restProps
|
|
21
|
+
}: SelectInputOptionsContainerProps,
|
|
22
|
+
ref: React.ForwardedRef<HTMLDivElement | null>,
|
|
23
|
+
) {
|
|
24
|
+
const handleAriaActiveDescendantChange = useEffectEvent(onAriaActiveDescendantChange);
|
|
25
|
+
useEffect(() => {
|
|
26
|
+
handleAriaActiveDescendantChange(ariaActiveDescendant);
|
|
27
|
+
}, [ariaActiveDescendant, handleAriaActiveDescendantChange]);
|
|
28
|
+
|
|
29
|
+
return (
|
|
30
|
+
<div
|
|
31
|
+
ref={ref}
|
|
32
|
+
role="none"
|
|
33
|
+
onKeyDown={(event) => {
|
|
34
|
+
// Prevent confirmation close without an active item
|
|
35
|
+
if (event.key === 'Enter' && ariaActiveDescendant == null) {
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
// Required to make ListBox focusable
|
|
40
|
+
if (event.key === 'Tab') {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
// Prevent absorbing Escape early
|
|
45
|
+
if (event.key === 'Escape') {
|
|
46
|
+
onKeyDown?.({
|
|
47
|
+
...event,
|
|
48
|
+
preventDefault: () => {},
|
|
49
|
+
stopPropagation: () => {},
|
|
50
|
+
});
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
onKeyDown?.(event);
|
|
55
|
+
}}
|
|
56
|
+
{...restProps}
|
|
57
|
+
/>
|
|
58
|
+
);
|
|
59
|
+
});
|