@zohodesk/components 1.0.0-temp-256 → 1.0.0-temp-256.1

package/es/ListItem/props/defaultProps.js

@@ -82,6 +82,7 @@ export const ListItemWithIconDefaultProps = {
   needBorder: true,
   a11y: {},
   customClass: '',
+  customTitleBoxClass: '',
   customProps: {},
   dataSelectorId: 'listItemWithIcon',
   needMultiLineText: false,

package/es/ListItem/props/propTypes.js

@@ -100,6 +100,7 @@ export const ListItemWithAvatar_Props = {
   value: PropTypes.string,
   secondaryValue: PropTypes.string,
   renderValueRightPlaceholderNode: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  renderLeftValuePlaceholderNode: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   lhsAlignContent: PropTypes.oneOf(['start', 'center', 'end']),
   a11y: PropTypes.shape({
     role: PropTypes.string,
@@ -110,7 +111,8 @@ export const ListItemWithAvatar_Props = {
     customListItem: PropTypes.string,
     customAvatar: PropTypes.string,
     customAvatarTeam: PropTypes.string,
-    customValueRightPlaceholder: PropTypes.string
+    customValueRightPlaceholder: PropTypes.string,
+    customLeftValuePlaceholder: PropTypes.string
   }),
   needMultiLineText: PropTypes.bool,
   customProps: PropTypes.shape({
@@ -141,6 +143,7 @@ export const ListItemWithCheckBox_Props = {
   secondaryValue: PropTypes.string,
   needBorder: PropTypes.bool,
   renderValueRightPlaceholderNode: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  renderLeftValuePlaceholderNode: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   lhsAlignContent: PropTypes.oneOf(['start', 'center', 'end']),
   lhsJustifyContent: PropTypes.oneOf(['start', 'center', 'end']),
   a11y: PropTypes.shape({
@@ -152,7 +155,8 @@ export const ListItemWithCheckBox_Props = {
     customListItem: PropTypes.string,
     customCheckBox: PropTypes.string,
     customLabel: PropTypes.string,
-    customValueRightPlaceholder: PropTypes.string
+    customValueRightPlaceholder: PropTypes.string,
+    customLeftValuePlaceholder: PropTypes.string
   }),
   customProps: PropTypes.object
 };
@@ -180,6 +184,7 @@ export const ListItemWithIcon_Props = {
   value: PropTypes.string,
   secondaryValue: PropTypes.string,
   renderValueRightPlaceholderNode: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  renderLeftValuePlaceholderNode: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   lhsAlignContent: PropTypes.oneOf(['start', 'center', 'end']),
   lhsJustifyContent: PropTypes.oneOf(['start', 'center', 'end']),
   a11y: PropTypes.shape({
@@ -190,6 +195,8 @@ export const ListItemWithIcon_Props = {
   needMultiLineText: PropTypes.bool,
   customClass: PropTypes.string,
   customValueRightPlaceholderClass: PropTypes.string,
+  customLeftValuePlaceholderClass: PropTypes.string,
+  customTitleBoxClass: PropTypes.string,
   customProps: PropTypes.shape({
     ListItemProps: PropTypes.object
   }),
@@ -218,6 +225,7 @@ export const ListItemWithRadio_Props = {
   secondaryValue: PropTypes.string,
   needBorder: PropTypes.bool,
   renderValueRightPlaceholderNode: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
+  renderLeftValuePlaceholderNode: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   lhsAlignContent: PropTypes.oneOf(['start', 'center', 'end']),
   lhsJustifyContent: PropTypes.oneOf(['start', 'center', 'end']),
   a11y: PropTypes.shape({
@@ -229,7 +237,8 @@ export const ListItemWithRadio_Props = {
     customListItem: PropTypes.string,
     customRadio: PropTypes.string,
     customRadioWrap: PropTypes.string,
-    customValueRightPlaceholder: PropTypes.string
+    customValueRightPlaceholder: PropTypes.string,
+    customLeftValuePlaceholder: PropTypes.string
   }),
   customProps: PropTypes.object
 };

package/es/Modal/Portal/__tests__/__snapshots__/Portal.spec.js.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`Portal rendering the defult props 1`] = `
 <body>

package/es/Modal/__tests__/__snapshots__/Modal.spec.js.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`Modal rendering the defult props 1`] = `
 <body>

package/es/MultiSelect/AdvancedGroupMultiSelect.js

@@ -27,6 +27,7 @@ import { DUMMY_OBJECT } from "./../utils/Common";
 import { Icon } from '@zohodesk/icons';
 /**** CSS ****/
 
+import { cn } from "@dot-system/css-utility";
 import style from "./MultiSelect.module.css";
 /**** Methods ****/
 
@@ -922,7 +923,7 @@ class AdvancedGroupMultiSelect extends React.Component {
     const isShowClearIcon = !isReadOnly && !isDisabled && selectedGroupOptions.length > 1;
     const isEditable = !(isReadOnly || isDisabled);
     return /*#__PURE__*/React.createElement("div", {
-      className: `${style.wrapper} ${isDisabled ? style.disabled : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''}`,
+      className: cn(`${style.wrapper} ${isDisabled ? style.disabled : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''}`),
       "data-id": `${isDisabled ? `${dataId}_disabled` : isReadOnly ? `${dataId}_readOnly` : dataId}`,
       "data-test-id": `${isDisabled ? `${dataId}_disabled` : isReadOnly ? `${dataId}_readOnly` : dataId}`,
       "data-title": isDisabled ? title : null,
@@ -955,8 +956,8 @@ class AdvancedGroupMultiSelect extends React.Component {
       adjust: true,
       shrink: true
     }, /*#__PURE__*/React.createElement("span", {
-      className: ` ${style.custmSpan} ${textBoxSize === 'xmedium' ? style.custmSpanXmedium : style.custmSpanMedium} ${isShowClearIcon ? style.clearIconSpace : ''}
-              `
+      className: cn(` ${style.custmSpan} ${textBoxSize === 'xmedium' ? style.custmSpanXmedium : style.custmSpanMedium} ${isShowClearIcon ? style.clearIconSpace : ''}
+              `)
     }, searchStr), /*#__PURE__*/React.createElement(TextBoxIcon, {
       isDisabled: isDisabled,
       inputRef: this.searchInputRef,
@@ -1052,7 +1053,7 @@ class AdvancedGroupMultiSelect extends React.Component {
       return /*#__PURE__*/React.createElement(React.Fragment, {
         key: groupId
       }, groupName && /*#__PURE__*/React.createElement("div", {
-        className: style.groupTitle
+        className: cn(style.groupTitle)
       }, /*#__PURE__*/React.createElement(DropDownHeading, {
         text: groupName,
         a11y: {
@@ -1084,11 +1085,11 @@ class AdvancedGroupMultiSelect extends React.Component {
       i18nKeys: i18nKeys,
       htmlId: ariaErrorId
     }), isNextOptions && /*#__PURE__*/React.createElement("div", {
-      className: style.loader
+      className: cn(style.loader)
     }, /*#__PURE__*/React.createElement(Loader, null)))) : /*#__PURE__*/React.createElement("div", {
-      className: style.loader
+      className: cn(style.loader)
     }, /*#__PURE__*/React.createElement(Loader, null)), getFooter ? isDataLoaded ? /*#__PURE__*/React.createElement(CardFooter, null, getFooter()) : /*#__PURE__*/React.createElement("div", {
-      className: style.loader
+      className: cn(style.loader)
     }, /*#__PURE__*/React.createElement(Loader, null)) : null)))) : null);
   }
 

package/es/MultiSelect/AdvancedMultiSelect.js

@@ -23,6 +23,7 @@ import { ResponsiveReceiver } from "../Responsive/CustomResponsive";
 import Loader from '@zohodesk/svg/lib/Loader/Loader';
 /**** CSS ****/
 
+import { cn } from "@dot-system/css-utility";
 import style from "./MultiSelect.module.css";
 /**** Methods ****/
 
@@ -382,6 +383,7 @@ export class AdvancedMultiSelectComponent extends MultiSelectComponent {
       needEffect,
       disabledOptions,
       isLoading,
+      shouldUseInternalLoader,
       dataSelectorId,
       customClass,
       isAbsolutePositioningNeeded,
@@ -433,8 +435,9 @@ export class AdvancedMultiSelectComponent extends MultiSelectComponent {
     });
     let isShowClearIcon = !isReadOnly && !isDisabled && isShowClear;
     const isEditable = !(isReadOnly || isDisabled);
+    const isInitialEmptyOptions = searchStr.length === 0 && options.length === 0;
     return /*#__PURE__*/React.createElement("div", {
-      className: `${style.wrapper} ${isDisabled ? style.disabled : ''} ${borderColor === 'transparent' ? style.transparentContainer : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''} ${containerClass}`,
+      className: cn(`${style.wrapper} ${isDisabled ? style.disabled : ''} ${borderColor === 'transparent' ? style.transparentContainer : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''} ${containerClass}`),
       "data-id": dataIdMultiSelectComp,
       "data-test-id": dataIdMultiSelectComp,
       "data-title": isDisabled ? title : null,
@@ -465,8 +468,8 @@ export class AdvancedMultiSelectComponent extends MultiSelectComponent {
       shrink: true,
       dataId: `${dataIdMultiSelectComp}_textBox`
     }, /*#__PURE__*/React.createElement("span", {
-      className: ` ${style.custmSpan} ${textBoxSize === 'xmedium' ? style.custmSpanXmedium : style.custmSpanMedium} ${isShowClearIcon ? style.clearIconSpace : ''}
-              `
+      className: cn(` ${style.custmSpan} ${textBoxSize === 'xmedium' ? style.custmSpanXmedium : style.custmSpanMedium} ${isShowClearIcon ? style.clearIconSpace : ''}
+              `)
     }, searchStr), /*#__PURE__*/React.createElement(TextBoxIcon, {
       isDisabled: isDisabled,
       inputRef: this.searchInputRef,
@@ -536,7 +539,7 @@ export class AdvancedMultiSelectComponent extends MultiSelectComponent {
     }, DropBoxProps, {
       alignBox: "row",
       isResponsivePadding: getFooter ? false : true
-    }), isLoading ? /*#__PURE__*/React.createElement(Container, {
+    }), (shouldUseInternalLoader ? isLoading : isLoading && isInitialEmptyOptions) ? /*#__PURE__*/React.createElement(Container, {
       align: "both",
       className: style.loader
     }, /*#__PURE__*/React.createElement(Loader, null)) : /*#__PURE__*/React.createElement(Box, {
@@ -577,7 +580,7 @@ export class AdvancedMultiSelectComponent extends MultiSelectComponent {
       dataId: dataIdLoading,
       i18nKeys: i18nKeys,
       htmlId: ariaErrorId
-    }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {
+    }), (shouldUseInternalLoader ? isFetchingOptions : isLoading && !isInitialEmptyOptions) && /*#__PURE__*/React.createElement(Container, {
       isCover: false,
       align: "both"
     }, /*#__PURE__*/React.createElement(Loader, null))), getFooter ? /*#__PURE__*/React.createElement(CardFooter, null, getFooter()) : null)))) : null);

package/es/MultiSelect/EmptyState.js

@@ -6,6 +6,7 @@ import { EmptyState_defaultProps } from "./props/defaultProps";
 import { MULTISELECT_I18N_KEYS } from "./constants";
 /**** CSS ****/
 
+import { cn } from "@dot-system/css-utility";
 import style from "./MultiSelect.module.css";
 export default class EmptyState extends React.PureComponent {
   render() {
@@ -36,13 +37,13 @@ export default class EmptyState extends React.PureComponent {
       role = 'alert'
     } = a11y;
     return /*#__PURE__*/React.createElement(React.Fragment, null, isLoading ? /*#__PURE__*/React.createElement("div", {
-      className: className,
+      className: cn(className),
       "data-id": `${dataId}_Loading`,
       "data-test-id": `${dataId}_Loading`,
       role: role,
       id: htmlId
     }, loadingText) : searchString.length && suggestions.length === 0 ? getCustomEmptyState ? getCustomEmptyState() : /*#__PURE__*/React.createElement("div", {
-      className: className,
+      className: cn(className),
       "data-id": `${dataId}_srchEmptyMsg`,
       "data-test-id": `${dataId}_srchEmptyMsg`,
       role: role,
@@ -54,7 +55,7 @@ export default class EmptyState extends React.PureComponent {
       htmlId,
       className
     }) : /*#__PURE__*/React.createElement("div", {
-      className: className,
+      className: cn(className),
       "data-id": `${dataId}_noOptnsMsg`,
       "data-test-id": `${dataId}_noOptnsMsg`,
       role: role,
@@ -66,7 +67,7 @@ export default class EmptyState extends React.PureComponent {
       htmlId,
       className
     }) : /*#__PURE__*/React.createElement("div", {
-      className: className,
+      className: cn(className),
       "data-id": `${dataId}_NoMoreOptionMsg`,
       "data-test-id": `${dataId}_NoMoreOptionMsg`,
       role: role,

package/es/MultiSelect/MobileHeader/MobileHeader.js

@@ -3,6 +3,7 @@ import Button from "../../Button/Button";
 import { Container, Box } from "../../Layout";
 import { defaultProps } from "./props/defaultProps";
 import { propTypes } from "./props/propTypes";
+import { cn } from "@dot-system/css-utility";
 import style from "./MobileHeader.module.css";
 export default function MobileHeader(props) {
   let {
@@ -21,7 +22,7 @@ export default function MobileHeader(props) {
   } = i18nText;
   const showMobileHeader = i18nKeys.mobileHeaderText || !i18nKeys.mobileHeaderText && selectedOptions.length >= 1;
   return /*#__PURE__*/React.createElement("div", {
-    className: style.container
+    className: cn(style.container)
   }, /*#__PURE__*/React.createElement(Container, {
     isCover: false,
     align: "vertical",

package/es/MultiSelect/MobileHeader/__tests__/__snapshots__/MobileHeader.spec.js.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`MobileHeader rendering the defult props 1`] = `
 <DocumentFragment>
@@ -6,25 +6,25 @@ exports[`MobileHeader rendering the defult props 1`] = `
     class="container"
   >
     <div
-      class="header flex rowdir alignBetween vCenter"
+      class="flex row alignContent_spaceBetween alignItems_center header"
       data-id="containerComponent"
       data-selector-id="container"
       data-test-id="containerComponent"
     >
       <div
-        class="cardHeading grow basis shrinkOff"
+        class="flexible basis_zero noShrink cardHeading"
         data-id="boxComponent"
         data-selector-id="box"
         data-test-id="boxComponent"
       />
       <div
-        class="shrinkOn"
+        class="shrink"
         data-id="boxComponent"
         data-selector-id="box"
         data-test-id="boxComponent"
       >
         <button
-          class="buttonText bold plainprimary medium"
+          class="bold plainprimary medium buttonText"
           data-id="buttonComp"
           data-selector-id="button"
           data-test-id="buttonComp"

package/es/MultiSelect/MultiSelect.js

@@ -27,6 +27,7 @@ import isMobilePopover from "../DropBox/utils/isMobilePopover";
 import { Icon } from '@zohodesk/icons';
 /**** CSS ****/
 
+import { cn } from "@dot-system/css-utility";
 import style from "./MultiSelect.module.css";
 /**** Methods ****/
 
@@ -190,7 +191,8 @@ export class MultiSelectComponent extends React.Component {
 
   componentDidUpdate(prevProps, prevState) {
     const {
-      searchStr
+      searchStr,
+      hoverOption
     } = this.state;
     const {
       needLocalSearch,
@@ -201,9 +203,10 @@ export class MultiSelectComponent extends React.Component {
     } = this.props; //handle dropbox open & close
 
     if (prevProps.isPopupOpen !== isPopupOpen) {
-      isPopupOpen && onDropBoxOpen && this.handleFetchOptions(onDropBoxOpen, searchStr);
-
-      if (!isPopupOpen) {
+      if (isPopupOpen) {
+        this.scrollToHighlightedIndex();
+        onDropBoxOpen && this.handleFetchOptions(onDropBoxOpen, searchStr);
+      } else {
         this.setState({
           hoverOption: 0
         });
@@ -212,7 +215,7 @@ export class MultiSelectComponent extends React.Component {
       }
     }
 
-    if (isPopupOpen) {
+    if (prevState.hoverOption !== hoverOption && isPopupOpen) {
       this.scrollToHighlightedIndex();
     } //When suggestions length less than 5, getNextOptions function call
 
@@ -963,7 +966,7 @@ export class MultiSelectComponent extends React.Component {
     return /*#__PURE__*/React.createElement(Container, {
       align: "vertical",
       alignBox: "row",
-      className: `${style.container} ${style[size]} ${needBorder ? !disableAction ? style[`borderColor_${borderColor}`] : style.borderColor_transparent : ''} ${isActive && needBorder || isResponsive || isEditable && isFocus && needBorder ? style.active : ''} ${textBoxClass} ${needBorder ? style.hasBorder : ''}`,
+      className: `${style.container} ${style[size]} ${needBorder ? !disableAction ? style[`borderColor_${borderColor}`] : style.borderColor_transparent : ''} ${isActive && needBorder || isResponsive || isEditable && isFocus && needBorder ? style.active : ''} ${needBorder ? style.hasBorder : ''} ${textBoxClass} `,
       eleRef: this.selectedOptionContainerRef,
       wrap: "wrap"
     }, /*#__PURE__*/React.createElement(SelectedOptions, {
@@ -986,8 +989,8 @@ export class MultiSelectComponent extends React.Component {
       adjust: true,
       shrink: true
     }, /*#__PURE__*/React.createElement("span", {
-      className: ` ${style.custmSpan} ${textBoxSize === 'xmedium' ? style.custmSpanXmedium : style.custmSpanMedium} ${isShowClearIcon ? style.clearIconSpace : ''}
-          ${customChildrenClass ? customChildrenClass : ''}`
+      className: cn(` ${style.custmSpan} ${textBoxSize === 'xmedium' ? style.custmSpanXmedium : style.custmSpanMedium} ${isShowClearIcon ? style.clearIconSpace : ''}
+          ${customChildrenClass ? customChildrenClass : ''}`)
     }, searchStr), /*#__PURE__*/React.createElement(TextBoxIcon, _extends({
       isDisabled: isDisabled,
       inputRef: this.searchInputRef,
@@ -1086,6 +1089,7 @@ export class MultiSelectComponent extends React.Component {
       needEffect,
       boxSize,
       isLoading,
+      shouldUseInternalLoader,
       selectAllText,
       needSelectAll,
       isVirtualizerEnabled,
@@ -1116,8 +1120,9 @@ export class MultiSelectComponent extends React.Component {
     let {
       SuggestionsProps
     } = customProps;
+    const isInitialEmptyOptions = searchStr.length === 0 && options.length === 0;
     return /*#__PURE__*/React.createElement("div", {
-      className: `${style.wrapper} ${isDisabled ? style.disabled : ''} ${isReadOnly ? style.readOnly : ''} ${disableAction ? CssProvider('isBlock') : ''} ${borderColor === 'transparent' ? style.transparentContainer : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''}`,
+      className: cn(`${style.wrapper} ${isDisabled ? style.disabled : ''} ${isReadOnly ? style.readOnly : ''} ${disableAction ? CssProvider('isBlock') : ''} ${borderColor === 'transparent' ? style.transparentContainer : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''}`),
       "data-id": `${isDisabled ? `${dataId}_disabled` : isReadOnly ? `${dataId}_readOnly` : dataId}`,
       "data-test-id": `${isDisabled ? `${dataId}_disabled` : isReadOnly ? `${dataId}_readOnly` : dataId}`,
       "data-title": isDisabled ? title : null,
@@ -1159,13 +1164,13 @@ export class MultiSelectComponent extends React.Component {
       i18nKeys: i18nKeys,
       onClick: this.handlePopupClose
     }, /*#__PURE__*/React.createElement("div", {
-      className: style.effect
+      className: cn(style.effect)
     }, this.getSelectionUI(true))) : null, needSelectAll && !(limit >= 0) ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
       onSelect: this.handleSelectAll,
       selectAllText: selectAllText,
       suggestions: suggestions,
       dataId: dataId
-    })) : null, isLoading ? /*#__PURE__*/React.createElement(Container, {
+    })) : null, (shouldUseInternalLoader ? isLoading : isLoading && isInitialEmptyOptions) ? /*#__PURE__*/React.createElement(Container, {
       align: "both",
       className: style.loader
     }, /*#__PURE__*/React.createElement(Loader, null)) : /*#__PURE__*/React.createElement(CardContent, {
@@ -1173,7 +1178,7 @@ export class MultiSelectComponent extends React.Component {
       customClass: !isModel && dropBoxSize ? style[dropBoxSize] : '',
       eleRef: this.suggestionContainerRef
     }, isSearching ? /*#__PURE__*/React.createElement("div", {
-      className: style[palette]
+      className: cn(style[palette])
     }, searchText) : suggestions.length ? /*#__PURE__*/React.createElement(Suggestions, _extends({
       a11y: a11yProps,
       needBorder: false,
@@ -1201,7 +1206,7 @@ export class MultiSelectComponent extends React.Component {
       palette: palette,
       i18nKeys: i18nKeys,
       htmlId: ariaErrorId
-    }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {
+    }), (shouldUseInternalLoader ? isFetchingOptions : isLoading && !isInitialEmptyOptions) && /*#__PURE__*/React.createElement(Container, {
       isCover: false,
       align: "both"
     }, /*#__PURE__*/React.createElement(Loader, null))), getFooter ? /*#__PURE__*/React.createElement(CardFooter, null, getFooter()) : null))) : null);

package/es/MultiSelect/MultiSelectWithAvatar.js

@@ -23,6 +23,7 @@ import MultiSelectHeader from "./MultiSelectHeader";
 import isMobilePopover from "../DropBox/utils/isMobilePopover";
 /**** CSS ****/
 
+import { cn } from "@dot-system/css-utility";
 import style from "./MultiSelect.module.css";
 import MobileHeader from "./MobileHeader/MobileHeader";
 /*eslint-disable  react/sort-prop-types*/
@@ -96,6 +97,7 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
       isBoxPaddingNeed,
       needEffect,
       isLoading,
+      shouldUseInternalLoader,
       keepSelectedOptions,
       customProps,
       limit
@@ -124,8 +126,9 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
     const ariaErrorId = this.getNextAriaId();
     const popUpState = !isReadOnly && !isDisabled && !disableAction && isPopupOpen;
     let isModel = isMobilePopover(needResponsive);
+    const isInitialEmptyOptions = searchStr.length === 0 && options.length === 0;
     return /*#__PURE__*/React.createElement("div", {
-      className: ` ${style.wrapper} ${isDisabled ? style.disabled : ''} ${isReadOnly ? style.readOnly : ''} ${disableAction ? CssProvider('isBlock') : ''} ${borderColor === 'transparent' ? style.transparentContainer : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''}`,
+      className: cn(` ${style.wrapper} ${isDisabled ? style.disabled : ''} ${isReadOnly ? style.readOnly : ''} ${disableAction ? CssProvider('isBlock') : ''} ${borderColor === 'transparent' ? style.transparentContainer : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''}`),
       "data-id": `${isDisabled ? `${dataId}_disabled` : isReadOnly ? `${dataId}_readOnly` : dataId}`,
       "data-test-id": `${isDisabled ? `${dataId}_disabled` : isReadOnly ? `${dataId}_readOnly` : dataId}`,
       "data-title": isDisabled ? title : null,
@@ -165,13 +168,13 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
       i18nKeys: i18nKeys,
       onClick: this.handlePopupClose
     }, /*#__PURE__*/React.createElement("div", {
-      className: style.effect
+      className: cn(style.effect)
     }, this.getSelectionUI(true)))) : null, needSelectAll && !(limit >= 0) ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
       onSelect: this.handleSelectAll,
       selectAllText: selectAllText,
       suggestions: suggestions,
       dataId: dataId
-    })) : null, isLoading ? /*#__PURE__*/React.createElement(Container, {
+    })) : null, (shouldUseInternalLoader ? isLoading : isLoading && isInitialEmptyOptions) ? /*#__PURE__*/React.createElement(Container, {
       align: "both",
       className: style.loader
     }, /*#__PURE__*/React.createElement(Loader, null)) : /*#__PURE__*/React.createElement(CardContent, {
@@ -204,7 +207,7 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
       palette: palette,
       i18nKeys: i18nKeys,
       htmlId: ariaErrorId
-    }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {
+    }), (shouldUseInternalLoader ? isFetchingOptions : isLoading && !isInitialEmptyOptions) && /*#__PURE__*/React.createElement(Container, {
       isCover: false,
       align: "both"
     }, /*#__PURE__*/React.createElement(Loader, null)))))) : null);

package/es/MultiSelect/__tests__/__snapshots__/AdvancedGroupMultiSelect.spec.js.snap

@@ -1,35 +1,34 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`AdvancedGroupMultiSelect rendering the defult props 1`] = `
 <DocumentFragment>
   <div
-    class="wrapper  effect"
+    class="wrapper effect"
     data-id="multiSelect"
     data-selector-id="advancedGroupMultiSelect"
     data-test-id="multiSelect"
   >
     <div
-      class="container medium  hasBorder borderColor_default  flex cover rowdir wrap vCenter"
+      class="flex fullSize row wrap alignItems_center container medium hasBorder borderColor_default"
       data-id="containerComponent"
       data-selector-id="container"
       data-test-id="containerComponent"
     >
       <div
-        class="wrapper grow basisAuto shrinkOn"
+        class="flexible basis_auto shrink wrapper"
         data-id="boxComponent"
         data-selector-id="box"
         data-test-id="boxComponent"
       >
         <span
-          class=" custmSpan custmSpanMedium 
-              "
+          class="custmSpan custmSpanMedium"
         />
         <div
-          class="varClass customContainer    effect     container custmInputWrapper  flex rowdir"
+          class="flex row varClass customContainer effect container custmInputWrapper"
           data-selector-id="textBoxIcon"
         >
           <div
-            class="grow basis shrinkOff"
+            class="flexible basis_zero noShrink"
             data-id="boxComponent"
             data-selector-id="box"
             data-test-id="boxComponent"
@@ -41,7 +40,7 @@ exports[`AdvancedGroupMultiSelect rendering the defult props 1`] = `
               aria-haspopup="true"
               aria-owns="1"
               autocomplete="off"
-              class="  container medium  default  effect  borderColor_default  "
+              class="container medium default effect borderColor_default"
               data-id="multiSelect_textBox"
               data-selector-id="textBoxIcon"
               data-test-id="multiSelect_textBox"
@@ -52,13 +51,13 @@ exports[`AdvancedGroupMultiSelect rendering the defult props 1`] = `
             />
           </div>
           <div
-            class="iconContainer  shrinkOff"
+            class="noShrink iconContainer"
             data-id="boxComponent"
             data-selector-id="box"
             data-test-id="boxComponent"
           >
             <div
-              class="flex cover rowdir"
+              class="flex fullSize row"
               data-id="containerComponent"
               data-selector-id="container"
               data-test-id="containerComponent"