@zohodesk/dot 1.0.0-temp-156 → 1.0.0-temp-157

package/lib/dropdown/ToggleDropDown/ToggleDropDown.js

@@ -1,64 +1,104 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.ToggleDropDown = void 0;
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _defaultProps = require("./props/defaultProps");
+
 var _propTypes = require("./props/propTypes");
+
 var _icons = require("@zohodesk/icons");
+
 var _Popup = _interopRequireDefault(require("@zohodesk/components/lib/Popup/Popup"));
+
 var _Layout = require("@zohodesk/components/lib/Layout");
+
 var _ListItem = _interopRequireDefault(require("@zohodesk/components/lib/ListItem/ListItem"));
+
 var _ListItemWithIcon = _interopRequireDefault(require("@zohodesk/components/lib/ListItem/ListItemWithIcon"));
+
 var _DropDownHeading = _interopRequireDefault(require("@zohodesk/components/lib/DropDown/DropDownHeading"));
+
 var _TextBoxIcon = _interopRequireDefault(require("@zohodesk/components/lib/TextBoxIcon/TextBoxIcon"));
+
 var _Loader = _interopRequireDefault(require("@zohodesk/svg/lib/Loader/Loader"));
+
 var _CommonEmptyState = _interopRequireDefault(require("../../emptystate/CommonEmptyState/CommonEmptyState"));
+
 var _EmptySearch = _interopRequireDefault(require("@zohodesk/svg/lib/emptystate/version3/EmptySearch"));
+
 var _CssProvider = _interopRequireDefault(require("@zohodesk/components/lib/Provider/CssProvider"));
+
 var _Common = require("@zohodesk/components/lib/utils/Common");
+
 var _IdProvider = require("@zohodesk/components/lib/Provider/IdProvider");
+
 var _semanticButtonModule = _interopRequireDefault(require("@zohodesk/components/lib/semantic/Button/semanticButton.module.css"));
+
 var _RippleEffect = _interopRequireDefault(require("@zohodesk/components/lib/RippleEffect/RippleEffect"));
+
 var _ResponsiveDropBox = _interopRequireDefault(require("@zohodesk/components/lib/ResponsiveDropBox/ResponsiveDropBox"));
+
 var _CustomResponsive = require("@zohodesk/components/lib/Responsive/CustomResponsive");
+
 var _ToggleDropDownModule = _interopRequireDefault(require("./ToggleDropDown.module.css"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 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); }
+
 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; }
