@zohodesk/dot 1.0.0-beta.21 → 1.0.0-beta.210

package/lib/dropdown/ToggleDropDown/ToggleDropDown.js

@@ -1,146 +1,179 @@
-'use strict';
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ToggleDropDown = undefined;
-
-var _ToggleDropDown$propT;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports["default"] = exports.ToggleDropDown = void 0;
 
-var _react = require('react');
+var _react = _interopRequireWildcard(require("react"));
 
-var _react2 = _interopRequireDefault(_react);
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _propTypes = require('prop-types');
+var _Icon = _interopRequireDefault(require("@zohodesk/icons/lib/Icon"));
 
-var _propTypes2 = _interopRequireDefault(_propTypes);
+var _DropBox = _interopRequireDefault(require("@zohodesk/components/lib/DropBox/DropBox"));
 
-var _Icon = require('@zohodesk/icons/lib/Icon');
+var _Popup = _interopRequireDefault(require("@zohodesk/components/lib/Popup/Popup"));
 
-var _Icon2 = _interopRequireDefault(_Icon);
+var _Layout = require("@zohodesk/components/lib/Layout");
 
-var _DropBox = require('@zohodesk/components/lib/DropBox/DropBox');
+var _ListItem = _interopRequireDefault(require("@zohodesk/components/lib/ListItem/ListItem"));
 
-var _DropBox2 = _interopRequireDefault(_DropBox);
+var _ListItemWithIcon = _interopRequireDefault(require("@zohodesk/components/lib/ListItem/ListItemWithIcon"));
 
-var _commonModule = require('@zohodesk/components/lib/common/common.module.css');
+var _DropDownHeading = _interopRequireDefault(require("@zohodesk/components/lib/DropDown/DropDownHeading"));
 
-var _commonModule2 = _interopRequireDefault(_commonModule);
+var _TextBoxIcon = _interopRequireDefault(require("@zohodesk/components/lib/TextBoxIcon/TextBoxIcon"));
 
-var _Popup = require('@zohodesk/components/lib/Popup/Popup');
+var _Loader = _interopRequireDefault(require("@zohodesk/svg/lib/svg/Loader"));
 
-var _Popup2 = _interopRequireDefault(_Popup);
+var _CommonEmptyState = _interopRequireDefault(require("../../emptystate/CommonEmptyState/CommonEmptyState"));
 
-var _Layout = require('@zohodesk/components/lib/Layout');
+var _EmptySearch = _interopRequireDefault(require("@zohodesk/svg/lib/svg/EmptySearch"));
 
-var _ListItem = require('@zohodesk/components/lib/ListItem/ListItem');
+var _CssProvider = _interopRequireDefault(require("@zohodesk/components/lib/Provider/CssProvider"));
 
-var _ListItem2 = _interopRequireDefault(_ListItem);
+var _Common = require("@zohodesk/components/lib/utils/Common");
 
-var _ListItemWithIcon = require('@zohodesk/components/lib/ListItem/ListItemWithIcon');
+var _IdProvider = require("@zohodesk/components/lib/Provider/IdProvider");
 
-var _ListItemWithIcon2 = _interopRequireDefault(_ListItemWithIcon);
+var _semanticButtonModule = _interopRequireDefault(require("@zohodesk/components/lib/semantic/Button/semanticButton.module.css"));
 
-var _DropDownHeading = require('@zohodesk/components/lib/DropDown/DropDownHeading');
+var _RippleEffect = _interopRequireDefault(require("@zohodesk/components/lib/RippleEffect/RippleEffect"));
 
-var _DropDownHeading2 = _interopRequireDefault(_DropDownHeading);
+var _General = require("../../utils/General");
 
-var _TextBoxIcon = require('@zohodesk/components/lib/TextBoxIcon/TextBoxIcon');
+var _ToggleDropDownModule = _interopRequireDefault(require("./ToggleDropDown.module.css"));
 
