@zohodesk/components 1.0.0-temp-220.7 → 1.0.0-temp-223

package/lib/MultiSelect/AdvancedMultiSelect.js

@@ -135,13 +135,16 @@ var AdvancedMultiSelectComponent = /*#__PURE__*/function (_MultiSelectComponent)
           _this$state$options = _this$state.options,
           options = _this$state$options === void 0 ? dummyArray : _this$state$options,
           searchStr = _this$state.searchStr;
-      var needLocalSearch = this.props.needLocalSearch;
+      var _this$props2 = this.props,
+          needLocalSearch = _this$props2.needLocalSearch,
+          searchFields = _this$props2.searchFields;
 
       var _this$getFilterSugges = this.getFilterSuggestions({
         options: options,
         selectedOptions: dummyArray,
         searchStr: (0, _Common.getSearchString)(searchStr),
-        needSearch: needLocalSearch
+        needSearch: needLocalSearch,
+        searchFields: searchFields
       }),
           suggestions = _this$getFilterSugges.suggestions,
           suggestionIds = _this$getFilterSugges.suggestionIds;
@@ -157,14 +160,14 @@ var AdvancedMultiSelectComponent = /*#__PURE__*/function (_MultiSelectComponent)
       var _this$state2 = this.state,
           optionsNormalize = _this$state2.optionsNormalize,
           searchStr = _this$state2.searchStr;