+
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a 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, _toPropertyKey(descriptor.key), descriptor); } }
+
+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); } }
+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+
 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 } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
 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 _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 _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
 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 _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
 var ToggleDropDown = /*#__PURE__*/function (_Component) {
   _inherits(ToggleDropDown, _Component);
+
   var _super = _createSuper(ToggleDropDown);
+
   function ToggleDropDown(props) {
     var _this;
+
     _classCallCheck(this, ToggleDropDown);
+
     _this = _super.call(this, props);
     _this.state = {
       searchValue: '',
-      selectedIndex: -1,
+      // selectedIndex: -1,
       options: props.options,
       isFetchingOptions: false
     };
     _this._isMounted = false;
-    _this.handleChange = _this.handleChange.bind(_assertThisInitialized(_this));
-    _this.handleKeyDown = _this.handleKeyDown.bind(_assertThisInitialized(_this));
+    _this.handleChange = _this.handleChange.bind(_assertThisInitialized(_this)); // this.handleKeyDown = this.handleKeyDown.bind(this);
+
     _this.onSelect = _this.onSelect.bind(_assertThisInitialized(_this));
     _this.handleTogglePopup = _this.handleTogglePopup.bind(_assertThisInitialized(_this));
     _this.showTogglePopup = _this.showTogglePopup.bind(_assertThisInitialized(_this));
@@ -66,20 +106,21 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
     _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.scrollContentRef = _this.scrollContentRef.bind(_assertThisInitialized(_this)); // this.handleMouseEnter = this.handleMouseEnter.bind(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.itemRef = _this.itemRef.bind(_assertThisInitialized(_this)); // this.inputRef = this.inputRef.bind(this);
+
+    _this.handleScroll = _this.handleScroll.bind(_assertThisInitialized(_this)); // this.getOptionsArray = this.getOptionsArray.bind(this);
+
     _this.emptySearchSVG = _this.emptySearchSVG.bind(_assertThisInitialized(_this));
-    _this.getAriaId = (0, _IdProvider.getUniqueId)(_assertThisInitialized(_this));
-    _this.getSelectedIndex = _this.getSelectedIndex.bind(_assertThisInitialized(_this));
+    _this.getAriaId = (0, _IdProvider.getUniqueId)(_assertThisInitialized(_this)); // this.getSelectedIndex = this.getSelectedIndex.bind(this);
+
     _this.handleGetNextOptions = _this.handleGetNextOptions.bind(_assertThisInitialized(_this));
     _this.handleFetchOptions = _this.handleFetchOptions.bind(_assertThisInitialized(_this));
     return _this;
   }
+
   _createClass(ToggleDropDown, [{
     key: "componentDidMount",
     value: function componentDidMount() {
@@ -96,12 +137,10 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/_react["default"].createElement(_EmptySearch["default"], {
         size: "small"
       });
-    }
-  }, {
-    key: "inputRef",
-    value: function inputRef(el) {
-      this.hiddenInput = el;
-    }
+    } // inputRef(el) {
+    //   this.hiddenInput = el;
+    // }
+
   }, {
     key: "itemRef",
     value: function itemRef(ele, index, id) {
@@ -116,11 +155,11 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
     key: "handleTogglePopup",
     value: function handleTogglePopup(e) {
       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;
+          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);
@@ -129,10 +168,10 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
     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;
+          togglePopup = _this$props2.togglePopup,
+          boxPosition = _this$props2.boxPosition,
+          onSelectLabel = _this$props2.onSelectLabel,
+          isPopupOpen = _this$props2.isPopupOpen;
       !isPopupOpen && onSelectLabel && onSelectLabel(e);
       !isPopupOpen && togglePopup(e, boxPosition);
     }
@@ -140,10 +179,10 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
     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;
+          togglePopup = _this$props3.togglePopup,
+          boxPosition = _this$props3.boxPosition,
+          onSelectLabel = _this$props3.onSelectLabel,
+          isPopupOpen = _this$props3.isPopupOpen;
       !isPopupOpen && onSelectLabel && onSelectLabel(e);
       isPopupOpen && togglePopup(e, boxPosition);
     }
@@ -151,6 +190,7 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
     key: "scrollContentRef",
     value: function scrollContentRef(el) {
       var isPopupOpen = this.props.isPopupOpen;
+
       if (isPopupOpen) {
         this.optionsContainer = el;
       }
@@ -166,48 +206,47 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
     key: "onSelect",
     value: function onSelect(element, e) {
       var _this$props4 = this.props,
-        onClick = _this$props4.onClick,
-        togglePopup = _this$props4.togglePopup,
-        preventPopupClose = _this$props4.preventPopupClose;
+          onClick = _this$props4.onClick,
+          togglePopup = _this$props4.togglePopup,
+          preventPopupClose = _this$props4.preventPopupClose;
       onClick && onClick(e, element);
       !preventPopupClose && togglePopup(e);
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this2 = this;
       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;
+          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 () {
-          isPopupReady ? isSearch ? _this2.searchInput.focus({
-            preventScroll: true
-          }) : _this2.hiddenInput.focus({
-            preventScroll: true
-          }) : _this2.hiddenInput.focus({
-            preventScroll: true
-          });
-        }, 10);
-      }
-      var optionsArr = this.getOptionsArray();
-      var option = optionsArr[selectedIndex];
-      var id = option && option[idName] || {};
-      var selSuggestion = this["suggestion_".concat(id)];
-      if (isPopupOpen) {
-        this.optionsContainer && (0, _Common.scrollTo)(this.optionsContainer, selSuggestion);
-      }
+          selectedIndex = _this$state.selectedIndex,
+          searchValue = _this$state.searchValue;
+
+      if (prevProps.isPopupReady !== isPopupReady) {// setTimeout(() => {
+        //   isPopupReady
+        //     ? isSearch
+        //       ? this.searchInput.focus({ preventScroll: true })
+        //       : this.hiddenInput.focus({ preventScroll: true })
+        //     : this.hiddenInput.focus({ preventScroll: true });
+        // }, 10);
+      } // const optionsArr = this.getOptionsArray();
+      // const option = optionsArr[selectedIndex];
+      // const id = (option && option[idName]) || {};
+      // const selSuggestion = this[`suggestion_${id}`];
+      // if (isPopupOpen) {
+      //   this.optionsContainer && 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) {
@@ -217,32 +256,35 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
             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);
+        } // 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;
+          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) {
@@ -253,8 +295,10 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
             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));
           }
         });