-var _TextBoxIcon2 = _interopRequireDefault(_TextBoxIcon);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _Loader = require('@zohodesk/svg/lib/svg/Loader');
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-var _Loader2 = _interopRequireDefault(_Loader);
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var _CommonEmptyState = require('../../emptystate/CommonEmptyState/CommonEmptyState');
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-var _CommonEmptyState2 = _interopRequireDefault(_CommonEmptyState);
-
-var _EmptySearch = require('@zohodesk/svg/lib/svg/EmptySearch');
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var _EmptySearch2 = _interopRequireDefault(_EmptySearch);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var _Common = require('@zohodesk/components/lib/utils/Common.js');
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-var _TextBox = require('@zohodesk/components/lib/TextBox/TextBox');
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var _TextBox2 = _interopRequireDefault(_TextBox);
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-var _ToggleDropDownModule = require('./ToggleDropDown.module.css');
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-var _ToggleDropDownModule2 = _interopRequireDefault(_ToggleDropDownModule);
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+var ToggleDropDown = /*#__PURE__*/function (_Component) {
+  _inherits(ToggleDropDown, _Component);
 
-var ToggleDropDown = exports.ToggleDropDown = function (_React$Component) {
-  _inherits(ToggleDropDown, _React$Component);
+  var _super = _createSuper(ToggleDropDown);
 
   function ToggleDropDown(props) {
-    _classCallCheck(this, ToggleDropDown);
+    var _this;
 
-    var _this = _possibleConstructorReturn(this, (ToggleDropDown.__proto__ || Object.getPrototypeOf(ToggleDropDown)).call(this, props));
+    _classCallCheck(this, ToggleDropDown);
 
+    _this = _super.call(this, props);
     _this.state = {
-      searchString: '',
-      selectedIndex: 0,
-      options: props.options,
-      seperatedOptions: props.seperatedOptions
+      searchValue: '',
+      selectedIndex: -1,
+      options: props.options
     };
-    _this.handleChange = _this.handleChange.bind(_this);
-    _this.handleKeyDown = _this.handleKeyDown.bind(_this);
-    _this.onSelect = _this.onSelect.bind(_this);
-    _this.handleTogglePopup = _this.handleTogglePopup.bind(_this);
-    _this.onSearchClear = _this.onSearchClear.bind(_this);
-    _this.searchList = _this.searchList.bind(_this);
-    _this.scrollContentRef = _this.scrollContentRef.bind(_this);
-    _this.handleMouseEnter = _this.handleMouseEnter.bind(_this);
-    _this.searchInputRef = _this.searchInputRef.bind(_this);
-    _this.itemRef = _this.itemRef.bind(_this);
-    _this.inputRef = _this.inputRef.bind(_this);
-    _this.handleScroll = _this.handleScroll.bind(_this);
+    _this.handleChange = _this.handleChange.bind(_assertThisInitialized(_this));
+    _this.handleKeyDown = _this.handleKeyDown.bind(_assertThisInitialized(_this));
+    _this.onSelect = _this.onSelect.bind(_assertThisInitialized(_this));
+    _this.handleTogglePopup = _this.handleTogglePopup.bind(_assertThisInitialized(_this));
+    _this.showTogglePopup = _this.showTogglePopup.bind(_assertThisInitialized(_this));
+    _this.hideTogglePopup = _this.hideTogglePopup.bind(_assertThisInitialized(_this));
+    _this.onSearchAPI = _this.onSearchAPI.bind(_assertThisInitialized(_this));
+    _this.onSearchClear = _this.onSearchClear.bind(_assertThisInitialized(_this));
+    _this.handleFilterSuggestions = _this.handleFilterSuggestions.bind(_assertThisInitialized(_this));
+    _this.scrollContentRef = _this.scrollContentRef.bind(_assertThisInitialized(_this));
+    _this.handleMouseEnter = _this.handleMouseEnter.bind(_assertThisInitialized(_this));
+    _this.searchInputRef = _this.searchInputRef.bind(_assertThisInitialized(_this));
+    _this.itemRef = _this.itemRef.bind(_assertThisInitialized(_this));
+    _this.inputRef = _this.inputRef.bind(_assertThisInitialized(_this));
+    _this.handleScroll = _this.handleScroll.bind(_assertThisInitialized(_this));
+    _this.getOptionsArray = _this.getOptionsArray.bind(_assertThisInitialized(_this));
+    _this.emptySearchSVG = _this.emptySearchSVG.bind(_assertThisInitialized(_this));
+    _this.getAriaId = (0, _IdProvider.getUniqueId)(_assertThisInitialized(_this));
+    _this.getSelectedIndex = _this.getSelectedIndex.bind(_assertThisInitialized(_this));
     return _this;
   }
 
   _createClass(ToggleDropDown, [{
-    key: 'inputRef',
+    key: "emptySearchSVG",
+    value: function emptySearchSVG() {
+      return /*#__PURE__*/_react["default"].createElement(_EmptySearch["default"], {
+        size: "small"
+      });
+    }
+  }, {
+    key: "inputRef",
     value: function inputRef(el) {
       this.hiddenInput = el;
     }
   }, {
-    key: 'itemRef',
+    key: "itemRef",
     value: function itemRef(ele, index, id) {
-      this['suggestion_' + id] = ele;
+      this["suggestion_".concat(id)] = ele;
     }
   }, {
-    key: 'searchInputRef',
+    key: "searchInputRef",
     value: function searchInputRef(el) {
       this.searchInput = el;
     }
   }, {
-    key: 'handleTogglePopup',
+    key: "handleTogglePopup",
     value: function handleTogglePopup(e) {
-      var _props = this.props,
-          togglePopup = _props.togglePopup,
-          boxPosition = _props.boxPosition,
-          onSelectLabel = _props.onSelectLabel,
-          isPopupOpen = _props.isPopupOpen;
-
+      var _this$props = this.props,
+          togglePopup = _this$props.togglePopup,
+          boxPosition = _this$props.boxPosition,
+          onSelectLabel = _this$props.onSelectLabel,
+          isPopupOpen = _this$props.isPopupOpen,
+          removeClose = _this$props.removeClose;
+      removeClose && removeClose(e);
       !isPopupOpen && onSelectLabel && onSelectLabel(e);
       togglePopup(e, boxPosition);
     }
   }, {
-    key: 'scrollContentRef',
+    key: "showTogglePopup",
+    value: function showTogglePopup(e) {
+      var _this$props2 = this.props,
+          togglePopup = _this$props2.togglePopup,
+          boxPosition = _this$props2.boxPosition,
+          onSelectLabel = _this$props2.onSelectLabel,
+          isPopupOpen = _this$props2.isPopupOpen;
+      !isPopupOpen && onSelectLabel && onSelectLabel(e);
+      !isPopupOpen && togglePopup(e, boxPosition);
+    }
+  }, {
+    key: "hideTogglePopup",
+    value: function hideTogglePopup(e) {
+      var _this$props3 = this.props,
+          togglePopup = _this$props3.togglePopup,
+          boxPosition = _this$props3.boxPosition,
+          onSelectLabel = _this$props3.onSelectLabel,
+          isPopupOpen = _this$props3.isPopupOpen;
+      !isPopupOpen && onSelectLabel && onSelectLabel(e);
+      isPopupOpen && togglePopup(e, boxPosition);
+    }
+  }, {
+    key: "scrollContentRef",
     value: function scrollContentRef(el) {
       var isPopupOpen = this.props.isPopupOpen;
 
@@ -149,445 +182,701 @@ var ToggleDropDown = exports.ToggleDropDown = function (_React$Component) {
       }
     }
   }, {
-    key: 'componentWillReceiveProps',
+    key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
-      if (nextProps.options.length != this.props.options.length) {
+      // if (nextProps.options.length != this.props.options.length) {
+      //   this.setState({
+      //     options: nextProps.options
+      //   });
+      // }
+      if ((0, _General.shallowDiff)(this.props.options, nextProps.options)) {
         this.setState({
           options: nextProps.options
         });
       }
     }
   }, {
-    key: 'onSelect',
+    key: "onSelect",
     value: function onSelect(element, e) {
-      var _props2 = this.props,
-          onClick = _props2.onClick,
-          togglePopup = _props2.togglePopup;
-
+      var _this$props4 = this.props,
+          onClick = _this$props4.onClick,
+          togglePopup = _this$props4.togglePopup,
+          preventPopupClose = _this$props4.preventPopupClose;
       onClick && onClick(e, element);
-      togglePopup(e);
+      !preventPopupClose && togglePopup(e);
     }
   }, {
-    key: 'componentDidUpdate',
+    key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       var _this2 = this;
 
-      var _props3 = this.props,
-          isPopupOpen = _props3.isPopupOpen,
-          isSearch = _props3.isSearch,
-          idName = _props3.idName;
-      var _state = this.state,
-          selectedIndex = _state.selectedIndex,
-          options = _state.options,
-          seperatedOptions = _state.seperatedOptions;
-
-      if (prevProps.isPopupOpen != isPopupOpen) {
+      var _this$props5 = this.props,
+          isPopupOpen = _this$props5.isPopupOpen,
+          isPopupReady = _this$props5.isPopupReady,
+          isSearch = _this$props5.isSearch,
+          idName = _this$props5.idName,
+          options = _this$props5.options,
+          onDropDownOpen = _this$props5.onDropDownOpen,
+          onDropDownClose = _this$props5.onDropDownClose;
+      var _this$state = this.state,
+          selectedIndex = _this$state.selectedIndex,
+          searchValue = _this$state.searchValue;
+
+      if (prevProps.isPopupReady !== isPopupReady) {
         setTimeout(function () {
-          isPopupOpen ? isSearch ? _this2.searchInput.focus() : _this2.hiddenInput.focus() : _this2.hiddenInput.focus();
+          isPopupReady ? isSearch ? _this2.searchInput.focus({
+            preventScroll: true
+          }) : _this2.hiddenInput.focus({
+            preventScroll: true
+          }) : _this2.hiddenInput.focus({
+            preventScroll: true
+          });
         }, 10);
       }
-      var mergeOptions = seperatedOptions ? options.concat(seperatedOptions) : options;
-      var option = mergeOptions[selectedIndex];
+
+      var optionsArr = this.getOptionsArray();
+      var option = optionsArr[selectedIndex];
       var id = option && option[idName] || {};
-      var selSuggestion = this['suggestion_' + id];
+      var selSuggestion = this["suggestion_".concat(id)];
+
       if (isPopupOpen) {
         this.optionsContainer && (0, _Common.scrollTo)(this.optionsContainer, selSuggestion);
       }
+
+      if (!prevProps.isPopupOpen && isPopupOpen && searchValue.length) {
+        this.onSearchClear();
+      }
+
+      if (this.props.from == 'activityFilter') {
+        //Temproary
+        var results = this.props.options.filter(function (_ref) {
+          var id1 = _ref.isDisabled;
+          return !prevProps.options.some(function (_ref2) {
+            var id2 = _ref2.isDisabled;
+            return id2 === id1;
+          });
+        });
+
+        if (results.length > 0) {
+          this.setState({
+            options: options
+          });
+        }
+      }
+
+      if (prevProps.isPopupOpen !== isPopupOpen) {
+        if (isPopupOpen) {
+          onDropDownOpen && onDropDownOpen();
+        } else {
+          onDropDownClose && onDropDownClose();
+        }
+
+        this.getSelectedIndex(optionsArr);
+      }
+    }
+  }, {
+    key: "handleFilterSuggestions",
+    value: function handleFilterSuggestions(searchValue) {
+      var _this$props6 = this.props,
+          options = _this$props6.options,
+          keyName = _this$props6.keyName,
+          isGroupDropDown = _this$props6.isGroupDropDown,
+          groupOptionsKey = _this$props6.groupOptionsKey,
+          groupNameKey = _this$props6.groupNameKey;
+      searchValue = searchValue.trim().toLowerCase();
+      var result = [];
+
+      if (isGroupDropDown) {
+        var filteredGroups = [];
+        options.map(function (group) {
+          var needDivider = group.needDivider;
+          var name = group[groupNameKey];
+          var groupOptions = group[groupOptionsKey];
+          var datas = groupOptions.filter(function (list) {
+            var value = list[keyName];
+            return value.toLowerCase().includes(searchValue);
+          });
+
+          if (datas.length) {
+            var _filteredGroups$push;
+
+            filteredGroups.push((_filteredGroups$push = {}, _defineProperty(_filteredGroups$push, groupNameKey, name), _defineProperty(_filteredGroups$push, groupOptionsKey, datas), _defineProperty(_filteredGroups$push, "needDivider", needDivider), _filteredGroups$push));
+          }
+        });
+        result = filteredGroups;
+      } else {
+        var filteredOptions = options.filter(function (item, i) {
+          if (item.needDivider) {
+            return true;
+          }
+
+          return item[keyName].toLowerCase().includes(searchValue);
+        });
+
+        if (filteredOptions.length) {
+          // to avoid more than one dividers consecutively comes as one by one
+          var needDividerCount = 0;
+          var orderedOptions = filteredOptions.filter(function (item) {
+            if (item.needDivider && needDividerCount === 0) {
+              needDividerCount++;
+              return true;
+            } else if (!item.needDivider) {
+              needDividerCount = 0;
+              return true;
+            }
+          }); // remove divider if it placed in first or last index
+
+          filteredOptions = [];
+          filteredOptions = orderedOptions.filter(function (item, i) {
+            if (i == 0 || i == orderedOptions.length - 1) {
+              if (!item.needDivider) {
+                return true;
+              }
+            } else {
+              return true;
+            }
+          });
+          result = filteredOptions;
+        }
+      }
+
+      return result;
+    }
+  }, {
+    key: "getOptionsArray",
+    value: function getOptionsArray() {
+      var searchValue = this.state.searchValue;
+      var _this$props7 = this.props,
+          isGroupDropDown = _this$props7.isGroupDropDown,
+          groupOptionsKey = _this$props7.groupOptionsKey;
+      var options = searchValue.length ? this.handleFilterSuggestions(searchValue) : this.props.options;
+      var optionsArr = [];
+
+      if (isGroupDropDown) {
+        for (var i = 0; i < options.length; i++) {
+          var groupOptions = options[i][groupOptionsKey];
+          Array.prototype.push.apply(optionsArr, groupOptions);
+        }
+      } else {
+        optionsArr = options.filter(function (item) {
+          return !item.needDivider;
+        });
+      }
+
+      return optionsArr;
     }
   }, {
-    key: 'handleKeyDown',
+    key: "handleKeyDown",
     value: function handleKeyDown(e) {
       var keyCode = e.keyCode;
-      var _state2 = this.state,
-          selectedIndex = _state2.selectedIndex,
-          options = _state2.options,
-          seperatedOptions = _state2.seperatedOptions;
-
-      var totalIndex = seperatedOptions ? options.length + seperatedOptions.length : options.length;
-      var mergeOptions = seperatedOptions ? options.concat(seperatedOptions) : options;
-      var _props4 = this.props,
-          togglePopup = _props4.togglePopup,
-          onClick = _props4.onClick,
-          boxPosition = _props4.boxPosition,
-          isPopupOpen = _props4.isPopupOpen,
-          isNextOptions = _props4.isNextOptions,
-          getNextOptions = _props4.getNextOptions;
-
-      if (isPopupOpen && (keyCode === 38 || keyCode === 40) && e.preventDefault) {
+      var _this$state2 = this.state,
+          selectedIndex = _this$state2.selectedIndex,
+          searchValue = _this$state2.searchValue;
+      var optionsArr = this.getOptionsArray();
+      var totalIndex = optionsArr.length;
+      var _this$props8 = this.props,
+          togglePopup = _this$props8.togglePopup,
+          onClick = _this$props8.onClick,
+          boxPosition = _this$props8.boxPosition,
+          isPopupReady = _this$props8.isPopupReady,
+          isNextOptions = _this$props8.isNextOptions,
+          getNextOptions = _this$props8.getNextOptions,
+          value = _this$props8.value,
+          keyName = _this$props8.keyName,
+          idName = _this$props8.idName,
+          preventPopupClose = _this$props8.preventPopupClose,
+          isSearch = _this$props8.isSearch;
+
+      if (isPopupReady && (keyCode === 38 || keyCode === 40) && e.preventDefault) {
         e.preventDefault(); //prevent body scroll
       }
-      switch (keyCode) {
-        case 40:
-          if (selectedIndex === totalIndex - 1) {
-            this.setState({ selectedIndex: 0 });
-          } else {
-            if (selectedIndex === totalIndex - 3) {
-              isNextOptions && getNextOptions && getNextOptions();
+
+      if (isPopupReady) {
+        switch (keyCode) {
+          case 40:
+            if (selectedIndex === totalIndex - 1) {
+              this.setState({
+                selectedIndex: 0
+              });
+            } else {
+              if (selectedIndex === totalIndex - 3) {
+                isNextOptions && getNextOptions && getNextOptions(e, {
+                  searchValue: searchValue
+                });
+              }
+
+              this.setState({
+                selectedIndex: selectedIndex + 1
+              });
             }
-            this.setState({ selectedIndex: selectedIndex + 1 });
-          }
-          break;
-        case 38:
-          if (selectedIndex === 0) {
-            this.setState({ selectedIndex: totalIndex - 1 });
-          } else {
-            this.setState({ selectedIndex: selectedIndex - 1 });
-          }
-          break;
-        case 13:
-          onClick && onClick(e, mergeOptions[selectedIndex]);
+
+            break;
+
+          case 38:
+            if (selectedIndex === 0) {
+              this.setState({
+                selectedIndex: totalIndex - 1
+              });
+            } else {
+              this.setState({
+                selectedIndex: selectedIndex - 1
+              });
+            }
+
+            break;
+
+          case 13:
+            var selectedId = optionsArr[selectedIndex][idName] || '';
+            onClick && onClick(selectedId, optionsArr[selectedIndex]);
+
+            if (!preventPopupClose) {
+              togglePopup(e, boxPosition);
+            } else if (isSearch) {
+              this.searchInput.focus({
+                preventScroll: true
+              });
+            } else {
+              this.hiddenInput.focus({
+                preventScroll: true
+              });
+            }
+
+            break;
+        }
+      } else {
+        if (keyCode === 13 || keyCode === 40) {
           togglePopup(e, boxPosition);
-          break;
+        }
       }
     }
   }, {
-    key: 'searchList',
-    value: function searchList(value) {
-      var _props5 = this.props,
-          options = _props5.options,
-          keyName = _props5.keyName,
-          seperatedOptions = _props5.seperatedOptions;
-
-      var foptions = options.filter(function (dept) {
-        return dept[keyName].toLowerCase().indexOf(value.toLowerCase()) != -1;
-      });
-      var fseperatedOptions = seperatedOptions && seperatedOptions.filter(function (dept) {
-        return dept[keyName].toLowerCase().indexOf(value.toLowerCase()) != -1;
-      });
-      var optionsObj = {
-        foptions: foptions,
-        fseperatedOptions: fseperatedOptions
-      };
-      return optionsObj;
+    key: "getSelectedIndex",
+    value: function getSelectedIndex(optionsArr) {
+      var _this$props9 = this.props,
+          selectedId = _this$props9.selectedId,
+          idName = _this$props9.idName;
+
+      if (selectedId) {
+        for (var i = 0; i < optionsArr.length; i++) {
+          var indexId = optionsArr[i][idName];
+
+          if (selectedId === indexId) {
+            this.setState({
+              selectedIndex: i
+            });
+            break;
+          }
+        }
+      } else {
+        this.setState({
+          selectedIndex: -1
+        });
+      }
+    }
+  }, {
+    key: "onSearchAPI",
+    value: function onSearchAPI() {
+      var searchValue = this.state.searchValue;
+      var _this$props10 = this.props,
+          needSearchFetching = _this$props10.needSearchFetching,
+          onSearch = _this$props10.onSearch;
+
+      if (needSearchFetching && onSearch) {
+        onSearch(searchValue);
+      }
     }
   }, {
-    key: 'handleChange',
+    key: "handleChange",
     value: function handleChange(value, e) {
-      var optionsObj = this.searchList(value);
+      var _this3 = this;
+
+      var filteredOptions = this.handleFilterSuggestions(value);
       this.setState({
-        searchString: value,
+        searchValue: value,
         selectedIndex: -1,
-        options: optionsObj.foptions,
-        seperatedOptions: optionsObj.fseperatedOptions
+        options: filteredOptions
+      }, function () {
+        _this3.onSearchAPI();
       });
     }
   }, {
-    key: 'onSearchClear',
+    key: "onSearchClear",
     value: function onSearchClear() {
-      var optionsObj = this.searchList('');
+      var _this4 = this;
+
+      var filteredOptions = this.handleFilterSuggestions('');
       this.setState({
-        searchString: '',
-        options: optionsObj.foptions,
-        seperatedOptions: optionsObj.fseperatedOptions
+        searchValue: '',
+        options: filteredOptions
+      }, function () {
+        _this4.onSearchAPI();
       });
     }
   }, {
-    key: 'handleMouseEnter',
+    key: "handleMouseEnter",
     value: function handleMouseEnter(id, value, index, e) {
       this.setState({
         selectedIndex: index
       });
     }
   }, {
-    key: 'handleScroll',
+    key: "handleScroll",
     value: function handleScroll(e) {
-      var _props6 = this.props,
-          isNextOptions = _props6.isNextOptions,
-          getNextOptions = _props6.getNextOptions;
+      var _this$props11 = this.props,
+          isNextOptions = _this$props11.isNextOptions,
+          getNextOptions = _this$props11.getNextOptions;
+      var searchValue = this.state.searchValue;
 
       if (e.target.scrollTop + e.target.offsetHeight > e.target.scrollHeight - 1) {
-        isNextOptions && getNextOptions && getNextOptions(e);
+        isNextOptions && getNextOptions && getNextOptions(e, {
+          searchValue: searchValue
+        });
       }
     }
   }, {
-    key: 'render',
+    key: "render",
     value: function render() {
-      var _this3 = this;
-
-      var _state3 = this.state,
-          options = _state3.options,
-          selectedIndex = _state3.selectedIndex,
-          seperatedOptions = _state3.seperatedOptions;
-      var _props7 = this.props,
-          value = _props7.value,
-          removeClose = _props7.removeClose,
-          boxSize = _props7.boxSize,
-          keyName = _props7.keyName,
-          idName = _props7.idName,
-          title = _props7.title,
-          isSearch = _props7.isSearch,
-          isArrow = _props7.isArrow,
-          placeHolderText = _props7.placeHolderText,
-          className = _props7.className,
-          right = _props7.right,
-          left = _props7.left,
-          top = _props7.top,
-          bottom = _props7.bottom,
-          isPopupOpen = _props7.isPopupOpen,
-          isPopupReady = _props7.isPopupReady,
-          position = _props7.position,
-          getTargetRef = _props7.getTargetRef,
-          getContainerRef = _props7.getContainerRef,
-          dataId = _props7.dataId,
-          searchBoxSize = _props7.searchBoxSize,
-          searchEmptyHint = _props7.searchEmptyHint,
-          searchErrorText = _props7.searchErrorText,
-          activeStyle = _props7.activeStyle,
-          _props7$showOnHover = _props7.showOnHover,
-          showOnHover = _props7$showOnHover === undefined ? false : _props7$showOnHover,
-          isDisabled = _props7.isDisabled,
-          showIconOnHover = _props7.showIconOnHover,
-          isReadOnly = _props7.isReadOnly,
-          hoverStyle = _props7.hoverStyle,
-          isEditable = _props7.isEditable,
-          iconName = _props7.iconName,
-          iconSize = _props7.iconSize,
-          needTick = _props7.needTick,
-          dataTitle = _props7.dataTitle,
-          isDataLoaded = _props7.isDataLoaded,
-          children = _props7.children,
-          targetAlign = _props7.targetAlign,
-          needResponsive = _props7.needResponsive;
-      var searchString = this.state.searchString;
-
-      var containerClass = (className ? className : '') + ' ' + (isPopupReady ? activeStyle ? activeStyle : '' : showIconOnHover ? _ToggleDropDownModule2.default.hoverIcon : '') + ' ' + (isDisabled ? _commonModule2.default.disabled : isReadOnly ? _ToggleDropDownModule2.default.readOnly : !isEditable ? _ToggleDropDownModule2.default.cursorDefault : !showOnHover ? _ToggleDropDownModule2.default.cursor + ' ' + (hoverStyle ? hoverStyle : '') : (hoverStyle ? hoverStyle : '') + ' ' + _ToggleDropDownModule2.default.cursorDefault);
-      return _react2.default.createElement(
-        'div',
-        {
-          className: _ToggleDropDownModule2.default.posRel,
-          onMouseEnter: showOnHover && !isDisabled && !isReadOnly && isEditable ? this.handleTogglePopup : undefined,
-          onMouseLeave: showOnHover && !isDisabled && !isReadOnly && isEditable ? this.handleTogglePopup : undefined
+      var _this5 = this;
+
+      var _this$state3 = this.state,
+          options = _this$state3.options,
+          selectedIndex = _this$state3.selectedIndex;
+      var _this$props12 = this.props,
+          value = _this$props12.value,
+          removeClose = _this$props12.removeClose,
+          boxSize = _this$props12.boxSize,
+          keyName = _this$props12.keyName,
+          idName = _this$props12.idName,
+          title = _this$props12.title,
+          isSearch = _this$props12.isSearch,
+          isArrow = _this$props12.isArrow,
+          placeHolderText = _this$props12.placeHolderText,
+          className = _this$props12.className,
+          right = _this$props12.right,
+          left = _this$props12.left,
+          top = _this$props12.top,
+          bottom = _this$props12.bottom,
+          isOpen = _this$props12.isPopupOpen,
+          isPopupActive = _this$props12.isPopupActive,
+          needExternalPopupState = _this$props12.needExternalPopupState,
+          isPopupReady = _this$props12.isPopupReady,
+          position = _this$props12.position,
+          getTargetRef = _this$props12.getTargetRef,
+          getContainerRef = _this$props12.getContainerRef,
+          dataId = _this$props12.dataId,
+          searchBoxSize = _this$props12.searchBoxSize,
+          searchEmptyHint = _this$props12.searchEmptyHint,
+          searchErrorText = _this$props12.searchErrorText,
+          activeStyle = _this$props12.activeStyle,
+          showOnHover = _this$props12.showOnHover,
+          isDisabled = _this$props12.isDisabled,
+          showIconOnHover = _this$props12.showIconOnHover,
+          isReadOnly = _this$props12.isReadOnly,
+          hoverStyle = _this$props12.hoverStyle,
+          isEditable = _this$props12.isEditable,
+          iconName = _this$props12.iconName,
+          iconSize = _this$props12.iconSize,
+          needTick = _this$props12.needTick,
+          dataTitle = _this$props12.dataTitle,
+          isDataLoaded = _this$props12.isDataLoaded,
+          children = _this$props12.children,
+          needResponsive = _this$props12.needResponsive,
+          arrowIconPosition = _this$props12.arrowIconPosition,
+          isGroupDropDown = _this$props12.isGroupDropDown,
+          groupOptionsKey = _this$props12.groupOptionsKey,
+          groupNameKey = _this$props12.groupNameKey,
+          isToggleStateNeeded = _this$props12.isToggleStateNeeded,
+          selectedId = _this$props12.selectedId,
+          isPadding = _this$props12.isPadding,
+          isNeedEffect = _this$props12.isNeedEffect,
+          hoverType = _this$props12.hoverType,
+          palette = _this$props12.palette,
+          getFooter = _this$props12.getFooter,
+          customProps = _this$props12.customProps;
+      var _customProps$ToggleDr = customProps.ToggleDropDownProps,
+          ToggleDropDownProps = _customProps$ToggleDr === void 0 ? {} : _customProps$ToggleDr,
+          _customProps$DropBoxP = customProps.DropBoxProps,
+          DropBoxProps = _customProps$DropBoxP === void 0 ? {} : _customProps$DropBoxP,
+          _customProps$TextBoxI = customProps.TextBoxIconProps,
+          TextBoxIconProps = _customProps$TextBoxI === void 0 ? {} : _customProps$TextBoxI,
+          _customProps$ListItem = customProps.ListItemWithIconProps,
+          ListItemWithIconProps = _customProps$ListItem === void 0 ? {} : _customProps$ListItem,
+          _customProps$ListItem2 = customProps.ListItemProps,
+          ListItemProps = _customProps$ListItem2 === void 0 ? {} : _customProps$ListItem2;
+      var isPopupOpen = needExternalPopupState ? isPopupActive && isOpen : isOpen;
+      var Component = isToggleStateNeeded ? children.type : null,
+          componentProps = isToggleStateNeeded ? children.props : null;
+      var searchValue = this.state.searchValue;
+      var commonClass = "".concat(className ? className : '', " ").concat(isPopupReady ? activeStyle ? activeStyle : '' : '', " ").concat(isDisabled ? (0, _CssProvider["default"])('isDisable') : isReadOnly || !isEditable ? _ToggleDropDownModule["default"].cursorDefault : !showOnHover ? "".concat(_ToggleDropDownModule["default"].cursor, " ").concat(hoverStyle ? hoverStyle : '') : "".concat(hoverStyle ? hoverStyle : '', " ").concat(_ToggleDropDownModule["default"].cursorDefault));
+      var listIndex = -1;
+      var ariaTitleId = this.getAriaId();
+      var allyOptionsArr = this.getOptionsArray();
+      return /*#__PURE__*/_react["default"].createElement("div", _extends({
+        className: _ToggleDropDownModule["default"].wrapper,
+        onMouseEnter: showOnHover && !isDisabled && !isReadOnly && isEditable ? this.showTogglePopup : undefined,
+        onMouseLeave: showOnHover && !isDisabled && !isReadOnly && isEditable ? this.hideTogglePopup : undefined
+      }, ToggleDropDownProps), /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
+        alignBox: "row",
+        onClick: !showOnHover && !isDisabled && !isReadOnly && isEditable && this.handleTogglePopup,
+        eleRef: getTargetRef,
+        align: "vertical",
+        isCover: false,
+        dataId: dataId
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: _ToggleDropDownModule["default"].hiddenInput
+      }, /*#__PURE__*/_react["default"].createElement("input", {
+        type: "text",
+        ref: this.inputRef,
+        onKeyDown: this.handleKeyDown,
+        tabIndex: "-1",
+        className: _ToggleDropDownModule["default"].hiddenInputElement
+      })), children ? isToggleStateNeeded ? /*#__PURE__*/_react["default"].createElement(Component, _extends({}, componentProps, {
+        isActive: isPopupOpen
+      })) : children : /*#__PURE__*/_react["default"].createElement(_RippleEffect["default"], {
+        hoverType: hoverType,
+        isActive: isPopupOpen,
+        isNeedEffect: isEditable && isNeedEffect
+      }, /*#__PURE__*/_react["default"].createElement(_Layout.Container, {
+        className: "".concat(_semanticButtonModule["default"].buttonReset, " ").concat(commonClass, " ").concat(!isPopupOpen && showIconOnHover ? _ToggleDropDownModule["default"].hoverIcon : ''),
+        isCover: false,
+        alignBox: "row",
+        align: "vertical",
+        tagName: "button",
+        "aria-labelledby": ariaTitleId,
+        "aria-haspopup": true,
+        "aria-expanded": isPopupOpen ? true : false
+      }, iconName ? /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
+        className: value ? _ToggleDropDownModule["default"].iconBox : ''
+      }, /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+        name: iconName,
+        size: iconSize
+      })) : null, value && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
+        id: ariaTitleId,
+        "aria-hidden": true,
+        className: "".concat(_ToggleDropDownModule["default"].value, " toggleDropText"),
+        shrink: true,
+        tagName: "span",
+        "data-title": dataTitle
+      }, value), isEditable ? /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
+        "aria-hidden": true,
+        size: "6",
+        name: "ZD-down",
+        iconClass: 'toggleDropIcon'.concat(" ", _ToggleDropDownModule["default"].arrow, " ").concat(_ToggleDropDownModule["default"]["".concat(arrowIconPosition, "_arrow")]),
+        dataId: "statusdownarrow"
+      }) : null)))), isPopupOpen ? /*#__PURE__*/_react["default"].createElement(_DropBox["default"], _extends({
+        boxPosition: position,
+        isActive: isPopupReady,
+        onClick: removeClose,
+        size: boxSize,
+        right: right,
+        left: left,
+        top: top,
+        bottom: bottom,
+        isArrow: isArrow,
+        isAnimate: true,
+        getRef: getContainerRef,
+        customClass: {
+          customDropBoxWrap: _ToggleDropDownModule["default"].dropBoxContainer
+        },
+        needResponsive: needResponsive,
+        isPadding: isPadding,
+        tabindex: "0",
+        a11y: {
+          role: !isSearch ? 'menu' : undefined,
+          ariaLabelledby: !isSearch ? ariaTitleId : undefined
         },
-        _react2.default.createElement(
-          _Layout.Container,
-          {
-            alignBox: 'row',
-            className: containerClass,
-            onClick: !showOnHover && !isDisabled && !isReadOnly && isEditable && this.handleTogglePopup,
-            eleRef: getTargetRef,
-            align: targetAlign,
-            isCover: false,
-            dataId: dataId
-          },
-          _react2.default.createElement(
-            'div',
-            { className: _ToggleDropDownModule2.default.hiddenInput },
-            _react2.default.createElement(_TextBox2.default, {
-              type: 'text',
-              inputRef: this.inputRef,
-              onKeyDown: this.handleKeyDown,
-              needAppearance: false
-            })
-          ),
-          children ? children : _react2.default.createElement(
-            _react2.default.Fragment,
-            null,
-            iconName ? _react2.default.createElement(
-              _Layout.Box,
-              { className: _ToggleDropDownModule2.default.iconBox },
-              _react2.default.createElement(_Icon2.default, { name: iconName, size: iconSize })
-            ) : null,
-            _react2.default.createElement(
-              _Layout.Box,
-              {
-                className: _ToggleDropDownModule2.default.value + ' toggleDropText',
-                shrink: true,
-                tagName: 'span',
-                'data-title': dataTitle
-              },
-              value
-            ),
-            isEditable ? _react2.default.createElement(
-              _Layout.Box,
-              {
-                className: _ToggleDropDownModule2.default.arrow,
-                dataId: 'statusdownarrow',
-                tagName: 'span'
-              },
-              _react2.default.createElement(_Icon2.default, {
-                size: '6',
-                name: 'ZD-blockDownArrow',
-                iconClass: 'toggleDropIcon'
-              })
-            ) : null
-          )
-        ),
-        isPopupOpen ? _react2.default.createElement(
-          _DropBox2.default,
-          {
-            boxPosition: position,
-            isActive: isPopupReady,
-            onClick: removeClose,
-            size: boxSize,
-            right: right,
-            left: left,
-            top: top,
-            bottom: bottom,
-            isArrow: isArrow,
-            isAnimate: true,
-            getRef: getContainerRef,
-            className: _ToggleDropDownModule2.default.dropBoxContainer,
-            needResponsive: needResponsive
-          },
-          _react2.default.createElement(
-            _react2.default.Fragment,
-            null,
-            title && _react2.default.createElement(
-              'div',
-              { className: _ToggleDropDownModule2.default.title },
-              _react2.default.createElement(_DropDownHeading2.default, { text: title })
-            ),
-            isSearch ? _react2.default.createElement(
-              'div',
-              { className: _ToggleDropDownModule2.default.search },
-              _react2.default.createElement(
-                _TextBoxIcon2.default,
-                {
-                  placeHolder: placeHolderText,
-                  onChange: this.handleChange,
-                  value: searchString,
-                  onClear: this.onSearchClear,
-                  size: searchBoxSize,
-                  inputRef: this.searchInputRef,
-                  onKeyDown: this.handleKeyDown
-                },
-                _react2.default.createElement(_Icon2.default, { name: 'ZD-search', size: '13' })
-              )
-            ) : null,
-            _react2.default.createElement(
-              _Layout.Box,
-              {
-                scroll: 'vertical',
-                dataId: dataId + '_list',
-                className: _ToggleDropDownModule2.default.maxHgt,
-                eleRef: this.scrollContentRef,
-                onScroll: this.handleScroll
-              },
-              (options.length != 0 || seperatedOptions && seperatedOptions.length != 0) && isDataLoaded ? _react2.default.createElement(
-                _react2.default.Fragment,
-                null,
-                options.length != 0 && options[0].iconName ? _react2.default.createElement(
-                  _react2.default.Fragment,
-                  null,
-                  options.map(function (item, i) {
-                    var iconName = item.iconName,
-                        iconSize = item.iconSize;
-
-                    return _react2.default.createElement(_ListItemWithIcon2.default, {
-                      key: i,
-                      dataId: 'dataid_' + i,
-                      value: item[keyName],
-                      id: item[idName],
-                      active: value === item[keyName],
-                      onClick: _this3.onSelect.bind(_this3, item),
-                      index: i,
-                      highlight: selectedIndex === i,
-                      iconName: iconName,
-                      iconSize: iconSize,
-                      needTick: needTick,
-                      needBorder: false,
-                      onMouseEnter: _this3.handleMouseEnter,
-                      getRef: _this3.itemRef
-                    });
-                  })
-                ) : _react2.default.createElement(
-                  _react2.default.Fragment,
-                  null,
-                  options.map(function (item, i) {
-                    return _react2.default.createElement(_ListItem2.default, {
-                      key: i,
-                      dataId: 'dataid_' + i,
-                      value: item[keyName],
-                      id: item[idName],
-                      active: value === item[keyName],
-                      onClick: _this3.onSelect.bind(_this3, item),
-                      index: i,
-                      highlight: selectedIndex === i,
-                      needTick: needTick,
-                      needBorder: false,
-                      onMouseEnter: _this3.handleMouseEnter,
-                      getRef: _this3.itemRef
-                    });
-                  })
-                ),
-                seperatedOptions && seperatedOptions.length != 0 && _react2.default.createElement(
-                  _react2.default.Fragment,
-                  null,
-                  options.length != 0 && _react2.default.createElement('div', { className: _ToggleDropDownModule2.default.seperatedLine }),
-                  seperatedOptions[0].iconName ? _react2.default.createElement(
-                    _react2.default.Fragment,
-                    null,
-                    seperatedOptions.map(function (item, i) {
-                      var iconName = item.iconName,
-                          iconSize = item.iconSize;
-
-                      return _react2.default.createElement(_ListItemWithIcon2.default, {
-                        key: i,
-                        dataId: 'dataid_' + (i + options.length),
-                        value: item[keyName],
-                        id: item[idName],
-                        active: value === item[keyName],
-                        onClick: _this3.onSelect.bind(_this3, item),
-                        index: i + options.length,
-                        highlight: selectedIndex === i + options.length,
-                        iconName: iconName,
-                        iconSize: iconSize,
-                        needTick: needTick,
-                        isTick: value === item[keyName],
-                        onMouseEnter: _this3.handleMouseEnter,
-                        getRef: _this3.itemRef
-                      });
-                    })
-                  ) : _react2.default.createElement(
-                    _react2.default.Fragment,
-                    null,
-                    seperatedOptions.map(function (item, i) {
-                      return _react2.default.createElement(_ListItem2.default, {
-                        key: i,
-                        dataId: 'dataid_' + (i + options.length),
-                        value: item[keyName],
-                        id: item[idName],
-                        active: value === item[keyName],
-                        onClick: _this3.onSelect.bind(_this3, item),
-                        index: i + options.length,
-                        highlight: selectedIndex == i + options.length,
-                        needTick: needTick,
-                        isTick: value === item[keyName],
-                        onMouseEnter: _this3.handleMouseEnter,
-                        getRef: _this3.itemRef
-                      });
-                    })
-                  )
-                )
-              ) : isDataLoaded ? _react2.default.createElement(
-                _CommonEmptyState2.default,
-                {
-                  className: _ToggleDropDownModule2.default.svgWrapper,
-                  title: searchErrorText || 'oops !',
-                  description: searchEmptyHint
-                },
-                _react2.default.createElement(_EmptySearch2.default, { size: 'small' })
-              ) : _react2.default.createElement(
-                'div',
-                { className: _ToggleDropDownModule2.default.loader },
-                _react2.default.createElement(_Loader2.default, null)
-              )
-            )
-          )
-        ) : null
-      );
+        palette: palette
+      }, DropBoxProps), /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, isSearch ? /*#__PURE__*/_react["default"].createElement("div", {
+        className: _ToggleDropDownModule["default"].search
+      }, /*#__PURE__*/_react["default"].createElement(_TextBoxIcon["default"], _extends({
+        placeHolder: placeHolderText,
+        onChange: this.handleChange,
+        value: searchValue,
+        onClear: this.onSearchClear,
+        size: searchBoxSize,
+        inputRef: this.searchInputRef,
+        onKeyDown: this.handleKeyDown,
+        a11y: {
+          role: 'combobox',
+          ariaOwns: ariaTitleId,
+          ariaActivedescendant: allyOptionsArr[selectedIndex] && allyOptionsArr[selectedIndex][keyName],
+          ariaAutocomplete: 'list',
+          ariaHaspopup: true,
+          ariaExpanded: true
+        }
+      }, TextBoxIconProps))) : null, title && options.length != 0 && /*#__PURE__*/_react["default"].createElement("div", {
+        className: _ToggleDropDownModule["default"].title
+      }, /*#__PURE__*/_react["default"].createElement(_DropDownHeading["default"], {
+        text: title,
+        htmlId: ariaTitleId,
+        palette: palette,
+        a11y: {
+          role: 'heading'
+        },
+        customClass: _ToggleDropDownModule["default"].dropdown
+      })), /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
+        id: ariaTitleId,
+        scroll: "vertical",
+        dataId: "".concat(dataId, "_list"),
+        className: _ToggleDropDownModule["default"].maxHgt,
+        eleRef: this.scrollContentRef,
+        onScroll: this.handleScroll,
+        role: isSearch ? 'listbox' : undefined,
+        "aria-labelledby": isSearch ? ariaTitleId : undefined
+      }, isDataLoaded ? options && options.length != 0 ? isGroupDropDown ? /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, options.map(function (group) {
+        var groupName = group[groupNameKey];
+        var groupOptions = group[groupOptionsKey];
+        var needDivider = group.needDivider;
+        return /*#__PURE__*/_react["default"].createElement(_react.Fragment, {
+          key: "index".concat(groupName)
+        }, needDivider && /*#__PURE__*/_react["default"].createElement("div", {
+          className: _ToggleDropDownModule["default"].seperatedLine
+        }), groupName && /*#__PURE__*/_react["default"].createElement("div", {
+          className: _ToggleDropDownModule["default"].groupName
+        }, /*#__PURE__*/_react["default"].createElement(_DropDownHeading["default"], {
+          text: groupName,
+          palette: palette,
+          a11y: {
+            role: 'heading'
+          }
+        })), groupOptions && groupOptions.map(function (item) {
+          var iconName = item.iconName,
+              iconSize = item.iconSize,
+              iconClass = item.iconClass,
+              title = item.title,
+              _item$disableTitle = item.disableTitle,
+              disableTitle = _item$disableTitle === void 0 ? '' : _item$disableTitle,
+              _item$isDisabled = item.isDisabled,
+              isDisabled = _item$isDisabled === void 0 ? false : _item$isDisabled;
+          listIndex += 1;
+          return iconName ? /*#__PURE__*/_react["default"].createElement(_ListItemWithIcon["default"], _extends({
+            key: listIndex,
+            dataId: item[keyName],
+            value: item[keyName],
+            id: item[idName],
+            active: selectedId === item[idName],
+            onClick: _this5.onSelect.bind(_this5, item),
+            index: listIndex,
+            highlight: selectedIndex === listIndex,
+            disableTitle: disableTitle,
+            isDisabled: isDisabled,
+            iconName: iconName,
+            iconClass: iconClass,
+            iconSize: iconSize,
+            needTick: needTick,
+            needBorder: false,
+            onMouseEnter: _this5.handleMouseEnter,
+            getRef: _this5.itemRef,
+            title: title ? title : item[keyName],
+            palette: palette,
+            a11y: {
+              role: isSearch ? 'option' : 'menuitem',
+              ariaSelected: selectedId === item[idName]
+            }
+          }, ListItemWithIconProps)) : /*#__PURE__*/_react["default"].createElement(_ListItem["default"], _extends({
+            key: listIndex,
+            dataId: item[keyName],
+            value: item[keyName],
+            id: item[idName],
+            active: selectedId === item[idName],
+            onClick: _this5.onSelect.bind(_this5, item),
+            isDisabled: isDisabled,
+            disableTitle: disableTitle,
+            index: listIndex,
+            highlight: selectedIndex === listIndex,
+            needTick: needTick,
+            needBorder: false,
+            onMouseEnter: _this5.handleMouseEnter,
+            getRef: _this5.itemRef,
+            title: title ? title : item[keyName],
+            palette: palette,
+            a11y: {
+              role: isSearch ? 'option' : 'menuitem',
+              ariaSelected: selectedId === item[idName]
+            }
+          }, ListItemProps));
+        }));
+      })) : /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, options.map(function (item, i) {
+        var iconName = item.iconName,
+            iconSize = item.iconSize,
+            iconClass = item.iconClass,
+            title = item.title,
+            needDivider = item.needDivider,
+            _item$isDisabled2 = item.isDisabled,
+            isDisabled = _item$isDisabled2 === void 0 ? false : _item$isDisabled2,
+            _item$disableTitle2 = item.disableTitle,
+            disableTitle = _item$disableTitle2 === void 0 ? '' : _item$disableTitle2;
+
+        if (!needDivider) {
+          listIndex += 1;
+        }
+
+        return /*#__PURE__*/_react["default"].createElement(_react.Fragment, {
+          key: i
+        }, needDivider ? /*#__PURE__*/_react["default"].createElement("div", {
+          className: _ToggleDropDownModule["default"].seperatedLine
+        }) : iconName ? /*#__PURE__*/_react["default"].createElement(_ListItemWithIcon["default"], _extends({
+          dataId: item[keyName],
+          value: item[keyName],
+          id: item[idName],
+          active: selectedId === item[idName],
+          onClick: _this5.onSelect.bind(_this5, item),
+          index: listIndex,
+          disableTitle: disableTitle,
+          isDisabled: isDisabled,
+          highlight: selectedIndex === listIndex,
+          iconName: iconName,
+          iconClass: iconClass,
+          iconSize: iconSize,
+          needTick: needTick,
+          needBorder: false,
+          onMouseEnter: _this5.handleMouseEnter,
+          getRef: _this5.itemRef,
+          title: title ? title : item[keyName],
+          key: listIndex,
+          palette: palette,
+          a11y: {
+            role: isSearch ? 'option' : 'menuitem',
+            ariaSelected: selectedId === item[idName]
+          }
+        }, ListItemWithIconProps)) : /*#__PURE__*/_react["default"].createElement(_ListItem["default"], _extends({
+          key: listIndex,
+          dataId: item[keyName],
+          value: item[keyName],
+          id: item[idName],
+          disableTitle: disableTitle,
+          isDisabled: isDisabled,
+          active: selectedId === item[idName],
+          onClick: _this5.onSelect.bind(_this5, item),
+          index: listIndex,
+          highlight: selectedIndex === listIndex,
+          needTick: needTick,
+          needBorder: false,
+          onMouseEnter: _this5.handleMouseEnter,
+          getRef: _this5.itemRef,
+          title: title ? title : item[keyName],
+          palette: palette,
+          a11y: {
+            role: isSearch ? 'option' : 'menuitem',
+            ariaSelected: selectedId === item[idName]
+          }
+        }, ListItemProps)));
+      })) : /*#__PURE__*/_react["default"].createElement(_CommonEmptyState["default"], {
+        className: _ToggleDropDownModule["default"].svgWrapper,
+        title: searchErrorText || 'oops !',
+        description: searchEmptyHint,
+        size: "small",
+        getEmptyState: this.emptySearchSVG
+      }) : /*#__PURE__*/_react["default"].createElement("div", {
+        className: _ToggleDropDownModule["default"].loader
+      }, /*#__PURE__*/_react["default"].createElement(_Loader["default"], null))), getFooter ? /*#__PURE__*/_react["default"].createElement("div", null, getFooter()) : null)) : null);
     }
   }]);
 
   return ToggleDropDown;
