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

package/lib/ResponsiveDropBox/__tests__/__snapshots__/ResponsiveDropBox.spec.js.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ResponsiveDropBox rendering the defult props 1`] = `
 <DocumentFragment>
@@ -31,7 +31,7 @@ exports[`ResponsiveDropBox rendering the defult props 1`] = `
         />
       </div>
       <div
-        class="flex coldir"
+        class="flex column"
         data-id="containerComponent"
         data-selector-id="container"
         data-test-id="containerComponent"

package/lib/Ribbon/Ribbon.js

@@ -13,6 +13,8 @@ var _defaultProps = require("./props/defaultProps");
 
 var _propTypes = require("./props/propTypes");
 
+var _cssUtility = require("@dot-system/css-utility");
+
 var _RibbonModule = _interopRequireDefault(require("./Ribbon.module.css"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -61,18 +63,18 @@ var Ribbon = /*#__PURE__*/function (_React$Component) {
           customClass = _this$props.customClass,
           dataSelectorId = _this$props.dataSelectorId;
       return /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(_RibbonModule["default"].basic, " ").concat(customClass, " ").concat(type !== 'tag' ? type === 'plain' || type === 'box' || type === 'stamp' ? "".concat(_RibbonModule["default"]["plain_".concat(palette)], " \n                 ").concat(type === 'box' ? _RibbonModule["default"]["box_".concat(palette)] : '', " ").concat(type === 'stamp' ? _RibbonModule["default"]["stamp_".concat(palette)] : '') : "".concat(_RibbonModule["default"]["palette_".concat(palette)], " ").concat(type === 'default' ? _RibbonModule["default"]["default_".concat(palette)] : '') : '', " ").concat(_RibbonModule["default"][size], " ").concat(_RibbonModule["default"][type]),
+        className: (0, _cssUtility.cn)("".concat(_RibbonModule["default"].basic, " ").concat(type !== 'tag' ? type === 'plain' || type === 'box' || type === 'stamp' ? "".concat(_RibbonModule["default"]["plain_".concat(palette)], " \n                 ").concat(type === 'box' ? _RibbonModule["default"]["box_".concat(palette)] : '', " ").concat(type === 'stamp' ? _RibbonModule["default"]["stamp_".concat(palette)] : '') : "".concat(_RibbonModule["default"]["palette_".concat(palette)], " ").concat(type === 'default' ? _RibbonModule["default"]["default_".concat(palette)] : '') : '', " ").concat(_RibbonModule["default"][size], " ").concat(_RibbonModule["default"][type], " ").concat(customClass, " ")),
         "data-id": dataId,
         "data-test-id": dataId,
         "data-selector-id": dataSelectorId
       }, type === 'sticker' ? /*#__PURE__*/_react["default"].createElement("span", {
-        className: _RibbonModule["default"].after
+        className: (0, _cssUtility.cn)(_RibbonModule["default"].after)
       }) : null, children ? /*#__PURE__*/_react["default"].createElement("span", {
-        className: _RibbonModule["default"].children
+        className: (0, _cssUtility.cn)(_RibbonModule["default"].children)
       }, children) : null, /*#__PURE__*/_react["default"].createElement("span", {
-        className: _RibbonModule["default"].childText
+        className: (0, _cssUtility.cn)(_RibbonModule["default"].childText)
       }, text), type === 'sticker' ? /*#__PURE__*/_react["default"].createElement("span", {
-        className: _RibbonModule["default"].before
+        className: (0, _cssUtility.cn)(_RibbonModule["default"].before)
       }) : null);
     }
   }]);
@@ -82,17 +84,4 @@ var Ribbon = /*#__PURE__*/function (_React$Component) {
 
 exports["default"] = Ribbon;
 Ribbon.propTypes = _propTypes.propTypes;
-Ribbon.defaultProps = _defaultProps.defaultProps; // if (__DOCS__) {
-//   Ribbon.docs = {
-//     componentGroup: 'Atom',
-//     folderName: 'Style Guide',
-//     external: true,
-//     description: ' ',
-//     images: [
-//       {
-//         view: 'http://zsupport-tech-1.tsi.zohocorpin.com:8080/ui/general/Ribbon/v1/Ribbon.png',
-//         psd: 'http://zsupport-tech-1.tsi.zohocorpin.com:8080/ui/general/Ribbon/v1/Ribbon.psd'
-//       }
-//     ]
-//   };
-// }
+Ribbon.defaultProps = _defaultProps.defaultProps;

package/lib/Ribbon/__tests__/__snapshots__/Ribbon.spec.js.snap

@@ -1,9 +1,9 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`Label rendering children  1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default default_default large default"
+    class="basic palette_default default_default large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -27,7 +27,7 @@ exports[`Label rendering children  1`] = `
 exports[`Label rendering the customClass 1`] = `
 <DocumentFragment>
   <span
-    class="basic ribbonCustomClass palette_default default_default large default"
+    class="basic palette_default default_default large default ribbonCustomClass"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -44,7 +44,7 @@ exports[`Label rendering the customClass 1`] = `
 exports[`Label rendering the defult props 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default default_default large default"
+    class="basic palette_default default_default large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -61,7 +61,7 @@ exports[`Label rendering the defult props 1`] = `
 exports[`Label rendering the palette of- danger 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_danger default_danger large default"
+    class="basic palette_danger default_danger large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -78,7 +78,7 @@ exports[`Label rendering the palette of- danger 1`] = `
 exports[`Label rendering the palette of- dark 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_dark default_dark large default"
+    class="basic palette_dark default_dark large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -95,7 +95,7 @@ exports[`Label rendering the palette of- dark 1`] = `
 exports[`Label rendering the palette of- default 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default default_default large default"
+    class="basic palette_default default_default large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -112,7 +112,7 @@ exports[`Label rendering the palette of- default 1`] = `
 exports[`Label rendering the palette of- info 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_info default_info large default"
+    class="basic palette_info default_info large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -129,7 +129,7 @@ exports[`Label rendering the palette of- info 1`] = `
 exports[`Label rendering the palette of- primary 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_primary default_primary large default"
+    class="basic palette_primary default_primary large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -146,7 +146,7 @@ exports[`Label rendering the palette of- primary 1`] = `
 exports[`Label rendering the palette of- secondary 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_secondary default_secondary large default"
+    class="basic palette_secondary default_secondary large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -163,7 +163,7 @@ exports[`Label rendering the palette of- secondary 1`] = `
 exports[`Label rendering the size - large 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default default_default large default"
+    class="basic palette_default default_default large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -180,7 +180,7 @@ exports[`Label rendering the size - large 1`] = `
 exports[`Label rendering the size - medium 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default default_default medium default"
+    class="basic palette_default default_default medium default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -197,7 +197,7 @@ exports[`Label rendering the size - medium 1`] = `
 exports[`Label rendering the size - small 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default default_default small default"
+    class="basic palette_default default_default small default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -214,7 +214,7 @@ exports[`Label rendering the size - small 1`] = `
 exports[`Label rendering the size - xlarge 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default default_default xlarge default"
+    class="basic palette_default default_default xlarge default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -231,8 +231,7 @@ exports[`Label rendering the size - xlarge 1`] = `
 exports[`Label rendering the type - box 1`] = `
 <DocumentFragment>
   <span
-    class="basic  plain_default 
-                 box_default  large box"
+    class="basic plain_default box_default large box"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -249,7 +248,7 @@ exports[`Label rendering the type - box 1`] = `
 exports[`Label rendering the type - default 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default default_default large default"
+    class="basic palette_default default_default large default"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -266,7 +265,7 @@ exports[`Label rendering the type - default 1`] = `
 exports[`Label rendering the type - flag 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default  large flag"
+    class="basic palette_default large flag"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -283,8 +282,7 @@ exports[`Label rendering the type - flag 1`] = `
 exports[`Label rendering the type - plain 1`] = `
 <DocumentFragment>
   <span
-    class="basic  plain_default 
-                   large plain"
+    class="basic plain_default large plain"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -301,7 +299,7 @@ exports[`Label rendering the type - plain 1`] = `
 exports[`Label rendering the type - ribbon 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default  large ribbon"
+    class="basic palette_default large ribbon"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -318,8 +316,7 @@ exports[`Label rendering the type - ribbon 1`] = `
 exports[`Label rendering the type - stamp 1`] = `
 <DocumentFragment>
   <span
-    class="basic  plain_default 
-                  stamp_default large stamp"
+    class="basic plain_default stamp_default large stamp"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -336,7 +333,7 @@ exports[`Label rendering the type - stamp 1`] = `
 exports[`Label rendering the type - sticker 1`] = `
 <DocumentFragment>
   <span
-    class="basic  palette_default  large sticker"
+    class="basic palette_default large sticker"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"
@@ -359,7 +356,7 @@ exports[`Label rendering the type - sticker 1`] = `
 exports[`Label rendering the type - tag 1`] = `
 <DocumentFragment>
   <span
-    class="basic   large tag"
+    class="basic large tag"
     data-id="ribbonComp"
     data-selector-id="ribbon"
     data-test-id="ribbonComp"

package/lib/RippleEffect/RippleEffect.js

@@ -33,7 +33,7 @@ function RippleEffect(props) {
 
   var child = _react["default"].Children.only(children);
 
-  return /*#__PURE__*/_react["default"].cloneElement(child, _defineProperty({}, cssClassPropOfChild, "".concat(child.props[cssClassPropOfChild] || '', " ").concat(className)));
+  return /*#__PURE__*/_react["default"].cloneElement(child, _defineProperty({}, cssClassPropOfChild, "".concat(className, " ").concat(child.props[cssClassPropOfChild] || '')));
 }
 
 RippleEffect.defaultProps = _defaultProps.defaultProps;

package/lib/RippleEffect/__tests__/__snapshots__/RippleEffect.spec.js.snap

@@ -1,9 +1,9 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`RippleEffect rendering hoverType of- bg 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default border bgHover  hoverEffect "
+    class="effect default border bgHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -13,7 +13,7 @@ exports[`RippleEffect rendering hoverType of- bg 1`] = `
 exports[`RippleEffect rendering hoverType of- border 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default border borderHover  hoverEffect "
+    class="effect default border borderHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -23,7 +23,7 @@ exports[`RippleEffect rendering hoverType of- border 1`] = `
 exports[`RippleEffect rendering hoverType of- default 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default border defaultHover  hoverEffect "
+    class="effect default border defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -33,7 +33,7 @@ exports[`RippleEffect rendering hoverType of- default 1`] = `
 exports[`RippleEffect rendering isActive is true 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default border defaultHover active hoverEffect "
+    class="effect default border defaultHover active hoverEffect"
   >
     RippleEffect
   </div>
@@ -43,7 +43,7 @@ exports[`RippleEffect rendering isActive is true 1`] = `
 exports[`RippleEffect rendering isCopyTextEnabled is false 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default border defaultHover  hoverEffect notAllowed"
+    class="effect default border defaultHover hoverEffect notAllowed"
   >
     RippleEffect
   </div>
@@ -53,7 +53,7 @@ exports[`RippleEffect rendering isCopyTextEnabled is false 1`] = `
 exports[`RippleEffect rendering isDisabled is true 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default border defaultHover   disabled"
+    class="effect default border defaultHover disabled"
   >
     RippleEffect
   </div>
@@ -63,7 +63,7 @@ exports[`RippleEffect rendering isDisabled is true 1`] = `
 exports[`RippleEffect rendering isNeedEffect is false 1`] = `
 <DocumentFragment>
   <div
-    class=" "
+    class=""
   >
     RippleEffect
   </div>
@@ -73,7 +73,7 @@ exports[`RippleEffect rendering isNeedEffect is false 1`] = `
 exports[`RippleEffect rendering needBorder is false 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default  defaultHover  hoverEffect "
+    class="effect default defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -83,7 +83,7 @@ exports[`RippleEffect rendering needBorder is false 1`] = `
 exports[`RippleEffect rendering the defult props 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default border defaultHover  hoverEffect "
+    class="effect default border defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -93,7 +93,7 @@ exports[`RippleEffect rendering the defult props 1`] = `
 exports[`RippleEffect rendering the palette of- danger 1`] = `
 <DocumentFragment>
   <div
-    class=" effect danger border defaultHover  hoverEffect "
+    class="effect danger border defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -103,7 +103,7 @@ exports[`RippleEffect rendering the palette of- danger 1`] = `
 exports[`RippleEffect rendering the palette of- default 1`] = `
 <DocumentFragment>
   <div
-    class=" effect default border defaultHover  hoverEffect "
+    class="effect default border defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -113,7 +113,7 @@ exports[`RippleEffect rendering the palette of- default 1`] = `
 exports[`RippleEffect rendering the palette of- green 1`] = `
 <DocumentFragment>
   <div
-    class=" effect green border defaultHover  hoverEffect "
+    class="effect green border defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -123,7 +123,7 @@ exports[`RippleEffect rendering the palette of- green 1`] = `
 exports[`RippleEffect rendering the palette of- primary 1`] = `
 <DocumentFragment>
   <div
-    class=" effect primary border defaultHover  hoverEffect "
+    class="effect primary border defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -133,7 +133,7 @@ exports[`RippleEffect rendering the palette of- primary 1`] = `
 exports[`RippleEffect rendering the palette of- primaryDark 1`] = `
 <DocumentFragment>
   <div
-    class=" effect primaryDark border defaultHover  hoverEffect "
+    class="effect primaryDark border defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -143,7 +143,7 @@ exports[`RippleEffect rendering the palette of- primaryDark 1`] = `
 exports[`RippleEffect rendering the palette of- primaryFilled 1`] = `
 <DocumentFragment>
   <div
-    class=" effect primaryFilled border defaultHover  hoverEffect "
+    class="effect primaryFilled border defaultHover hoverEffect"
   >
     RippleEffect
   </div>
@@ -153,7 +153,7 @@ exports[`RippleEffect rendering the palette of- primaryFilled 1`] = `
 exports[`RippleEffect rendering the palette of- primaryLight 1`] = `
 <DocumentFragment>
   <div
-    class=" effect primaryLight border defaultHover  hoverEffect "
+    class="effect primaryLight border defaultHover hoverEffect"
   >
     RippleEffect
   </div>

package/lib/Select/GroupSelect.js

@@ -39,6 +39,8 @@ var _ResponsiveDropBox = _interopRequireDefault(require("../ResponsiveDropBox/Re
 
 var _CustomResponsive = require("../Responsive/CustomResponsive");
 
+var _cssUtility = require("@dot-system/css-utility");
+
 var _SelectModule = _interopRequireDefault(require("./Select.module.css"));
 
 var _dropDownUtils = require("../utils/dropDownUtils");
@@ -669,6 +671,7 @@ var GroupSelectComponent = /*#__PURE__*/function (_PureComponent) {
           htmlId = _this$props9.htmlId,
           iconOnHover = _this$props9.iconOnHover,
           isLoading = _this$props9.isLoading,
+          shouldUseInternalLoader = _this$props9.shouldUseInternalLoader,
           dataSelectorId = _this$props9.dataSelectorId,
           customProps = _this$props9.customProps,
           customClass = _this$props9.customClass;
@@ -708,14 +711,15 @@ var GroupSelectComponent = /*#__PURE__*/function (_PureComponent) {
           dropBoxClass = _customClass$dropBox === void 0 ? '' : _customClass$dropBox,
           _customClass$cardCont = customClass.cardContent,
           cardContentClass = _customClass$cardCont === void 0 ? '' : _customClass$cardCont;
+      var isInitialEmptyOptions = searchStr.length === 0 && revampedGroups.length === 0;
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(_SelectModule["default"].container, " ").concat(_SelectModule["default"]["box_".concat(size)], " ").concat(isReadOnly ? _SelectModule["default"].readonly : '', " ").concat(borderColor === 'transparent' ? _SelectModule["default"].transparentContainer : '', " ").concat(iconOnHover && (isReadOnly || isDisabled) ? _SelectModule["default"].iconOnHoverReadonly : iconOnHover && !(isReadOnly || isDisabled) ? _SelectModule["default"].iconOnHoverStyle : ''),
+        className: (0, _cssUtility.cn)("".concat(_SelectModule["default"].container, " ").concat(_SelectModule["default"]["box_".concat(size)], " ").concat(isReadOnly ? _SelectModule["default"].readonly : '', " ").concat(borderColor === 'transparent' ? _SelectModule["default"].transparentContainer : '', " ").concat(iconOnHover && (isReadOnly || isDisabled) ? _SelectModule["default"].iconOnHoverReadonly : iconOnHover && !(isReadOnly || isDisabled) ? _SelectModule["default"].iconOnHoverStyle : '')),
         "data-id": dataIdSlctComp,
         "data-test-id": dataIdSlctComp,
         "data-title": isDisabled ? title : null,
         "data-selector-id": dataSelectorId
       }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(className ? className : ''),
+        className: (0, _cssUtility.cn)("".concat(className ? className : '')),
         onClick: isDisabled || isReadOnly ? null : this.togglePopup,
         ref: getTargetRef,
         "data-id": "".concat(isDisabled ? "".concat(dataId, "_disabled") : isReadOnly ? "".concat(dataId, "_readOnly") : dataId),
@@ -813,7 +817,7 @@ var GroupSelectComponent = /*#__PURE__*/function (_PureComponent) {
           customClass: {
             customDropBox: dropBoxClass
           }
-        }, isLoading ? /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
+        }, (shouldUseInternalLoader ? isLoading : isLoading && isInitialEmptyOptions) ? /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
           align: "both",
           className: _SelectModule["default"].loader
         }, /*#__PURE__*/_react["default"].createElement(_Loader["default"], null)) : /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
@@ -822,7 +826,7 @@ var GroupSelectComponent = /*#__PURE__*/function (_PureComponent) {
           customClass: _SelectModule["default"].box,
           onScroll: _this7.handleScroll
         }, needSearch ? /*#__PURE__*/_react["default"].createElement(_Card.CardHeader, null, /*#__PURE__*/_react["default"].createElement("div", {
-          className: "".concat(_SelectModule["default"].search, " ").concat(_SelectModule["default"][size])
+          className: (0, _cssUtility.cn)("".concat(_SelectModule["default"].search, " ").concat(_SelectModule["default"][size]))
         }, /*#__PURE__*/_react["default"].createElement(_TextBoxIcon["default"], {
           inputRef: _this7.searchInputRef,
           maxLength: maxLength,
@@ -851,7 +855,7 @@ var GroupSelectComponent = /*#__PURE__*/function (_PureComponent) {
           return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
             key: groupId
           }, groupName && /*#__PURE__*/_react["default"].createElement("div", {
-            className: _SelectModule["default"].groupTitle
+            className: (0, _cssUtility.cn)(_SelectModule["default"].groupTitle)
           }, /*#__PURE__*/_react["default"].createElement(_DropDownHeading["default"], {
             text: groupName,
             a11y: {
@@ -883,7 +887,7 @@ var GroupSelectComponent = /*#__PURE__*/function (_PureComponent) {
           isLoading: isFetchingOptions,
           i18nKeys: i18nKeys,
           htmlId: ariaErrorId
-        }), isFetchingOptions && /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
+        }), (shouldUseInternalLoader ? isFetchingOptions : isLoading && !isInitialEmptyOptions) && /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
           isCover: false,
           align: "both"
         }, /*#__PURE__*/_react["default"].createElement(_Loader["default"], null))), getFooter ? /*#__PURE__*/_react["default"].createElement(_Card.CardFooter, null, getFooter()) : null)));

package/lib/Select/Select.js

@@ -45,6 +45,8 @@ var _Common = require("../utils/Common.js");
 
 var _utils = require("@zohodesk/utils");
 
+var _cssUtility = require("@dot-system/css-utility");
+
 var _SelectModule = _interopRequireDefault(require("./Select.module.css"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -274,12 +276,13 @@ var SelectComponent = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
+    value: function componentDidUpdate(prevProps, prevState) {
       var _this2 = this;
 
       var _this$state = this.state,
           searchStr = _this$state.searchStr,
-          selectedValueIndex = _this$state.selectedValueIndex;
+          selectedValueIndex = _this$state.selectedValueIndex,
+          hoverIndex = _this$state.hoverIndex;
       var _this$props = this.props,
           needLocalSearch = _this$props.needLocalSearch,
           onDropBoxClose = _this$props.onDropBoxClose,
@@ -289,12 +292,13 @@ var SelectComponent = /*#__PURE__*/function (_Component) {
           isPopupOpen = _this$props.isPopupOpen,
           isSearchClearOnClose = _this$props.isSearchClearOnClose;
 
-      if (isPopupOpen) {
+      if ((prevState.hoverIndex !== hoverIndex || prevState.selectedValueIndex !== selectedValueIndex) && isPopupOpen) {
         this.scrollToHighlightedIndex();
       }
 
       if (prevProps.isPopupOpen !== isPopupOpen) {
         if (isPopupOpen) {
+          this.scrollToHighlightedIndex();
           onDropBoxOpen && this.handleFetchOptions(onDropBoxOpen, searchStr);
           setTimeout(function () {
             _this2.searchInput && _this2.searchInput.focus({
@@ -849,6 +853,7 @@ var SelectComponent = /*#__PURE__*/function (_Component) {
           autoComplete = _this$props11.autoComplete,
           ariaLabelledby = _this$props11.ariaLabelledby,
           isLoading = _this$props11.isLoading,
+          shouldUseInternalLoader = _this$props11.shouldUseInternalLoader,
           dataSelectorId = _this$props11.dataSelectorId,
           isAbsolutePositioningNeeded = _this$props11.isAbsolutePositioningNeeded,
           positionsOffset = _this$props11.positionsOffset,
@@ -894,6 +899,7 @@ var SelectComponent = /*#__PURE__*/function (_Component) {
           dropBoxClass = _customClass$dropBox === void 0 ? '' : _customClass$dropBox,
           _customClass$cardCont = customClass.cardContent,
           cardContentClass = _customClass$cardCont === void 0 ? '' : _customClass$cardCont;
+      var isInitialEmptyOptions = searchStr.length === 0 && options.length === 0;
       var inputFieldLineA11yAttributes = this.getInputFieldLineA11y({
         setAriaId: setAriaId,
         isReadOnly: isReadOnly,
@@ -902,11 +908,11 @@ var SelectComponent = /*#__PURE__*/function (_Component) {
         inputFieldLineA11y: inputFieldLineA11y
       });
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(isParentBased || isReadOnly || isDisabled ? _SelectModule["default"].container : '', " ").concat(_SelectModule["default"]["box_".concat(size)], " ").concat(isReadOnly ? _SelectModule["default"].readonly : '', " ").concat(borderColor === 'transparent' ? _SelectModule["default"].transparentContainer : '', " ").concat(iconOnHover && (isReadOnly || isDisabled) ? _SelectModule["default"].iconOnHoverReadonly : iconOnHover && !(isReadOnly || isDisabled) ? _SelectModule["default"].iconOnHoverStyle : ''),
+        className: (0, _cssUtility.cn)("".concat(isParentBased || isReadOnly || isDisabled ? _SelectModule["default"].container : '', " ").concat(_SelectModule["default"]["box_".concat(size)], " ").concat(isReadOnly ? _SelectModule["default"].readonly : '', " ").concat(borderColor === 'transparent' ? _SelectModule["default"].transparentContainer : '', " ").concat(iconOnHover && (isReadOnly || isDisabled) ? _SelectModule["default"].iconOnHoverReadonly : iconOnHover && !(isReadOnly || isDisabled) ? _SelectModule["default"].iconOnHoverStyle : '')),
         "data-title": isDisabled ? title : null,
         "data-selector-id": dataSelectorId
       }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(className ? className : ''),
+        className: (0, _cssUtility.cn)("".concat(className ? className : '')),
         onClick: isDisabled || isReadOnly ? null : this.togglePopup,
         ref: getTargetRef,
         "data-id": "".concat(isDisabled ? "".concat(dataId, "_disabled") : isReadOnly ? "".concat(dataId, "_readOnly") : dataId),
@@ -1067,7 +1073,7 @@ var SelectComponent = /*#__PURE__*/function (_Component) {
           customClass: {
             customDropBox: dropBoxClass
           }
-        }, isLoading ? /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
+        }, (shouldUseInternalLoader ? isLoading : isLoading && isInitialEmptyOptions) ? /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
           align: "both",
           className: _SelectModule["default"].loader
         }, /*#__PURE__*/_react["default"].createElement(_Loader["default"], null)) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, !getChildren ? /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
@@ -1075,7 +1081,7 @@ var SelectComponent = /*#__PURE__*/function (_Component) {
         }, /*#__PURE__*/_react["default"].createElement(_Card["default"], {
           onScroll: _this7.handleScroll
         }, needSearch ? /*#__PURE__*/_react["default"].createElement(_Card.CardHeader, null, /*#__PURE__*/_react["default"].createElement("div", {
-          className: "".concat(_SelectModule["default"].search, " ").concat(_SelectModule["default"][size])
+          className: (0, _cssUtility.cn)("".concat(_SelectModule["default"].search, " ").concat(_SelectModule["default"][size]))
         }, /*#__PURE__*/_react["default"].createElement(_TextBoxIcon["default"], {
           a11y: {
             ariaControls: setAriaId,
@@ -1133,7 +1139,7 @@ var SelectComponent = /*#__PURE__*/function (_Component) {
           getCustomEmptyState: getCustomEmptyState ? _this7.handleGetAddNewOptionText : null,
           i18nKeys: i18nKeys,
           htmlId: ariaErrorId
-        }), isFetchingOptions && /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
+        }), (shouldUseInternalLoader ? isFetchingOptions : isLoading && !isInitialEmptyOptions) && /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
           isCover: false,
           align: "both"
         }, /*#__PURE__*/_react["default"].createElement(_Loader["default"], null))), getFooter ? /*#__PURE__*/_react["default"].createElement(_Card.CardFooter, null, getFooter({