@@ -264,8 +308,10 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           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;
@@ -277,8 +323,8 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
               needDividerCount = 0;
               return true;
             }
-          });
-          // remove divider if it placed in first or last index
+          }); // remove divider if it placed in first or last index
+
           filteredOptions = [];
           filteredOptions = orderedOptions.filter(function (item, i) {
             if (i == 0 || i == orderedOptions.length - 1) {
@@ -292,132 +338,102 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           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",
-    value: function handleKeyDown(e) {
-      var keyCode = e.keyCode;
-      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,
-        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
-      }
+    } // getOptionsArray() {
+    //   const { searchValue } = this.state;
+    //   const { isGroupDropDown, groupOptionsKey } = this.props;
+    //   const options = searchValue.length ? this.handleFilterSuggestions(searchValue) : this.props.options;
+    //   let optionsArr = [];
+    //   if (isGroupDropDown) {
+    //     for (let i = 0; i < options.length; i++) {
+    //       const groupOptions = options[i][groupOptionsKey];
+    //       Array.prototype.push.apply(optionsArr, groupOptions);
+    //     }
+    //   } else {
+    //     optionsArr = options.filter((item) => !item.needDivider);
+    //   }
+    //   return optionsArr;
+    // }
+    // handleKeyDown(e) {
+    //   const { keyCode } = e;
+    //   const { selectedIndex, searchValue } = this.state;
+    //   const optionsArr = this.getOptionsArray();
+    //   const totalIndex = optionsArr.length;
+    //   const { togglePopup, onClick, boxPosition, isPopupReady, value, keyName, idName, preventPopupClose, isSearch } =
+    //     this.props;
+    //   if (isPopupReady && (keyCode === 38 || keyCode === 40) && e.preventDefault) {
+    //     e.preventDefault(); //prevent body scroll
+    //   }
+    //   if (isPopupReady) {
+    //     switch (keyCode) {
+    //       case 40:
+    //         if (selectedIndex === totalIndex - 1) {
+    //           this.setState({ selectedIndex: 0 });
+    //         } else {
+    //           if (selectedIndex === totalIndex - 3) {
+    //             this.handleGetNextOptions();
+    //           }
+    //           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: {
+    //         const 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);
+    //     }
+    //   }
+    // }
+    // getSelectedIndex(optionsArr) {
+    //   const { selectedId, idName } = this.props;
+    //   if (selectedId) {
+    //     for (let i = 0; i < optionsArr.length; i++) {
+    //       const indexId = optionsArr[i][idName];
+    //       if (selectedId === indexId) {
+    //         this.setState({
+    //           selectedIndex: i
+    //         });
+    //         break;
+    //       }
+    //     }
+    //   } else {
+    //     this.setState({
+    //       selectedIndex: -1
+    //     });
+    //   }
+    // }
 
-      if (isPopupReady) {
-        switch (keyCode) {
-          case 40:
-            if (selectedIndex === totalIndex - 1) {
-              this.setState({
-                selectedIndex: 0
-              });
-            } else {
-              if (selectedIndex === totalIndex - 3) {
-                this.handleGetNextOptions();
-              }
-              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:
-            {
-              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);
-        }
-      }
-    }
-  }, {
-    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;
+      var _this$props7 = this.props,
+          needSearchFetching = _this$props7.needSearchFetching,
+          onSearch = _this$props7.onSearch;
+
       if (needSearchFetching && onSearch) {
         onSearch(searchValue);
       }
@@ -425,35 +441,35 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleChange",
     value: function handleChange(value, e) {
-      var _this3 = this;
+      var _this2 = this;
+
       var filteredOptions = this.handleFilterSuggestions(value);
       this.setState({
         searchValue: value,
-        selectedIndex: -1,
+        // selectedIndex: -1,
         options: filteredOptions
       }, function () {
-        _this3.onSearchAPI();
+        _this2.onSearchAPI();
       });
     }
   }, {
     key: "onSearchClear",
     value: function onSearchClear() {
-      var _this4 = this;
+      var _this3 = this;
+
       var filteredOptions = this.handleFilterSuggestions('');
       this.setState({
         searchValue: '',
         options: filteredOptions
       }, function () {
-        _this4.onSearchAPI();
-      });
-    }
-  }, {
-    key: "handleMouseEnter",
-    value: function handleMouseEnter(id, value, index, e) {
-      this.setState({
-        selectedIndex: index
+        _this3.onSearchAPI();
       });
-    }
+    } // handleMouseEnter(id, value, index, e) {
+    //   this.setState({
+    //     selectedIndex: index
+    //   });
+    // }
+
   }, {
     key: "handleScroll",
     value: function handleScroll(e) {
@@ -464,31 +480,34 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleGetNextOptions",
     value: function handleGetNextOptions() {
-      var _this$props11 = this.props,
-        isNextOptions = _this$props11.isNextOptions,
-        getNextOptions = _this$props11.getNextOptions;
+      var _this$props8 = this.props,
+          isNextOptions = _this$props8.isNextOptions,
+          getNextOptions = _this$props8.getNextOptions;
       var searchValue = this.state.searchValue;
       isNextOptions && getNextOptions && this.handleFetchOptions(getNextOptions, searchValue);
     }
   }, {
     key: "handleFetchOptions",
     value: function handleFetchOptions(APICall) {
-      var _this5 = this;
+      var _this4 = this;
+
       var searchValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
       var _this$state$isFetchin = this.state.isFetchingOptions,
-        isFetchingOptions = _this$state$isFetchin === void 0 ? false : _this$state$isFetchin;
+          isFetchingOptions = _this$state$isFetchin === void 0 ? false : _this$state$isFetchin;
       var _isMounted = this._isMounted;
+
       if (!isFetchingOptions && APICall) {
         this.setState({
           isFetchingOptions: true
         });
+
         try {
           return APICall(searchValue).then(function () {
-            _isMounted && _this5.setState({
+            _isMounted && _this4.setState({
               isFetchingOptions: false
             });
           }, function () {
-            _isMounted && _this5.setState({
+            _isMounted && _this4.setState({
               isFetchingOptions: false
             });
           });
@@ -512,89 +531,90 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this6 = 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,
-        dataSelectorId = _this$props12.dataSelectorId,
-        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,
-        needMultiLineText = _this$props12.needMultiLineText,
-        customClass = _this$props12.customClass;
+      var _this5 = this;
+
+      var _this$state2 = this.state,
+          options = _this$state2.options,
+          selectedIndex = _this$state2.selectedIndex;
+      var _this$props9 = this.props,
+          value = _this$props9.value,
+          removeClose = _this$props9.removeClose,
+          boxSize = _this$props9.boxSize,
+          keyName = _this$props9.keyName,
+          idName = _this$props9.idName,
+          title = _this$props9.title,
+          isSearch = _this$props9.isSearch,
+          isArrow = _this$props9.isArrow,
+          placeHolderText = _this$props9.placeHolderText,
+          className = _this$props9.className,
+          right = _this$props9.right,
+          left = _this$props9.left,
+          top = _this$props9.top,
+          bottom = _this$props9.bottom,
+          isOpen = _this$props9.isPopupOpen,
+          isPopupActive = _this$props9.isPopupActive,
+          needExternalPopupState = _this$props9.needExternalPopupState,
+          isPopupReady = _this$props9.isPopupReady,
+          position = _this$props9.position,
+          getTargetRef = _this$props9.getTargetRef,
+          getContainerRef = _this$props9.getContainerRef,
+          dataId = _this$props9.dataId,
+          dataSelectorId = _this$props9.dataSelectorId,
+          searchBoxSize = _this$props9.searchBoxSize,
+          searchEmptyHint = _this$props9.searchEmptyHint,
+          searchErrorText = _this$props9.searchErrorText,
+          activeStyle = _this$props9.activeStyle,
+          showOnHover = _this$props9.showOnHover,
+          isDisabled = _this$props9.isDisabled,
+          showIconOnHover = _this$props9.showIconOnHover,
+          isReadOnly = _this$props9.isReadOnly,
+          hoverStyle = _this$props9.hoverStyle,
+          isEditable = _this$props9.isEditable,
+          iconName = _this$props9.iconName,
+          iconSize = _this$props9.iconSize,
+          needTick = _this$props9.needTick,
+          dataTitle = _this$props9.dataTitle,
+          isDataLoaded = _this$props9.isDataLoaded,
+          children = _this$props9.children,
+          needResponsive = _this$props9.needResponsive,
+          arrowIconPosition = _this$props9.arrowIconPosition,
+          isGroupDropDown = _this$props9.isGroupDropDown,
+          groupOptionsKey = _this$props9.groupOptionsKey,
+          groupNameKey = _this$props9.groupNameKey,
+          isToggleStateNeeded = _this$props9.isToggleStateNeeded,
+          selectedId = _this$props9.selectedId,
+          isPadding = _this$props9.isPadding,
+          isNeedEffect = _this$props9.isNeedEffect,
+          hoverType = _this$props9.hoverType,
+          palette = _this$props9.palette,
+          getFooter = _this$props9.getFooter,
+          customProps = _this$props9.customProps,
+          needMultiLineText = _this$props9.needMultiLineText,
+          customClass = _this$props9.customClass;
       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;
+          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 _customClass$customDr = customClass.customDropBox,
-        customDropBox = _customClass$customDr === void 0 ? '' : _customClass$customDr,
-        _customClass$customLi = customClass.customListBox,
-        customListBox = _customClass$customLi === void 0 ? '' : _customClass$customLi;
+          customDropBox = _customClass$customDr === void 0 ? '' : _customClass$customDr,
+          _customClass$customLi = customClass.customListBox,
+          customListBox = _customClass$customLi === void 0 ? '' : _customClass$customLi;
       var isPopupOpen = needExternalPopupState ? isPopupActive && isOpen : isOpen;
       var Component = isToggleStateNeeded ? children.type : null,
-        componentProps = isToggleStateNeeded ? children.props : null;
-      var _this$state4 = this.state,
-        searchValue = _this$state4.searchValue,
-        isFetchingOptions = _this$state4.isFetchingOptions;
+          componentProps = isToggleStateNeeded ? children.props : null;
+      var _this$state3 = this.state,
+          searchValue = _this$state3.searchValue,
+          isFetchingOptions = _this$state3.isFetchingOptions;
       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();
+      var ariaTitleId = this.getAriaId(); // const allyOptionsArr = this.getOptionsArray();
+
       return /*#__PURE__*/_react["default"].createElement("div", _extends({
         className: _ToggleDropDownModule["default"].wrapper,
         onMouseEnter: showOnHover && !isDisabled && !isReadOnly && isEditable ? this.showTogglePopup : undefined,
@@ -607,15 +627,7 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
         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, {
+      }, children ? isToggleStateNeeded ? /*#__PURE__*/_react["default"].createElement(Component, _extends({}, componentProps, {
         isActive: isPopupOpen
       })) : children : /*#__PURE__*/_react["default"].createElement(_RippleEffect["default"], {
         hoverType: hoverType,
@@ -677,21 +689,37 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
             ariaLabelledby: !isSearch ? ariaTitleId : undefined
           },
           palette: palette,
-          isResponsivePadding: true
-        }, DropBoxProps), /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, isSearch ? /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
+          isResponsivePadding: true,
+          needFocusScope: true,
+          customProps: {
+            focusScopeProps: {
+              loadNextOptions: _this5.handleGetNextOptions,
+              searchValue: searchValue,
+              isFetchingOptions: isFetchingOptions
+            }
+          }
+        }, DropBoxProps, {
+          onClose: _this5.handleTogglePopup
+        }), /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, isSearch ? /*#__PURE__*/_react["default"].createElement(_Layout.Box, {
           className: _ToggleDropDownModule["default"].search
         }, /*#__PURE__*/_react["default"].createElement(_TextBoxIcon["default"], _extends({
           placeHolder: placeHolderText,
-          onChange: _this6.handleChange,
+          onChange: _this5.handleChange,
           value: searchValue,
-          onClear: _this6.onSearchClear,
-          size: searchBoxSize,
-          inputRef: _this6.searchInputRef,
-          onKeyDown: _this6.handleKeyDown,
+          onClear: _this5.onSearchClear,
+          size: searchBoxSize // inputRef={this.searchInputRef}
+          ,
+          customProps: {
+            TextBoxProps: {
+              'data-a11y-autofocus': true
+            }
+          } //search
+          // onKeyDown={this.handleKeyDown}
+          ,
           a11y: {
             role: 'combobox',
             ariaOwns: ariaTitleId,
-            ariaActivedescendant: allyOptionsArr[selectedIndex] && allyOptionsArr[selectedIndex][keyName],
+            // ariaActivedescendant: allyOptionsArr[selectedIndex] && allyOptionsArr[selectedIndex][keyName],
             ariaAutocomplete: 'list',
             ariaHaspopup: true,
             ariaExpanded: true
@@ -714,10 +742,11 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           preventParentScroll: "vertical",
           dataId: "".concat(dataId, "_list"),
           className: "".concat(tabletMode ? _ToggleDropDownModule["default"].responsivemaxHgt : _ToggleDropDownModule["default"].maxHgt, " ").concat(customListBox),
-          eleRef: _this6.scrollContentRef,
-          onScroll: _this6.handleScroll,
-          role: isSearch ? 'listbox' : undefined,
-          "aria-labelledby": isSearch ? ariaTitleId : undefined
+          eleRef: _this5.scrollContentRef,
+          onScroll: _this5.handleScroll,
+          role: isSearch ? 'listbox' : 'menu',
+          "aria-labelledby": isSearch ? ariaTitleId : undefined,
+          "data-scroll": "true"
         }, isDataLoaded ? options && options.length != 0 ? isGroupDropDown ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, options.map(function (group) {
           var groupName = group[groupNameKey];
           var groupOptions = group[groupOptionsKey];
@@ -736,13 +765,13 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
             }
           })), 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;
+                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,
@@ -750,21 +779,22 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
               value: item[keyName],
               id: item[idName],
               active: selectedId === item[idName],
-              onClick: _this6.onSelect.bind(_this6, item),
-              index: listIndex,
-              highlight: selectedIndex === listIndex,
+              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: _this6.handleMouseEnter,
-              getRef: _this6.itemRef,
+              needBorder: false // onMouseEnter={this.handleMouseEnter}
+              ,
+              getRef: _this5.itemRef,
               title: title ? title : item[keyName],
               palette: palette,
               needMultiLineText: needMultiLineText,
+              autoHover: true,
               a11y: {
                 role: isSearch ? 'option' : 'menuitem',
                 ariaSelected: selectedId === item[idName],
@@ -776,18 +806,19 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
               value: item[keyName],
               id: item[idName],
               active: selectedId === item[idName],
-              onClick: _this6.onSelect.bind(_this6, item),
+              onClick: _this5.onSelect.bind(_this5, item),
               isDisabled: isDisabled,
               disableTitle: disableTitle,
-              index: listIndex,
-              highlight: selectedIndex === listIndex,
+              index: listIndex // highlight={selectedIndex === listIndex}
+              ,
               needTick: needTick,
-              needBorder: false,
-              onMouseEnter: _this6.handleMouseEnter,
-              getRef: _this6.itemRef,
+              needBorder: false // onMouseEnter={this.handleMouseEnter}
+              ,
+              getRef: _this5.itemRef,
               title: title ? title : item[keyName],
               palette: palette,
               needMultiLineText: needMultiLineText,
+              autoHover: true,
               a11y: {
                 role: isSearch ? 'option' : 'menuitem',
                 ariaSelected: selectedId === item[idName],
@@ -800,17 +831,19 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           align: "both"
         }, /*#__PURE__*/_react["default"].createElement(_Loader["default"], null))) : /*#__PURE__*/_react["default"].createElement(_react["default"].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;
+              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", {
@@ -820,22 +853,23 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
             value: item[keyName],
             id: item[idName],
             active: selectedId === item[idName],
-            onClick: _this6.onSelect.bind(_this6, item),
+            onClick: _this5.onSelect.bind(_this5, item),
             index: listIndex,
             disableTitle: disableTitle,
-            isDisabled: isDisabled,
-            highlight: selectedIndex === listIndex,
+            isDisabled: isDisabled // highlight={selectedIndex === listIndex}
+            ,
             iconName: iconName,
             iconClass: iconClass,
             iconSize: iconSize,
             needTick: needTick,
-            needBorder: false,
-            onMouseEnter: _this6.handleMouseEnter,
-            getRef: _this6.itemRef,
+            needBorder: false // onMouseEnter={this.handleMouseEnter}
+            ,
+            getRef: _this5.itemRef,
             title: title ? title : item[keyName],
             key: listIndex,
             palette: palette,
             needMultiLineText: needMultiLineText,
+            autoHover: true,
             a11y: {
               role: isSearch ? 'option' : 'menuitem',
               ariaSelected: selectedId === item[idName],
@@ -849,16 +883,17 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
             disableTitle: disableTitle,
             isDisabled: isDisabled,
             active: selectedId === item[idName],
-            onClick: _this6.onSelect.bind(_this6, item),
-            index: listIndex,
-            highlight: selectedIndex === listIndex,
+            onClick: _this5.onSelect.bind(_this5, item),
+            index: listIndex // highlight={selectedIndex === listIndex}
+            ,
             needTick: needTick,
-            needBorder: false,
-            onMouseEnter: _this6.handleMouseEnter,
-            getRef: _this6.itemRef,
+            needBorder: false // onMouseEnter={this.handleMouseEnter}
+            ,
+            getRef: _this5.itemRef,
             title: title ? title : item[keyName],
             palette: palette,
             needMultiLineText: needMultiLineText,
+            autoHover: true,
             a11y: {
               role: isSearch ? 'option' : 'menuitem',
               ariaSelected: selectedId === item[idName],
@@ -873,23 +908,25 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           description: searchEmptyHint,
           title: searchErrorText || 'No results',
           size: "small",
-          getEmptyState: _this6.emptySearchSVG
+          getEmptyState: _this5.emptySearchSVG
         }) : /*#__PURE__*/_react["default"].createElement("div", {
           className: _ToggleDropDownModule["default"].loader
         }, /*#__PURE__*/_react["default"].createElement(_Loader["default"], null))), getFooter ? /*#__PURE__*/_react["default"].createElement(_Layout.Box, null, getFooter()) : null));
       }) : null);
     }
   }]);
+
   return ToggleDropDown;
 }(_react.Component);
+
 exports.ToggleDropDown = ToggleDropDown;
 ToggleDropDown.defaultProps = _defaultProps.defaultProps;
-ToggleDropDown.propTypes = _propTypes.propTypes;
-
-// if (__DOCS__) {
+ToggleDropDown.propTypes = _propTypes.propTypes; // if (__DOCS__) {
 //   ToggleDropDown.docs = {
 //     componentGroup: 'Molecule'
 //   };
 // }
+
 var _default = (0, _Popup["default"])(ToggleDropDown);
+
 exports["default"] = _default;