-}(_react2.default.Component);
-
-if (false) {
-  ToggleDropDown.docs = {
-    componentGroup: 'Molecule'
-  };
-}
+}(_react.Component);
 
+exports.ToggleDropDown = ToggleDropDown;
 ToggleDropDown.defaultProps = {
   keyName: 'value',
   idName: 'id',
@@ -595,53 +884,99 @@ ToggleDropDown.defaultProps = {
   searchBoxSize: 'small',
   isDisabled: false,
   showIconOnHover: false,
+  showOnHover: false,
   isReadOnly: false,
   isEditable: true,
   isDataLoaded: true,
   needTick: true,
-  targetAlign: 'vertical',
-  needResponsive: true
+  needResponsive: true,
+  arrowIconPosition: 'default',
+  groupOptionsKey: 'items',
+  groupNameKey: 'name',
+  isPadding: true,
+  isToggleStateNeeded: false,
+  isNeedEffect: true,
+  hoverType: 'default',
+  needExternalPopupState: false,
+  customProps: {},
+  preventPopupClose: false
 };
+ToggleDropDown.propTypes = {
+  activeStyle: _propTypes["default"].string,
+  arrowIconPosition: _propTypes["default"].oneOf(['default', 'overlay']),
+  bottom: _propTypes["default"].number,
+  boxPosition: _propTypes["default"].oneOf(['bottomRight', 'bottomLeft', 'bottomCenter', 'topRight', 'topLeft', 'topCenter', 'rightTop', 'rightBottom', 'rightCenter', 'leftTop', 'leftBottom', 'leftCenter']),
+  boxSize: _propTypes["default"].oneOf(['xsmall', 'small', 'medium', 'mlarge', 'large']),
+  children: _propTypes["default"].node,
+  className: _propTypes["default"].string,
+  dataId: _propTypes["default"].string,
+  dataTitle: _propTypes["default"].string,
+  getContainerRef: _propTypes["default"].func,
+  getNextOptions: _propTypes["default"].func,
+  getTargetRef: _propTypes["default"].func,
+  groupNameKey: _propTypes["default"].string,
+  groupOptionsKey: _propTypes["default"].string,
+  hoverStyle: _propTypes["default"].string,
+  hoverType: _propTypes["default"].oneOf(['default', 'border', 'bg']),
+  iconName: _propTypes["default"].string,
+  iconSize: _propTypes["default"].string,
+  idName: _propTypes["default"].string,
+  isArrow: _propTypes["default"].bool,
+  isDataLoaded: _propTypes["default"].bool,
+  isDisabled: _propTypes["default"].bool,
+  isEditable: _propTypes["default"].bool,
+  isGroupDropDown: _propTypes["default"].bool,
+  isNeedEffect: _propTypes["default"].bool,
+  isNextOptions: _propTypes["default"].bool,
+  isPadding: _propTypes["default"].bool,
+  isPopupActive: _propTypes["default"].bool,
+  isPopupOpen: _propTypes["default"].bool,
+  isPopupReady: _propTypes["default"].bool,
+  isReadOnly: _propTypes["default"].bool,
+  isSearch: _propTypes["default"].bool,
+  isToggleStateNeeded: _propTypes["default"].bool,
+  keyName: _propTypes["default"].string,
+  left: _propTypes["default"].number,
+  needExternalPopupState: _propTypes["default"].bool,
+  needResponsive: _propTypes["default"].bool,
+  needSearchFetching: _propTypes["default"].bool,
+  needTick: _propTypes["default"].bool,
+  onClick: _propTypes["default"].func,
+  onSearch: _propTypes["default"].func,
+  options: _propTypes["default"].array.isRequired,
+  palette: _propTypes["default"].oneOf(['dark']),
+  placeHolderText: _propTypes["default"].string,
+  position: _propTypes["default"].string,
+  removeClose: _propTypes["default"].func,
+  right: _propTypes["default"].number,
+  searchBoxSize: _propTypes["default"].oneOf(['small', 'medium', 'xmedium']),
+  searchEmptyHint: _propTypes["default"].string,
+  searchErrorText: _propTypes["default"].string,
+  selectedId: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number]),
+  showIconOnHover: _propTypes["default"].bool,
+  showOnHover: _propTypes["default"].bool,
+  title: _propTypes["default"].string,
+  togglePopup: _propTypes["default"].func,
+  value: _propTypes["default"].node,
+  onDropDownOpen: _propTypes["default"].func,
+  onDropDownClose: _propTypes["default"].func,
+  getFooter: _propTypes["default"].func,
+  customProps: _propTypes["default"].shape({
+    ToggleDropDownProps: _propTypes["default"].object,
+    DropBoxProps: _propTypes["default"].object,
+    TextBoxIconProps: _propTypes["default"].object,
+    ListItemWithIconProps: _propTypes["default"].object,
+    ListItemProps: _propTypes["default"].object
+  }),
+  preventPopupClose: _propTypes["default"].bool
+};
+
+if (false) {
+  ToggleDropDown.docs = {
+    componentGroup: 'Molecule'
+  };
+}
+
+var _default = (0, _Popup["default"])(ToggleDropDown);
 
