@skbkontur/react-ui 0.0.0-0b8a8f7a39 → 0.0.0-0dca6f33be

package/internal/Popup/Popup/Popup.js

@@ -1,29 +1,27 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
 
+var _class, _class2, _temp;
+
 function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-  var it;
-
-  if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
-    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-      if (it) o = it;
-      var i = 0;
-      return function () {
-        if (i >= o.length) return {
-          done: true
-        };
-        return {
-          done: false,
-          value: o[i++]
-        };
+  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+  if (it) return (it = it.call(o)).next.bind(it);
+
+  if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
+    if (it) o = it;
+    var i = 0;
+    return function () {
+      if (i >= o.length) return {
+        done: true
       };
-    }
-
-    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+      return {
+        done: false,
+        value: o[i++]
+      };
+    };
   }
 
-  it = o[Symbol.iterator]();
-  return it.next.bind(it);
+  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
 function _unsupportedIterableToArray(o, minLen) {
@@ -46,38 +44,50 @@ function _arrayLikeToArray(arr, len) {
 }
 
 import React from 'react';
-import { findDOMNode } from 'react-dom';
 import PropTypes from 'prop-types';
 import { Transition } from 'react-transition-group';
 import raf from 'raf';
 import warning from 'warning';
-import cn from 'classnames';
+import { getDOMRect } from "../../../lib/dom/getDOMRect";
 import * as LayoutEvents from "../../../lib/LayoutEvents";
 import { ZIndex } from "../../ZIndex";
 import { RenderContainer } from "../../RenderContainer";
-import { isFunction } from "../../../lib/utils";
-import { isIE11, isEdge } from "../../../lib/client";
+import { isFunction, isNonNullable, isNullable, isRefableElement } from "../../../lib/utils";
+import { isIE11, isEdge, isSafari } from "../../../lib/client";
 import { ThemeContext } from "../../../lib/theming/ThemeContext";
-import { isHTMLElement, safePropTypesInstanceOf } from "../../../lib/SSRSafe";
+import { isElement, safePropTypesInstanceOf } from "../../../lib/SSRSafe";
 import { isTestEnv } from "../../../lib/currentEnvironment";
 import { CommonWrapper } from "../../CommonWrapper";
+import { cx } from "../../../lib/theming/Emotion";
+import { responsiveLayout } from "../../../components/ResponsiveLayout/decorator";
+import { MobilePopup } from "../../MobilePopup";
+import { getRootNode, rootNode } from "../../../lib/rootNode";
+import { callChildRef } from "../../../lib/callChildRef/callChildRef";
+import { isInstanceWithAnchorElement } from "../../../lib/InstanceWithAnchorElement";
+import { createPropsGetter } from "../../../lib/createPropsGetter";
 import { PopupPin } from "../PopupPin";
 import { PopupHelper } from "../PopupHelper";
-import { jsStyles } from "../Popup.styles";
+import { styles } from "../Popup.styles";
 var POPUP_BORDER_DEFAULT_COLOR = 'transparent';
 var TRANSITION_TIMEOUT = {
   enter: 0,
   exit: 200
 };
-var DUMMY_LOCATION = {
-  position: 'top left',
+export var PopupPositions = ['top left', 'top center', 'top right', 'right top', 'right middle', 'right bottom', 'bottom right', 'bottom center', 'bottom left', 'left bottom', 'left middle', 'left top'];
+export var DefaultPosition = PopupPositions[0];
+export var DUMMY_LOCATION = {
+  position: DefaultPosition,
   coordinates: {
     top: -9999,
     left: -9999
   }
 };
-export var PopupPositions = ['top left', 'top center', 'top right', 'right top', 'right middle', 'right bottom', 'bottom right', 'bottom center', 'bottom left', 'left bottom', 'left middle', 'left top'];
-export var Popup = /*#__PURE__*/function (_React$Component) {
+export var PopupDataTids = {
+  content: 'PopupContent',
+  contentInner: 'PopupContentInner',
+  popupPin: 'PopupPin__root'
+};
+export var Popup = responsiveLayout(_class = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(Popup, _React$Component);
 
   function Popup() {
@@ -88,24 +98,26 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
     }
 
     _this = _React$Component.call.apply(_React$Component, [this].concat(args)) || this;
+    _this.getProps = createPropsGetter(Popup.defaultProps);
     _this.state = {
       location: _this.props.opened ? DUMMY_LOCATION : null
     };
-    _this.theme = void 0;
-    _this.layoutEventsToken = void 0;
     _this.locationUpdateId = null;
-    _this.lastPopupElement = void 0;
+    _this.refForTransition = /*#__PURE__*/React.createRef();
+    _this.hasAnchorElementListeners = false;
     _this.anchorElement = null;
-    _this.anchorInstance = void 0;
 
-    _this.refAnchorElement = function (instance) {
-      _this.anchorInstance = instance;
+    _this.updateAnchorElement = function (instance) {
+      var childDomNode = isInstanceWithAnchorElement(instance) ? instance.getAnchorElement() : getRootNode(instance);
+      var anchorElement = _this.anchorElement;
 
-      var element = _this.extractElement(instance);
+      if (childDomNode !== anchorElement) {
+        _this.removeEventListeners(anchorElement);
 
-      _this.updateAnchorElement(element);
+        _this.anchorElement = childDomNode;
 
-      _this.anchorElement = element;
+        _this.addEventListeners(childDomNode);
+      }
     };
 
     _this.handleMouseEnter = function (event) {
@@ -138,18 +150,44 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
       }
     };
 
+    _this.calculateWidth = function (width) {
+      if (typeof width === 'string' && width.includes('%')) {
+        var anchorWidth = Math.floor(getDOMRect(_this.anchorElement).width);
+        return _this.anchorElement ? anchorWidth * parseFloat(width) / 100 : 0;
+      }
+
+      return width;
+    };
+
+    _this.content = function (children) {
+      var backgroundColor = _this.props.backgroundColor;
+
+      var width = _this.getProps().width;
+
+      return /*#__PURE__*/React.createElement("div", {
+        className: styles.content(_this.theme),
+        "data-tid": PopupDataTids.content,
+        ref: _this.refForTransition
+      }, /*#__PURE__*/React.createElement("div", {
+        className: styles.contentInner(_this.theme),
+        style: {
+          backgroundColor: backgroundColor,
+          width: _this.calculateWidth(width)
+        },
+        "data-tid": PopupDataTids.contentInner
+      }, children));
+    };
+
     _this.resetLocation = function () {
       _this.cancelDelayedUpdateLocation();
 
-      _this.setState({
+      _this.state.location !== null && _this.setState({
         location: null
       });
     };
 
-    _this.refPopupElement = function (zIndex) {
-      if (zIndex) {
-        _this.lastPopupElement = zIndex && findDOMNode(zIndex);
-      }
+    _this.refPopupElement = function (element) {
+      _this.lastPopupElement = element;
     };
 
     _this.handleLayoutEvent = function () {
@@ -157,10 +195,6 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
         return;
       }
 
-      if (_this.anchorInstance) {
-        _this.updateAnchorElement(_this.extractElement(_this.anchorInstance));
-      }
-
       _this.updateLocation();
     };
 
@@ -173,6 +207,10 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
 
       var location = _this.getLocation(popupElement, _this.state.location);
 
+      if (location) {
+        _this.props.onPositionChange == null ? void 0 : _this.props.onPositionChange(location == null ? void 0 : location.position);
+      }
+
       if (!_this.locationEquals(_this.state.location, location)) {
         _this.setState({
           location: location
@@ -188,39 +226,61 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
   _proto.componentDidMount = function componentDidMount() {
     this.updateLocation();
     this.layoutEventsToken = LayoutEvents.addListener(this.handleLayoutEvent);
+
+    if (!this.hasAnchorElementListeners) {
+      this.addEventListeners(this.anchorElement);
+    }
   };
 
-  _proto.UNSAFE_componentWillReceiveProps = function UNSAFE_componentWillReceiveProps(nextProps) {
-    /**
-    * Delaying updateLocation to ensure it happens after props update
+  Popup.getDerivedStateFromProps = function getDerivedStateFromProps(props, state) {
+    /**
+    * Delaying updateLocation to ensure it happens after props update
     */
-    if (nextProps.opened) {
-      if (!this.state.location) {
-        this.setState({
+    if (props.opened) {
+      if (!state.location) {
+        return {
           location: DUMMY_LOCATION
-        });
+        };
       }
-
-      this.delayUpdateLocation();
+    } else if (state.location) {
+      return {
+        location: DUMMY_LOCATION
+      };
     }
+
+    return state;
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps, prevState) {
     var hadNoLocation = prevState.location === DUMMY_LOCATION;
     var hasLocation = this.state.location !== DUMMY_LOCATION;
+    var wasClosed = prevProps.opened && !this.props.opened;
 
-    if (hadNoLocation && hasLocation && this.props.onOpen) {
+    if (this.isMobileLayout && prevState.location === null && this.state.location === null) {
+      this.setState({
+        location: DUMMY_LOCATION
+      });
+    }
+
+    if (this.props.opened && hadNoLocation && hasLocation && this.props.onOpen) {
       this.props.onOpen();
     }
 
-    if (!hadNoLocation && !this.state.location && this.props.onClose) {
+    if (wasClosed && !hasLocation && this.props.onClose) {
       this.props.onClose();
     }
+
+    if (this.props.opened) {
+      this.delayUpdateLocation();
+    }
   };
 
   _proto.componentWillUnmount = function componentWillUnmount() {
     this.cancelDelayedUpdateLocation();
-    this.removeEventListeners(this.anchorElement);
+
+    if (this.hasAnchorElementListeners) {
+      this.removeEventListeners(this.anchorElement);
+    }
 
     if (this.layoutEventsToken) {
       this.layoutEventsToken.remove();
@@ -241,76 +301,94 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
     });
   };
 
+  _proto.renderMobile = function renderMobile() {
+    var opened = this.props.opened;
+    var children = this.renderChildren();
+    return children ? /*#__PURE__*/React.createElement(MobilePopup, {
+      opened: opened,
+      withoutRenderContainer: true,
+      onCloseRequest: this.props.mobileOnCloseRequest
+    }, this.content(children)) : null;
+  };
+
   _proto.renderMain = function renderMain() {
+    var _this3 = this;
+
     var location = this.state.location;
-    var _this$props = this.props,
-        anchorElement = _this$props.anchorElement,
-        useWrapper = _this$props.useWrapper;
-    var child = null;
+    var anchorElement = this.props.anchorElement;
+    var useWrapper = this.getProps().useWrapper;
+    var anchor = null;
 
-    if (isHTMLElement(anchorElement)) {
+    if (isElement(anchorElement)) {
       this.updateAnchorElement(anchorElement);
     } else if ( /*#__PURE__*/React.isValidElement(anchorElement)) {
-      child = useWrapper ? /*#__PURE__*/React.createElement("span", null, anchorElement) : anchorElement;
+      anchor = useWrapper ? /*#__PURE__*/React.createElement("span", null, anchorElement) : anchorElement;
     } else {
-      child = /*#__PURE__*/React.createElement("span", null, anchorElement);
+      anchor = /*#__PURE__*/React.createElement("span", null, anchorElement);
     }
 
-    return /*#__PURE__*/React.createElement(RenderContainer, {
-      anchor: child,
-      ref: child ? this.refAnchorElement : undefined
-    }, location && this.renderContent(location));
-  };
+    var anchorWithRef = anchor && /*#__PURE__*/React.isValidElement(anchor) && isRefableElement(anchor) ? /*#__PURE__*/React.cloneElement(anchor, {
+      ref: function ref(instance) {
+        var _anchor;
 
-  _proto.extractElement = function extractElement(instance) {
-    if (!instance) {
-      return null;
-    }
-
-    var element = findDOMNode(instance);
-    return isHTMLElement(element) ? element : null;
-  };
+        _this3.updateAnchorElement(instance);
 
-  _proto.updateAnchorElement = function updateAnchorElement(element) {
-    var anchorElement = this.anchorElement;
+        var originalRef = (_anchor = anchor) == null ? void 0 : _anchor.ref;
+        originalRef && callChildRef(originalRef, instance);
+      }
+    }) : null; // we need to get anchor's DOM node
+    // so we either set our own ref on it via cloning
+    // or relay on findDOMNode (inside getRootNode)
+    // which should be called within updateAnchorElement
+    // in the case when the anchor is not refable
 
-    if (element !== anchorElement) {
-      this.removeEventListeners(anchorElement);
-      this.anchorElement = element;
-      this.addEventListeners(element);
-    }
+    var canGetAnchorNode = !!anchorWithRef || isElement(anchorElement);
+    return /*#__PURE__*/React.createElement(RenderContainer, {
+      anchor: anchorWithRef || anchor,
+      ref: canGetAnchorNode ? null : this.updateAnchorElement
+    }, this.isMobileLayout && !this.props.withoutMobile ? this.renderMobile() : location && this.renderContent(location));
   };
 
   _proto.addEventListeners = function addEventListeners(element) {
-    if (element && isHTMLElement(element)) {
-      element.addEventListener('mouseenter', this.handleMouseEnter);
-      element.addEventListener('mouseleave', this.handleMouseLeave);
+    if (element && isElement(element)) {
+      // @ts-expect-error: Type ElementEventMap is missing events: https://github.com/skbkontur/retail-ui/pull/2946#discussion_r931072657
+      element.addEventListener('mouseenter', this.handleMouseEnter); // @ts-expect-error: See the comment above
+
+      element.addEventListener('mouseleave', this.handleMouseLeave); // @ts-expect-error: See the comment above
+
       element.addEventListener('click', this.handleClick);
       element.addEventListener('focusin', this.handleFocus);
       element.addEventListener('focusout', this.handleBlur);
+      this.hasAnchorElementListeners = true;
     }
   };
 
   _proto.removeEventListeners = function removeEventListeners(element) {
-    if (element && isHTMLElement(element)) {
-      element.removeEventListener('mouseenter', this.handleMouseEnter);
-      element.removeEventListener('mouseleave', this.handleMouseLeave);
+    if (element && isElement(element)) {
+      // @ts-expect-error: Type ElementEventMap is missing events: https://github.com/skbkontur/retail-ui/pull/2946#discussion_r931072657
+      element.removeEventListener('mouseenter', this.handleMouseEnter); // @ts-expect-error: See the comment above
+
+      element.removeEventListener('mouseleave', this.handleMouseLeave); // @ts-expect-error: See the comment above
+
       element.removeEventListener('click', this.handleClick);
       element.removeEventListener('focusin', this.handleFocus);
       element.removeEventListener('focusout', this.handleBlur);
+      this.hasAnchorElementListeners = false;
     }
   };
 
   _proto.renderContent = function renderContent(location) {
-    var _this3 = this;
+    var _this4 = this;
+
+    var _this$props = this.props,
+        maxWidth = _this$props.maxWidth,
+        opened = _this$props.opened;
+
+    var _this$getProps = this.getProps(),
+        hasShadow = _this$getProps.hasShadow,
+        disableAnimations = _this$getProps.disableAnimations,
+        ignoreHover = _this$getProps.ignoreHover;
 
-    var _this$props2 = this.props,
-        backgroundColor = _this$props2.backgroundColor,
-        disableAnimations = _this$props2.disableAnimations,
-        maxWidth = _this$props2.maxWidth,
-        hasShadow = _this$props2.hasShadow,
-        ignoreHover = _this$props2.ignoreHover,
-        opened = _this$props2.opened;
     var children = this.renderChildren();
 
     var _PopupHelper$getPosit = PopupHelper.getPositionObject(location.position),
@@ -320,6 +398,7 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
       maxWidth: maxWidth
     });
 
+    var shouldFallbackShadow = isIE11 || isEdge || isSafari;
     return /*#__PURE__*/React.createElement(Transition, {
       timeout: TRANSITION_TIMEOUT,
       appear: !disableAnimations,
@@ -328,27 +407,22 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
       unmountOnExit: true,
       enter: !disableAnimations,
       exit: !disableAnimations,
-      onExited: this.resetLocation
+      onExited: this.resetLocation,
+      nodeRef: this.refForTransition
     }, function (state) {
       var _extends2, _ref;
 
-      return /*#__PURE__*/React.createElement(CommonWrapper, _this3.props, /*#__PURE__*/React.createElement(ZIndex, {
-        ref: _this3.refPopupElement,
+      return /*#__PURE__*/React.createElement(CommonWrapper, _extends({}, _this4.props, {
+        rootNodeRef: _this4.setRootNode
+      }), /*#__PURE__*/React.createElement(ZIndex, {
+        "data-tid": 'Popup__root',
+        wrapperRef: _this4.refPopupElement,
         priority: 'Popup',
-        className: cn(_extends((_extends2 = {}, _extends2[jsStyles.popup(_this3.theme)] = true, _extends2[jsStyles.shadow(_this3.theme)] = hasShadow, _extends2[jsStyles.shadowFallback(_this3.theme)] = hasShadow && (isIE11 || isEdge), _extends2[jsStyles.popupIgnoreHover()] = ignoreHover, _extends2), disableAnimations ? {} : (_ref = {}, _ref[jsStyles["transition-enter-" + direction](_this3.theme)] = true, _ref[jsStyles.transitionEnter()] = state === 'entering', _ref[jsStyles.transitionEnterActive()] = state === 'entered', _ref[jsStyles.transitionExit()] = state === 'exiting', _ref))),
+        className: cx(_extends((_extends2 = {}, _extends2[styles.popup(_this4.theme)] = true, _extends2[styles.shadow(_this4.theme)] = hasShadow && !shouldFallbackShadow, _extends2[styles.shadowFallback(_this4.theme)] = hasShadow && shouldFallbackShadow, _extends2[styles.popupIgnoreHover()] = ignoreHover, _extends2), disableAnimations ? {} : (_ref = {}, _ref[styles["transition-enter-" + direction](_this4.theme)] = true, _ref[styles.transitionEnter()] = state === 'entering', _ref[styles.transitionEnterActive()] = state === 'entered', _ref[styles.transitionExit()] = state === 'exiting', _ref))),
         style: rootStyle,
-        onMouseEnter: _this3.handleMouseEnter,
-        onMouseLeave: _this3.handleMouseLeave
-      }, /*#__PURE__*/React.createElement("div", {
-        className: jsStyles.content(_this3.theme),
-        "data-tid": 'PopupContent'
-      }, /*#__PURE__*/React.createElement("div", {
-        className: jsStyles.contentInner(_this3.theme),
-        style: {
-          backgroundColor: backgroundColor
-        },
-        "data-tid": 'PopupContentInner'
-      }, children)), _this3.renderPin(location.position)));
+        onMouseEnter: _this4.handleMouseEnter,
+        onMouseLeave: _this4.handleMouseLeave
+      }, _this4.content(children), (!_this4.isMobileLayout || _this4.props.withoutMobile) && _this4.renderPin(location.position)));
     });
   };
 
@@ -357,20 +431,24 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
   };
 
   _proto.renderPin = function renderPin(positionName) {
-    /**
-    * Box-shadow does not appear under the pin. Borders are used instead.
-    * In non-ie browsers drop-shadow filter is used. It is applying
-    * shadow to the pin too.
+    /**
+    * Box-shadow does not appear under the pin. Borders are used instead.
+    * In non-ie browsers drop-shadow filter is used. It is applying
+    * shadow to the pin too.
     */
     var isDefaultBorderColor = this.theme.popupBorderColor === POPUP_BORDER_DEFAULT_COLOR;
     var pinBorder = isIE11 && isDefaultBorderColor ? 'rgba(0, 0, 0, 0.09)' : this.theme.popupBorderColor;
-    var _this$props3 = this.props,
-        pinSize = _this$props3.pinSize,
-        hasShadow = _this$props3.hasShadow,
-        backgroundColor = _this$props3.backgroundColor,
-        borderColor = _this$props3.borderColor;
+    var _this$props2 = this.props,
+        pinSize = _this$props2.pinSize,
+        backgroundColor = _this$props2.backgroundColor,
+        borderColor = _this$props2.borderColor;
+
+    var _this$getProps2 = this.getProps(),
+        hasShadow = _this$getProps2.hasShadow,
+        hasPin = _this$getProps2.hasPin;
+
     var position = PopupHelper.getPositionObject(positionName);
-    return this.props.hasPin && /*#__PURE__*/React.createElement(PopupPin, {
+    return hasPin && /*#__PURE__*/React.createElement(PopupPin, {
       popupElement: this.lastPopupElement,
       popupPosition: positionName,
       size: pinSize || parseInt(this.theme.popupPinSize),
@@ -398,19 +476,27 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
       return true;
     }
 
-    if (x == null || y == null) {
+    if (isNullable(x) || isNullable(y)) {
       return false;
     }
 
-    return x.coordinates.left === y.coordinates.left && x.coordinates.top === y.coordinates.top && x.position === y.position;
+    if (!isIE11 && !isEdge) {
+      return x.coordinates.left === y.coordinates.left && x.coordinates.top === y.coordinates.top && x.position === y.position;
+    } // Для ie/edge обновляем позицию только при разнице минимум в 1. Иначе есть вероятность
+    // уйти в бесконечный ререндер
+
+
+    return x.position === y.position && Math.abs(x.coordinates.top - y.coordinates.top) <= 1 && Math.abs(x.coordinates.left - y.coordinates.left) <= 1;
   };
 
   _proto.getLocation = function getLocation(popupElement, location) {
-    var positions = this.props.positions;
+    var _this$props3 = this.props,
+        positions = _this$props3.positions,
+        tryPreserveFirstRenderedPosition = _this$props3.tryPreserveFirstRenderedPosition;
     var anchorElement = this.anchorElement;
-    warning(anchorElement && isHTMLElement(anchorElement), 'Anchor element is not defined or not instance of HTMLElement');
+    warning(anchorElement && isElement(anchorElement), 'Anchor element is not defined or not instance of Element');
 
-    if (!(anchorElement && isHTMLElement(anchorElement))) {
+    if (!(anchorElement && isElement(anchorElement))) {
       return location;
     }
 
@@ -425,7 +511,12 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
       var isFullyVisible = PopupHelper.isFullyVisible(coordinates, popupRect);
       var canBecomeVisible = !isFullyVisible && PopupHelper.canBecomeFullyVisible(position, coordinates);
 
-      if (isFullyVisible || canBecomeVisible) {
+      if ( // если нужно сохранить первоначальную позицию и Попап целиком
+      // находится в пределах вьюпорта (или может быть проскроллен в него)
+      tryPreserveFirstRenderedPosition && (isFullyVisible || canBecomeVisible) || // если Попап целиком во вьюпорте и в самой приоритетной позиции
+      // (иначе нужно попытаться позицию сменить)
+      isFullyVisible && position === positions[0]) {
+        // сохраняем текущую позицию
         return {
           coordinates: coordinates,
           position: position
@@ -454,7 +545,7 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
   };
 
   _proto.getPinnedPopupOffset = function getPinnedPopupOffset(anchorRect, position) {
-    if (!this.props.hasPin || /center|middle/.test(position.align)) {
+    if (!this.getProps().hasPin || /center|middle/.test(position.align)) {
       return 0;
     }
 
@@ -464,9 +555,10 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
   };
 
   _proto.getCoordinates = function getCoordinates(anchorRect, popupRect, positionName) {
-    var margin = this.props.margin || parseInt(this.theme.popupMargin);
+    var marginFromProps = this.props.margin;
+    var margin = isNonNullable(marginFromProps) && !isNaN(marginFromProps) ? marginFromProps : parseInt(this.theme.popupMargin) || 0;
     var position = PopupHelper.getPositionObject(positionName);
-    var popupOffset = this.props.popupOffset + this.getPinnedPopupOffset(anchorRect, position);
+    var popupOffset = this.getProps().popupOffset + this.getPinnedPopupOffset(anchorRect, position);
 
     switch (position.direction) {
       case 'top':
@@ -552,75 +644,73 @@ export var Popup = /*#__PURE__*/function (_React$Component) {
   };
 
   return Popup;
-}(React.Component);
-Popup.__KONTUR_REACT_UI__ = 'Popup';
-Popup.propTypes = {
-  /**
-  * Ссылка (ref) на элемент или React компонент, для которого рисуется попап
+}(React.Component), _class2.__KONTUR_REACT_UI__ = 'Popup', _class2.propTypes = {
+  /**
+  * Ссылка (ref) на элемент или React компонент, для которого рисуется попап
   */
   anchorElement: PropTypes.oneOfType([safePropTypesInstanceOf(function () {
     return HTMLElement;
   }), PropTypes.node]).isRequired,
 
-  /**
-  * Фон попапа и пина
+  /**
+  * Фон попапа и пина
   */
   backgroundColor: PropTypes.string,
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
 
-  /**
-  * Показывать ли пин
+  /**
+  * Показывать ли пин
   */
   hasPin: PropTypes.bool,
 
-  /**
-  * Применять ли box-shadow на попапе. При false отключает границу на пине
+  /**
+  * Применять ли box-shadow на попапе. При false отключает границу на пине
   */
   hasShadow: PropTypes.bool,
 
-  /**
-  * Отступ попапа от элемента
+  /**
+  * Отступ попапа от элемента
   */
   margin: PropTypes.number,
 
-  /**
-  * Показан или скрыт попап
+  /**
+  * Показан или скрыт попап
   */
   opened: PropTypes.bool,
 
-  /**
-  * Смещение пина от края попапа. Край задаётся в пропе position вторым словом
+  /**
+  * Смещение пина от края попапа. Край задаётся в пропе position вторым словом
   */
   pinOffset: PropTypes.number,
 
-  /**
-  * Сторона пина без учёта границы.
-  * Пин представляет собой равносторонний треугольник, высота от попапа
-  * до "носика" пина будет соответствовать формуле (size* √3)/2
+  /**
+  * Сторона пина без учёта границы.
+  * Пин представляет собой равносторонний треугольник, высота от попапа
+  * до "носика" пина будет соответствовать формуле (size* √3)/2
   */
   pinSize: PropTypes.number,
 
-  /**
-  * смещение попапа относительно родительского элемента
+  /**
+  * смещение попапа относительно родительского элемента
   */
   popupOffset: PropTypes.number,
 
-  /**
-  * С какой стороны показывать попап и край попапа,
-  * на котором будет отображаться пин
+  /**
+  * С какой стороны показывать попап и край попапа,
+  * на котором будет отображаться пин
   */
   positions: PropTypes.array,
 
-  /**
-  * Игнорировать ли события hover/click
+  /**
+  * Игнорировать ли события hover/click
   */
   ignoreHover: PropTypes.bool
-};
-Popup.defaultProps = {
+}, _class2.defaultProps = {
   popupOffset: 0,
   hasPin: false,
   hasShadow: false,
   disableAnimations: isTestEnv,
   useWrapper: false,
-  ignoreHover: false
-};
+  ignoreHover: false,
+  width: 'auto'
+}, _class2.defaultRootNode = null, _temp)) || _class) || _class;