@zohodesk/components 1.0.0-temp-230 → 1.0.0-temp-232
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/.cli/propValidation_report.html +1 -1
- package/README.md +7 -12
- package/assets/Appearance/dark/mode/Component_DarkMode.module.css +0 -8
- package/assets/Appearance/dark/mode/Component_v1_DarkMode.module.css +3 -0
- package/assets/Appearance/light/mode/Component_LightMode.module.css +0 -8
- package/assets/Appearance/light/mode/Component_v1_LightMode.module.css +3 -0
- package/assets/Appearance/pureDark/mode/Component_PureDarkMode.module.css +0 -8
- package/assets/Appearance/pureDark/mode/Component_v1_PureDarkMode.module.css +3 -0
- package/es/DateTime/__tests__/__snapshots__/DateTime.spec.js.snap +18 -9
- package/es/DateTime/__tests__/__snapshots__/DateWidget.spec.js.snap +6 -3
- package/es/DateTime/__tests__/__snapshots__/Time.spec.js.snap +18 -9
- package/es/ListItem/ListItem.js +2 -7
- package/es/ListItem/ListItem.module.css +0 -6
- package/es/ListItem/__tests__/ListItem.spec.js +0 -8
- package/es/ListItem/__tests__/__snapshots__/ListItem.spec.js.snap +0 -47
- package/es/ListItem/props/propTypes.js +1 -2
- package/es/MultiSelect/AdvancedGroupMultiSelect.js +16 -8
- package/es/MultiSelect/AdvancedMultiSelect.js +13 -6
- package/es/MultiSelect/EmptyState.js +2 -1
- package/es/MultiSelect/MultiSelect.js +25 -24
- package/es/MultiSelect/MultiSelectWithAvatar.js +9 -2
- package/es/MultiSelect/SelectedOptions.js +3 -24
- package/es/MultiSelect/Suggestions.js +11 -5
- package/es/MultiSelect/__tests__/MultiSelect.spec.js +19 -32
- package/es/MultiSelect/__tests__/SelectedOptions.spec.js +0 -13
- package/es/MultiSelect/__tests__/Suggestions.spec.js +52 -6
- package/es/MultiSelect/__tests__/__snapshots__/AdvancedGroupMultiSelect.spec.js.snap +3 -3
- package/es/MultiSelect/__tests__/__snapshots__/AdvancedMultiSelect.spec.js.snap +9 -9
- package/es/MultiSelect/__tests__/__snapshots__/MultiSelect.spec.js.snap +178 -10
- package/es/MultiSelect/__tests__/__snapshots__/MultiSelectWithAvatar.spec.js.snap +3 -3
- package/es/MultiSelect/__tests__/__snapshots__/SelectedOptions.spec.js.snap +0 -15
- package/es/MultiSelect/__tests__/__snapshots__/Suggestions.spec.js.snap +308 -31
- package/es/MultiSelect/constants.js +6 -0
- package/es/MultiSelect/props/propTypes.js +12 -58
- package/es/Select/Select.js +3 -32
- package/es/Select/SelectWithIcon.js +1 -1
- package/es/Select/__tests__/Select.spec.js +0 -10
- package/es/Select/__tests__/__snapshots__/GroupSelect.spec.js.snap +6 -3
- package/es/Select/__tests__/__snapshots__/Select.spec.js.snap +429 -245
- package/es/Select/__tests__/__snapshots__/SelectWithIcon.spec.js.snap +6 -3
- package/es/Select/props/propTypes.js +1 -2
- package/es/TextBoxIcon/TextBoxIcon.js +12 -18
- package/es/TextBoxIcon/TextBoxIcon.module.css +38 -3
- package/es/TextBoxIcon/__tests__/TextBoxIcon.spec.js +2 -1
- package/es/TextBoxIcon/__tests__/__snapshots__/TextBoxIcon.spec.js.snap +225 -116
- package/es/TextBoxIcon/props/propTypes.js +2 -1
- package/es/utils/Common.js +2 -4
- package/es/utils/dropDownUtils.js +27 -14
- package/es/v1/Label/Label.js +82 -33
- package/es/v1/Label/css/Label_v1.module.css +47 -0
- package/es/v1/Label/css/cssJSLogic.js +29 -0
- package/es/v1/Label/props/defaultProps.js +8 -10
- package/es/v1/Label/props/propTypes.js +22 -14
- package/lib/DateTime/__tests__/__snapshots__/DateTime.spec.js.snap +18 -9
- package/lib/DateTime/__tests__/__snapshots__/DateWidget.spec.js.snap +6 -3
- package/lib/DateTime/__tests__/__snapshots__/Time.spec.js.snap +18 -9
- package/lib/ListItem/ListItem.js +2 -7
- package/lib/ListItem/ListItem.module.css +0 -6
- package/lib/ListItem/__tests__/ListItem.spec.js +0 -8
- package/lib/ListItem/__tests__/__snapshots__/ListItem.spec.js.snap +0 -47
- package/lib/ListItem/props/propTypes.js +1 -2
- package/lib/MultiSelect/AdvancedGroupMultiSelect.js +94 -83
- package/lib/MultiSelect/AdvancedMultiSelect.js +16 -7
- package/lib/MultiSelect/EmptyState.js +3 -1
- package/lib/MultiSelect/MultiSelect.js +30 -25
- package/lib/MultiSelect/MultiSelectWithAvatar.js +11 -3
- package/lib/MultiSelect/SelectedOptions.js +3 -24
- package/lib/MultiSelect/Suggestions.js +11 -5
- package/lib/MultiSelect/__tests__/MultiSelect.spec.js +19 -34
- package/lib/MultiSelect/__tests__/SelectedOptions.spec.js +0 -15
- package/lib/MultiSelect/__tests__/Suggestions.spec.js +52 -8
- package/lib/MultiSelect/__tests__/__snapshots__/AdvancedGroupMultiSelect.spec.js.snap +3 -3
- package/lib/MultiSelect/__tests__/__snapshots__/AdvancedMultiSelect.spec.js.snap +9 -9
- package/lib/MultiSelect/__tests__/__snapshots__/MultiSelect.spec.js.snap +178 -10
- package/lib/MultiSelect/__tests__/__snapshots__/MultiSelectWithAvatar.spec.js.snap +3 -3
- package/lib/MultiSelect/__tests__/__snapshots__/SelectedOptions.spec.js.snap +0 -15
- package/lib/MultiSelect/__tests__/__snapshots__/Suggestions.spec.js.snap +308 -31
- package/lib/MultiSelect/constants.js +13 -0
- package/lib/MultiSelect/props/propTypes.js +11 -58
- package/lib/Select/Select.js +2 -32
- package/lib/Select/SelectWithIcon.js +1 -1
- package/lib/Select/__tests__/Select.spec.js +0 -12
- package/lib/Select/__tests__/__snapshots__/GroupSelect.spec.js.snap +6 -3
- package/lib/Select/__tests__/__snapshots__/Select.spec.js.snap +429 -245
- package/lib/Select/__tests__/__snapshots__/SelectWithIcon.spec.js.snap +6 -3
- package/lib/Select/props/propTypes.js +1 -2
- package/lib/TextBoxIcon/TextBoxIcon.js +13 -19
- package/lib/TextBoxIcon/TextBoxIcon.module.css +38 -3
- package/lib/TextBoxIcon/__tests__/TextBoxIcon.spec.js +2 -1
- package/lib/TextBoxIcon/__tests__/__snapshots__/TextBoxIcon.spec.js.snap +225 -116
- package/lib/TextBoxIcon/props/propTypes.js +2 -1
- package/lib/utils/Common.js +4 -10
- package/lib/utils/dropDownUtils.js +25 -13
- package/lib/v1/Label/Label.js +90 -35
- package/lib/v1/Label/css/Label_v1.module.css +47 -0
- package/lib/v1/Label/css/cssJSLogic.js +31 -0
- package/lib/v1/Label/props/defaultProps.js +10 -12
- package/lib/v1/Label/props/propTypes.js +24 -16
- package/package.json +8 -8
- package/es/ColorSelect/ColorMultiSelect.js +0 -36
- package/es/ColorSelect/ColorSingleSelect.js +0 -50
- package/es/ColorSelect/__tests__/ColorMultiSelect.spec.js +0 -59
- package/es/ColorSelect/__tests__/ColorSingleSelect.spec.js +0 -59
- package/es/ColorSelect/__tests__/__snapshots__/ColorMultiSelect.spec.js.snap +0 -547
- package/es/ColorSelect/__tests__/__snapshots__/ColorSingleSelect.spec.js.snap +0 -178
- package/es/ColorSelect/common/ColorIndicator/ColorIndicator.js +0 -27
- package/es/ColorSelect/common/ColorIndicator/ColorIndicator.module.css +0 -18
- package/es/ColorSelect/common/ColorIndicator/__tests__/ColorSingleSelect.spec.js +0 -60
- package/es/ColorSelect/common/ColorIndicator/__tests__/__snapshots__/ColorSingleSelect.spec.js.snap +0 -95
- package/es/ColorSelect/common/ColorIndicator/props/defaultProps.js +0 -7
- package/es/ColorSelect/common/ColorIndicator/props/propTypes.js +0 -9
- package/es/ColorSelect/common/ColoredTag/ColoredTag.js +0 -33
- package/es/ColorSelect/common/ColoredTag/__tests__/ColoredTag.spec.js +0 -50
- package/es/ColorSelect/common/ColoredTag/__tests__/__snapshots__/ColoredTag.spec.js.snap +0 -101
- package/es/ColorSelect/common/ColoredTag/props/propTypes.js +0 -9
- package/es/ColorSelect/common/helpers.js +0 -35
- package/es/ColorSelect/props/defaultProps.js +0 -13
- package/es/ColorSelect/props/propTypes.js +0 -14
- package/es/InputFieldLine/InputFieldLine.js +0 -39
- package/es/InputFieldLine/InputFieldLine.module.css +0 -90
- package/es/InputFieldLine/__tests__/InputFieldLine.spec.js +0 -114
- package/es/InputFieldLine/__tests__/__snapshots__/InputFieldLine.spec.js.snap +0 -194
- package/es/InputFieldLine/props/defaultProps.js +0 -14
- package/es/InputFieldLine/props/propTypes.js +0 -19
- package/es/Select/ArrowIcon/ArrowIcon.js +0 -48
- package/es/Select/ArrowIcon/ArrowIcon.module.css +0 -22
- package/lib/ColorSelect/ColorMultiSelect.js +0 -65
- package/lib/ColorSelect/ColorSingleSelect.js +0 -78
- package/lib/ColorSelect/__tests__/ColorMultiSelect.spec.js +0 -70
- package/lib/ColorSelect/__tests__/ColorSingleSelect.spec.js +0 -70
- package/lib/ColorSelect/__tests__/__snapshots__/ColorMultiSelect.spec.js.snap +0 -547
- package/lib/ColorSelect/__tests__/__snapshots__/ColorSingleSelect.spec.js.snap +0 -178
- package/lib/ColorSelect/common/ColorIndicator/ColorIndicator.js +0 -40
- package/lib/ColorSelect/common/ColorIndicator/ColorIndicator.module.css +0 -18
- package/lib/ColorSelect/common/ColorIndicator/__tests__/ColorSingleSelect.spec.js +0 -67
- package/lib/ColorSelect/common/ColorIndicator/__tests__/__snapshots__/ColorSingleSelect.spec.js.snap +0 -95
- package/lib/ColorSelect/common/ColorIndicator/props/defaultProps.js +0 -14
- package/lib/ColorSelect/common/ColorIndicator/props/propTypes.js +0 -20
- package/lib/ColorSelect/common/ColoredTag/ColoredTag.js +0 -61
- package/lib/ColorSelect/common/ColoredTag/__tests__/ColoredTag.spec.js +0 -58
- package/lib/ColorSelect/common/ColoredTag/__tests__/__snapshots__/ColoredTag.spec.js.snap +0 -101
- package/lib/ColorSelect/common/ColoredTag/props/propTypes.js +0 -28
- package/lib/ColorSelect/common/helpers.js +0 -53
- package/lib/ColorSelect/props/defaultProps.js +0 -31
- package/lib/ColorSelect/props/propTypes.js +0 -35
- package/lib/InputFieldLine/InputFieldLine.js +0 -53
- package/lib/InputFieldLine/InputFieldLine.module.css +0 -90
- package/lib/InputFieldLine/__tests__/InputFieldLine.spec.js +0 -122
- package/lib/InputFieldLine/__tests__/__snapshots__/InputFieldLine.spec.js.snap +0 -194
- package/lib/InputFieldLine/props/defaultProps.js +0 -21
- package/lib/InputFieldLine/props/propTypes.js +0 -36
- package/lib/Select/ArrowIcon/ArrowIcon.js +0 -62
- package/lib/Select/ArrowIcon/ArrowIcon.module.css +0 -22
|
@@ -3,6 +3,7 @@ import React from 'react';
|
|
|
3
3
|
import { MultiSelect_propTypes } from "./props/propTypes";
|
|
4
4
|
import { MultiSelect_defaultProps } from "./props/defaultProps";
|
|
5
5
|
import { defaultProps as MobileHeader_defaultProps } from "./MobileHeader/props/defaultProps";
|
|
6
|
+
import { MULTISELECT_I18N_KEYS } from "./constants";
|
|
6
7
|
/**** Components ****/
|
|
7
8
|
|
|
8
9
|
import Popup from "../Popup/Popup";
|
|
@@ -234,12 +235,14 @@ export class MultiSelectComponent extends React.Component {
|
|
|
234
235
|
|
|
235
236
|
handleGetSelectedOptions(selectedOptions, normalizedFormatOptions, props) {
|
|
236
237
|
const {
|
|
237
|
-
allowValueFallback
|
|
238
|
+
allowValueFallback,
|
|
239
|
+
limit
|
|
238
240
|
} = props;
|
|
239
241
|
return this.getSelectedOptions({
|
|
240
242
|
selectedOptions,
|
|
241
243
|
normalizedFormatOptions,
|
|
242
|
-
allowValueFallback
|
|
244
|
+
allowValueFallback,
|
|
245
|
+
limit
|
|
243
246
|
});
|
|
244
247
|
}
|
|
245
248
|
|
|
@@ -313,8 +316,10 @@ export class MultiSelectComponent extends React.Component {
|
|
|
313
316
|
getNextOptions,
|
|
314
317
|
isPopupOpen,
|
|
315
318
|
isPopupOpenOnEnter,
|
|
316
|
-
onKeyDown
|
|
319
|
+
onKeyDown,
|
|
320
|
+
limit
|
|
317
321
|
} = this.props;
|
|
322
|
+
const allowKeyboardActions = !limit || limit && selectedOptions.length < limit;
|
|
318
323
|
const highLightedSelectOptionsLen = highLightedSelectOptions.length;
|
|
319
324
|
|
|
320
325
|
if (isPopupOpen && (keyCode === 38 || keyCode === 40 || keyCode === 13 || keyCode === 27 || keyCode === 9)) {
|
|
@@ -334,7 +339,7 @@ export class MultiSelectComponent extends React.Component {
|
|
|
334
339
|
|
|
335
340
|
const suggestionsLen = suggestions.length;
|
|
336
341
|
|
|
337
|
-
if (suggestionsLen && isPopupOpen && keyCode === 38) {
|
|
342
|
+
if (suggestionsLen && isPopupOpen && keyCode === 38 && allowKeyboardActions) {
|
|
338
343
|
//up arrow
|
|
339
344
|
|
|
340
345
|
/*if (hoverOption === 0) { //disable first to last option higlight
|
|
@@ -345,7 +350,7 @@ export class MultiSelectComponent extends React.Component {
|
|
|
345
350
|
hoverOption: hoverOption - 1
|
|
346
351
|
});
|
|
347
352
|
}
|
|
348
|
-
} else if (suggestionsLen && isPopupOpen && keyCode === 40) {
|
|
353
|
+
} else if (suggestionsLen && isPopupOpen && keyCode === 40 && allowKeyboardActions) {
|
|
349
354
|
//down arrow
|
|
350
355
|
|
|
351
356
|
/*else if (hoverOption === suggestionsLen - 1 || hoverOption === null) {
|
|
@@ -362,8 +367,8 @@ export class MultiSelectComponent extends React.Component {
|
|
|
362
367
|
hoverOption: hoverOption + 1
|
|
363
368
|
});
|
|
364
369
|
}
|
|
365
|
-
} else if (keyCode === 13) {
|
|
366
|
-
//enter
|
|
370
|
+
} else if (keyCode === 13 && allowKeyboardActions) {
|
|
371
|
+
//enter ke
|
|
367
372
|
const selectedOption = suggestions[hoverOption] || {};
|
|
368
373
|
const {
|
|
369
374
|
id
|
|
@@ -727,14 +732,16 @@ export class MultiSelectComponent extends React.Component {
|
|
|
727
732
|
needToCloseOnSelect,
|
|
728
733
|
togglePopup,
|
|
729
734
|
selectedOptions: propSelectedOptions,
|
|
730
|
-
disabledOptions = dummyArray
|
|
735
|
+
disabledOptions = dummyArray,
|
|
736
|
+
limit
|
|
731
737
|
} = this.props;
|
|
732
738
|
const {
|
|
733
739
|
newSelectedOptions
|
|
734
740
|
} = filterSelectedOptions({
|
|
735
741
|
selectedOptions,
|
|
736
742
|
propSelectedOptions,
|
|
737
|
-
disabledOptions
|
|
743
|
+
disabledOptions,
|
|
744
|
+
limit
|
|
738
745
|
});
|
|
739
746
|
const selectedOptionsLen = newSelectedOptions.length;
|
|
740
747
|
const allSelectedOptionsDetails = [];
|
|
@@ -882,7 +889,6 @@ export class MultiSelectComponent extends React.Component {
|
|
|
882
889
|
isPopupOpen,
|
|
883
890
|
ariaErrorId,
|
|
884
891
|
customProps,
|
|
885
|
-
renderCustomSelectedValue,
|
|
886
892
|
isFocus,
|
|
887
893
|
isPopupReady,
|
|
888
894
|
renderCustomClearComponent,
|
|
@@ -895,10 +901,10 @@ export class MultiSelectComponent extends React.Component {
|
|
|
895
901
|
searchStr
|
|
896
902
|
} = this.state;
|
|
897
903
|
const {
|
|
898
|
-
clearText =
|
|
904
|
+
clearText = MULTISELECT_I18N_KEYS.clearText
|
|
899
905
|
} = i18nKeys;
|
|
900
906
|
const {
|
|
901
|
-
clearLabel =
|
|
907
|
+
clearLabel = MULTISELECT_I18N_KEYS.clearLabel,
|
|
902
908
|
ariaLabelledby
|
|
903
909
|
} = a11y;
|
|
904
910
|
let {
|
|
@@ -927,11 +933,7 @@ export class MultiSelectComponent extends React.Component {
|
|
|
927
933
|
onSelect: this.handleClickSelectedOption,
|
|
928
934
|
size: size,
|
|
929
935
|
palette: palette,
|
|
930
|
-
dataId: `${dataId}_selectedOptions
|
|
931
|
-
renderCustomSelectedValue: renderCustomSelectedValue,
|
|
932
|
-
isPopupReady: isPopupReady,
|
|
933
|
-
isPopupOpen: isPopupOpen,
|
|
934
|
-
isDisabled: isDisabled
|
|
936
|
+
dataId: `${dataId}_selectedOptions`
|
|
935
937
|
}), /*#__PURE__*/React.createElement(Box, {
|
|
936
938
|
flexible: true,
|
|
937
939
|
className: style.wrapper,
|
|
@@ -1040,11 +1042,8 @@ export class MultiSelectComponent extends React.Component {
|
|
|
1040
1042
|
isLoading,
|
|
1041
1043
|
selectAllText,
|
|
1042
1044
|
needSelectAll,
|
|
1043
|
-
|
|
1045
|
+
limit
|
|
1044
1046
|
} = this.props;
|
|
1045
|
-
let {
|
|
1046
|
-
SuggestionsProps = {}
|
|
1047
|
-
} = customProps;
|
|
1048
1047
|
const {
|
|
1049
1048
|
selectedOptions,
|
|
1050
1049
|
searchStr,
|
|
@@ -1054,7 +1053,8 @@ export class MultiSelectComponent extends React.Component {
|
|
|
1054
1053
|
selectedOptionIds
|
|
1055
1054
|
} = this.state;
|
|
1056
1055
|
const {
|
|
1057
|
-
searchText =
|
|
1056
|
+
searchText = MULTISELECT_I18N_KEYS.searchText,
|
|
1057
|
+
limitReachedMessage = MULTISELECT_I18N_KEYS.limitReachedMessage
|
|
1058
1058
|
} = i18nKeys;
|
|
1059
1059
|
const suggestions = this.handleFilterSuggestions();
|
|
1060
1060
|
const setAriaId = this.getNextAriaId();
|
|
@@ -1108,7 +1108,7 @@ export class MultiSelectComponent extends React.Component {
|
|
|
1108
1108
|
onClick: this.handlePopupClose
|
|
1109
1109
|
}, /*#__PURE__*/React.createElement("div", {
|
|
1110
1110
|
className: style.effect
|
|
1111
|
-
}, this.getSelectionUI(true))) : null, needSelectAll ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
|
|
1111
|
+
}, this.getSelectionUI(true))) : null, needSelectAll && !(limit >= 0) ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
|
|
1112
1112
|
onSelect: this.handleSelectAll,
|
|
1113
1113
|
selectAllText: selectAllText,
|
|
1114
1114
|
suggestions: suggestions,
|
|
@@ -1135,7 +1135,8 @@ export class MultiSelectComponent extends React.Component {
|
|
|
1135
1135
|
a11y: {
|
|
1136
1136
|
role: 'option'
|
|
1137
1137
|
},
|
|
1138
|
-
|
|
1138
|
+
limit: limit,
|
|
1139
|
+
limitReachedMessage: limitReachedMessage
|
|
1139
1140
|
}) : /*#__PURE__*/React.createElement(EmptyState, {
|
|
1140
1141
|
isLoading: isFetchingOptions,
|
|
1141
1142
|
options: options,
|
|
@@ -3,6 +3,7 @@ import React from 'react';
|
|
|
3
3
|
import { MultiSelectWithAvatar_propTypes } from "./props/propTypes";
|
|
4
4
|
import { MultiSelectWithAvatar_defaultProps } from "./props/defaultProps";
|
|
5
5
|
import { defaultProps as MobileHeader_defaultProps } from "./MobileHeader/props/defaultProps";
|
|
6
|
+
import { MULTISELECT_I18N_KEYS } from "./constants";
|
|
6
7
|
/**** Components ****/
|
|
7
8
|
|
|
8
9
|
import { MultiSelectComponent } from "./MultiSelect";
|
|
@@ -93,11 +94,15 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
|
|
|
93
94
|
needEffect,
|
|
94
95
|
isLoading,
|
|
95
96
|
keepSelectedOptions,
|
|
96
|
-
customProps
|
|
97
|
+
customProps,
|
|
98
|
+
limit
|
|
97
99
|
} = this.props;
|
|
98
100
|
let {
|
|
99
101
|
SuggestionsProps = {}
|
|
100
102
|
} = customProps;
|
|
103
|
+
let {
|
|
104
|
+
limitReachedMessage = MULTISELECT_I18N_KEYS.limitReachedMessage
|
|
105
|
+
} = i18nKeys;
|
|
101
106
|
i18nKeys = Object.assign({}, MobileHeader_defaultProps.i18nKeys, i18nKeys, {
|
|
102
107
|
emptyText: i18nKeys.emptyText || emptyMessage,
|
|
103
108
|
searchEmptyText: i18nKeys.searchEmptyText || searchEmptyMessage,
|
|
@@ -158,7 +163,7 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
|
|
|
158
163
|
onClick: this.handlePopupClose
|
|
159
164
|
}, /*#__PURE__*/React.createElement("div", {
|
|
160
165
|
className: style.effect
|
|
161
|
-
}, this.getSelectionUI(true)))) : null, needSelectAll ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
|
|
166
|
+
}, this.getSelectionUI(true)))) : null, needSelectAll && !(limit >= 0) ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
|
|
162
167
|
onSelect: this.handleSelectAll,
|
|
163
168
|
selectAllText: selectAllText,
|
|
164
169
|
suggestions: suggestions,
|
|
@@ -184,6 +189,8 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
|
|
|
184
189
|
a11y: {
|
|
185
190
|
role: 'option'
|
|
186
191
|
},
|
|
192
|
+
limit: limit,
|
|
193
|
+
limitReachedMessage: limitReachedMessage,
|
|
187
194
|
...SuggestionsProps
|
|
188
195
|
}) : /*#__PURE__*/React.createElement(EmptyState, {
|
|
189
196
|
isLoading: isFetchingOptions,
|
|
@@ -23,13 +23,11 @@ export default class SelectedOptions extends React.PureComponent {
|
|
|
23
23
|
size,
|
|
24
24
|
palette,
|
|
25
25
|
dataId,
|
|
26
|
-
|
|
27
|
-
isPopupOpen,
|
|
28
|
-
isPopupReady,
|
|
29
|
-
isDisabled: isInputDisabled
|
|
26
|
+
limit
|
|
30
27
|
} = this.props;
|
|
31
28
|
const isDarkPalette = palette === 'dark' ? 'dark' : 'danger';
|
|
32
|
-
|
|
29
|
+
const selectedData = limit && limit > 0 ? selectedOptions.slice(0, limit) : selectedOptions;
|
|
30
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, selectedData.map(option => {
|
|
33
31
|
const {
|
|
34
32
|
id,
|
|
35
33
|
value,
|
|
@@ -71,25 +69,6 @@ export default class SelectedOptions extends React.PureComponent {
|
|
|
71
69
|
iconName: icon,
|
|
72
70
|
iconSize: iconSize
|
|
73
71
|
}));
|
|
74
|
-
} else if (optionType === 'custom') {
|
|
75
|
-
return /*#__PURE__*/React.createElement(Box, {
|
|
76
|
-
className: `${style.tag} ${style[size]}`,
|
|
77
|
-
key: `${id}customTag`,
|
|
78
|
-
dataId: dataId
|
|
79
|
-
}, typeof renderCustomSelectedValue == 'function' ? renderCustomSelectedValue({
|
|
80
|
-
onRemove: isDisabled || isReadOnly ? null : onRemove,
|
|
81
|
-
palette: isDarkPalette,
|
|
82
|
-
onSelectTag: isReadOnly ? null : onSelect,
|
|
83
|
-
getRef: getRef,
|
|
84
|
-
isReadOnly: isReadOnly,
|
|
85
|
-
isPopupReady: isPopupReady,
|
|
86
|
-
isPopupOpen: isPopupOpen,
|
|
87
|
-
isDisabled: isInputDisabled,
|
|
88
|
-
size,
|
|
89
|
-
highLightedSelectOptions,
|
|
90
|
-
isActive: highLightedSelectOptions.indexOf(id) >= 0,
|
|
91
|
-
option
|
|
92
|
-
}) : renderCustomSelectedValue);
|
|
93
72
|
}
|
|
94
73
|
|
|
95
74
|
return /*#__PURE__*/React.createElement(Box, {
|
|
@@ -19,7 +19,6 @@ export default class Suggestions extends React.PureComponent {
|
|
|
19
19
|
needTick,
|
|
20
20
|
needBorder,
|
|
21
21
|
selectedOptions = [],
|
|
22
|
-
renderBeforeChildren,
|
|
23
22
|
activeId,
|
|
24
23
|
hoverId,
|
|
25
24
|
dataId,
|
|
@@ -29,12 +28,15 @@ export default class Suggestions extends React.PureComponent {
|
|
|
29
28
|
palette,
|
|
30
29
|
htmlId,
|
|
31
30
|
a11y,
|
|
32
|
-
needMultiLineText
|
|
31
|
+
needMultiLineText,
|
|
32
|
+
limit,
|
|
33
|
+
limitReachedMessage
|
|
33
34
|
} = this.props;
|
|
34
35
|
const {
|
|
35
36
|
ariaParentRole,
|
|
36
37
|
ariaMultiselectable
|
|
37
38
|
} = a11y;
|
|
39
|
+
const selectedOptionsLength = selectedOptions.length;
|
|
38
40
|
return /*#__PURE__*/React.createElement(Container, {
|
|
39
41
|
isCover: false,
|
|
40
42
|
role: ariaParentRole,
|
|
@@ -59,13 +61,14 @@ export default class Suggestions extends React.PureComponent {
|
|
|
59
61
|
} = suggestion;
|
|
60
62
|
const isActive = activeId === id || selectedOptions.indexOf(id) >= 0;
|
|
61
63
|
const isHighlight = hoverOption === index || id === hoverId ? true : false;
|
|
64
|
+
const isLimitReached = selectedOptionsLength >= limit && !isActive;
|
|
62
65
|
const list_a11y = Object.assign({}, a11y, {
|
|
63
66
|
ariaSelected: isActive,
|
|
64
67
|
ariaLabel: value,
|
|
65
68
|
'data-a11y-list-active': isHighlight
|
|
66
69
|
});
|
|
67
70
|
const commonProps = {
|
|
68
|
-
isDisabled,
|
|
71
|
+
isDisabled: isDisabled ? isDisabled : isLimitReached,
|
|
69
72
|
needMultiLineText,
|
|
70
73
|
...listItemCustomProps
|
|
71
74
|
};
|
|
@@ -77,6 +80,10 @@ export default class Suggestions extends React.PureComponent {
|
|
|
77
80
|
};
|
|
78
81
|
}
|
|
79
82
|
|
|
83
|
+
if (isLimitReached) {
|
|
84
|
+
commonProps.disableTitle = limitReachedMessage;
|
|
85
|
+
}
|
|
86
|
+
|
|
80
87
|
if (optionType === 'avatar') {
|
|
81
88
|
return /*#__PURE__*/React.createElement(ListItemWithAvatar, { ...commonProps,
|
|
82
89
|
autoHover: false,
|
|
@@ -137,8 +144,7 @@ export default class Suggestions extends React.PureComponent {
|
|
|
137
144
|
active: isActive,
|
|
138
145
|
size: listItemSize,
|
|
139
146
|
palette: palette,
|
|
140
|
-
a11y: list_a11y
|
|
141
|
-
renderBeforeChildren: renderBeforeChildren ? typeof renderBeforeChildren === 'function' ? renderBeforeChildren(suggestion) : renderBeforeChildren : null
|
|
147
|
+
a11y: list_a11y
|
|
142
148
|
});
|
|
143
149
|
})));
|
|
144
150
|
}
|
|
@@ -1,35 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { render } from '@testing-library/react';
|
|
3
3
|
import MultiSelect from "../MultiSelect";
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
text: 'custom 1',
|
|
7
|
-
optionType: 'custom'
|
|
8
|
-
}, {
|
|
9
|
-
id: 2,
|
|
10
|
-
text: 'custom 2',
|
|
11
|
-
optionType: 'custom'
|
|
12
|
-
}, {
|
|
13
|
-
id: 3,
|
|
14
|
-
text: 'custom 3',
|
|
15
|
-
optionType: 'custom'
|
|
16
|
-
}, {
|
|
17
|
-
id: 4,
|
|
18
|
-
text: 'custom 4',
|
|
19
|
-
optionType: 'custom'
|
|
20
|
-
}, {
|
|
21
|
-
id: 5,
|
|
22
|
-
text: 'custom 5',
|
|
23
|
-
optionType: 'custom'
|
|
24
|
-
}, {
|
|
25
|
-
id: 6,
|
|
26
|
-
text: 'custom 6',
|
|
27
|
-
optionType: 'custom'
|
|
28
|
-
}, {
|
|
29
|
-
id: 7,
|
|
30
|
-
text: 'custom 7',
|
|
31
|
-
optionType: 'custom'
|
|
32
|
-
}];
|
|
4
|
+
const testData = ['text1', 'text2', 'text3', 'text4', 'text5', 'text6', 'text7', 'text8', 'text9', 'text10'];
|
|
5
|
+
const testSelectedData = ['text1', 'text2', 'text3'];
|
|
33
6
|
describe('MultiSelect', () => {
|
|
34
7
|
test('rendering the defult props', () => {
|
|
35
8
|
const {
|
|
@@ -37,12 +10,26 @@ describe('MultiSelect', () => {
|
|
|
37
10
|
} = render( /*#__PURE__*/React.createElement(MultiSelect, null));
|
|
38
11
|
expect(asFragment()).toMatchSnapshot();
|
|
39
12
|
});
|
|
40
|
-
test('
|
|
13
|
+
test('rendering with limit feature', () => {
|
|
41
14
|
const {
|
|
42
15
|
asFragment
|
|
43
16
|
} = render( /*#__PURE__*/React.createElement(MultiSelect, {
|
|
44
|
-
|
|
45
|
-
|
|
17
|
+
valueField: "id",
|
|
18
|
+
textField: "text",
|
|
19
|
+
options: testData,
|
|
20
|
+
selectedOptions: testSelectedData,
|
|
21
|
+
needSelectAll: true,
|
|
22
|
+
selectAllText: "Select All",
|
|
23
|
+
placeHolder: "Select Text",
|
|
24
|
+
i18nKeys: {
|
|
25
|
+
clearText: 'Clear Selected Items',
|
|
26
|
+
loadingText: 'Fetching...',
|
|
27
|
+
emptyText: 'No Options .',
|
|
28
|
+
noMoreText: 'No More Options .',
|
|
29
|
+
searchEmptyText: 'No Matches Found .'
|
|
30
|
+
},
|
|
31
|
+
needResponsive: true,
|
|
32
|
+
limit: 3
|
|
46
33
|
}));
|
|
47
34
|
expect(asFragment()).toMatchSnapshot();
|
|
48
35
|
});
|
|
@@ -25,17 +25,4 @@ describe('SelectedOptions', () => {
|
|
|
25
25
|
}));
|
|
26
26
|
expect(asFragment()).toMatchSnapshot();
|
|
27
27
|
});
|
|
28
|
-
test('Should render with renderCustomSelectedValue', () => {
|
|
29
|
-
const {
|
|
30
|
-
asFragment
|
|
31
|
-
} = render( /*#__PURE__*/React.createElement(SelectedOptions, {
|
|
32
|
-
highLightedSelectOptions: [],
|
|
33
|
-
selectedOptions: [{
|
|
34
|
-
value: 'SelectedObject1',
|
|
35
|
-
optionType: 'custom'
|
|
36
|
-
}],
|
|
37
|
-
renderCustomSelectedValue: () => /*#__PURE__*/React.createElement("span", null, " SelectedOptions Custom Value")
|
|
38
|
-
}));
|
|
39
|
-
expect(asFragment()).toMatchSnapshot();
|
|
40
|
-
});
|
|
41
28
|
});
|
|
@@ -1,6 +1,53 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { render } from '@testing-library/react';
|
|
3
3
|
import Suggestions from "../Suggestions";
|
|
4
|
+
const sampleData = [{
|
|
5
|
+
"id": 2,
|
|
6
|
+
"value": "text2",
|
|
7
|
+
"optionType": "default",
|
|
8
|
+
"listItemProps": {
|
|
9
|
+
"style": {
|
|
10
|
+
"color": "red"
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
}, {
|
|
14
|
+
"id": 3,
|
|
15
|
+
"value": "text3",
|
|
16
|
+
"optionType": "default",
|
|
17
|
+
"listItemProps": {
|
|
18
|
+
"style": {
|
|
19
|
+
"color": "blue"
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}, {
|
|
23
|
+
"id": 4,
|
|
24
|
+
"value": "text4",
|
|
25
|
+
"optionType": "default"
|
|
26
|
+
}, {
|
|
27
|
+
"id": 5,
|
|
28
|
+
"value": "text5",
|
|
29
|
+
"optionType": "default"
|
|
30
|
+
}, {
|
|
31
|
+
"id": 6,
|
|
32
|
+
"value": "text6",
|
|
33
|
+
"optionType": "default"
|
|
34
|
+
}, {
|
|
35
|
+
"id": 7,
|
|
36
|
+
"value": "text7",
|
|
37
|
+
"optionType": "default"
|
|
38
|
+
}, {
|
|
39
|
+
"id": 8,
|
|
40
|
+
"value": "text8",
|
|
41
|
+
"optionType": "default"
|
|
42
|
+
}, {
|
|
43
|
+
"id": 9,
|
|
44
|
+
"value": "text9",
|
|
45
|
+
"optionType": "default"
|
|
46
|
+
}, {
|
|
47
|
+
"id": 10,
|
|
48
|
+
"value": "text10",
|
|
49
|
+
"optionType": "default"
|
|
50
|
+
}];
|
|
4
51
|
describe('Suggestions', () => {
|
|
5
52
|
test('rendering the defult props', () => {
|
|
6
53
|
const {
|
|
@@ -10,15 +57,14 @@ describe('Suggestions', () => {
|
|
|
10
57
|
}));
|
|
11
58
|
expect(asFragment()).toMatchSnapshot();
|
|
12
59
|
});
|
|
13
|
-
test('
|
|
60
|
+
test('rendering with limit props', () => {
|
|
14
61
|
const {
|
|
15
62
|
asFragment
|
|
16
63
|
} = render( /*#__PURE__*/React.createElement(Suggestions, {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
renderBeforeChildren: () => /*#__PURE__*/React.createElement("span", null, "Suggestions Before Children")
|
|
64
|
+
selectedOptions: [1, 2, 3, 4],
|
|
65
|
+
suggestions: sampleData,
|
|
66
|
+
limit: 3,
|
|
67
|
+
limitReachedMessage: "Limit Reached"
|
|
22
68
|
}));
|
|
23
69
|
expect(asFragment()).toMatchSnapshot();
|
|
24
70
|
});
|
|
@@ -25,10 +25,10 @@ exports[`AdvancedGroupMultiSelect rendering the defult props 1`] = `
|
|
|
25
25
|
"
|
|
26
26
|
/>
|
|
27
27
|
<div
|
|
28
|
-
class="
|
|
29
|
-
data-id="
|
|
28
|
+
class="container effect custmInputWrapper flex rowdir"
|
|
29
|
+
data-id="containerComponent"
|
|
30
30
|
data-selector-id="textBoxIcon"
|
|
31
|
-
data-test-id="
|
|
31
|
+
data-test-id="containerComponent"
|
|
32
32
|
>
|
|
33
33
|
<div
|
|
34
34
|
class="grow basis shrinkOff"
|
|
@@ -25,10 +25,10 @@ exports[`AdvancedMultiSelect rendering the defult props 1`] = `
|
|
|
25
25
|
"
|
|
26
26
|
/>
|
|
27
27
|
<div
|
|
28
|
-
class="
|
|
29
|
-
data-id="
|
|
28
|
+
class="container effect custmInputWrapper flex rowdir"
|
|
29
|
+
data-id="containerComponent"
|
|
30
30
|
data-selector-id="textBoxIcon"
|
|
31
|
-
data-test-id="
|
|
31
|
+
data-test-id="containerComponent"
|
|
32
32
|
>
|
|
33
33
|
<div
|
|
34
34
|
class="grow basis shrinkOff"
|
|
@@ -98,10 +98,10 @@ exports[`AdvancedMultiSelect rendering the options array with objects and string
|
|
|
98
98
|
"
|
|
99
99
|
/>
|
|
100
100
|
<div
|
|
101
|
-
class="
|
|
102
|
-
data-id="
|
|
101
|
+
class="container effect custmInputWrapper flex rowdir"
|
|
102
|
+
data-id="containerComponent"
|
|
103
103
|
data-selector-id="textBoxIcon"
|
|
104
|
-
data-test-id="
|
|
104
|
+
data-test-id="containerComponent"
|
|
105
105
|
>
|
|
106
106
|
<div
|
|
107
107
|
class="grow basis shrinkOff"
|
|
@@ -346,10 +346,10 @@ exports[`AdvancedMultiSelect rendering the options array with only objects using
|
|
|
346
346
|
"
|
|
347
347
|
/>
|
|
348
348
|
<div
|
|
349
|
-
class="
|
|
350
|
-
data-id="
|
|
349
|
+
class="container effect custmInputWrapper flex rowdir"
|
|
350
|
+
data-id="containerComponent"
|
|
351
351
|
data-selector-id="textBoxIcon"
|
|
352
|
-
data-test-id="
|
|
352
|
+
data-test-id="containerComponent"
|
|
353
353
|
>
|
|
354
354
|
<div
|
|
355
355
|
class="grow basis shrinkOff"
|