-ToggleDropDown.propTypes = (_ToggleDropDown$propT = {
-  activeStyle: _propTypes2.default.string,
-  bottom: _propTypes2.default.number,
-  boxPosition: _propTypes2.default.oneOf(['bottomRight', 'bottomLeft', 'bottomCenter', 'topRight', 'topLeft', 'topCenter', 'rightTop', 'rightBottom', 'rightCenter', 'leftTop', 'leftBottom', 'leftCenter']),
-  boxSize: _propTypes2.default.oneOf(['small', 'medium', 'mlarge', 'large']),
-  className: _propTypes2.default.string,
-  dataId: _propTypes2.default.string,
-  dataTitle: _propTypes2.default.string,
-  getContainerRef: _propTypes2.default.func,
-  getTargetRef: _propTypes2.default.func,
-  hoverStyle: _propTypes2.default.string,
-  iconName: _propTypes2.default.string,
-  iconSize: _propTypes2.default.string,
-  idName: _propTypes2.default.string,
-  isArrow: _propTypes2.default.bool,
-  isDataLoaded: _propTypes2.default.bool,
-  isDisabled: _propTypes2.default.bool,
-  isEditable: _propTypes2.default.bool,
-  isPopupOpen: _propTypes2.default.bool,
-  isPopupReady: _propTypes2.default.bool,
-  isReadOnly: _propTypes2.default.bool,
-  isSearch: _propTypes2.default.bool,
-  keyName: _propTypes2.default.string,
-  left: _propTypes2.default.number,
-  needTick: _propTypes2.default.bool,
-  onClick: _propTypes2.default.func,
-  options: _propTypes2.default.array.isRequired,
-  placeHolderText: _propTypes2.default.string,
-  position: _propTypes2.default.string,
-  removeClose: _propTypes2.default.func,
-  right: _propTypes2.default.number,
-  searchBoxSize: _propTypes2.default.oneOf(['small', 'medium', 'xmedium']),
-  searchEmptyHint: _propTypes2.default.string,
-  searchErrorText: _propTypes2.default.string,
-  showIconOnHover: _propTypes2.default.bool,
-  showOnHover: _propTypes2.default.bool,
-  title: _propTypes2.default.string,
-  togglePopup: _propTypes2.default.func,
-  value: _propTypes2.default.node
-}, _defineProperty(_ToggleDropDown$propT, 'isDataLoaded', _propTypes2.default.bool), _defineProperty(_ToggleDropDown$propT, 'children', _propTypes2.default.node), _defineProperty(_ToggleDropDown$propT, 'seperatedOptions', _propTypes2.default.array), _defineProperty(_ToggleDropDown$propT, 'targetAlign', _propTypes2.default.oneOf(['vertical', 'horizontal', 'both', 'top', 'right', 'bottom', 'left', 'between', 'around'])), _defineProperty(_ToggleDropDown$propT, 'isNextOptions', _propTypes2.default.bool), _defineProperty(_ToggleDropDown$propT, 'getNextOptions', _propTypes2.default.func), _defineProperty(_ToggleDropDown$propT, 'needResponsive', _propTypes2.default.bool), _ToggleDropDown$propT);
-
-exports.default = (0, _Popup2.default)(ToggleDropDown);
+exports["default"] = _default;