@zohodesk/components 1.0.0-test-252 → 1.0.0

package/es/MultiSelect/MultiSelect.js

@@ -2,8 +2,8 @@
 import React from 'react';
 import { MultiSelect_propTypes } from './props/propTypes';
 import { MultiSelect_defaultProps } from './props/defaultProps';
-
 /**** Components ****/
+
 import Popup from '../Popup/Popup';
 import TextBoxIcon from '../TextBoxIcon/TextBoxIcon';
 import { Container, Box } from '../Layout';
@@ -18,16 +18,18 @@ import ResponsiveDropBox from '../ResponsiveDropBox/ResponsiveDropBox';
 import { ResponsiveReceiver } from '../Responsive/CustomResponsive';
 import Loader from '@zohodesk/svg/lib/Loader/Loader';
 /**** Icons ****/
-import Icon from '@zohodesk/icons/lib/Icon';
+
+import { Icon } from '@zohodesk/icons';
 /**** CSS ****/
-import style from './MultiSelect.module.css';
 
+import style from './MultiSelect.module.css';
 /**** Methods ****/
+
 import { debounce, scrollTo, bind, getIsEmptyValue, getSearchString, findScrollEnd } from '../utils/Common.js';
 import { makeFormatOptions, makeGetMultiSelectFilterSuggestions as makeGetFilterSuggestions, makeGetMultiSelectSelectedOptions as makeGetSelectedOptions, makeObjectConcat, filterSelectedOptions, makeGetIsShowClearIcon } from '../utils/dropDownUtils';
 import { getLibraryConfig } from '../Provider/Config';
-
 /* eslint-disable react/forbid-component-props */
+
 /* eslint-disable react/no-unused-prop-types */
 
 const dummyArray = [];
