@zohodesk/components 1.0.0-temp-189.1 → 1.0.0-temp-190

package/es/v1/DateTime/DateWidget.js

@@ -909,7 +909,8 @@ class DateWidgetComponent extends React.Component {
     if (isAllowedDateType) {
       // if (focusOrder !== oldFocusOrder) {
       const {
-        dateFormatSelection = {}
+        dateFormatSelection = {},
+        isFocused
       } = this.state;
       const {
         order = []
@@ -931,9 +932,17 @@ class DateWidgetComponent extends React.Component {
 
       if (isPopupOpen) {
         if (yearViewTypes.indexOf(focusedType) >= 0 && (!isYearView || isMonthOpen !== oldIsMonthOpen)) {
-          this.DateTimeYearViewToggle(true, isMonthOpen);
-        } else if (yearViewTypes.indexOf(focusedType) === -1 && isYearView) {
-          this.DateTimeYearViewToggle(false, false);
+          if (!isFocused && isYearView) {
+            this.DateTimeYearViewToggle(true, oldIsMonthOpen);
+          } else {
+            this.DateTimeYearViewToggle(true, isMonthOpen);
+          }
+        } else if (yearViewTypes.indexOf(focusedType) === -1) {
+          if (!isFocused && isYearView) {
+            this.DateTimeYearViewToggle(isYearView, oldIsMonthOpen);
+          } else {
+            this.DateTimeYearViewToggle(false, false);
+          }
         }
       } // }
 

package/es/v1/DropBox/DropBox.js

@@ -1,15 +1,15 @@
 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); }
 
-import React, { useRef, Fragment, useContext } from 'react';
+import React, { useRef, useContext } from 'react';
 import FocusScope from '@zohodesk/a11y/es/FocusScope/FocusScope';
 import Modal from '../Modal/Modal';
-import { getLibraryConfig } from '../../Provider/Config';
 import LibraryContext from '../../Provider/LibraryContextInit';
 import cssJSLogic from '../../DropBox/css/cssJSLogic';
 import DropBoxElement from './DropBoxElement/DropBoxElement';
 import { DropBoxDefaultProps } from './props/defaultProps';
 import { DropBoxPropTypes } from './props/propTypes';
 import { stopPropagation } from '../../utils/Common';
+import isMobilePopover from './utils/isMobilePopover';
 import style from '../../DropBox/css/DropBox.module.css';
 export default function DropBox(props) {
   const dropBoxRef = useRef(null);
@@ -37,18 +37,7 @@ export default function DropBox(props) {
   const {
     direction
   } = DropBoxContext || {};
-  let windowWidth,
-      mobileWidth = getLibraryConfig('mobileWidth'),
-      isModel = false;
-
-  if (needResponsive) {
-    windowWidth = window.innerWidth;
-
-    if (windowWidth <= mobileWidth) {
-      isModel = true;
-    }
-  }
-
+  let isModel = isMobilePopover(needResponsive);
   const {
     zIndexStyle
   } = cssJSLogic(props);

package/es/v1/DropBox/utils/isMobilePopover.js

@@ -0,0 +1,17 @@
+import { getLibraryConfig } from '../../Provider/Config';
+export default function isMobilePopover(needResponsive) {
+  //   let { needResponsive } = props;
+  let windowWidth,
+      mobileWidth = getLibraryConfig('mobileWidth'),
+      isModel = false;
+
+  if (needResponsive) {
+    windowWidth = window.innerWidth;
+
+    if (windowWidth <= mobileWidth) {
+      isModel = true;
+    }
+  }
+
+  return isModel ? true : false;
+}

package/es/v1/MultiSelect/MultiSelect.js

@@ -17,8 +17,8 @@ import MultiSelectHeader from './MultiSelectHeader';
 import CssProvider from '../../Provider/CssProvider';
 import { getUniqueId } from '../../Provider/IdProvider';
 import ResponsiveDropBox from '../ResponsiveDropBox/ResponsiveDropBox';
-import { ResponsiveReceiver } from '../Responsive/CustomResponsive';
 import Loader from '@zohodesk/svg/lib/Loader/Loader';
+import isMobilePopover from '../DropBox/utils/isMobilePopover';
 /**** Icons ****/
 
 import { Icon } from '@zohodesk/icons';
@@ -28,8 +28,8 @@ import style from '../../MultiSelect/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';
+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 */
@@ -840,17 +840,6 @@ export class MultiSelectComponent extends React.Component {
     });
   }
 
-  responsiveFunc(_ref) {
-    let {
-      mediaQueryOR
-    } = _ref;
-    return {
-      tabletMode: mediaQueryOR([{
-        maxWidth: 700
-      }])
-    };
-  }
-
   getSelectionUI() {
     let isResponsive = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     let {
@@ -1023,6 +1012,7 @@ export class MultiSelectComponent extends React.Component {
       searchEmptyText: i18nKeys.searchEmptyText || searchEmptyMessage,
       noMoreText: i18nKeys.noMoreText || noMoreOptionsMessage
     });
+    let isModel = isMobilePopover(needResponsive);
     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}`,
@@ -1030,85 +1020,77 @@ export class MultiSelectComponent extends React.Component {
       "data-title": isDisabled ? title : null,
       onClick: this.handleInputFocus,
       "data-selector-id": dataSelectorId
-    }, this.getSelectionUI(), !isReadOnly && !isDisabled && !disableAction && isPopupOpen ? /*#__PURE__*/React.createElement(ResponsiveReceiver, {
-      query: this.responsiveFunc,
-      responsiveId: "Helmet"
-    }, _ref2 => {
-      let {
-        tabletMode
-      } = _ref2;
-      return /*#__PURE__*/React.createElement(ResponsiveDropBox, {
-        animationStyle: animationStyle,
-        boxPosition: position || `${defaultDropBoxPosition}`,
-        getRef: getContainerRef,
-        isActive: isPopupReady,
-        isAnimate: isAnimate,
-        isArrow: false,
-        onClick: removeClose,
-        needResponsive: needResponsive,
-        isPadding: false,
-        isBoxPaddingNeed: isBoxPaddingNeed,
-        palette: palette,
-        htmlId: setAriaId,
-        a11y: {
-          role: 'listbox',
-          ariaMultiselectable: true
-        },
-        size: boxSize,
-        alignBox: "row",
-        isResponsivePadding: getFooter ? false : true
-      }, /*#__PURE__*/React.createElement(Box, {
-        flexible: true
-      }, /*#__PURE__*/React.createElement(Card, {
-        customClass: `${style.box} ${style[`${palette}Box`]}`,
-        onScroll: this.handleScroll
-      }, tabletMode && /*#__PURE__*/React.createElement(MobileHeader, {
-        selectedOptions: selectedOptions,
-        i18nKeys: i18nKeys,
-        onClick: this.handlePopupClose
-      }, /*#__PURE__*/React.createElement("div", {
-        className: style.effect
-      }, this.getSelectionUI(true))), needSelectAll ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
-        onSelect: this.handleSelectAll,
-        selectAllText: selectAllText,
-        suggestions: suggestions,
-        dataId: dataId
-      })) : null, isLoading ? /*#__PURE__*/React.createElement(Container, {
-        align: "both",
-        className: style.loader
-      }, /*#__PURE__*/React.createElement(Loader, null)) : /*#__PURE__*/React.createElement(CardContent, {
-        shrink: true,
-        customClass: !tabletMode && dropBoxSize ? style[dropBoxSize] : '',
-        eleRef: this.suggestionContainerRef
-      }, isSearching ? /*#__PURE__*/React.createElement("div", {
-        className: style[palette]
-      }, searchText) : suggestions.length ? /*#__PURE__*/React.createElement(Suggestions, {
-        suggestions: suggestions,
-        getRef: this.suggestionItemRef,
-        hoverOption: hoverOption,
-        onClick: this.handleSelectOption,
-        onMouseEnter: this.handleMouseEnter,
-        needBorder: false,
-        dataId: `${dataId}_Options`,
-        palette: palette,
-        selectedOptions: selectedOptionIds,
-        a11y: {
-          role: 'option'
-        }
-      }) : /*#__PURE__*/React.createElement(EmptyState, {
-        isLoading: isFetchingOptions,
-        options: options,
-        searchString: searchStr,
-        suggestions: suggestions,
-        dataId: dataId,
-        palette: palette,
-        i18nKeys: i18nKeys,
-        htmlId: ariaErrorId
-      }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {
-        isCover: false,
-        align: "both"
-      }, /*#__PURE__*/React.createElement(Loader, null))), getFooter ? /*#__PURE__*/React.createElement(CardFooter, null, getFooter()) : null)));
-    }) : null);
+    }, this.getSelectionUI(), !isReadOnly && !isDisabled && !disableAction && isPopupOpen ? /*#__PURE__*/React.createElement(ResponsiveDropBox, {
+      animationStyle: animationStyle,
+      boxPosition: position || `${defaultDropBoxPosition}`,
+      getRef: getContainerRef,
+      isActive: isPopupReady,
+      isAnimate: isAnimate,
+      isArrow: false,
+      onClick: removeClose,
+      needResponsive: needResponsive,
+      isPadding: false,
+      isBoxPaddingNeed: isBoxPaddingNeed,
+      palette: palette,
+      htmlId: setAriaId,
+      a11y: {
+        role: 'listbox',
+        ariaMultiselectable: true
+      },
+      size: boxSize,
+      alignBox: "row",
+      isResponsivePadding: getFooter ? false : true
+    }, /*#__PURE__*/React.createElement(Box, {
+      flexible: true
+    }, /*#__PURE__*/React.createElement(Card, {
+      customClass: `${style.box} ${style[`${palette}Box`]}`,
+      onScroll: this.handleScroll
+    }, isModel && /*#__PURE__*/React.createElement(MobileHeader, {
+      selectedOptions: selectedOptions,
+      i18nKeys: i18nKeys,
+      onClick: this.handlePopupClose
+    }, /*#__PURE__*/React.createElement("div", {
+      className: style.effect
+    }, this.getSelectionUI(true))), needSelectAll ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
+      onSelect: this.handleSelectAll,
+      selectAllText: selectAllText,
+      suggestions: suggestions,
+      dataId: dataId
+    })) : null, isLoading ? /*#__PURE__*/React.createElement(Container, {
+      align: "both",
+      className: style.loader
+    }, /*#__PURE__*/React.createElement(Loader, null)) : /*#__PURE__*/React.createElement(CardContent, {
+      shrink: true,
+      customClass: !isModel && dropBoxSize ? style[dropBoxSize] : '',
+      eleRef: this.suggestionContainerRef
+    }, isSearching ? /*#__PURE__*/React.createElement("div", {
+      className: style[palette]
+    }, searchText) : suggestions.length ? /*#__PURE__*/React.createElement(Suggestions, {
+      suggestions: suggestions,
+      getRef: this.suggestionItemRef,
+      hoverOption: hoverOption,
+      onClick: this.handleSelectOption,
+      onMouseEnter: this.handleMouseEnter,
+      needBorder: false,
+      dataId: `${dataId}_Options`,
+      palette: palette,
+      selectedOptions: selectedOptionIds,
+      a11y: {
+        role: 'option'
+      }
+    }) : /*#__PURE__*/React.createElement(EmptyState, {
+      isLoading: isFetchingOptions,
+      options: options,
+      searchString: searchStr,
+      suggestions: suggestions,
+      dataId: dataId,
+      palette: palette,
+      i18nKeys: i18nKeys,
+      htmlId: ariaErrorId
+    }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {
+      isCover: false,
+      align: "both"
+    }, /*#__PURE__*/React.createElement(Loader, null))), getFooter ? /*#__PURE__*/React.createElement(CardFooter, null, getFooter()) : null))) : null);
   }
 
 }

package/es/v1/MultiSelect/MultiSelectWithAvatar.js

@@ -17,12 +17,13 @@ import MobileHeader from './MobileHeader/MobileHeader';
 import MultiSelectHeader from './MultiSelectHeader';
 import CssProvider from '../../Provider/CssProvider';
 import { getUniqueId } from '../../Provider/IdProvider';
-import ResponsiveDropBox from '../ResponsiveDropBox/ResponsiveDropBox';
-import { ResponsiveReceiver } from '../Responsive/CustomResponsive';
+import ResponsiveDropBox from '../ResponsiveDropBox/ResponsiveDropBox'; // import { ResponsiveReceiver } from '../Responsive/CustomResponsive';
+
 import Loader from '@zohodesk/svg/lib/Loader/Loader';
+import isMobilePopover from '../DropBox/utils/isMobilePopover';
 /**** Icons ****/
+// import { Icon } from '@zohodesk/icons';
 
-import { Icon } from '@zohodesk/icons';
 /**** CSS ****/
 
 import style from '../../MultiSelect/MultiSelect.module.css';
@@ -57,17 +58,6 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
     });
   }
 
-  responsiveFunc(_ref) {
-    let {
-      mediaQueryOR
-    } = _ref;
-    return {
-      tabletMode: mediaQueryOR([{
-        maxWidth: 700
-      }])
-    };
-  }
-
   render() {
     let {
       isReadOnly,
@@ -108,6 +98,7 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
       searchEmptyText: i18nKeys.searchEmptyText || searchEmptyMessage,
       noMoreText: i18nKeys.noMoreText || noMoreOptionsMessage
     });
+    let isModel = isMobilePopover(needResponsive);
     const {
       selectedOptions,
       searchStr,
@@ -127,83 +118,75 @@ class MultiSelectWithAvatarComponent extends MultiSelectComponent {
       "data-title": isDisabled ? title : null,
       onClick: this.handleInputFocus,
       "data-selector-id": dataSelectorId
-    }, this.getSelectionUI(), popUpState ? /*#__PURE__*/React.createElement(ResponsiveReceiver, {
-      query: this.responsiveFunc,
-      responsiveId: "Helmet"
-    }, _ref2 => {
-      let {
-        tabletMode
-      } = _ref2;
-      return /*#__PURE__*/React.createElement(ResponsiveDropBox, {
-        animationStyle: animationStyle,
-        boxPosition: position || `${defaultDropBoxPosition}Center`,
-        getRef: getContainerRef,
-        isActive: isPopupReady,
-        isAnimate: isAnimate,
-        isArrow: false,
-        onClick: removeClose,
-        needResponsive: needResponsive,
-        isPadding: false,
-        isBoxPaddingNeed: isBoxPaddingNeed,
-        palette: palette,
-        htmlId: setAriaId,
-        a11y: {
-          ariaMultiselectable: true,
-          role: 'listbox'
-        },
-        isResponsivePadding: true,
-        alignBox: "row"
-      }, /*#__PURE__*/React.createElement(Box, {
-        flexible: true
-      }, /*#__PURE__*/React.createElement(Card, {
-        customClass: `${style.box} ${style[`${palette}Box`]}`,
-        onScroll: this.handleScroll
-      }, tabletMode && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MobileHeader, {
-        selectedOptions: selectedOptions,
-        i18nKeys: i18nKeys,
-        onClick: this.handlePopupClose
-      }, /*#__PURE__*/React.createElement("div", {
-        className: style.effect
-      }, this.getSelectionUI(true)))), needSelectAll ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
-        onSelect: this.handleSelectAll,
-        selectAllText: selectAllText,
-        suggestions: suggestions,
-        dataId: dataId
-      })) : null, isLoading ? /*#__PURE__*/React.createElement(Container, {
-        align: "both",
-        className: style.loader
-      }, /*#__PURE__*/React.createElement(Loader, null)) : /*#__PURE__*/React.createElement(CardContent, {
-        shrink: true,
-        customClass: !tabletMode && dropBoxSize ? style[dropBoxSize] : '',
-        eleRef: this.suggestionContainerRef
-      }, suggestions.length ? /*#__PURE__*/React.createElement(Suggestions, _extends({
-        needTick: keepSelectedOptions,
-        suggestions: suggestions,
-        getRef: this.suggestionItemRef,
-        hoverOption: hoverOption,
-        onClick: this.handleSelectOption,
-        onMouseEnter: this.handleMouseEnter,
-        needBorder: false,
-        dataId: `${dataId}_Options`,
-        palette: palette,
-        selectedOptions: selectedOptionIds,
-        a11y: {
-          role: 'option'
-        }
-      }, SuggestionsProps)) : /*#__PURE__*/React.createElement(EmptyState, {
-        isLoading: isFetchingOptions,
-        options: options,
-        searchString: searchStr,
-        suggestions: suggestions,
-        dataId: dataId,
-        palette: palette,
-        i18nKeys: i18nKeys,
-        htmlId: ariaErrorId
-      }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {
-        isCover: false,
-        align: "both"
-      }, /*#__PURE__*/React.createElement(Loader, null))))));
-    }) : null);
+    }, this.getSelectionUI(), popUpState ? /*#__PURE__*/React.createElement(ResponsiveDropBox, {
+      animationStyle: animationStyle,
+      boxPosition: position || `${defaultDropBoxPosition}Center`,
+      getRef: getContainerRef,
+      isActive: isPopupReady,
+      isAnimate: isAnimate,
+      isArrow: false,
+      onClick: removeClose,
+      needResponsive: needResponsive,
+      isPadding: false,
+      isBoxPaddingNeed: isBoxPaddingNeed,
+      palette: palette,
+      htmlId: setAriaId,
+      a11y: {
+        ariaMultiselectable: true,
+        role: 'listbox'
+      },
+      isResponsivePadding: true,
+      alignBox: "row"
+    }, /*#__PURE__*/React.createElement(Box, {
+      flexible: true
+    }, /*#__PURE__*/React.createElement(Card, {
+      customClass: `${style.box} ${style[`${palette}Box`]}`,
+      onScroll: this.handleScroll
+    }, isModel && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MobileHeader, {
+      selectedOptions: selectedOptions,
+      i18nKeys: i18nKeys,
+      onClick: this.handlePopupClose
+    }, /*#__PURE__*/React.createElement("div", {
+      className: style.effect
+    }, this.getSelectionUI(true)))), needSelectAll ? /*#__PURE__*/React.createElement(CardHeader, null, /*#__PURE__*/React.createElement(MultiSelectHeader, {
+      onSelect: this.handleSelectAll,
+      selectAllText: selectAllText,
+      suggestions: suggestions,
+      dataId: dataId
+    })) : null, isLoading ? /*#__PURE__*/React.createElement(Container, {
+      align: "both",
+      className: style.loader
+    }, /*#__PURE__*/React.createElement(Loader, null)) : /*#__PURE__*/React.createElement(CardContent, {
+      shrink: true,
+      customClass: !isModel && dropBoxSize ? style[dropBoxSize] : '',
+      eleRef: this.suggestionContainerRef
+    }, suggestions.length ? /*#__PURE__*/React.createElement(Suggestions, _extends({
+      needTick: keepSelectedOptions,
+      suggestions: suggestions,
+      getRef: this.suggestionItemRef,
+      hoverOption: hoverOption,
+      onClick: this.handleSelectOption,
+      onMouseEnter: this.handleMouseEnter,
+      needBorder: false,
+      dataId: `${dataId}_Options`,
+      palette: palette,
+      selectedOptions: selectedOptionIds,
+      a11y: {
+        role: 'option'
+      }
+    }, SuggestionsProps)) : /*#__PURE__*/React.createElement(EmptyState, {
+      isLoading: isFetchingOptions,
+      options: options,
+      searchString: searchStr,
+      suggestions: suggestions,
+      dataId: dataId,
+      palette: palette,
+      i18nKeys: i18nKeys,
+      htmlId: ariaErrorId
+    }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {
+      isCover: false,
+      align: "both"
+    }, /*#__PURE__*/React.createElement(Loader, null)))))) : null);
   }
 
 }

package/es/v1/Select/SelectWithAvatar.js

@@ -10,7 +10,7 @@ import Tag from '../Tag/Tag';
 import Textbox from '../TextBox/TextBox';
 import TextBoxIcon from '../TextBoxIcon/TextBoxIcon';
 import { Container, Box } from '../Layout';
-import Card, { CardContent, CardHeader } from '../Card/Card';
+import Card, { CardContent, CardHeader, CardFooter } from '../Card/Card';
 import Suggestions from '../MultiSelect/Suggestions';
 import EmptyState from '../MultiSelect/EmptyState';
 import DropDownHeading from '../DropDown/DropDownHeading';
@@ -158,7 +158,8 @@ class SelectWithAvatarComponent extends SelectComponent {
       htmlId,
       needEffect,
       isLoading,
-      dataSelectorId
+      dataSelectorId,
+      getFooter
     } = this.props;
     i18nKeys = Object.assign({}, i18nKeys, {
       emptyText: i18nKeys.emptyText || emptyMessage,
@@ -321,7 +322,7 @@ class SelectWithAvatarComponent extends SelectComponent {
       }), isFetchingOptions && /*#__PURE__*/React.createElement(Container, {
         isCover: false,
         align: "both"
-      }, /*#__PURE__*/React.createElement(Loader, null))))));
+      }, /*#__PURE__*/React.createElement(Loader, null))), getFooter ? /*#__PURE__*/React.createElement(CardFooter, null, getFooter()) : null)));
     }) : null);
   }
 

package/es/v1/Select/props/propTypes.js

@@ -230,7 +230,8 @@ export const SelectWithAvatar_propTypes = { ...Select_propTypes,
   htmlId: PropTypes.string,
   needEffect: PropTypes.bool,
   isLoading: PropTypes.bool,
-  dataSelectorId: PropTypes.string
+  dataSelectorId: PropTypes.string,
+  getFooter: PropTypes.func
 };
 export const SelectWithIcon_propTypes = {
   animationStyle: PropTypes.oneOf(['default', 'bounce']),

package/es/v1/Tag/Tag.js

@@ -115,7 +115,7 @@ function Tag(props) {
           ${rounded ? style.lgRadiusClose : style.smRadiusClose} ${isDarkPalette ? style.darkTagClose : ''}
           ${customTagClose} ${style[`close${closePalette}`]}`,
     dataId: `${dataId}_RemoveTag`,
-    "data-title": closeTitle,
+    title: closeTitle,
     onClick: handleRemove,
     a11y: {
       ariaLabel: clearLabel

package/lib/DateTime/DateWidget.js

@@ -934,8 +934,10 @@ var DateWidgetComponent = /*#__PURE__*/function (_React$Component) {
 
       if (isAllowedDateType) {
         // if (focusOrder !== oldFocusOrder) {
-        var _this$state$dateForma = this.state.dateFormatSelection,
-            dateFormatSelection = _this$state$dateForma === void 0 ? {} : _this$state$dateForma;
+        var _this$state5 = this.state,
+            _this$state5$dateForm = _this$state5.dateFormatSelection,
+            dateFormatSelection = _this$state5$dateForm === void 0 ? {} : _this$state5$dateForm,
+            isFocused = _this$state5.isFocused;
         var _dateFormatSelection$2 = dateFormatSelection.order,
             order = _dateFormatSelection$2 === void 0 ? [] : _dateFormatSelection$2;
         var isPopupOpen = this.props.isPopupOpen; // const { type: oldFocusedType = '' } = order[oldFocusOrder] || {};
@@ -953,9 +955,17 @@ var DateWidgetComponent = /*#__PURE__*/function (_React$Component) {
 
         if (isPopupOpen) {
           if (yearViewTypes.indexOf(focusedType) >= 0 && (!isYearView || isMonthOpen !== oldIsMonthOpen)) {
-            this.DateTimeYearViewToggle(true, isMonthOpen);
-          } else if (yearViewTypes.indexOf(focusedType) === -1 && isYearView) {
-            this.DateTimeYearViewToggle(false, false);
+            if (!isFocused && isYearView) {
+              this.DateTimeYearViewToggle(true, oldIsMonthOpen);
+            } else {
+              this.DateTimeYearViewToggle(true, isMonthOpen);
+            }
+          } else if (yearViewTypes.indexOf(focusedType) === -1) {
+            if (!isFocused && isYearView) {
+              this.DateTimeYearViewToggle(isYearView, oldIsMonthOpen);
+            } else {
+              this.DateTimeYearViewToggle(false, false);
+            }
           }
         } // }
 
@@ -1004,12 +1014,12 @@ var DateWidgetComponent = /*#__PURE__*/function (_React$Component) {
           a11y = _this$props11.a11y,
           boxSize = _this$props11.boxSize,
           onError = _this$props11.onError;
-      var _this$state5 = this.state,
-          _this$state5$selected = _this$state5.selected,
-          value = _this$state5$selected === void 0 ? '' : _this$state5$selected,
-          isError = _this$state5.isError,
-          isDateEdited = _this$state5.isDateEdited,
-          isFocused = _this$state5.isFocused;
+      var _this$state6 = this.state,
+          _this$state6$selected = _this$state6.selected,
+          value = _this$state6$selected === void 0 ? '' : _this$state6$selected,
+          isError = _this$state6.isError,
+          isDateEdited = _this$state6.isDateEdited,
+          isFocused = _this$state6.isFocused;
       var showValue = this.handleGetShowValue();
       var isAllowedDateType = this.handleGetAllowedType();
       var showClear = !(isDisabled || isReadOnly) && (isDateEdited || value) ? true : false;

package/lib/DropBox/DropBox.js

@@ -13,8 +13,6 @@ var _FocusScope = _interopRequireDefault(require("@zohodesk/a11y/es/FocusScope/F
 
 var _Modal = _interopRequireDefault(require("../Modal/Modal"));
 
-var _Config = require("../Provider/Config");
-
 var _LibraryContextInit = _interopRequireDefault(require("../Provider/LibraryContextInit"));
 
 var _cssJSLogic2 = _interopRequireDefault(require("./css/cssJSLogic"));
@@ -27,6 +25,8 @@ var _propTypes = require("./props/propTypes");
 
 var _Common = require("./../utils/Common");
 
+var _isMobilePopover = _interopRequireDefault(require("./utils/isMobilePopover"));
+
 var _DropBoxModule = _interopRequireDefault(require("./css/DropBox.module.css"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -64,17 +64,7 @@ function DropBox(props) {
   var _ref = DropBoxContext || {},
       direction = _ref.direction;
 
-  var windowWidth,
-      mobileWidth = (0, _Config.getLibraryConfig)('mobileWidth'),
-      isModel = false;
-
-  if (needResponsive) {
-    windowWidth = window.innerWidth;
-
-    if (windowWidth <= mobileWidth) {
-      isModel = true;
-    }
-  }
+  var isModel = (0, _isMobilePopover["default"])(needResponsive);
 
   var _cssJSLogic = (0, _cssJSLogic2["default"])(props),
       zIndexStyle = _cssJSLogic.zIndexStyle;