@zohodesk/dot 1.0.0-beta.270 → 1.0.0-beta.271

package/lib/dropdown/ToggleDropDown/ToggleDropDown.js

@@ -92,13 +92,13 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
     _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));
@@ -106,16 +106,16 @@ 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;
@@ -137,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) {
@@ -217,8 +215,6 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this2 = this;
-
       var _this$props5 = this.props,
           isPopupOpen = _this$props5.isPopupOpen,
           isPopupReady = _this$props5.isPopupReady,
@@ -231,26 +227,21 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           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 (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 (isPopupOpen) {
-        this.optionsContainer && (0, _Common.scrollTo)(this.optionsContainer, selSuggestion);
-      }
 
       if (!prevProps.isPopupOpen && isPopupOpen && searchValue.length) {
         this.onSearchClear();
@@ -278,9 +269,8 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
           onDropDownOpen && onDropDownOpen();
         } else {
           onDropDownClose && onDropDownClose();
-        }
+        } // this.getSelectedIndex(optionsArr);
 
-        this.getSelectedIndex(optionsArr);
       }
     }
   }, {
@@ -350,143 +340,99 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
       }
 
       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;
-        });
-      }
+    } // 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
+    //     });
+    //   }
+    // }
 
-      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
-      }
-
-      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);
@@ -495,37 +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) {
@@ -536,16 +480,16 @@ 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,
@@ -559,11 +503,11 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
 
         try {
           return APICall(searchValue).then(function () {
-            _isMounted && _this5.setState({
+            _isMounted && _this4.setState({
               isFetchingOptions: false
             });
           }, function () {
-            _isMounted && _this5.setState({
+            _isMounted && _this4.setState({
               isFetchingOptions: false
             });
           });
@@ -587,66 +531,66 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this6 = this;
+      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,
-          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 _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,
@@ -664,13 +608,13 @@ var ToggleDropDown = /*#__PURE__*/function (_Component) {
       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;
+      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,
@@ -683,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,
@@ -753,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
@@ -790,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];
@@ -826,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],
@@ -852,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],
@@ -898,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],
@@ -927,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],
@@ -951,7 +908,7 @@ 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));