@@ -38,9 +40,8 @@ export class MultiSelectComponent extends React.Component {
     this.getFilterSuggestions = makeGetFilterSuggestions();
     this.formatOptions = makeFormatOptions();
     this.getSelectedOptions = makeGetSelectedOptions();
-    this.getIsShowClearIcon = makeGetIsShowClearIcon();
+    this.getIsShowClearIcon = makeGetIsShowClearIcon(); //Use in AdvancedMultiSelect component
 
-    //Use in AdvancedMultiSelect component
     this.objectConcat = makeObjectConcat();
     this.formatSelectedOptions = makeFormatOptions();
     const {
@@ -78,11 +79,11 @@ export class MultiSelectComponent extends React.Component {
     this.handleScroll = this.handleScroll.bind(this);
     this.handleScrollFuncCall = debounce(this.handleScrollFuncCall.bind(this), 500);
   }
+
   componentDidMount() {
     // let { suggestionContainer } = this;
     this._isMounted = true;
-    this.handleExposedPublicMethods();
-    // suggestionContainer &&
+    this.handleExposedPublicMethods(); // suggestionContainer &&
     //   suggestionContainer.addEventListener('scroll', this.handleScroll);
   }
 
@@ -95,6 +96,7 @@ export class MultiSelectComponent extends React.Component {
       prefixText
     } = nextProps;
     const oldProps = this.props;
+
     if (selectedOptions !== oldProps.selectedOptions || options !== oldProps.options || valueField !== oldProps.valueField || textField !== oldProps.textField || prefixText !== oldProps.prefixText //For GroupMultiSelect component
     ) {
       const {
@@ -133,6 +135,7 @@ export class MultiSelectComponent extends React.Component {
       });
     }
   }
+
   componentDidUpdate(prevProps, prevState) {
     const {
       suggestionContainer,
@@ -151,11 +154,11 @@ export class MultiSelectComponent extends React.Component {
       onDropBoxClose,
       onDropBoxOpen,
       isSearchClearOnClose
-    } = this.props;
+    } = this.props; //handle dropbox open & close
 
-    //handle dropbox open & close
     if (prevProps.isPopupOpen !== isPopupOpen) {
       isPopupOpen && onDropBoxOpen && this.handleFetchOptions(onDropBoxOpen, searchStr);
+
       if (!isPopupOpen) {
         this.setState({
           hoverOption: 0
@@ -163,41 +166,42 @@ export class MultiSelectComponent extends React.Component {
         isSearchClearOnClose && searchStr && this.handleSearch('');
         onDropBoxClose && onDropBoxClose();
       }
-    }
+    } //scrollTo handling
+
 
-    //scrollTo handling
     const hoverId = suggestionsOrder[hoverOption] || '';
     const selectedSuggestion = this[`suggestion_${hoverId}`];
     const lastHighLightedSelectOption = highLightedSelectOptions.slice(-1).length ? highLightedSelectOptions.slice(-1)[0] : null;
     const selectedOption = this[`selectedOption_${lastHighLightedSelectOption}`];
     isPopupOpen && scrollTo(suggestionContainer, selectedSuggestion);
-    selectedOptions.length && selectedOption && scrollTo(selectedOptionContainer, selectedOption);
+    selectedOptions.length && selectedOption && scrollTo(selectedOptionContainer, selectedOption); //When suggestions length less than 5, getNextOptions function call
 
-    //When suggestions length less than 5, getNextOptions function call
     const {
       isNextOptions,
       getNextOptions
-    } = this.props;
-    // let { searchStr } = this.state;
+    } = this.props; // let { searchStr } = this.state;
+
     const suggestions = this.handleFilterSuggestions();
     const suggestionsLen = suggestions.length;
+
     if (isPopupOpen && suggestionsLen <= 5 && isNextOptions && getNextOptions && !needLocalSearch) {
       this.handleFetchOptions(getNextOptions, searchStr);
-    }
+    } //Need To MultiselectNew Component
+
 
-    //Need To MultiselectNew Component
     this.handleComponentDidUpdate(prevProps, prevState);
   }
+
   componentWillUnmount() {
     // let { suggestionContainer } = this;
-    this._isMounted = false;
-    // suggestionContainer &&
+    this._isMounted = false; // suggestionContainer &&
     //   suggestionContainer.removeEventListener('scroll', this.handleScroll);
   }
 
   handleComponentDidUpdate() {
     return;
   }
+
   handleFormatOptions(props) {
     const {
       options,
@@ -215,12 +219,14 @@ export class MultiSelectComponent extends React.Component {
       disabledOptions
     });
   }
+
   handleGetSelectedOptions(selectedOptions, normalizedFormatOptions) {
     return this.getSelectedOptions({
       selectedOptions,
       normalizedFormatOptions
     });
   }
+
   handleInputCick(e) {
     const {
       removeClose
@@ -229,6 +235,7 @@ export class MultiSelectComponent extends React.Component {
       highLightedSelectOptions,
       searchStr = ''
     } = this.state;
+
     if (highLightedSelectOptions.length) {
       this.setState({
         highLightedSelectOptions: [],
@@ -242,6 +249,7 @@ export class MultiSelectComponent extends React.Component {
       this.togglePopup(e);
     }
   }
+
   handleFilterSuggestions() {
     const {
       options = dummyArray,
@@ -249,7 +257,8 @@ export class MultiSelectComponent extends React.Component {
     } = this.state;
     const {
       selectedOptions,
-      needLocalSearch
+      needLocalSearch,
+      keepSelectedOptions
     } = this.props;
     const {
       suggestions,
@@ -258,11 +267,13 @@ export class MultiSelectComponent extends React.Component {
       options,
       selectedOptions,
       searchStr: getSearchString(searchStr),
-      needSearch: needLocalSearch
+      needSearch: needLocalSearch,
+      keepSelectedOptions
     });
     this.suggestionsOrder = suggestionIds;
     return suggestions;
   }
+
   handleKeyDown(e) {
     const {
       keyCode,
@@ -287,20 +298,27 @@ export class MultiSelectComponent extends React.Component {
       onKeyDown
     } = this.props;
     const highLightedSelectOptionsLen = highLightedSelectOptions.length;
+
     if (isPopupOpen && (keyCode === 38 || keyCode === 40 || keyCode === 13 || keyCode === 27 || keyCode === 9)) {
       suggestions = this.handleFilterSuggestions();
     }
+
     if (!isPopupOpen && !isPopupOpenOnEnter) {
       onKeyDown && onKeyDown(e);
     }
+
     if (!isPopupOpen && keyCode === 40) {
       //down arrow press popup open
       e.preventDefault(); //prevent body scroll
+
       this.togglePopup(e);
     }
+
     const suggestionsLen = suggestions.length;
+
     if (suggestionsLen && isPopupOpen && keyCode === 38) {
       //up arrow
+
       /*if (hoverOption === 0) { //disable first to last option higlight
         !isNextOptions && this.setState({ hoverOption: suggestionsLen - 1 });
       }*/
@@ -311,6 +329,7 @@ export class MultiSelectComponent extends React.Component {
       }
     } else if (suggestionsLen && isPopupOpen && keyCode === 40) {
       //down arrow
+
       /*else if (hoverOption === suggestionsLen - 1 || hoverOption === null) {
         //disable last to first option higlight
         !isNextOptions && this.setState({ hoverOption: 0 });
@@ -338,8 +357,7 @@ export class MultiSelectComponent extends React.Component {
       if (highLightedSelectOptionsLen) {
         this.handleRemoveOption(highLightedSelectOptions);
       } else {
-        this.handleRemoveOption(selectedOptions.slice(-1));
-        // this.setState({
+        this.handleRemoveOption(selectedOptions.slice(-1)); // this.setState({
         //   highLightedSelectOptions: selectedOptions.slice(-1)
         // });
       }
@@ -354,6 +372,7 @@ export class MultiSelectComponent extends React.Component {
       const lastHighLightedSelectOptionIndex = lastHighLightedSelectOption && selectedOptions.indexOf(lastHighLightedSelectOption) >= 0 ? selectedOptions.indexOf(lastHighLightedSelectOption) : 0;
       const newShiftKeyPressHighLighted = shiftKeyPressHighLighted ? shiftKeyPressHighLighted : shiftKeyPressHighLighted + 1;
       const newHighLightedSelectOption = lastHighLightedSelectOptionIndex !== null ? selectedOptions[lastHighLightedSelectOptionIndex + newShiftKeyPressHighLighted] : selectedOptions[0];
+
       if (!getIsEmptyValue(newHighLightedSelectOption)) {
         const newLastHighLightedSelectOption = lastHighLightedSelectOption ? lastHighLightedSelectOption : selectedOptions[0];
         highLightedSelectOptions = !shiftKeyPressHighLighted ? [newLastHighLightedSelectOption] : highLightedSelectOptions;
@@ -370,6 +389,7 @@ export class MultiSelectComponent extends React.Component {
       const lastHighLightedSelectOptionIndex = lastHighLightedSelectOption ? selectedOptions.indexOf(lastHighLightedSelectOption) : selectedOptions.length - 1;
       const newShiftKeyPressHighLighted = shiftKeyPressHighLighted !== 1 ? shiftKeyPressHighLighted : shiftKeyPressHighLighted - 1;
       const newHighLightedSelectOption = selectedOptions[lastHighLightedSelectOptionIndex + newShiftKeyPressHighLighted - 1];
+
       if (!getIsEmptyValue(newHighLightedSelectOption)) {
         const newLastHighLightedSelectOption = lastHighLightedSelectOption ? lastHighLightedSelectOption : selectedOptions.slice(-1)[0];
         highLightedSelectOptions = !shiftKeyPressHighLighted ? [newLastHighLightedSelectOption] : highLightedSelectOptions;
@@ -382,14 +402,15 @@ export class MultiSelectComponent extends React.Component {
         });
       }
     } else if ((keyCode === 39 || keyCode === 37) && selectedOptions.length && !searchStr.length) {
-      const isRightArrow = keyCode === 39 ? true : false;
-      // let isLefttArrow = keyCode === 37 ? true : false;
+      const isRightArrow = keyCode === 39 ? true : false; // let isLefttArrow = keyCode === 37 ? true : false;
+
       if (highLightedSelectOptions.length) {
         const [lastHighLightedSelectOption] = highLightedSelectOptions.slice(-1);
         const lastHighLightedSelectOptionIndex = selectedOptions.indexOf(lastHighLightedSelectOption);
         const newLastHighLightedSelectOptionIndex = isRightArrow ? lastHighLightedSelectOptionIndex === selectedOptions.length - 1 ? lastHighLightedSelectOptionIndex : lastHighLightedSelectOptionIndex + 1 : lastHighLightedSelectOptionIndex - 1;
         const newLastHighLightedSelectOption = selectedOptions[newLastHighLightedSelectOptionIndex];
         const isEmptyHighlighted = isRightArrow && highLightedSelectOptions.length === 1 && selectedOptions.slice(-1)[0] === lastHighLightedSelectOption ? true : false;
+
         if (!getIsEmptyValue(newLastHighLightedSelectOption)) {
           this.setState({
             lastHighLightedSelectOption: isEmptyHighlighted ? '' : newLastHighLightedSelectOption,
@@ -405,12 +426,12 @@ export class MultiSelectComponent extends React.Component {
           shiftKeyPressHighLighted: 0
         });
       }
-    } else if (keyCode === 27) {
-      // this.handlePopupClose(e);
+    } else if (keyCode === 27) {// this.handlePopupClose(e);
     } else if (keyCode === 9) {
       this.handlePopupClose(e);
     }
   }
+
   handleSelectAll(e) {
     e && e.preventDefault();
     const suggestions = this.handleFilterSuggestions();
@@ -422,12 +443,12 @@ export class MultiSelectComponent extends React.Component {
       const {
         id
       } = option;
+
       if (selectedOptions.indexOf(id) === -1) {
         newSelectedOptions.push(id);
       }
     });
-    this.handleChange([...selectedOptions, ...newSelectedOptions]);
-    // this.handlePopupClose(e);
+    this.handleChange([...selectedOptions, ...newSelectedOptions]); // this.handlePopupClose(e);
   }
 
   handleDeselectAll(e) {
@@ -438,28 +459,40 @@ export class MultiSelectComponent extends React.Component {
     const {
       highLightedSelectOptions
     } = this.state;
+
     if (highLightedSelectOptions.length) {
       this.setState({
         highLightedSelectOptions: [],
         lastHighLightedSelectOption: ''
       });
     }
+
     removeClose(e);
     this.handleChange([]);
   }
+
   handleSelectOption(option, value, index, e) {
     const {
       selectedOptions,
-      isSearchClearOnSelect
+      isSearchClearOnSelect,
+      keepSelectedOptions
     } = this.props;
     const {
       searchStr
     } = this.state;
+
     if (searchStr.trim() != '' && isSearchClearOnSelect) {
       this.handleSearch('');
     }
-    this.handleChange([...selectedOptions, option], e);
-    // e && e.stopPropagation && this.handlePopupClose(e);
+
+    if (keepSelectedOptions && selectedOptions.indexOf(option) != -1) {
+      let newSelectedOptions = selectedOptions.filter(id => {
+        return id != option;
+      });
+      this.handleChange(newSelectedOptions, e);
+    } else {
+      this.handleChange([...selectedOptions, option], e);
+    }
   }
 
   handleRemoveOption(options) {
@@ -473,18 +506,22 @@ export class MultiSelectComponent extends React.Component {
       lastHighLightedSelectOption,
       shiftKeyPressHighLighted
     } = this.state;
+
     if (newOptions.length && !isReadOnly) {
       const newSelectedOptions = selectedOptions.filter(option => newOptions.indexOf(option) === -1);
       const newHighLightedSelectOptions = highLightedSelectOptions.filter(option => newSelectedOptions.indexOf(option) >= 0);
       let isHighlightedRemoved = false;
       const newOptionsLen = newOptions.length;
+
       for (let i = 0; i < newOptionsLen; i++) {
         const removedOption = newOptions[i];
+
         if (highLightedSelectOptions.indexOf(removedOption) >= 0) {
           isHighlightedRemoved = true;
           break;
         }
       }
+
       this.setState({
         lastHighLightedSelectOption: newSelectedOptions.indexOf(lastHighLightedSelectOption) >= 0 && !isHighlightedRemoved ? lastHighLightedSelectOption : '',
         highLightedSelectOptions: isHighlightedRemoved ? [] : newHighLightedSelectOptions,
@@ -492,10 +529,12 @@ export class MultiSelectComponent extends React.Component {
       });
       this.handleChange(newSelectedOptions);
     }
+
     this.searchInput && this.searchInput.focus({
       preventScroll: true
     });
   }
+
   handleMouseEnter(id, val, hoverOptionIndex, e) {
     e && e.preventDefault();
     const {
@@ -505,16 +544,19 @@ export class MultiSelectComponent extends React.Component {
       suggestionsOrder
     } = this;
     const newHoverIndex = suggestionsOrder.indexOf(id);
+
     if (newHoverIndex !== hoverOption) {
       this.setState({
         hoverOption: newHoverIndex
       });
     }
   }
+
   handleFetchOptions() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
+
     const [APICall, searchStr] = args;
     const {
       isFetchingOptions
@@ -523,10 +565,12 @@ export class MultiSelectComponent extends React.Component {
       _isMounted
     } = this;
     const isForce = isFetchingOptions && searchStr ? true : false;
+
     if (!isFetchingOptions && APICall || isForce) {
       this.setState({
         isFetchingOptions: true
       });
+
       try {
         return APICall(searchStr).then(() => {
           _isMounted && this.setState({
@@ -544,6 +588,7 @@ export class MultiSelectComponent extends React.Component {
       }
     }
   }
+
   handleSearchOptions() {
     const {
       onSearch
@@ -553,6 +598,7 @@ export class MultiSelectComponent extends React.Component {
     } = this.state;
     searchStr && this.handleFetchOptions(onSearch, searchStr);
   }
+
   handleSearch(value, e) {
     const {
       onSearch,
@@ -575,6 +621,7 @@ export class MultiSelectComponent extends React.Component {
       }
     });
   }
+
   handleClickSelectedOption() {
     let id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     let e = arguments.length > 1 ? arguments[1] : undefined;
@@ -590,13 +637,16 @@ export class MultiSelectComponent extends React.Component {
       ctrlKey,
       shiftKey
     } = e;
+
     if (e && shiftKey) {
       //shift+click
       let from = selectedOptions.indexOf(lastHighLightedSelectOption) >= 0 ? selectedOptions.indexOf(lastHighLightedSelectOption) : 0;
       let to = id && selectedOptions.indexOf(id) >= 0 ? selectedOptions.indexOf(id) : null;
+
       if (to >= 0 && to < from) {
         [to] = [from, from = to];
       }
+
       to += 1;
       const newSelectedHighlights = to ? selectedOptions.slice(from, to) : [];
       to && this.setState({
@@ -607,6 +657,7 @@ export class MultiSelectComponent extends React.Component {
       //ctrl+click
       const isRemove = highLightedSelectOptions.indexOf(id) >= 0;
       let newSelectedHighlights = [];
+
       if (isRemove) {
         lastHighLightedSelectOption = id === lastHighLightedSelectOption ? '' : lastHighLightedSelectOption;
         newSelectedHighlights = highLightedSelectOptions.filter(option => option !== id);
@@ -614,6 +665,7 @@ export class MultiSelectComponent extends React.Component {
         lastHighLightedSelectOption = id;
         newSelectedHighlights = [...highLightedSelectOptions, id];
       }
+
       this.setState({
         highLightedSelectOptions: newSelectedHighlights,
         lastHighLightedSelectOption
@@ -624,6 +676,7 @@ export class MultiSelectComponent extends React.Component {
         lastHighLightedSelectOption: id
       });
     }
+
     this.setState({
       shiftKeyPressHighLighted: 0
     });
@@ -631,11 +684,13 @@ export class MultiSelectComponent extends React.Component {
       preventScroll: true
     });
   }
+
   handleScroll(e) {
     let ele = e.target;
     let isScrollReachedBottom = findScrollEnd(ele);
     isScrollReachedBottom && this.handleScrollFuncCall();
   }
+
   handleScrollFuncCall() {
     const {
       getNextOptions,
@@ -646,6 +701,7 @@ export class MultiSelectComponent extends React.Component {
     } = this.state;
     isNextOptions && getNextOptions && this.handleFetchOptions(getNextOptions, searchStr);
   }
+
   handleChange() {
     let selectedOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     let e = arguments.length > 1 ? arguments[1] : undefined;
@@ -668,19 +724,23 @@ export class MultiSelectComponent extends React.Component {
     });
     const selectedOptionsLen = newSelectedOptions.length;
     const allSelectedOptionsDetails = [];
+
     for (let i = 0; i < selectedOptionsLen; i++) {
       const id = newSelectedOptions[i];
       allSelectedOptionsDetails.push(optionsNormalize[id]);
     }
-    onChange && onChange(newSelectedOptions, allSelectedOptionsDetails);
-    // this.setState({ searchStr: '' });
+
+    onChange && onChange(newSelectedOptions, allSelectedOptionsDetails); // this.setState({ searchStr: '' });
+
     this.searchInput && this.searchInput.focus({
       preventScroll: true
     });
+
     if (needToCloseOnSelect) {
       togglePopup(e);
     }
   }
+
   togglePopup(e) {
     const {
       togglePopup,
@@ -689,12 +749,14 @@ export class MultiSelectComponent extends React.Component {
     } = this.props;
     !isReadOnly && togglePopup(e, defaultDropBoxPosition ? `${defaultDropBoxPosition}` : null);
   }
+
   handlePopupClose(e) {
     const {
       closePopupOnly
     } = this.props;
     closePopupOnly(e);
   }
+
   searchInputRef(el) {
     const {
       getRef
@@ -702,6 +764,7 @@ export class MultiSelectComponent extends React.Component {
     this.searchInput = el;
     getRef && getRef(el);
   }
+
   selectedOptionContainerRef(el) {
     const {
       getTargetRef
@@ -709,25 +772,31 @@ export class MultiSelectComponent extends React.Component {
     this.selectedOptionContainer = el;
     getTargetRef(el);
   }
+
   selectedOptionRef(el, id) {
     this[`selectedOption_${id}`] = el;
   }
+
   suggestionContainerRef(el) {
     this.suggestionContainer = el;
   }
+
   suggestionItemRef(el, index, id) {
     this[`suggestion_${id}`] = el;
   }
+
   handleActive(e) {
     const {
       searchStr,
       isActive
     } = this.state;
+
     if (!isActive) {
       this.setState({
         isActive: true
       });
     }
+
     const {
       target
     } = e || {};
@@ -737,16 +806,19 @@ export class MultiSelectComponent extends React.Component {
     } = this.props;
     onFocus && onFocus(searchStr);
   }
+
   handleInactive() {
     const {
       isActive
     } = this.state;
+
     if (isActive) {
       this.setState({
         isActive: false
       });
     }
   }
+
   handleInputFocus() {
     const {
       isDisabled,
@@ -756,6 +828,7 @@ export class MultiSelectComponent extends React.Component {
       preventScroll: true
     });
   }
+
   handleExposedPublicMethods() {
     const {
       getPublicMethods,
@@ -765,6 +838,7 @@ export class MultiSelectComponent extends React.Component {
       openPopupOnly
     });
   }
+
   responsiveFunc(_ref) {
     let {
       mediaQueryOR
@@ -775,6 +849,7 @@ export class MultiSelectComponent extends React.Component {
       }])
     };
   }
+
   render() {
     let {
       isReadOnly,
@@ -800,6 +875,7 @@ export class MultiSelectComponent extends React.Component {
       title,
       needResponsive,
       dataId,
+      dataSelectorId,
       isSearching,
       borderColor,
       textBoxClass,
@@ -825,7 +901,8 @@ export class MultiSelectComponent extends React.Component {
       searchText = 'Searching...'
     } = i18nKeys;
     const {
-      clearLabel = 'Clear all'
+      clearLabel = 'Clear all',
+      ariaLabelledby
     } = a11y;
     i18nKeys = Object.assign({}, i18nKeys, {
       emptyText: i18nKeys.emptyText || emptyMessage,
@@ -839,7 +916,8 @@ export class MultiSelectComponent extends React.Component {
       highLightedSelectOptions,
       options,
       isFetchingOptions,
-      isActive
+      isActive,
+      selectedOptionIds
     } = this.state;
     const suggestions = this.handleFilterSuggestions();
     const setAriaId = this.getNextAriaId();
@@ -854,8 +932,10 @@ export class MultiSelectComponent extends React.Component {
     return /*#__PURE__*/React.createElement("div", {
       className: `${style.wrapper} ${isDisabled ? style.disabled : ''} ${isReadOnly ? style.readOnly : ''} ${disableAction ? CssProvider('isBlock') : ''} ${borderColor === 'transparent' ? style.transparentContainer : ''} ${needEffect && !(isDisabled || isReadOnly) ? style.effect : ''}`,
       "data-id": `${isDisabled ? `${dataId}_disabled` : isReadOnly ? `${dataId}_readOnly` : dataId}`,
+      "data-test-id": `${isDisabled ? `${dataId}_disabled` : isReadOnly ? `${dataId}_readOnly` : dataId}`,
       "data-title": isDisabled ? title : null,
-      onClick: this.handleInputFocus
+      onClick: this.handleInputFocus,
+      "data-selector-id": dataSelectorId
     }, /*#__PURE__*/React.createElement(Container, {
       align: "vertical",
       alignBox: "row",
@@ -907,7 +987,8 @@ export class MultiSelectComponent extends React.Component {
         ariaExpanded: !isReadOnly && !isDisabled && !disableAction && isPopupOpen ? true : false,
         ariaHaspopup: true,
         ariaRequired: true,
-        ariaDescribedby: ariaErrorId
+        ariaDescribedby: ariaErrorId,
+        ariaLabelledby: ariaLabelledby
       },
       autoComplete: autoComplete
     }, /*#__PURE__*/React.createElement(Container, {
@@ -981,6 +1062,7 @@ export class MultiSelectComponent extends React.Component {
         needBorder: false,
         dataId: `${dataId}_Options`,
         palette: palette,
+        selectedOptions: selectedOptionIds,
         a11y: {
           role: 'option'
         }
@@ -999,15 +1081,16 @@ export class MultiSelectComponent extends React.Component {
       }, /*#__PURE__*/React.createElement(Loader, null))), getFooter ? /*#__PURE__*/React.createElement(CardFooter, null, getFooter()) : null)));
     }) : null);
   }
+
 }
 MultiSelectComponent.propTypes = MultiSelect_propTypes;
-MultiSelectComponent.defaultProps = MultiSelect_defaultProps;
-if (false) {
-  MultiSelectComponent.docs = {
-    componentGroup: 'Form Elements',
-    folderName: 'Style Guide'
-  };
-}
+MultiSelectComponent.defaultProps = MultiSelect_defaultProps; // if (__DOCS__) {
+//   MultiSelectComponent.docs = {
+//     componentGroup: 'Form Elements',
+//     folderName: 'Style Guide'
+//   };
+// }
+
 MultiSelectComponent.displayName = 'MultiSelect';
 const MultiSelect = Popup(MultiSelectComponent);
 MultiSelect.propTypes = MultiSelectComponent.propTypes;