@zohodesk/components 1.0.0-temp-125 → 1.0.0-temp-126
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/assets/Appearance/dark/mode/darkMode.module.css +0 -1
- package/assets/Appearance/default/mode/defaultMode.module.css +0 -1
- package/assets/Appearance/pureDark/mode/pureDarkMode.module.css +0 -1
- package/css_error.log +0 -0
- package/es/Avatar/Avatar.js +4 -7
- package/es/Avatar/Avatar.module.css +0 -6
- package/es/Avatar/props/defaultProps.js +1 -3
- package/es/Avatar/props/propTypes.js +2 -4
- package/es/AvatarTeam/AvatarTeam.js +2 -8
- package/es/AvatarTeam/AvatarTeam.module.css +3 -30
- package/es/AvatarTeam/props/defaultProps.js +1 -4
- package/es/AvatarTeam/props/propTypes.js +1 -4
- package/es/MultiSelect/MultiSelect.js +4 -2
- package/es/MultiSelect/MultiSelectWithAvatar.js +3 -1
- package/es/MultiSelect/props/defaultProps.js +4 -2
- package/es/MultiSelect/props/propTypes.js +4 -2
- package/es/Provider/AvatarSize.js +0 -1
- package/es/common/avatarsizes.module.css +2 -6
- package/es/utils/dropDownUtils.js +3 -2
- package/lib/Avatar/Avatar.js +4 -7
- package/lib/Avatar/Avatar.module.css +0 -6
- package/lib/Avatar/props/defaultProps.js +1 -3
- package/lib/Avatar/props/propTypes.js +2 -4
- package/lib/AvatarTeam/AvatarTeam.js +2 -8
- package/lib/AvatarTeam/AvatarTeam.module.css +3 -30
- package/lib/AvatarTeam/props/defaultProps.js +1 -4
- package/lib/AvatarTeam/props/propTypes.js +1 -4
- package/lib/MultiSelect/MultiSelect.js +4 -2
- package/lib/MultiSelect/MultiSelectWithAvatar.js +3 -1
- package/lib/MultiSelect/props/defaultProps.js +4 -2
- package/lib/MultiSelect/props/propTypes.js +4 -2
- package/lib/Provider/AvatarSize.js +0 -1
- package/lib/common/avatarsizes.module.css +2 -6
- package/lib/utils/dropDownUtils.js +5 -2
- package/package.json +1 -1
|
@@ -30,7 +30,6 @@
|
|
|
30
30
|
--zdt_avatarteam_secondary_bg: var(--dot_ebonyclay);
|
|
31
31
|
--zdt_avatarteam_nofill_border: var(--zdt_cta_grey_40_border);
|
|
32
32
|
--zdt_avatarteam_nofill_hover_border: var(--dot_oslogrey);
|
|
33
|
-
--zdt_avatarteam_innerCircle: var(--dot_ebonyclay);
|
|
34
33
|
|
|
35
34
|
/* button */
|
|
36
35
|
--zdt_button_default_text: var(--zdt_cta_alpha_text);
|
|
@@ -30,7 +30,6 @@
|
|
|
30
30
|
--zdt_avatarteam_secondary_bg: var(--dot_white);
|
|
31
31
|
--zdt_avatarteam_nofill_border: var(--zdt_cta_grey_40_border);
|
|
32
32
|
--zdt_avatarteam_nofill_hover_border: var(--dot_slateGrey);
|
|
33
|
-
--zdt_avatarteam_innerCircle: var(--dot_white);
|
|
34
33
|
|
|
35
34
|
/* button */
|
|
36
35
|
--zdt_button_default_text: var(--zdt_cta_alpha_text);
|
|
@@ -30,7 +30,6 @@
|
|
|
30
30
|
--zdt_avatarteam_secondary_bg: #212121;
|
|
31
31
|
--zdt_avatarteam_nofill_border: var(--zdt_cta_grey_40_border);
|
|
32
32
|
--zdt_avatarteam_nofill_hover_border: var(--dot_oslogrey);
|
|
33
|
-
--zdt_avatarteam_innerCircle: #212121;
|
|
34
33
|
|
|
35
34
|
/* button */
|
|
36
35
|
--zdt_button_default_text: var(--zdt_cta_alpha_text);
|
package/css_error.log
ADDED
|
File without changes
|
package/es/Avatar/Avatar.js
CHANGED
|
@@ -125,9 +125,7 @@ export default class Avatar extends React.Component {
|
|
|
125
125
|
alternateSrc,
|
|
126
126
|
isAnimate,
|
|
127
127
|
dataSelectorId,
|
|
128
|
-
customProps
|
|
129
|
-
needInnerborder,
|
|
130
|
-
needDefaultBorder
|
|
128
|
+
customProps
|
|
131
129
|
} = this.props;
|
|
132
130
|
let {
|
|
133
131
|
AvatarProps = {}
|
|
@@ -141,8 +139,7 @@ export default class Avatar extends React.Component {
|
|
|
141
139
|
let showInitial = !showAvatar || showAvatar && isInvalidImageList;
|
|
142
140
|
const showAlternateAvatar = alternateSrc ? showInitial : false;
|
|
143
141
|
let border = borderOnHover || onClick;
|
|
144
|
-
let
|
|
145
|
-
let borderStyle = (!src || !showAvatar || showInitial || showDefaultBorder) && needBorder ? `${style.border} ${borderOnActive ? style.borderOnActive : border ? style.borderOnHover : ''} ` : '';
|
|
142
|
+
let borderStyle = (!src || !showAvatar || showInitial) && needBorder ? `${style.border} ${borderOnActive ? style.borderOnActive : border ? style.borderOnHover : ''} ` : '';
|
|
146
143
|
borderStyle = showAlternateAvatar ? '' : borderStyle;
|
|
147
144
|
return /*#__PURE__*/React.createElement("div", _extends({
|
|
148
145
|
className: `${style.avatar} ${style[size]} ${AvatarSize(size)} ${style[shapeStyle]} ${style[palette]} ${textStyle} ${borderStyle} ${customClass ? customClass : ''}`,
|
|
@@ -155,7 +152,7 @@ export default class Avatar extends React.Component {
|
|
|
155
152
|
"data-id": `${dataId}_AvatarInitial`,
|
|
156
153
|
"data-selector-id": `${dataSelectorId}_AvatarInitial`
|
|
157
154
|
}, initial), (showAvatar || showAlternateAvatar) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("img", {
|
|
158
|
-
className: `${style.image} ${isAnimate ? style.animate : ''}
|
|
155
|
+
className: `${style.image} ${isAnimate ? style.animate : ''}`,
|
|
159
156
|
"data-id": `${dataId}_AvatarImg`,
|
|
160
157
|
"data-selector-id": `${dataSelectorId}_AvatarImg`,
|
|
161
158
|
name: name,
|
|
@@ -163,7 +160,7 @@ export default class Avatar extends React.Component {
|
|
|
163
160
|
onLoad: this.putValidImageURLJSON,
|
|
164
161
|
src: showAlternateAvatar ? alternateSrc : src,
|
|
165
162
|
alt: name
|
|
166
|
-
}),
|
|
163
|
+
}), !isValidImageList && !showAlternateAvatar ? null : /*#__PURE__*/React.createElement("span", {
|
|
167
164
|
className: `${style.shadow} ${textStyle} `
|
|
168
165
|
})));
|
|
169
166
|
}
|
|
@@ -79,9 +79,6 @@
|
|
|
79
79
|
[dir=rtl] .animate{
|
|
80
80
|
animation-duration: var(--zd_transition2);
|
|
81
81
|
}
|
|
82
|
-
.innerBorder{
|
|
83
|
-
border: 1px solid var(--zdt_avatarteam_innerCircle);
|
|
84
|
-
}
|
|
85
82
|
.square_small {
|
|
86
83
|
--avatar_border_radius: 4px;
|
|
87
84
|
}
|
|
@@ -112,9 +109,6 @@
|
|
|
112
109
|
text-transform: var(--avatar_text_transform);
|
|
113
110
|
display: inline-block;
|
|
114
111
|
}
|
|
115
|
-
.xxsmall{
|
|
116
|
-
--avatar_font_size: var(--zd_font_size8);
|
|
117
|
-
}
|
|
118
112
|
.small {
|
|
119
113
|
--avatar_font_size: var(--zd_font_size9);
|
|
120
114
|
}
|
|
@@ -9,7 +9,7 @@ export const propTypes = {
|
|
|
9
9
|
onClick: PropTypes.func,
|
|
10
10
|
palette: PropTypes.oneOf(['primary', 'secondary', 'info', 'default']),
|
|
11
11
|
shape: PropTypes.oneOf(['circle', 'square']),
|
|
12
|
-
size: PropTypes.oneOf(['
|
|
12
|
+
size: PropTypes.oneOf(['small', 'xsmall', 'medium', 'xmedium', 'large', 'xlarge']),
|
|
13
13
|
src: PropTypes.string,
|
|
14
14
|
textPalette: PropTypes.oneOf(['white', 'black']),
|
|
15
15
|
title: PropTypes.string,
|
|
@@ -20,7 +20,5 @@ export const propTypes = {
|
|
|
20
20
|
customProps: PropTypes.shape({
|
|
21
21
|
AvatarProps: PropTypes.object
|
|
22
22
|
}),
|
|
23
|
-
isAnimate: PropTypes.bool
|
|
24
|
-
needInnerborder: PropTypes.bool,
|
|
25
|
-
needDefaultBorder: PropTypes.bool
|
|
23
|
+
isAnimate: PropTypes.bool
|
|
26
24
|
};
|
|
@@ -32,10 +32,7 @@ export default class AvatarTeam extends React.Component {
|
|
|
32
32
|
borderOnActive,
|
|
33
33
|
borderOnHover,
|
|
34
34
|
dataSelectorId,
|
|
35
|
-
customProps
|
|
36
|
-
needInnerborder,
|
|
37
|
-
needBorder,
|
|
38
|
-
needDefaultBorder
|
|
35
|
+
customProps
|
|
39
36
|
} = this.props;
|
|
40
37
|
let {
|
|
41
38
|
AvatarTeamProps = {},
|
|
@@ -61,10 +58,7 @@ export default class AvatarTeam extends React.Component {
|
|
|
61
58
|
needTitle: needTitle,
|
|
62
59
|
customClass: customAvatar,
|
|
63
60
|
borderOnActive: borderOnActive,
|
|
64
|
-
borderOnHover: border
|
|
65
|
-
needInnerborder: needInnerborder,
|
|
66
|
-
needBorder: needBorder,
|
|
67
|
-
needDefaultBorder: needDefaultBorder
|
|
61
|
+
borderOnHover: border
|
|
68
62
|
}, AvatarProps)), /*#__PURE__*/React.createElement("span", {
|
|
69
63
|
className: `${style.team} ${isFilled ? `${style[`${palette}Filled`]}` : style.nofill}
|
|
70
64
|
${style[`${size}team`]} ${customAvatarTeam}`
|
|
@@ -3,9 +3,6 @@
|
|
|
3
3
|
--avatarteam_border_width: var(--zd_size1);
|
|
4
4
|
--avatarteam_border_style: solid;
|
|
5
5
|
--avatarteam_border_color: var(--zdt_avatarteam_default_border);
|
|
6
|
-
--avatarteam_outline_width: var(--zd_size1);
|
|
7
|
-
--avatarteam_outline_style: solid;
|
|
8
|
-
--avatarteam_outline_color: var(--zdt_avatarteam_innerCircle);
|
|
9
6
|
--avatarteam_bg_color: var(--zdt_avatarteam_default_bg);
|
|
10
7
|
--avatarteam_width: var(--zd_size5);
|
|
11
8
|
--avatarteam_height: var(--zd_size5);
|
|
@@ -19,7 +16,6 @@
|
|
|
19
16
|
position: relative;
|
|
20
17
|
display: inline-block;
|
|
21
18
|
font-size: 0;
|
|
22
|
-
vertical-align: middle;
|
|
23
19
|
}
|
|
24
20
|
.team {
|
|
25
21
|
composes: varClass;
|
|
@@ -27,9 +23,6 @@
|
|
|
27
23
|
top: var(--avatarteam_top_top);
|
|
28
24
|
width: var(--avatarteam_width);
|
|
29
25
|
height: var(--avatarteam_height);
|
|
30
|
-
outline-width: var(--avatarteam_outline_width);
|
|
31
|
-
outline-style: var(--avatarteam_outline_style);
|
|
32
|
-
outline-color: var(--avatarteam_outline_color);
|
|
33
26
|
border-width: var(--avatarteam_border_width);
|
|
34
27
|
border-style: var(--avatarteam_border_style);
|
|
35
28
|
border-color: var(--avatarteam_border_color);
|
|
@@ -45,11 +38,11 @@
|
|
|
45
38
|
right: 50%;
|
|
46
39
|
}
|
|
47
40
|
.nofill {
|
|
48
|
-
--avatarteam_border_color: var(--
|
|
41
|
+
--avatarteam_border_color: var(--zdt_avatarteam_nofill_border);
|
|
49
42
|
}
|
|
50
43
|
.primaryFilled,
|
|
51
44
|
.infoFilled {
|
|
52
|
-
--avatarteam_bg_color: var(--
|
|
45
|
+
--avatarteam_bg_color: var(--zdt_avatarteam_primary_bg);
|
|
53
46
|
}
|
|
54
47
|
.secondaryFilled {
|
|
55
48
|
--avatarteam_bg_color: var(--zdt_avatarteam_secondary_bg);
|
|
@@ -71,9 +64,6 @@
|
|
|
71
64
|
height: inherit;
|
|
72
65
|
width: inherit;
|
|
73
66
|
top: var(--avatarteam_bottom_top);
|
|
74
|
-
outline-width: var(--avatarteam_outline_width);
|
|
75
|
-
outline-style: var(--avatarteam_outline_style);
|
|
76
|
-
outline-color: var( --avatarteam_outline_color);
|
|
77
67
|
}
|
|
78
68
|
.team:after, .team:before {
|
|
79
69
|
border: inherit;
|
|
@@ -90,8 +80,7 @@
|
|
|
90
80
|
left: var(--avatarteam_bottom_right);
|
|
91
81
|
}
|
|
92
82
|
.smallteam,
|
|
93
|
-
.xsmallteam
|
|
94
|
-
.xxsmallteam {
|
|
83
|
+
.xsmallteam {
|
|
95
84
|
--avatarteam_height: var(--zd_size3);
|
|
96
85
|
--avatarteam_width: var(--zd_size3);
|
|
97
86
|
}
|
|
@@ -105,22 +94,6 @@
|
|
|
105
94
|
--avatarteam_height: var(--zd_size7);
|
|
106
95
|
--avatarteam_width: var(--zd_size7);
|
|
107
96
|
}
|
|
108
|
-
|
|
109
|
-
.xxsmallteam {
|
|
110
|
-
--avatarteam_top_top: 0px;
|
|
111
|
-
}
|
|
112
|
-
.xxsmallteam::after,
|
|
113
|
-
.xxsmallteam:before {
|
|
114
|
-
--avatarteam_bottom_top: var(--zd_size13);
|
|
115
|
-
}
|
|
116
|
-
.xxsmallteam:after {
|
|
117
|
-
--avatarteam_bottom_left: calc(var(--zd_size8) * -1);
|
|
118
|
-
}
|
|
119
|
-
.xxsmallteam:before {
|
|
120
|
-
--avatarteam_bottom_right: calc(var(--zd_size8) * -1);
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
|
|
124
97
|
.smallteam::after,
|
|
125
98
|
.smallteam:before {
|
|
126
99
|
--avatarteam_bottom_top: var(--zd_size17);
|
|
@@ -7,10 +7,9 @@ export const propTypes = {
|
|
|
7
7
|
needTitle: PropTypes.bool,
|
|
8
8
|
onClick: PropTypes.func,
|
|
9
9
|
palette: PropTypes.oneOf(['primary', 'secondary', 'info']),
|
|
10
|
-
size: PropTypes.oneOf(['
|
|
10
|
+
size: PropTypes.oneOf(['small', 'xsmall', 'medium', 'xmedium', 'large', 'xlarge']),
|
|
11
11
|
src: PropTypes.string,
|
|
12
12
|
textPalette: PropTypes.oneOf(['white', 'black']),
|
|
13
|
-
needBorder: PropTypes.bool,
|
|
14
13
|
title: PropTypes.string,
|
|
15
14
|
customClass: PropTypes.shape({
|
|
16
15
|
customAvatar: PropTypes.string,
|
|
@@ -18,8 +17,6 @@ export const propTypes = {
|
|
|
18
17
|
}),
|
|
19
18
|
borderOnActive: PropTypes.bool,
|
|
20
19
|
borderOnHover: PropTypes.bool,
|
|
21
|
-
needInnerborder: PropTypes.bool,
|
|
22
|
-
needDefaultBorder: PropTypes.bool,
|
|
23
20
|
customProps: PropTypes.shape({
|
|
24
21
|
AvatarTeamProps: PropTypes.object,
|
|
25
22
|
AvatarProps: PropTypes.object
|
|
@@ -249,7 +249,8 @@ export class MultiSelectComponent extends React.Component {
|
|
|
249
249
|
} = this.state;
|
|
250
250
|
const {
|
|
251
251
|
selectedOptions,
|
|
252
|
-
needLocalSearch
|
|
252
|
+
needLocalSearch,
|
|
253
|
+
isNeedTick
|
|
253
254
|
} = this.props;
|
|
254
255
|
const {
|
|
255
256
|
suggestions,
|
|
@@ -258,7 +259,8 @@ export class MultiSelectComponent extends React.Component {
|
|
|
258
259
|
options,
|
|
259
260
|
selectedOptions,
|
|
260
261
|
searchStr: getSearchString(searchStr),
|
|
261
|
-
needSearch: needLocalSearch
|
|
262
|
+
needSearch: needLocalSearch,
|
|
263
|
+
isNeedTick
|
|
262
264
|
});
|
|
263
265
|
this.suggestionsOrder = suggestionIds;
|
|
264
266
|
return suggestions;
|
|
@@ -99,7 +99,8 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
|
|
|
99
99
|
customChildrenClass,
|
|
100
100
|
isBoxPaddingNeed,
|
|
101
101
|
needEffect,
|
|
102
|
-
isLoading
|
|
102
|
+
isLoading,
|
|
103
|
+
isNeedTick
|
|
103
104
|
} = this.props;
|
|
104
105
|
const {
|
|
105
106
|
clearText = 'Clear all'
|
|
@@ -246,6 +247,7 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
|
|
|
246
247
|
customClass: !tabletMode && dropBoxSize ? style[dropBoxSize] : '',
|
|
247
248
|
eleRef: this.suggestionContainerRef
|
|
248
249
|
}, suggestions.length ? /*#__PURE__*/React.createElement(Suggestions, {
|
|
250
|
+
needTick: isNeedTick,
|
|
249
251
|
suggestions: suggestions,
|
|
250
252
|
getRef: this.suggestionItemRef,
|
|
251
253
|
hoverOption: hoverOption,
|
|
@@ -106,7 +106,8 @@ export const MultiSelect_defaultProps = {
|
|
|
106
106
|
needEffect: true,
|
|
107
107
|
boxSize: 'default',
|
|
108
108
|
isLoading: false,
|
|
109
|
-
dataSelectorId: 'multiSelect'
|
|
109
|
+
dataSelectorId: 'multiSelect',
|
|
110
|
+
isNeedTick: false
|
|
110
111
|
};
|
|
111
112
|
export const MultiSelectHeader_defaultProps = {
|
|
112
113
|
dataId: 'MultiSelectHeader'
|
|
@@ -138,7 +139,8 @@ export const MultiSelectWithAvatar_defaultProps = {
|
|
|
138
139
|
isSearchClearOnSelect: true,
|
|
139
140
|
needEffect: true,
|
|
140
141
|
isLoading: false,
|
|
141
|
-
dataSelectorId: 'multiSelectWithAvatar'
|
|
142
|
+
dataSelectorId: 'multiSelectWithAvatar',
|
|
143
|
+
isNeedTick: false
|
|
142
144
|
};
|
|
143
145
|
export const SelectedOptions_defaultProps = {
|
|
144
146
|
size: 'medium'
|
|
@@ -239,7 +239,8 @@ export const MultiSelect_propTypes = {
|
|
|
239
239
|
needEffect: PropTypes.bool,
|
|
240
240
|
boxSize: PropTypes.string,
|
|
241
241
|
isLoading: PropTypes.bool,
|
|
242
|
-
dataSelectorId: PropTypes.string
|
|
242
|
+
dataSelectorId: PropTypes.string,
|
|
243
|
+
isNeedTick: PropTypes.bool
|
|
243
244
|
};
|
|
244
245
|
export const MultiSelectHeader_propTypes = {
|
|
245
246
|
dataId: PropTypes.string,
|
|
@@ -318,7 +319,8 @@ export const MultiSelectWithAvatar_propTypes = {
|
|
|
318
319
|
isSearchClearOnSelect: PropTypes.bool,
|
|
319
320
|
disabledOptions: PropTypes.arrayOf(PropTypes.string),
|
|
320
321
|
isLoading: PropTypes.bool,
|
|
321
|
-
dataSelectorId: PropTypes.string
|
|
322
|
+
dataSelectorId: PropTypes.string,
|
|
323
|
+
isNeedTick: PropTypes.bool
|
|
322
324
|
};
|
|
323
325
|
export const SelectedOptions_propTypes = {
|
|
324
326
|
getRef: PropTypes.func,
|
|
@@ -9,8 +9,7 @@
|
|
|
9
9
|
.medium,
|
|
10
10
|
.xmedium,
|
|
11
11
|
.large,
|
|
12
|
-
.xlarge
|
|
13
|
-
.xxsmall {
|
|
12
|
+
.xlarge {
|
|
14
13
|
composes: varClass;
|
|
15
14
|
width: var(--avatar_width);
|
|
16
15
|
height: var(--avatar_height);
|
|
@@ -19,10 +18,7 @@
|
|
|
19
18
|
--avatar_height: var(--zd_size22);
|
|
20
19
|
--avatar_width: var(--zd_size22);
|
|
21
20
|
}
|
|
22
|
-
|
|
23
|
-
--avatar_height: var(--zd_size18);
|
|
24
|
-
--avatar_width: var(--zd_size18);
|
|
25
|
-
}
|
|
21
|
+
|
|
26
22
|
.xsmall {
|
|
27
23
|
--avatar_height: var(--zd_size30);
|
|
28
24
|
--avatar_width: var(--zd_size30);
|
|
@@ -21,9 +21,10 @@ const getSelectedValue = props => getIsEmptyValue(props.selectedValue) ? '' : pr
|
|
|
21
21
|
const getSelectedFormatOptions = props => props.selectedFormatOptions || dummyObj;
|
|
22
22
|
export const getPrefixText = props => props.prefixText || '';
|
|
23
23
|
const getIsStartWithSearch = props => props.isStartsWithSearch;
|
|
24
|
+
const getIsNeedTick = props => props.isNeedTick;
|
|
24
25
|
const getDisabledOptions = props => props.disabledOptions || dummyArray;
|
|
25
26
|
const getListItemProps = props => props.listItemProps || '';
|
|
26
|
-
export const makeGetMultiSelectFilterSuggestions = () => createSelector([getOptions, getSelectedOptionsSel, getSearchStr, getNeedSearch, getIsStartWithSearch], (options, selectedOptions, searchStr, needSearch, isStartsWithSearch) => {
|
|
27
|
+
export const makeGetMultiSelectFilterSuggestions = () => createSelector([getOptions, getSelectedOptionsSel, getSearchStr, getNeedSearch, getIsStartWithSearch, getIsNeedTick], (options, selectedOptions, searchStr, needSearch, isStartsWithSearch, isNeedTick) => {
|
|
27
28
|
const suggestions = [];
|
|
28
29
|
const suggestionIds = [];
|
|
29
30
|
options.forEach(option => {
|
|
@@ -34,7 +35,7 @@ export const makeGetMultiSelectFilterSuggestions = () => createSelector([getOpti
|
|
|
34
35
|
const valueString = getSearchString(value);
|
|
35
36
|
const searchString = getSearchString(searchStr);
|
|
36
37
|
const isMatch = needSearch ? isStartsWithSearch ? valueString.startsWith(searchString) : valueString.indexOf(searchString) !== -1 : true;
|
|
37
|
-
if (selectedOptions.indexOf(id) === -1 && isMatch) {
|
|
38
|
+
if (selectedOptions.indexOf(id) === -1 && isMatch || isNeedTick) {
|
|
38
39
|
suggestions.push(option);
|
|
39
40
|
suggestionIds.push(id);
|
|
40
41
|
}
|
package/lib/Avatar/Avatar.js
CHANGED
|
@@ -151,9 +151,7 @@ var Avatar = /*#__PURE__*/function (_React$Component) {
|
|
|
151
151
|
alternateSrc = _this$props2.alternateSrc,
|
|
152
152
|
isAnimate = _this$props2.isAnimate,
|
|
153
153
|
dataSelectorId = _this$props2.dataSelectorId,
|
|
154
|
-
customProps = _this$props2.customProps
|
|
155
|
-
needInnerborder = _this$props2.needInnerborder,
|
|
156
|
-
needDefaultBorder = _this$props2.needDefaultBorder;
|
|
154
|
+
customProps = _this$props2.customProps;
|
|
157
155
|
var _customProps$AvatarPr = customProps.AvatarProps,
|
|
158
156
|
AvatarProps = _customProps$AvatarPr === void 0 ? {} : _customProps$AvatarPr;
|
|
159
157
|
var textStyle = textPalette ? _AvatarModule["default"][textPalette] : palette === 'secondary' ? _AvatarModule["default"].white : _AvatarModule["default"].black;
|
|
@@ -165,8 +163,7 @@ var Avatar = /*#__PURE__*/function (_React$Component) {
|
|
|
165
163
|
var showInitial = !showAvatar || showAvatar && isInvalidImageList;
|
|
166
164
|
var showAlternateAvatar = alternateSrc ? showInitial : false;
|
|
167
165
|
var border = borderOnHover || onClick;
|
|
168
|
-
var
|
|
169
|
-
var borderStyle = (!src || !showAvatar || showInitial || showDefaultBorder) && needBorder ? "".concat(_AvatarModule["default"].border, " ").concat(borderOnActive ? _AvatarModule["default"].borderOnActive : border ? _AvatarModule["default"].borderOnHover : '', " ") : '';
|
|
166
|
+
var borderStyle = (!src || !showAvatar || showInitial) && needBorder ? "".concat(_AvatarModule["default"].border, " ").concat(borderOnActive ? _AvatarModule["default"].borderOnActive : border ? _AvatarModule["default"].borderOnHover : '', " ") : '';
|
|
170
167
|
borderStyle = showAlternateAvatar ? '' : borderStyle;
|
|
171
168
|
return /*#__PURE__*/_react["default"].createElement("div", _extends({
|
|
172
169
|
className: "".concat(_AvatarModule["default"].avatar, " ").concat(_AvatarModule["default"][size], " ").concat((0, _AvatarSize["default"])(size), " ").concat(_AvatarModule["default"][shapeStyle], " ").concat(_AvatarModule["default"][palette], " ").concat(textStyle, " ").concat(borderStyle, " ").concat(customClass ? customClass : ''),
|
|
@@ -179,7 +176,7 @@ var Avatar = /*#__PURE__*/function (_React$Component) {
|
|
|
179
176
|
"data-id": "".concat(dataId, "_AvatarInitial"),
|
|
180
177
|
"data-selector-id": "".concat(dataSelectorId, "_AvatarInitial")
|
|
181
178
|
}, initial), (showAvatar || showAlternateAvatar) && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("img", {
|
|
182
|
-
className: "".concat(_AvatarModule["default"].image, " ").concat(isAnimate ? _AvatarModule["default"].animate : ''
|
|
179
|
+
className: "".concat(_AvatarModule["default"].image, " ").concat(isAnimate ? _AvatarModule["default"].animate : ''),
|
|
183
180
|
"data-id": "".concat(dataId, "_AvatarImg"),
|
|
184
181
|
"data-selector-id": "".concat(dataSelectorId, "_AvatarImg"),
|
|
185
182
|
name: name,
|
|
@@ -187,7 +184,7 @@ var Avatar = /*#__PURE__*/function (_React$Component) {
|
|
|
187
184
|
onLoad: this.putValidImageURLJSON,
|
|
188
185
|
src: showAlternateAvatar ? alternateSrc : src,
|
|
189
186
|
alt: name
|
|
190
|
-
}),
|
|
187
|
+
}), !isValidImageList && !showAlternateAvatar ? null : /*#__PURE__*/_react["default"].createElement("span", {
|
|
191
188
|
className: "".concat(_AvatarModule["default"].shadow, " ").concat(textStyle, " ")
|
|
192
189
|
})));
|
|
193
190
|
}
|
|
@@ -79,9 +79,6 @@
|
|
|
79
79
|
[dir=rtl] .animate{
|
|
80
80
|
animation-duration: var(--zd_transition2);
|
|
81
81
|
}
|
|
82
|
-
.innerBorder{
|
|
83
|
-
border: 1px solid var(--zdt_avatarteam_innerCircle);
|
|
84
|
-
}
|
|
85
82
|
.square_small {
|
|
86
83
|
--avatar_border_radius: 4px;
|
|
87
84
|
}
|
|
@@ -112,9 +109,6 @@
|
|
|
112
109
|
text-transform: var(--avatar_text_transform);
|
|
113
110
|
display: inline-block;
|
|
114
111
|
}
|
|
115
|
-
.xxsmall{
|
|
116
|
-
--avatar_font_size: var(--zd_font_size8);
|
|
117
|
-
}
|
|
118
112
|
.small {
|
|
119
113
|
--avatar_font_size: var(--zd_font_size9);
|
|
120
114
|
}
|
|
@@ -16,7 +16,7 @@ var propTypes = {
|
|
|
16
16
|
onClick: _propTypes["default"].func,
|
|
17
17
|
palette: _propTypes["default"].oneOf(['primary', 'secondary', 'info', 'default']),
|
|
18
18
|
shape: _propTypes["default"].oneOf(['circle', 'square']),
|
|
19
|
-
size: _propTypes["default"].oneOf(['
|
|
19
|
+
size: _propTypes["default"].oneOf(['small', 'xsmall', 'medium', 'xmedium', 'large', 'xlarge']),
|
|
20
20
|
src: _propTypes["default"].string,
|
|
21
21
|
textPalette: _propTypes["default"].oneOf(['white', 'black']),
|
|
22
22
|
title: _propTypes["default"].string,
|
|
@@ -27,8 +27,6 @@ var propTypes = {
|
|
|
27
27
|
customProps: _propTypes["default"].shape({
|
|
28
28
|
AvatarProps: _propTypes["default"].object
|
|
29
29
|
}),
|
|
30
|
-
isAnimate: _propTypes["default"].bool
|
|
31
|
-
needInnerborder: _propTypes["default"].bool,
|
|
32
|
-
needDefaultBorder: _propTypes["default"].bool
|
|
30
|
+
isAnimate: _propTypes["default"].bool
|
|
33
31
|
};
|
|
34
32
|
exports.propTypes = propTypes;
|
|
@@ -56,10 +56,7 @@ var AvatarTeam = /*#__PURE__*/function (_React$Component) {
|
|
|
56
56
|
borderOnActive = _this$props.borderOnActive,
|
|
57
57
|
borderOnHover = _this$props.borderOnHover,
|
|
58
58
|
dataSelectorId = _this$props.dataSelectorId,
|
|
59
|
-
customProps = _this$props.customProps
|
|
60
|
-
needInnerborder = _this$props.needInnerborder,
|
|
61
|
-
needBorder = _this$props.needBorder,
|
|
62
|
-
needDefaultBorder = _this$props.needDefaultBorder;
|
|
59
|
+
customProps = _this$props.customProps;
|
|
63
60
|
var _customProps$AvatarTe = customProps.AvatarTeamProps,
|
|
64
61
|
AvatarTeamProps = _customProps$AvatarTe === void 0 ? {} : _customProps$AvatarTe,
|
|
65
62
|
_customProps$AvatarPr = customProps.AvatarProps,
|
|
@@ -84,10 +81,7 @@ var AvatarTeam = /*#__PURE__*/function (_React$Component) {
|
|
|
84
81
|
needTitle: needTitle,
|
|
85
82
|
customClass: customAvatar,
|
|
86
83
|
borderOnActive: borderOnActive,
|
|
87
|
-
borderOnHover: border
|
|
88
|
-
needInnerborder: needInnerborder,
|
|
89
|
-
needBorder: needBorder,
|
|
90
|
-
needDefaultBorder: needDefaultBorder
|
|
84
|
+
borderOnHover: border
|
|
91
85
|
}, AvatarProps)), /*#__PURE__*/_react["default"].createElement("span", {
|
|
92
86
|
className: "".concat(_AvatarTeamModule["default"].team, " ").concat(isFilled ? "".concat(_AvatarTeamModule["default"]["".concat(palette, "Filled")]) : _AvatarTeamModule["default"].nofill, " \n ").concat(_AvatarTeamModule["default"]["".concat(size, "team")], " ").concat(customAvatarTeam)
|
|
93
87
|
}));
|
|
@@ -3,9 +3,6 @@
|
|
|
3
3
|
--avatarteam_border_width: var(--zd_size1);
|
|
4
4
|
--avatarteam_border_style: solid;
|
|
5
5
|
--avatarteam_border_color: var(--zdt_avatarteam_default_border);
|
|
6
|
-
--avatarteam_outline_width: var(--zd_size1);
|
|
7
|
-
--avatarteam_outline_style: solid;
|
|
8
|
-
--avatarteam_outline_color: var(--zdt_avatarteam_innerCircle);
|
|
9
6
|
--avatarteam_bg_color: var(--zdt_avatarteam_default_bg);
|
|
10
7
|
--avatarteam_width: var(--zd_size5);
|
|
11
8
|
--avatarteam_height: var(--zd_size5);
|
|
@@ -19,7 +16,6 @@
|
|
|
19
16
|
position: relative;
|
|
20
17
|
display: inline-block;
|
|
21
18
|
font-size: 0;
|
|
22
|
-
vertical-align: middle;
|
|
23
19
|
}
|
|
24
20
|
.team {
|
|
25
21
|
composes: varClass;
|
|
@@ -27,9 +23,6 @@
|
|
|
27
23
|
top: var(--avatarteam_top_top);
|
|
28
24
|
width: var(--avatarteam_width);
|
|
29
25
|
height: var(--avatarteam_height);
|
|
30
|
-
outline-width: var(--avatarteam_outline_width);
|
|
31
|
-
outline-style: var(--avatarteam_outline_style);
|
|
32
|
-
outline-color: var(--avatarteam_outline_color);
|
|
33
26
|
border-width: var(--avatarteam_border_width);
|
|
34
27
|
border-style: var(--avatarteam_border_style);
|
|
35
28
|
border-color: var(--avatarteam_border_color);
|
|
@@ -45,11 +38,11 @@
|
|
|
45
38
|
right: 50%;
|
|
46
39
|
}
|
|
47
40
|
.nofill {
|
|
48
|
-
--avatarteam_border_color: var(--
|
|
41
|
+
--avatarteam_border_color: var(--zdt_avatarteam_nofill_border);
|
|
49
42
|
}
|
|
50
43
|
.primaryFilled,
|
|
51
44
|
.infoFilled {
|
|
52
|
-
--avatarteam_bg_color: var(--
|
|
45
|
+
--avatarteam_bg_color: var(--zdt_avatarteam_primary_bg);
|
|
53
46
|
}
|
|
54
47
|
.secondaryFilled {
|
|
55
48
|
--avatarteam_bg_color: var(--zdt_avatarteam_secondary_bg);
|
|
@@ -71,9 +64,6 @@
|
|
|
71
64
|
height: inherit;
|
|
72
65
|
width: inherit;
|
|
73
66
|
top: var(--avatarteam_bottom_top);
|
|
74
|
-
outline-width: var(--avatarteam_outline_width);
|
|
75
|
-
outline-style: var(--avatarteam_outline_style);
|
|
76
|
-
outline-color: var( --avatarteam_outline_color);
|
|
77
67
|
}
|
|
78
68
|
.team:after, .team:before {
|
|
79
69
|
border: inherit;
|
|
@@ -90,8 +80,7 @@
|
|
|
90
80
|
left: var(--avatarteam_bottom_right);
|
|
91
81
|
}
|
|
92
82
|
.smallteam,
|
|
93
|
-
.xsmallteam
|
|
94
|
-
.xxsmallteam {
|
|
83
|
+
.xsmallteam {
|
|
95
84
|
--avatarteam_height: var(--zd_size3);
|
|
96
85
|
--avatarteam_width: var(--zd_size3);
|
|
97
86
|
}
|
|
@@ -105,22 +94,6 @@
|
|
|
105
94
|
--avatarteam_height: var(--zd_size7);
|
|
106
95
|
--avatarteam_width: var(--zd_size7);
|
|
107
96
|
}
|
|
108
|
-
|
|
109
|
-
.xxsmallteam {
|
|
110
|
-
--avatarteam_top_top: 0px;
|
|
111
|
-
}
|
|
112
|
-
.xxsmallteam::after,
|
|
113
|
-
.xxsmallteam:before {
|
|
114
|
-
--avatarteam_bottom_top: var(--zd_size13);
|
|
115
|
-
}
|
|
116
|
-
.xxsmallteam:after {
|
|
117
|
-
--avatarteam_bottom_left: calc(var(--zd_size8) * -1);
|
|
118
|
-
}
|
|
119
|
-
.xxsmallteam:before {
|
|
120
|
-
--avatarteam_bottom_right: calc(var(--zd_size8) * -1);
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
|
|
124
97
|
.smallteam::after,
|
|
125
98
|
.smallteam:before {
|
|
126
99
|
--avatarteam_bottom_top: var(--zd_size17);
|
|
@@ -14,10 +14,9 @@ var propTypes = {
|
|
|
14
14
|
needTitle: _propTypes["default"].bool,
|
|
15
15
|
onClick: _propTypes["default"].func,
|
|
16
16
|
palette: _propTypes["default"].oneOf(['primary', 'secondary', 'info']),
|
|
17
|
-
size: _propTypes["default"].oneOf(['
|
|
17
|
+
size: _propTypes["default"].oneOf(['small', 'xsmall', 'medium', 'xmedium', 'large', 'xlarge']),
|
|
18
18
|
src: _propTypes["default"].string,
|
|
19
19
|
textPalette: _propTypes["default"].oneOf(['white', 'black']),
|
|
20
|
-
needBorder: _propTypes["default"].bool,
|
|
21
20
|
title: _propTypes["default"].string,
|
|
22
21
|
customClass: _propTypes["default"].shape({
|
|
23
22
|
customAvatar: _propTypes["default"].string,
|
|
@@ -25,8 +24,6 @@ var propTypes = {
|
|
|
25
24
|
}),
|
|
26
25
|
borderOnActive: _propTypes["default"].bool,
|
|
27
26
|
borderOnHover: _propTypes["default"].bool,
|
|
28
|
-
needInnerborder: _propTypes["default"].bool,
|
|
29
|
-
needDefaultBorder: _propTypes["default"].bool,
|
|
30
27
|
customProps: _propTypes["default"].shape({
|
|
31
28
|
AvatarTeamProps: _propTypes["default"].object,
|
|
32
29
|
AvatarProps: _propTypes["default"].object
|
|
@@ -274,12 +274,14 @@ var MultiSelectComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
274
274
|
searchStr = _this$state3$searchSt === void 0 ? '' : _this$state3$searchSt;
|
|
275
275
|
var _this$props4 = this.props,
|
|
276
276
|
selectedOptions = _this$props4.selectedOptions,
|
|
277
|
-
needLocalSearch = _this$props4.needLocalSearch
|
|
277
|
+
needLocalSearch = _this$props4.needLocalSearch,
|
|
278
|
+
isNeedTick = _this$props4.isNeedTick;
|
|
278
279
|
var _this$getFilterSugges = this.getFilterSuggestions({
|
|
279
280
|
options: options,
|
|
280
281
|
selectedOptions: selectedOptions,
|
|
281
282
|
searchStr: (0, _Common.getSearchString)(searchStr),
|
|
282
|
-
needSearch: needLocalSearch
|
|
283
|
+
needSearch: needLocalSearch,
|
|
284
|
+
isNeedTick: isNeedTick
|
|
283
285
|
}),
|
|
284
286
|
suggestions = _this$getFilterSugges.suggestions,
|
|
285
287
|
suggestionIds = _this$getFilterSugges.suggestionIds;
|
|
@@ -119,7 +119,8 @@ var MultiSelectWithAvatarComponent = /*#__PURE__*/function (_MultiSelectComponen
|
|
|
119
119
|
customChildrenClass = _this$props.customChildrenClass,
|
|
120
120
|
isBoxPaddingNeed = _this$props.isBoxPaddingNeed,
|
|
121
121
|
needEffect = _this$props.needEffect,
|
|
122
|
-
isLoading = _this$props.isLoading
|
|
122
|
+
isLoading = _this$props.isLoading,
|
|
123
|
+
isNeedTick = _this$props.isNeedTick;
|
|
123
124
|
var _i18nKeys = i18nKeys,
|
|
124
125
|
_i18nKeys$clearText = _i18nKeys.clearText,
|
|
125
126
|
clearText = _i18nKeys$clearText === void 0 ? 'Clear all' : _i18nKeys$clearText;
|
|
@@ -260,6 +261,7 @@ var MultiSelectWithAvatarComponent = /*#__PURE__*/function (_MultiSelectComponen
|
|
|
260
261
|
customClass: !tabletMode && dropBoxSize ? _MultiSelectModule["default"][dropBoxSize] : '',
|
|
261
262
|
eleRef: _this2.suggestionContainerRef
|
|
262
263
|
}, suggestions.length ? /*#__PURE__*/_react["default"].createElement(_Suggestions["default"], {
|
|
264
|
+
needTick: isNeedTick,
|
|
263
265
|
suggestions: suggestions,
|
|
264
266
|
getRef: _this2.suggestionItemRef,
|
|
265
267
|
hoverOption: hoverOption,
|
|
@@ -115,7 +115,8 @@ var MultiSelect_defaultProps = {
|
|
|
115
115
|
needEffect: true,
|
|
116
116
|
boxSize: 'default',
|
|
117
117
|
isLoading: false,
|
|
118
|
-
dataSelectorId: 'multiSelect'
|
|
118
|
+
dataSelectorId: 'multiSelect',
|
|
119
|
+
isNeedTick: false
|
|
119
120
|
};
|
|
120
121
|
exports.MultiSelect_defaultProps = MultiSelect_defaultProps;
|
|
121
122
|
var MultiSelectHeader_defaultProps = {
|
|
@@ -149,7 +150,8 @@ var MultiSelectWithAvatar_defaultProps = {
|
|
|
149
150
|
isSearchClearOnSelect: true,
|
|
150
151
|
needEffect: true,
|
|
151
152
|
isLoading: false,
|
|
152
|
-
dataSelectorId: 'multiSelectWithAvatar'
|
|
153
|
+
dataSelectorId: 'multiSelectWithAvatar',
|
|
154
|
+
isNeedTick: false
|
|
153
155
|
};
|
|
154
156
|
exports.MultiSelectWithAvatar_defaultProps = MultiSelectWithAvatar_defaultProps;
|
|
155
157
|
var SelectedOptions_defaultProps = {
|
|
@@ -249,7 +249,8 @@ var MultiSelect_propTypes = {
|
|
|
249
249
|
needEffect: _propTypes["default"].bool,
|
|
250
250
|
boxSize: _propTypes["default"].string,
|
|
251
251
|
isLoading: _propTypes["default"].bool,
|
|
252
|
-
dataSelectorId: _propTypes["default"].string
|
|
252
|
+
dataSelectorId: _propTypes["default"].string,
|
|
253
|
+
isNeedTick: _propTypes["default"].bool
|
|
253
254
|
};
|
|
254
255
|
exports.MultiSelect_propTypes = MultiSelect_propTypes;
|
|
255
256
|
var MultiSelectHeader_propTypes = {
|
|
@@ -330,7 +331,8 @@ var MultiSelectWithAvatar_propTypes = {
|
|
|
330
331
|
isSearchClearOnSelect: _propTypes["default"].bool,
|
|
331
332
|
disabledOptions: _propTypes["default"].arrayOf(_propTypes["default"].string),
|
|
332
333
|
isLoading: _propTypes["default"].bool,
|
|
333
|
-
dataSelectorId: _propTypes["default"].string
|
|
334
|
+
dataSelectorId: _propTypes["default"].string,
|
|
335
|
+
isNeedTick: _propTypes["default"].bool
|
|
334
336
|
};
|
|
335
337
|
exports.MultiSelectWithAvatar_propTypes = MultiSelectWithAvatar_propTypes;
|
|
336
338
|
var SelectedOptions_propTypes = {
|
|
@@ -9,7 +9,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
|
|
|
9
9
|
var styleList = {
|
|
10
10
|
small: _avatarsizesModule["default"].small,
|
|
11
11
|
xsmall: _avatarsizesModule["default"].xsmall,
|
|
12
|
-
xxsmall: _avatarsizesModule["default"].xxsmall,
|
|
13
12
|
medium: _avatarsizesModule["default"].medium,
|
|
14
13
|
xmedium: _avatarsizesModule["default"].xmedium,
|
|
15
14
|
large: _avatarsizesModule["default"].large,
|
|
@@ -9,8 +9,7 @@
|
|
|
9
9
|
.medium,
|
|
10
10
|
.xmedium,
|
|
11
11
|
.large,
|
|
12
|
-
.xlarge
|
|
13
|
-
.xxsmall {
|
|
12
|
+
.xlarge {
|
|
14
13
|
composes: varClass;
|
|
15
14
|
width: var(--avatar_width);
|
|
16
15
|
height: var(--avatar_height);
|
|
@@ -19,10 +18,7 @@
|
|
|
19
18
|
--avatar_height: var(--zd_size22);
|
|
20
19
|
--avatar_width: var(--zd_size22);
|
|
21
20
|
}
|
|
22
|
-
|
|
23
|
-
--avatar_height: var(--zd_size18);
|
|
24
|
-
--avatar_width: var(--zd_size18);
|
|
25
|
-
}
|
|
21
|
+
|
|
26
22
|
.xsmall {
|
|
27
23
|
--avatar_height: var(--zd_size30);
|
|
28
24
|
--avatar_width: var(--zd_size30);
|
|
@@ -84,6 +84,9 @@ exports.getPrefixText = getPrefixText;
|
|
|
84
84
|
var getIsStartWithSearch = function getIsStartWithSearch(props) {
|
|
85
85
|
return props.isStartsWithSearch;
|
|
86
86
|
};
|
|
87
|
+
var getIsNeedTick = function getIsNeedTick(props) {
|
|
88
|
+
return props.isNeedTick;
|
|
89
|
+
};
|
|
87
90
|
var getDisabledOptions = function getDisabledOptions(props) {
|
|
88
91
|
return props.disabledOptions || dummyArray;
|
|
89
92
|
};
|
|
@@ -91,7 +94,7 @@ var getListItemProps = function getListItemProps(props) {
|
|
|
91
94
|
return props.listItemProps || '';
|
|
92
95
|
};
|
|
93
96
|
var makeGetMultiSelectFilterSuggestions = function makeGetMultiSelectFilterSuggestions() {
|
|
94
|
-
return (0, _reselect.createSelector)([getOptions, getSelectedOptionsSel, getSearchStr, getNeedSearch, getIsStartWithSearch], function (options, selectedOptions, searchStr, needSearch, isStartsWithSearch) {
|
|
97
|
+
return (0, _reselect.createSelector)([getOptions, getSelectedOptionsSel, getSearchStr, getNeedSearch, getIsStartWithSearch, getIsNeedTick], function (options, selectedOptions, searchStr, needSearch, isStartsWithSearch, isNeedTick) {
|
|
95
98
|
var suggestions = [];
|
|
96
99
|
var suggestionIds = [];
|
|
97
100
|
options.forEach(function (option) {
|
|
@@ -101,7 +104,7 @@ var makeGetMultiSelectFilterSuggestions = function makeGetMultiSelectFilterSugge
|
|
|
101
104
|
var valueString = (0, _Common.getSearchString)(value);
|
|
102
105
|
var searchString = (0, _Common.getSearchString)(searchStr);
|
|
103
106
|
var isMatch = needSearch ? isStartsWithSearch ? valueString.startsWith(searchString) : valueString.indexOf(searchString) !== -1 : true;
|
|
104
|
-
if (selectedOptions.indexOf(id) === -1 && isMatch) {
|
|
107
|
+
if (selectedOptions.indexOf(id) === -1 && isMatch || isNeedTick) {
|
|
105
108
|
suggestions.push(option);
|
|
106
109
|
suggestionIds.push(id);
|
|
107
110
|
}
|