-      var _this$props2 = this.props,
-          onChange = _this$props2.onChange,
-          _this$props2$needToCl = _this$props2.needToCloseOnSelect,
-          needToCloseOnSelect = _this$props2$needToCl === void 0 ? false : _this$props2$needToCl,
-          togglePopup = _this$props2.togglePopup,
-          isSearchClearOnSelect = _this$props2.isSearchClearOnSelect,
-          propSelectedOptions = _this$props2.selectedOptions,
-          disabledOptions = _this$props2.disabledOptions;
+      var _this$props3 = this.props,
+          onChange = _this$props3.onChange,
+          _this$props3$needToCl = _this$props3.needToCloseOnSelect,
+          needToCloseOnSelect = _this$props3$needToCl === void 0 ? false : _this$props3$needToCl,
+          togglePopup = _this$props3.togglePopup,
+          isSearchClearOnSelect = _this$props3.isSearchClearOnSelect,
+          propSelectedOptions = _this$props3.selectedOptions,
+          disabledOptions = _this$props3.disabledOptions;
 
       var _filterSelectedOption = (0, _dropDownUtils.filterSelectedOptions)({
         selectedOptions: selectedOptions,
@@ -219,7 +222,9 @@ var AdvancedMultiSelectComponent = /*#__PURE__*/function (_MultiSelectComponent)
           prefixText = props.prefixText,
           optionType = props.optionType,
           disabledOptions = props.disabledOptions,
-          allowValueFallback = props.allowValueFallback;
+          allowValueFallback = props.allowValueFallback,
+          searchFields = props.searchFields,
+          secondaryField = props.secondaryField;
       return this.formatOptions({
         options: options,
         valueField: valueField,
@@ -230,7 +235,9 @@ var AdvancedMultiSelectComponent = /*#__PURE__*/function (_MultiSelectComponent)
         optionType: optionType,
         iconSize: iconSize,
         disabledOptions: disabledOptions,
-        allowValueFallback: allowValueFallback
+        allowValueFallback: allowValueFallback,
+        searchFields: searchFields,
+        secondaryField: secondaryField
       });
     }
   }, {
@@ -288,11 +295,11 @@ var AdvancedMultiSelectComponent = /*#__PURE__*/function (_MultiSelectComponent)
       var _this2 = this;
 
       var oldAllSelectedOptionsDetails = this.allSelectedOptionsDetails;
-      var _this$props3 = this.props,
-          selectedOptions = _this$props3.selectedOptions,
-          selectedOptionsLimit = _this$props3.selectedOptionsLimit,
-          id = _this$props3.id,
-          selectedOptionDetails = _this$props3.selectedOptionDetails;
+      var _this$props4 = this.props,
+          selectedOptions = _this$props4.selectedOptions,
+          selectedOptionsLimit = _this$props4.selectedOptionsLimit,
+          id = _this$props4.id,
+          selectedOptionDetails = _this$props4.selectedOptionDetails;
       var oldSelectedOptions = prevProps.selectedOptions,
           oldSelectedOptionsLimit = prevProps.selectedOptionsLimit;
       var oldCount = this.state.showedSelectedOptionsCount;
@@ -360,11 +367,11 @@ var AdvancedMultiSelectComponent = /*#__PURE__*/function (_MultiSelectComponent)
       var _this3 = this;
 
       var showedSelectedOptionsCount = this.state.showedSelectedOptionsCount;
-      var _this$props4 = this.props,
-          selectedOptionsLimit = _this$props4.selectedOptionsLimit,
-          selectedOptions = _this$props4.selectedOptions,
-          getSelectedOptionDetails = _this$props4.getSelectedOptionDetails,
-          removeClose = _this$props4.removeClose;
+      var _this$props5 = this.props,
+          selectedOptionsLimit = _this$props5.selectedOptionsLimit,
+          selectedOptions = _this$props5.selectedOptions,
+          getSelectedOptionDetails = _this$props5.getSelectedOptionDetails,
+          removeClose = _this$props5.removeClose;
       removeClose(e);
       var selectedOptionsLen = selectedOptions.length;
 
@@ -401,53 +408,53 @@ var AdvancedMultiSelectComponent = /*#__PURE__*/function (_MultiSelectComponent)
     value: function render() {
       var _this4 = this;
 
-      var _this$props5 = this.props,
-          isReadOnly = _this$props5.isReadOnly,
-          needSelectAll = _this$props5.needSelectAll,
-          searchEmptyMessage = _this$props5.searchEmptyMessage,
-          emptyMessage = _this$props5.emptyMessage,
-          noMoreOptionsMessage = _this$props5.noMoreOptionsMessage,
-          dropBoxSize = _this$props5.dropBoxSize,
-          placeHolder = _this$props5.placeHolder,
-          isPopupOpen = _this$props5.isPopupOpen,
-          isPopupReady = _this$props5.isPopupReady,
-          position = _this$props5.position,
-          defaultDropBoxPosition = _this$props5.defaultDropBoxPosition,
-          selectAllText = _this$props5.selectAllText,
-          getContainerRef = _this$props5.getContainerRef,
-          removeClose = _this$props5.removeClose,
-          isAnimate = _this$props5.isAnimate,
-          animationStyle = _this$props5.animationStyle,
-          textBoxSize = _this$props5.textBoxSize,
-          variant = _this$props5.variant,
-          size = _this$props5.size,
-          isDisabled = _this$props5.isDisabled,
-          title = _this$props5.title,
-          dataIdMultiSelectComp = _this$props5.dataIdMultiSelectComp,
-          dataIdClearIcon = _this$props5.dataIdClearIcon,
-          dataIdSelectAllEle = _this$props5.dataIdSelectAllEle,
-          dataIdLoading = _this$props5.dataIdLoading,
-          _this$props5$selected = _this$props5.selectedOptions,
-          allselectedOptionIds = _this$props5$selected === void 0 ? [] : _this$props5$selected,
-          listItemSize = _this$props5.listItemSize,
-          needBorder = _this$props5.needBorder,
-          i18nKeys = _this$props5.i18nKeys,
-          htmlId = _this$props5.htmlId,
-          a11y = _this$props5.a11y,
-          borderColor = _this$props5.borderColor,
-          isBoxPaddingNeed = _this$props5.isBoxPaddingNeed,
-          getFooter = _this$props5.getFooter,
-          customProps = _this$props5.customProps,
-          needEffect = _this$props5.needEffect,
-          disabledOptions = _this$props5.disabledOptions,
-          isLoading = _this$props5.isLoading,
-          dataSelectorId = _this$props5.dataSelectorId,
-          customClass = _this$props5.customClass,
-          isAbsolutePositioningNeeded = _this$props5.isAbsolutePositioningNeeded,
-          positionsOffset = _this$props5.positionsOffset,
-          targetOffset = _this$props5.targetOffset,
-          isRestrictScroll = _this$props5.isRestrictScroll,
-          isFocus = _this$props5.isFocus;
+      var _this$props6 = this.props,
+          isReadOnly = _this$props6.isReadOnly,
+          needSelectAll = _this$props6.needSelectAll,
+          searchEmptyMessage = _this$props6.searchEmptyMessage,
+          emptyMessage = _this$props6.emptyMessage,
+          noMoreOptionsMessage = _this$props6.noMoreOptionsMessage,
+          dropBoxSize = _this$props6.dropBoxSize,
+          placeHolder = _this$props6.placeHolder,
+          isPopupOpen = _this$props6.isPopupOpen,
+          isPopupReady = _this$props6.isPopupReady,
+          position = _this$props6.position,
+          defaultDropBoxPosition = _this$props6.defaultDropBoxPosition,
+          selectAllText = _this$props6.selectAllText,
+          getContainerRef = _this$props6.getContainerRef,
+          removeClose = _this$props6.removeClose,
+          isAnimate = _this$props6.isAnimate,
+          animationStyle = _this$props6.animationStyle,
+          textBoxSize = _this$props6.textBoxSize,
+          variant = _this$props6.variant,
+          size = _this$props6.size,
+          isDisabled = _this$props6.isDisabled,
+          title = _this$props6.title,
+          dataIdMultiSelectComp = _this$props6.dataIdMultiSelectComp,
+          dataIdClearIcon = _this$props6.dataIdClearIcon,
+          dataIdSelectAllEle = _this$props6.dataIdSelectAllEle,
+          dataIdLoading = _this$props6.dataIdLoading,
+          _this$props6$selected = _this$props6.selectedOptions,
+          allselectedOptionIds = _this$props6$selected === void 0 ? [] : _this$props6$selected,
+          listItemSize = _this$props6.listItemSize,
+          needBorder = _this$props6.needBorder,
+          i18nKeys = _this$props6.i18nKeys,
+          htmlId = _this$props6.htmlId,
+          a11y = _this$props6.a11y,
+          borderColor = _this$props6.borderColor,
+          isBoxPaddingNeed = _this$props6.isBoxPaddingNeed,
+          getFooter = _this$props6.getFooter,
+          customProps = _this$props6.customProps,
+          needEffect = _this$props6.needEffect,
+          disabledOptions = _this$props6.disabledOptions,
+          isLoading = _this$props6.isLoading,
+          dataSelectorId = _this$props6.dataSelectorId,
+          customClass = _this$props6.customClass,
+          isAbsolutePositioningNeeded = _this$props6.isAbsolutePositioningNeeded,
+          positionsOffset = _this$props6.positionsOffset,
+          targetOffset = _this$props6.targetOffset,
+          isRestrictScroll = _this$props6.isRestrictScroll,
+          isFocus = _this$props6.isFocus;
       var _customProps$Suggesti = customProps.SuggestionsProps,
           SuggestionsProps = _customProps$Suggesti === void 0 ? {} : _customProps$Suggesti,
           _customProps$DropBoxP = customProps.DropBoxProps,

package/lib/MultiSelect/MultiSelect.js

@@ -300,7 +300,8 @@ var MultiSelectComponent = /*#__PURE__*/function (_React$Component) {
           textField = props.textField,
           prefixText = props.prefixText,
           disabledOptions = props.disabledOptions,
-          allowValueFallback = props.allowValueFallback;
+          allowValueFallback = props.allowValueFallback,
+          searchFields = props.searchFields;
       return this.formatOptions({
         options: options,
         valueField: valueField,
@@ -308,7 +309,8 @@ var MultiSelectComponent = /*#__PURE__*/function (_React$Component) {
         prefixText: prefixText,
         optionType: 'default',
         disabledOptions: disabledOptions,
-        allowValueFallback: allowValueFallback
+        allowValueFallback: allowValueFallback,
+        searchFields: searchFields
       });
     }
   }, {
@@ -354,14 +356,16 @@ var MultiSelectComponent = /*#__PURE__*/function (_React$Component) {
       var _this$props4 = this.props,
           selectedOptions = _this$props4.selectedOptions,
           needLocalSearch = _this$props4.needLocalSearch,
-          keepSelectedOptions = _this$props4.keepSelectedOptions;
+          keepSelectedOptions = _this$props4.keepSelectedOptions,
+          searchFields = _this$props4.searchFields;
 
       var _this$getFilterSugges = this.getFilterSuggestions({
         options: options,
         selectedOptions: selectedOptions,
         searchStr: (0, _Common.getSearchString)(searchStr),
         needSearch: needLocalSearch,
-        keepSelectedOptions: keepSelectedOptions
+        keepSelectedOptions: keepSelectedOptions,
+        searchFields: searchFields
       }),
           suggestions = _this$getFilterSugges.suggestions,
           suggestionIds = _this$getFilterSugges.suggestionIds;

package/lib/MultiSelect/MultiSelect.module.css

@@ -200,7 +200,15 @@
   cursor: pointer;
   margin-top: var(--zd_size5) ;
   background-color: var(--zdt_multiselect_delete_bg);
-  border: 0;
+  border: 0
+}
+
+[dir=ltr] .more {
+  margin-right:var(--zd_size3) 
+}
+
+[dir=rtl] .more {
+  margin-left:var(--zd_size3) 
 }
 
 .rightPlaceholder{

package/lib/MultiSelect/MultiSelectWithAvatar.js

@@ -100,7 +100,9 @@ var MultiSelectWithAvatarComponent = /*#__PURE__*/function (_MultiSelectComponen
           textField = props.textField,
           imageField = props.imageField,
           disabledOptions = props.disabledOptions,
-          allowValueFallback = props.allowValueFallback;
+          allowValueFallback = props.allowValueFallback,
+          searchFields = props.searchFields,
+          secondaryField = props.secondaryField;
       return this.formatOptions({
         options: options,
         valueField: valueField,
@@ -108,7 +110,9 @@ var MultiSelectWithAvatarComponent = /*#__PURE__*/function (_MultiSelectComponen
         imageField: imageField,
         optionType: 'avatar',
         disabledOptions: disabledOptions,
-        allowValueFallback: allowValueFallback
+        allowValueFallback: allowValueFallback,
+        searchFields: searchFields,
+        secondaryField: secondaryField
       });
     }
   }, {

package/lib/MultiSelect/Suggestions.js

@@ -98,6 +98,7 @@ var Suggestions = /*#__PURE__*/function (_React$PureComponent) {
       }, suggestions.map(function (suggestion, index) {
         var id = suggestion.id,
             value = suggestion.value,
+            secondaryValue = suggestion.secondaryValue,
             photoURL = suggestion.photoURL,
             icon = suggestion.icon,
             optionType = suggestion.optionType,
@@ -143,7 +144,8 @@ var Suggestions = /*#__PURE__*/function (_React$PureComponent) {
             size: listItemSize,
             avatarPalette: avatarPalette,
             palette: palette,
-            a11y: list_a11y
+            a11y: list_a11y,
+            secondaryValue: secondaryValue
           }));
         } else if (optionType === 'icon') {
           return /*#__PURE__*/_react["default"].createElement(_ListItemWithIcon["default"], _extends({}, commonProps, {
@@ -163,7 +165,8 @@ var Suggestions = /*#__PURE__*/function (_React$PureComponent) {
             iconSize: iconSize,
             size: listItemSize,
             palette: palette,
-            a11y: list_a11y
+            a11y: list_a11y,
+            secondaryValue: secondaryValue
           }));
         }
 

package/lib/MultiSelect/__tests__/__snapshots__/MultiSelectHeader.spec.js.snap

@@ -13,27 +13,48 @@ exports[`MultiSelectHeader rendering the basic value 1`] = `
   >
     <div
       aria-hidden="true"
-      class="iconBox shrinkOff"
+      class="iconBox lhsBox lhsJustifyContent_center shrinkOff selfStart"
       data-id="MultiSelectHeader_selectAll_Icon"
       data-selector-id="box"
       data-test-id="MultiSelectHeader_selectAll_Icon"
     >
-      <i
-        aria-hidden="true"
-        class="zd_font_icons basic icon-androidd    "
-        data-id="fontIcon"
-        data-selector-id="fontIcon"
-        data-test-id="fontIcon"
-        style="--zd-iconfont-size: var(--zd_font_size15);"
-      />
+      <div
+        class="lhsBox_medium shrinkOff selfStart"
+        data-id="boxComponent"
+        data-selector-id="box"
+        data-test-id="boxComponent"
+      >
+        <i
+          aria-hidden="true"
+          class="zd_font_icons basic icon-androidd    "
+          data-id="fontIcon"
+          data-selector-id="fontIcon"
+          data-test-id="fontIcon"
+          style="--zd-iconfont-size: var(--zd_font_size15);"
+        />
+      </div>
     </div>
     <div
-      class="value grow basis shrinkOn"
-      data-id="MultiSelectHeader_selectAll_Text"
+      class="grow basis shrinkOn"
+      data-id="boxComponent"
       data-selector-id="box"
-      data-test-id="MultiSelectHeader_selectAll_Text"
+      data-test-id="boxComponent"
     >
-      List
+      <div
+        class="flex cover coldir"
+        data-id="containerComponent"
+        data-selector-id="container"
+        data-test-id="containerComponent"
+      >
+        <div
+          class="value shrinkOff"
+          data-id="MultiSelectHeader_selectAll_Text"
+          data-selector-id="box"
+          data-test-id="MultiSelectHeader_selectAll_Text"
+        >
+          List
+        </div>
+      </div>
     </div>
   </li>
 </DocumentFragment>

package/lib/MultiSelect/props/propTypes.js

@@ -65,6 +65,7 @@ var MultiSelect_propTypes = {
   a11y: _propTypes["default"].shape({
     clearLabel: _propTypes["default"].string
   }),
+  searchFields: _propTypes["default"].arrayOf(_propTypes["default"].string),
   isAnimate: _propTypes["default"].bool,
   isBoxPaddingNeed: _propTypes["default"].bool,
   isDisabled: _propTypes["default"].bool,
@@ -153,7 +154,8 @@ var MultiSelectWithAvatar_propTypes = _objectSpread({
   customProps: _propTypes["default"].shape({
     SuggestionsProps: _propTypes["default"].object,
     DropBoxProps: _propTypes["default"].object
-  })
+  }),
+  secondaryField: _propTypes["default"].string
 }, MultiSelect_propTypes);
 
 exports.MultiSelectWithAvatar_propTypes = MultiSelectWithAvatar_propTypes;
@@ -305,6 +307,7 @@ var AdvancedMultiSelect_propTypes = _objectSpread(_objectSpread({}, MultiSelect_
   //For grouping multiSelect
   optionType: _propTypes["default"].oneOf(['default', 'avatar', 'icon']),
   needEffect: _propTypes["default"].bool,
+  secondaryField: _propTypes["default"].string,
   animationStyle: _propTypes["default"].string,
   defaultDropBoxPosition: _propTypes["default"].oneOf(['bottom', 'top', 'left', 'right']),
   dropBoxSize: _propTypes["default"].oneOf(['small', 'medium', 'large']),

package/lib/Popup/Popup.js

@@ -147,9 +147,8 @@ var Popup = function Popup(Component) {
         isMobile: false
       };
       _this.togglePopup = _this.togglePopup.bind(_assertThisInitialized(_this));
-      _this.closePopups = _this.closePopups.bind(_assertThisInitialized(_this));
-      _this.handleDocumentInteraction = _this.handleDocumentInteraction.bind(_assertThisInitialized(_this));
       _this.documentClickHandler = _this.documentClickHandler.bind(_assertThisInitialized(_this));
+      _this.documentClickHandler1 = _this.documentClickHandler1.bind(_assertThisInitialized(_this));
       _this.removeClose = _this.removeClose.bind(_assertThisInitialized(_this));
       _this.documentKeyupHandler = _this.documentKeyupHandler.bind(_assertThisInitialized(_this));
       _this.openPopupOnly = _this.openPopupOnly.bind(_assertThisInitialized(_this));
@@ -211,11 +210,11 @@ var Popup = function Popup(Component) {
         popups[group] = groupPopups;
 
         if (Object.keys(popups).length === 1 && groupPopups.length === 1) {
-          document.addEventListener('click', this.handleDocumentInteraction, true);
           document.addEventListener('click', this.documentClickHandler, false);
           document.addEventListener('keyup', this.documentKeyupHandler, false); // document.addEventListener('scroll', this.handleScroll, true);
 
           window.addEventListener('resize', this.handleResize);
+          document.addEventListener('click', this.documentClickHandler1, true);
           document.addEventListener('mousedown', this.handleDocumentMouseDown, true);
           document.addEventListener('focus', this.handleDocumentFocus, true);
         }
@@ -305,11 +304,11 @@ var Popup = function Popup(Component) {
         }
 
         if (noPopups) {
-          document.removeEventListener('click', this.handleDocumentInteraction, true);
-          document.removeEventListener('click', this.documentClickHandler, false);
+          document.removeEventListener('click', this.documentClickHandler);
           document.removeEventListener('keyup', this.documentKeyupHandler); // document.removeEventListener('scroll', this.handleScroll);
 
           window.removeEventListener('resize', this.handleResize);
+          document.removeEventListener('click', this.documentClickHandler1, true);
           document.removeEventListener('mousedown', this.handleDocumentMouseDown, true);
           document.removeEventListener('focus', this.handleDocumentFocus, true);
         }
@@ -690,66 +689,31 @@ var Popup = function Popup(Component) {
         return needPrevent;
       }
     }, {
-      key: "closePopups",
-      value: function closePopups(e) {
-        var checkTarget = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
-        try {
-          Object.keys(popups).forEach(function (groupName) {
-            var openGroupPopups = (popups[groupName] || []).filter(function (popup) {
-              return popup.state.isPopupOpen;
-            });
-            openGroupPopups.forEach(function (popup) {
-              var dropElement = popup.dropElement,
-                  placeHolderElement = popup.placeHolderElement;
-
-              var _ref5 = e || {},
-                  target = _ref5.target;
-
-              var canClosePopup = !popup.props.checkBeforeClose || popup.props.checkBeforeClose && popup.props.checkBeforeClose() && !(0, _Common.isTextSelected)();
-              var isOutsideClick = checkTarget && placeHolderElement && dropElement && placeHolderElement !== target && !placeHolderElement.contains(target) && dropElement !== target && !dropElement.contains(target);
-
-              if (canClosePopup && (!checkTarget || isOutsideClick)) {
-                popup.setState({
-                  isPopupOpen: false,
-                  isPopupReady: false
-                });
-              }
-            });
-          });
-
-          if (!checkTarget) {
-            lastOpenedGroup = [];
-          }
-        } catch (error) {// eslint-disable-next-line no-console
-          //console.error('popup component not unmounted properly', error);
-        }
-      }
-    }, {
-      key: "documentClickHandler",
-      value: function documentClickHandler(e) {
-        // Handles document click events to close all popups.
-        // This function closes all popups without checking if the click occurred outside the popup.
-        this.closePopups(e, false);
-      }
-    }, {
-      key: "handleDocumentInteraction",
-      value: function handleDocumentInteraction(e) {
-        // Handles interactions with the document to determine whether to close the popup.
-        // This function is specifically designed to close the popup when clicking outside of it.
-        // Check if the click event should prevent popup closure.
+      key: "documentClickHandler1",
+      value: function documentClickHandler1(e) {
         var needPrevent = this.handleGetNeedPrevent(e);
 
         if (needPrevent) {
-          // If the click event should prevent popup closure:
-          // - Stop the event propagation.
-          // - Close the last opened group of popups.
           this.removeClose(e);
           this.handleCloseLastOpenedGroup();
-        } else {
-          // If the click event does not need to prevent popup closure:
-          // - Close all popups, but only if the click occurred outside the popup elements.
-          this.closePopups(e, true);
+        }
+      }
+    }, {
+      key: "documentClickHandler",
+      value: function documentClickHandler() {
+        try {
+          Object.keys(popups).forEach(function (groupName) {
+            var groupPopups = popups[groupName] || [];
+            groupPopups.forEach(function (popup) {
+              popup.state.isPopupOpen && (!popup.props.checkBeforeClose || popup.props.checkBeforeClose && popup.props.checkBeforeClose()) && !(0, _Common.isTextSelected)() && popup.setState({
+                isPopupOpen: false,
+                isPopupReady: false
+              });
+            });
+          });
+          lastOpenedGroup = [];
+        } catch (e) {// eslint-disable-next-line no-console
+          //console.error('popup component not unmounted properly', e);
         }
       }
     }, {
@@ -793,8 +757,8 @@ var Popup = function Popup(Component) {
         var isUpdatePosition = arguments.length > 1 ? arguments[1] : undefined;
 
         // isUpdatePosition --->>> Window resize and dropBox resize and to update the position
-        var _ref6 = this.context || {},
-            direction = _ref6.direction;
+        var _ref5 = this.context || {},
+            direction = _ref5.direction;
 
         var placeHolderElement = this.placeHolderElement,
             dropElement = this.dropElement;
@@ -833,12 +797,12 @@ var Popup = function Popup(Component) {
               customOrder: customOrder
             });
 
-            var _ref7 = betterPosition || _Common.DUMMY_OBJECT,
-                view = _ref7.view,
-                views = _ref7.views,
-                viewsOffset = _ref7.viewsOffset,
-                targetOffset = _ref7.targetOffset,
-                popupOffset = _ref7.popupOffset;
+            var _ref6 = betterPosition || _Common.DUMMY_OBJECT,
+                view = _ref6.view,
+                views = _ref6.views,
+                viewsOffset = _ref6.viewsOffset,
+                targetOffset = _ref6.targetOffset,
+                popupOffset = _ref6.popupOffset;
 
             if (!isAbsolute) {
               if (!isPopupReady) {
@@ -902,33 +866,33 @@ var Popup = function Popup(Component) {
                     customOrder: customOrder
                   });
 
-                  var _ref8 = betterPosition || {},
-                      view = _ref8.view,
-                      views = _ref8.views,
-                      _ref8$viewsOffset = _ref8.viewsOffset,
-                      viewsOffset = _ref8$viewsOffset === void 0 ? {} : _ref8$viewsOffset,
-                      targetOffset = _ref8.targetOffset,
-                      popupOffset = _ref8.popupOffset;
-
-                  var _ref9 = positionsOffset[position] || {},
+                  var _ref7 = betterPosition || {},
+                      view = _ref7.view,
+                      views = _ref7.views,
+                      _ref7$viewsOffset = _ref7.viewsOffset,
+                      viewsOffset = _ref7$viewsOffset === void 0 ? {} : _ref7$viewsOffset,
+                      targetOffset = _ref7.targetOffset,
+                      popupOffset = _ref7.popupOffset;
+
+                  var _ref8 = positionsOffset[position] || {},
+                      _ref8$left = _ref8.left,
+                      oldLeft = _ref8$left === void 0 ? '' : _ref8$left,
+                      _ref8$top = _ref8.top,
+                      oldTop = _ref8$top === void 0 ? '' : _ref8$top,
+                      _ref8$bottom = _ref8.bottom,
+                      oldBottom = _ref8$bottom === void 0 ? '' : _ref8$bottom,
+                      _ref8$right = _ref8.right,
+                      oldRight = _ref8$right === void 0 ? '' : _ref8$right;
+
+                  var _ref9 = viewsOffset[view] || {},
                       _ref9$left = _ref9.left,
-                      oldLeft = _ref9$left === void 0 ? '' : _ref9$left,
+                      left = _ref9$left === void 0 ? '' : _ref9$left,
                       _ref9$top = _ref9.top,
-                      oldTop = _ref9$top === void 0 ? '' : _ref9$top,
+                      top = _ref9$top === void 0 ? '' : _ref9$top,
                       _ref9$bottom = _ref9.bottom,
-                      oldBottom = _ref9$bottom === void 0 ? '' : _ref9$bottom,
+                      bottom = _ref9$bottom === void 0 ? '' : _ref9$bottom,
                       _ref9$right = _ref9.right,
-                      oldRight = _ref9$right === void 0 ? '' : _ref9$right;
-
-                  var _ref10 = viewsOffset[view] || {},
-                      _ref10$left = _ref10.left,
-                      left = _ref10$left === void 0 ? '' : _ref10$left,
-                      _ref10$top = _ref10.top,
-                      top = _ref10$top === void 0 ? '' : _ref10$top,
-                      _ref10$bottom = _ref10.bottom,
-                      bottom = _ref10$bottom === void 0 ? '' : _ref10$bottom,
-                      _ref10$right = _ref10.right,
-                      right = _ref10$right === void 0 ? '' : _ref10$right;
+                      right = _ref9$right === void 0 ? '' : _ref9$right;
 
                   var changeState = isAbsolute ? position !== view : oldLeft !== left || oldTop !== top || oldBottom !== bottom || oldRight !== right; // let isInViewPort = viewPort.isInViewPort(
                   //   placeHolderElement,
@@ -987,11 +951,11 @@ var Popup = function Popup(Component) {
         var height = popupSize.height,
             width = popupSize.width;
 
-        var _ref11 = this.size || {},
-            _ref11$height = _ref11.height,
-            oldHeight = _ref11$height === void 0 ? 0 : _ref11$height,
-            _ref11$width = _ref11.width,
-            oldWidth = _ref11$width === void 0 ? 0 : _ref11$width;
+        var _ref10 = this.size || {},
+            _ref10$height = _ref10.height,
+            oldHeight = _ref10$height === void 0 ? 0 : _ref10$height,
+            _ref10$width = _ref10.width,
+            oldWidth = _ref10$width === void 0 ? 0 : _ref10$width;
 
         var _this$state2 = this.state,
             isPopupReady = _this$state2.isPopupReady,