@skbkontur/react-ui 0.0.0-e55f22da73 → 0.0.0-f50cd2db6e

package/components/SidePage/SidePageHeader/SidePageHeader.js

@@ -1,27 +1,28 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
+
+var _class, _class2, _temp;
+
 import React from 'react';
-import cn from 'classnames';
 import { Sticky } from "../../Sticky";
 import { CrossIcon } from "../../../internal/icons/CrossIcon";
 import { isFunction } from "../../../lib/utils";
 import { ThemeContext } from "../../../lib/theming/ThemeContext";
-import { jsStyles } from "../SidePage.styles";
+import { CommonWrapper } from "../../../internal/CommonWrapper";
+import { cx } from "../../../lib/theming/Emotion";
+import { keyListener } from "../../../lib/events/keyListener";
+import { responsiveLayout } from "../../ResponsiveLayout/decorator";
+import { rootNode } from "../../../lib/rootNode";
+import { styles } from "../SidePage.styles";
 import { SidePageContext } from "../SidePageContext";
-var REGULAR_HEADER_PADDING_TOP = 25;
-var FIXED_HEADER_PADDING_TOP = 13;
-var FONT_FAMILY_CORRECTION = 1;
-var CLOSE_ELEMENT_OFFSET = REGULAR_HEADER_PADDING_TOP - FIXED_HEADER_PADDING_TOP - FONT_FAMILY_CORRECTION;
-var FIXED_HEADER_HEIGHT = 50;
-/**
-                               * Шапка сайдпейджа
-                               *
-                               * @visibleName SidePage.Header
-                               */
-
-export var SidePageHeader =
-/*#__PURE__*/
-function (_React$Component) {
+export
+/**
+* Шапка сайдпейджа
+*
+* @visibleName SidePage.Header
+*/
+var SidePageHeader = responsiveLayout(_class = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(SidePageHeader, _React$Component);
 
   function SidePageHeader() {
@@ -32,19 +33,22 @@ function (_React$Component) {
     }
 
     _this = _React$Component.call.apply(_React$Component, [this].concat(args)) || this;
+    _this.context = _this.context;
     _this.state = {
-      isReadyToFix: false
+      isReadyToFix: false,
+      focusedByTab: false
     };
-    _this.theme = void 0;
     _this.wrapper = null;
     _this.lastRegularHeight = 0;
 
     _this.componentDidMount = function () {
       window.addEventListener('scroll', _this.update, true);
+      _this.context.setHasHeader == null ? void 0 : _this.context.setHasHeader();
     };
 
     _this.componentWillUnmount = function () {
       window.removeEventListener('scroll', _this.update, true);
+      _this.context.setHasHeader == null ? void 0 : _this.context.setHasHeader(false);
     };
 
     _this.update = function () {
@@ -52,51 +56,59 @@ function (_React$Component) {
     };
 
     _this.renderHeader = function (fixed) {
-      var _cn, _cn2;
+      var _cx, _cx2;
 
       if (fixed === void 0) {
         fixed = false;
       }
 
-      return React.createElement("div", {
-        className: cn(jsStyles.header(), (_cn = {}, _cn[jsStyles.headerFixed(_this.theme)] = fixed, _cn))
-      }, _this.renderClose(), React.createElement("div", {
-        className: cn(jsStyles.title(), (_cn2 = {}, _cn2[jsStyles.titleFixed()] = fixed, _cn2))
+      return /*#__PURE__*/React.createElement("div", {
+        className: cx(styles.header(_this.theme), (_cx = {}, _cx[styles.headerFixed(_this.theme)] = fixed, _cx[styles.mobileHeader(_this.theme)] = _this.isMobileLayout, _cx))
+      }, _this.renderClose(fixed), /*#__PURE__*/React.createElement("div", {
+        className: cx(styles.title(_this.theme), (_cx2 = {}, _cx2[styles.mobileTitle(_this.theme)] = _this.isMobileLayout, _cx2[styles.titleFixed()] = fixed, _cx2))
       }, isFunction(_this.props.children) ? _this.props.children(fixed) : _this.props.children));
     };
 
-    _this.renderCloseContent = function (fixed) {
-      return React.createElement(SidePageContext.Consumer, null, function (_ref) {
-        var _cn3;
+    _this.renderClose = function (fixed) {
+      var _cx3;
+
+      var stickyOffset = parseInt(_this.theme.sidePageHeaderStickyOffset);
+      return /*#__PURE__*/React.createElement("div", {
+        className: cx(styles.wrapperClose(_this.theme), (_cx3 = {}, _cx3[styles.wrapperCloseFixed(_this.theme)] = fixed, _cx3[styles.mobileWrapperClose(_this.theme)] = _this.isMobileLayout, _cx3))
+      }, /*#__PURE__*/React.createElement(SidePageContext.Consumer, null, function (_ref) {
+        var _cx4;
 
         var requestClose = _ref.requestClose;
-        return React.createElement("a", {
-          className: cn(jsStyles.close(_this.theme), (_cn3 = {}, _cn3[jsStyles.fixed()] = fixed, _cn3)),
+        var button = /*#__PURE__*/React.createElement("button", {
+          className: cx(styles.close(_this.theme), (_cx4 = {}, _cx4[styles.closeFocus(_this.theme)] = _this.state.focusedByTab, _cx4[styles.mobileClose(_this.theme)] = _this.isMobileLayout, _cx4)),
+          onFocus: _this.handleFocus,
+          onBlur: _this.handleBlur,
           onClick: requestClose,
-          "data-tid": "SidePage__close"
-        }, React.createElement("span", {
-          className: jsStyles.closeIcon()
-        }, React.createElement(CrossIcon, null)));
-      });
-    };
-
-    _this.renderClose = function () {
-      return React.createElement(Sticky, {
-        side: "top",
-        offset: CLOSE_ELEMENT_OFFSET
-      }, _this.renderCloseContent);
+          "data-tid": "SidePage__close",
+          tabIndex: 0
+        }, /*#__PURE__*/React.createElement(CrossIcon, null));
+
+        if (_this.isMobileLayout) {
+          return button;
+        }
+
+        return /*#__PURE__*/React.createElement(Sticky, {
+          side: "top",
+          offset: stickyOffset
+        }, button);
+      }));
     };
 
     _this.updateReadyToFix = function () {
       if (_this.wrapper) {
         var wrapperScrolledUp = _this.wrapper.getBoundingClientRect().top;
 
-        var isReadyToFix = _this.regularHeight + wrapperScrolledUp <= FIXED_HEADER_HEIGHT;
+        var isReadyToFix = _this.regularHeight + wrapperScrolledUp <= _this.fixedHeaderHeight;
 
         _this.setState(function (state) {
-          return state.isReadyToFix !== isReadyToFix ? {
+          return state.isReadyToFix !== isReadyToFix ? _extends({}, state, {
             isReadyToFix: isReadyToFix
-          } : state;
+          }) : state;
         });
       }
     };
@@ -105,6 +117,22 @@ function (_React$Component) {
       _this.wrapper = el;
     };
 
+    _this.handleFocus = function () {
+      requestAnimationFrame(function () {
+        if (keyListener.isTabPressed) {
+          _this.setState({
+            focusedByTab: true
+          });
+        }
+      });
+    };
+
+    _this.handleBlur = function () {
+      _this.setState({
+        focusedByTab: false
+      });
+    };
+
     return _this;
   }
 
@@ -113,19 +141,36 @@ function (_React$Component) {
   _proto.render = function render() {
     var _this2 = this;
 
-    return React.createElement(ThemeContext.Consumer, null, function (theme) {
+    return /*#__PURE__*/React.createElement(ThemeContext.Consumer, null, function (theme) {
       _this2.theme = theme;
       return _this2.renderMain();
     });
   };
 
+  _proto.getStickyProp = function getStickyProp() {
+    if (typeof this.props.sticky !== 'undefined') {
+      return this.props.sticky;
+    }
+
+    if (this.isMobileLayout) {
+      return false;
+    }
+
+    return true;
+  };
+
   _proto.renderMain = function renderMain() {
     var isReadyToFix = this.state.isReadyToFix;
-    return React.createElement("div", {
-      ref: this.wrapperRef
-    }, isReadyToFix ? React.createElement(Sticky, {
+    var isStickyDesktop = !this.isMobileLayout && this.getStickyProp() && isReadyToFix;
+    var isStickyMobile = this.isMobileLayout && this.getStickyProp();
+    return /*#__PURE__*/React.createElement(CommonWrapper, _extends({
+      rootNodeRef: this.setRootNode
+    }, this.props), /*#__PURE__*/React.createElement("div", {
+      ref: this.wrapperRef,
+      className: styles.headerWrapper()
+    }, isStickyDesktop || isStickyMobile ? /*#__PURE__*/React.createElement(Sticky, {
       side: "top"
-    }, this.renderHeader) : this.renderHeader());
+    }, this.renderHeader) : this.renderHeader()));
   };
 
   _createClass(SidePageHeader, [{
@@ -143,8 +188,13 @@ function (_React$Component) {
 
       return this.lastRegularHeight;
     }
+  }, {
+    key: "fixedHeaderHeight",
+    get: function get() {
+      var theme = this.theme;
+      return parseInt(theme.sidePageHeaderFixedLineHeight) + parseInt(theme.sidePageHeaderFixedPaddingY) * 2;
+    }
   }]);
 
   return SidePageHeader;
-}(React.Component);
-SidePageHeader.__KONTUR_REACT_UI__ = 'SidePageHeader';
+}(React.Component), _class2.__KONTUR_REACT_UI__ = 'SidePageHeader', _class2.contextType = SidePageContext, _temp)) || _class) || _class;

package/components/SidePage/SidePageHeader/SidePageHeader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["SidePageHeader.tsx"],"names":["React","cn","Sticky","CrossIcon","isFunction","ThemeContext","jsStyles","SidePageContext","REGULAR_HEADER_PADDING_TOP","FIXED_HEADER_PADDING_TOP","FONT_FAMILY_CORRECTION","CLOSE_ELEMENT_OFFSET","FIXED_HEADER_HEIGHT","SidePageHeader","state","isReadyToFix","theme","wrapper","lastRegularHeight","componentDidMount","window","addEventListener","update","componentWillUnmount","removeEventListener","updateReadyToFix","renderHeader","fixed","header","headerFixed","renderClose","title","titleFixed","props","children","renderCloseContent","requestClose","close","closeIcon","wrapperScrolledUp","getBoundingClientRect","top","regularHeight","setState","wrapperRef","el","render","renderMain","height","Component","__KONTUR_REACT_UI__"],"mappings":"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","sourcesContent":["import React from 'react';\r\nimport cn from 'classnames';\r\n\r\nimport { Sticky } from '../Sticky';\r\nimport { CrossIcon } from '../../internal/icons/CrossIcon';\r\nimport { isFunction } from '../../lib/utils';\r\nimport { ThemeContext } from '../../lib/theming/ThemeContext';\r\nimport { Theme } from '../../lib/theming/Theme';\r\n\r\nimport { jsStyles } from './SidePage.styles';\r\nimport { SidePageContext } from './SidePageContext';\r\n\r\nconst REGULAR_HEADER_PADDING_TOP = 25;\r\nconst FIXED_HEADER_PADDING_TOP = 13;\r\nconst FONT_FAMILY_CORRECTION = 1;\r\nconst CLOSE_ELEMENT_OFFSET = REGULAR_HEADER_PADDING_TOP - FIXED_HEADER_PADDING_TOP - FONT_FAMILY_CORRECTION;\r\nconst FIXED_HEADER_HEIGHT = 50;\r\n\r\nexport interface SidePageHeaderProps {\r\n  children?: React.ReactNode | ((fixed: boolean) => React.ReactNode);\r\n}\r\n\r\nexport interface SidePageHeaderState {\r\n  isReadyToFix: boolean;\r\n}\r\n\r\n/**\r\n * Шапка сайдпейджа\r\n *\r\n * @visibleName SidePage.Header\r\n */\r\nexport class SidePageHeader extends React.Component<SidePageHeaderProps, SidePageHeaderState> {\r\n  public static __KONTUR_REACT_UI__ = 'SidePageHeader';\r\n\r\n  public state = {\r\n    isReadyToFix: false,\r\n  };\r\n\r\n  private theme!: Theme;\r\n  private wrapper: HTMLElement | null = null;\r\n  private lastRegularHeight = 0;\r\n\r\n  public get regularHeight(): number {\r\n    const { isReadyToFix } = this.state;\r\n    if (!this.wrapper) {\r\n      return 0;\r\n    }\r\n    if (!isReadyToFix) {\r\n      this.lastRegularHeight = this.wrapper.getBoundingClientRect().height;\r\n    }\r\n    return this.lastRegularHeight;\r\n  }\r\n\r\n  public componentDidMount = () => {\r\n    window.addEventListener('scroll', this.update, true);\r\n  };\r\n\r\n  public componentWillUnmount = () => {\r\n    window.removeEventListener('scroll', this.update, true);\r\n  };\r\n\r\n  public update = () => {\r\n    this.updateReadyToFix();\r\n  };\r\n\r\n  public render(): JSX.Element {\r\n    return (\r\n      <ThemeContext.Consumer>\r\n        {theme => {\r\n          this.theme = theme;\r\n          return this.renderMain();\r\n        }}\r\n      </ThemeContext.Consumer>\r\n    );\r\n  }\r\n\r\n  private renderMain() {\r\n    const { isReadyToFix } = this.state;\r\n    return (\r\n      <div ref={this.wrapperRef}>\r\n        {isReadyToFix ? <Sticky side=\"top\">{this.renderHeader}</Sticky> : this.renderHeader()}\r\n      </div>\r\n    );\r\n  }\r\n\r\n  private renderHeader = (fixed = false) => {\r\n    return (\r\n      <div className={cn(jsStyles.header(), { [jsStyles.headerFixed(this.theme)]: fixed })}>\r\n        {this.renderClose()}\r\n        <div className={cn(jsStyles.title(), { [jsStyles.titleFixed()]: fixed })}>\r\n          {isFunction(this.props.children) ? this.props.children(fixed) : this.props.children}\r\n        </div>\r\n      </div>\r\n    );\r\n  };\r\n\r\n  private renderCloseContent = (fixed: boolean) => (\r\n    <SidePageContext.Consumer>\r\n      {({ requestClose }) => (\r\n        <a\r\n          className={cn(jsStyles.close(this.theme), {\r\n            [jsStyles.fixed()]: fixed,\r\n          })}\r\n          onClick={requestClose}\r\n          data-tid=\"SidePage__close\"\r\n        >\r\n          <span className={jsStyles.closeIcon()}>\r\n            <CrossIcon />\r\n          </span>\r\n        </a>\r\n      )}\r\n    </SidePageContext.Consumer>\r\n  );\r\n\r\n  private renderClose = () => (\r\n    <Sticky side=\"top\" offset={CLOSE_ELEMENT_OFFSET}>\r\n      {this.renderCloseContent}\r\n    </Sticky>\r\n  );\r\n\r\n  private updateReadyToFix = () => {\r\n    if (this.wrapper) {\r\n      const wrapperScrolledUp = this.wrapper.getBoundingClientRect().top;\r\n      const isReadyToFix = this.regularHeight + wrapperScrolledUp <= FIXED_HEADER_HEIGHT;\r\n      this.setState(state => (state.isReadyToFix !== isReadyToFix ? { isReadyToFix } : state));\r\n    }\r\n  };\r\n\r\n  private wrapperRef = (el: HTMLElement | null) => {\r\n    this.wrapper = el;\r\n  };\r\n}\r\n"]}
+{"version":3,"sources":["SidePageHeader.tsx"],"names":["React","Sticky","CrossIcon","isFunction","ThemeContext","CommonWrapper","cx","keyListener","responsiveLayout","rootNode","styles","SidePageContext","SidePageHeader","context","state","isReadyToFix","focusedByTab","wrapper","lastRegularHeight","componentDidMount","window","addEventListener","update","setHasHeader","componentWillUnmount","removeEventListener","updateReadyToFix","renderHeader","fixed","header","theme","headerFixed","mobileHeader","isMobileLayout","renderClose","title","mobileTitle","titleFixed","props","children","stickyOffset","parseInt","sidePageHeaderStickyOffset","wrapperClose","wrapperCloseFixed","mobileWrapperClose","requestClose","button","close","closeFocus","mobileClose","handleFocus","handleBlur","wrapperScrolledUp","getBoundingClientRect","top","regularHeight","fixedHeaderHeight","setState","wrapperRef","el","requestAnimationFrame","isTabPressed","render","renderMain","getStickyProp","sticky","isStickyDesktop","isStickyMobile","setRootNode","headerWrapper","height","sidePageHeaderFixedLineHeight","sidePageHeaderFixedPaddingY","Component","__KONTUR_REACT_UI__","contextType"],"mappings":"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","sourcesContent":["import React from 'react';\n\nimport { Sticky } from '../Sticky';\nimport { CrossIcon } from '../../internal/icons/CrossIcon';\nimport { isFunction } from '../../lib/utils';\nimport { ThemeContext } from '../../lib/theming/ThemeContext';\nimport { Theme } from '../../lib/theming/Theme';\nimport { CommonProps, CommonWrapper } from '../../internal/CommonWrapper';\nimport { cx } from '../../lib/theming/Emotion';\nimport { keyListener } from '../../lib/events/keyListener';\nimport { responsiveLayout } from '../ResponsiveLayout/decorator';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\n\nimport { styles } from './SidePage.styles';\nimport { SidePageContext, SidePageContextType } from './SidePageContext';\n\nexport interface SidePageHeaderProps extends CommonProps {\n  children?: React.ReactNode | ((fixed: boolean) => React.ReactNode);\n  sticky?: boolean;\n}\n\nexport interface SidePageHeaderState {\n  isReadyToFix: boolean;\n  focusedByTab: boolean;\n}\n\n/**\n * Шапка сайдпейджа\n *\n * @visibleName SidePage.Header\n */\n@responsiveLayout\n@rootNode\nexport class SidePageHeader extends React.Component<SidePageHeaderProps, SidePageHeaderState> {\n  public static __KONTUR_REACT_UI__ = 'SidePageHeader';\n\n  public static contextType = SidePageContext;\n  public context: SidePageContextType = this.context;\n\n  private isMobileLayout!: boolean;\n\n  public state: SidePageHeaderState = {\n    isReadyToFix: false,\n    focusedByTab: false,\n  };\n\n  private theme!: Theme;\n  private wrapper: HTMLElement | null = null;\n  private lastRegularHeight = 0;\n  private setRootNode!: TSetRootNode;\n\n  public get regularHeight(): number {\n    const { isReadyToFix } = this.state;\n    if (!this.wrapper) {\n      return 0;\n    }\n    if (!isReadyToFix) {\n      this.lastRegularHeight = this.wrapper.getBoundingClientRect().height;\n    }\n    return this.lastRegularHeight;\n  }\n\n  public get fixedHeaderHeight(): number {\n    const { theme } = this;\n    return parseInt(theme.sidePageHeaderFixedLineHeight) + parseInt(theme.sidePageHeaderFixedPaddingY) * 2;\n  }\n\n  public componentDidMount = () => {\n    window.addEventListener('scroll', this.update, true);\n    this.context.setHasHeader?.();\n  };\n\n  public componentWillUnmount = () => {\n    window.removeEventListener('scroll', this.update, true);\n    this.context.setHasHeader?.(false);\n  };\n\n  public update = () => {\n    this.updateReadyToFix();\n  };\n\n  public render(): JSX.Element {\n    return (\n      <ThemeContext.Consumer>\n        {(theme) => {\n          this.theme = theme;\n          return this.renderMain();\n        }}\n      </ThemeContext.Consumer>\n    );\n  }\n\n  public getStickyProp() {\n    if (typeof this.props.sticky !== 'undefined') {\n      return this.props.sticky;\n    }\n\n    if (this.isMobileLayout) {\n      return false;\n    }\n\n    return true;\n  }\n\n  private renderMain() {\n    const { isReadyToFix } = this.state;\n\n    const isStickyDesktop = !this.isMobileLayout && this.getStickyProp() && isReadyToFix;\n    const isStickyMobile = this.isMobileLayout && this.getStickyProp();\n\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        <div ref={this.wrapperRef} className={styles.headerWrapper()}>\n          {isStickyDesktop || isStickyMobile ? <Sticky side=\"top\">{this.renderHeader}</Sticky> : this.renderHeader()}\n        </div>\n      </CommonWrapper>\n    );\n  }\n\n  private renderHeader = (fixed = false) => {\n    return (\n      <div\n        className={cx(styles.header(this.theme), {\n          [styles.headerFixed(this.theme)]: fixed,\n          [styles.mobileHeader(this.theme)]: this.isMobileLayout,\n        })}\n      >\n        {this.renderClose(fixed)}\n        <div\n          className={cx(styles.title(this.theme), {\n            [styles.mobileTitle(this.theme)]: this.isMobileLayout,\n            [styles.titleFixed()]: fixed,\n          })}\n        >\n          {isFunction(this.props.children) ? this.props.children(fixed) : this.props.children}\n        </div>\n      </div>\n    );\n  };\n\n  private renderClose = (fixed: boolean) => {\n    const stickyOffset = parseInt(this.theme.sidePageHeaderStickyOffset);\n\n    return (\n      <div\n        className={cx(styles.wrapperClose(this.theme), {\n          [styles.wrapperCloseFixed(this.theme)]: fixed,\n          [styles.mobileWrapperClose(this.theme)]: this.isMobileLayout,\n        })}\n      >\n        <SidePageContext.Consumer>\n          {({ requestClose }) => {\n            const button = (\n              <button\n                className={cx(styles.close(this.theme), {\n                  [styles.closeFocus(this.theme)]: this.state.focusedByTab,\n                  [styles.mobileClose(this.theme)]: this.isMobileLayout,\n                })}\n                onFocus={this.handleFocus}\n                onBlur={this.handleBlur}\n                onClick={requestClose}\n                data-tid=\"SidePage__close\"\n                tabIndex={0}\n              >\n                <CrossIcon />\n              </button>\n            );\n\n            if (this.isMobileLayout) {\n              return button;\n            }\n\n            return (\n              <Sticky side=\"top\" offset={stickyOffset}>\n                {button}\n              </Sticky>\n            );\n          }}\n        </SidePageContext.Consumer>\n      </div>\n    );\n  };\n\n  private updateReadyToFix = () => {\n    if (this.wrapper) {\n      const wrapperScrolledUp = this.wrapper.getBoundingClientRect().top;\n      const isReadyToFix = this.regularHeight + wrapperScrolledUp <= this.fixedHeaderHeight;\n      this.setState((state) => (state.isReadyToFix !== isReadyToFix ? { ...state, isReadyToFix } : state));\n    }\n  };\n\n  private wrapperRef = (el: HTMLElement | null) => {\n    this.wrapper = el;\n  };\n\n  private handleFocus = () => {\n    requestAnimationFrame(() => {\n      if (keyListener.isTabPressed) {\n        this.setState({ focusedByTab: true });\n      }\n    });\n  };\n\n  private handleBlur = () => {\n    this.setState({ focusedByTab: false });\n  };\n}\n"]}

package/components/SidePage/SidePageHeader.d.ts

@@ -1,9 +1,13 @@
 import React from 'react';
-export interface SidePageHeaderProps {
+import { CommonProps } from '../../internal/CommonWrapper';
+import { SidePageContextType } from './SidePageContext';
+export interface SidePageHeaderProps extends CommonProps {
     children?: React.ReactNode | ((fixed: boolean) => React.ReactNode);
+    sticky?: boolean;
 }
 export interface SidePageHeaderState {
     isReadyToFix: boolean;
+    focusedByTab: boolean;
 }
 /**
  * Шапка сайдпейджа
@@ -12,21 +16,26 @@ export interface SidePageHeaderState {
  */
 export declare class SidePageHeader extends React.Component<SidePageHeaderProps, SidePageHeaderState> {
     static __KONTUR_REACT_UI__: string;
-    state: {
-        isReadyToFix: boolean;
-    };
+    static contextType: React.Context<SidePageContextType>;
+    context: SidePageContextType;
+    private isMobileLayout;
+    state: SidePageHeaderState;
     private theme;
     private wrapper;
     private lastRegularHeight;
+    private setRootNode;
     get regularHeight(): number;
+    get fixedHeaderHeight(): number;
     componentDidMount: () => void;
     componentWillUnmount: () => void;
     update: () => void;
     render(): JSX.Element;
+    getStickyProp(): boolean;
     private renderMain;
     private renderHeader;
-    private renderCloseContent;
     private renderClose;
     private updateReadyToFix;
     private wrapperRef;
+    private handleFocus;
+    private handleBlur;
 }

package/components/SidePage/index/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAd;AACA,cAAc,kBAAd;AACA,cAAc,gBAAd;AACA,cAAc,kBAAd;AACA,cAAc,qBAAd","sourcesContent":["export * from './SidePage';\r\nexport * from './SidePageHeader';\r\nexport * from './SidePageBody';\r\nexport * from './SidePageFooter';\r\nexport * from './SidePageContainer';\r\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAd;AACA,cAAc,kBAAd;AACA,cAAc,gBAAd;AACA,cAAc,kBAAd;AACA,cAAc,qBAAd","sourcesContent":["export * from './SidePage';\nexport * from './SidePageHeader';\nexport * from './SidePageBody';\nexport * from './SidePageFooter';\nexport * from './SidePageContainer';\n"]}

package/components/Spinner/Spinner/Spinner.js

@@ -1,50 +1,51 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
 
 var _dec, _class, _class2, _temp;
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import warning from 'warning';
-import cn from 'classnames';
 import { locale } from "../../../lib/locale/decorators";
 import { ThemeContext } from "../../../lib/theming/ThemeContext";
-import { hasSvgAnimationSupport } from "../../../lib/utils";
 import { SpinnerIcon } from "../../../internal/icons/SpinnerIcon";
-import { SpinnerOld } from "../../../internal/SpinnerOld";
-import { jsStyles } from "../Spinner.styles";
-import { SpinnerFallback, types } from "../SpinnerFallback";
+import { CommonWrapper } from "../../../internal/CommonWrapper";
+import { cx } from "../../../lib/theming/Emotion";
+import { rootNode } from "../../../lib/rootNode";
+import { styles } from "../Spinner.styles";
 import { SpinnerLocaleHelper } from "../locale";
+var types = {
+  big: 'big',
+  mini: 'mini',
+  normal: 'normal'
+};
 export
-/**
- * DRAFT - инлайн-лоадер
- */
-var Spinner = (_dec = locale('Spinner', SpinnerLocaleHelper), _dec(_class = (_temp = _class2 =
-/*#__PURE__*/
-function (_React$Component) {
+/**
+* DRAFT - инлайн-лоадер
+*/
+var Spinner = (_dec = locale('Spinner', SpinnerLocaleHelper), rootNode(_class = _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(Spinner, _React$Component);
 
   function Spinner(props) {
     var _this;
 
     _this = _React$Component.call(this, props) || this;
-    _this.theme = void 0;
-    _this.locale = void 0;
 
-    _this.renderSpinner = function (type, dimmed) {
-      var circleClassName = dimmed ? jsStyles.circleDimmed(_this.theme) : jsStyles.circle(_this.theme);
-      return React.createElement(SpinnerIcon, {
+    _this.renderSpinner = function (type, dimmed, inline) {
+      var circleClassName = dimmed ? styles.circleDimmed(_this.theme) : styles.circle(_this.theme);
+      return /*#__PURE__*/React.createElement(SpinnerIcon, {
         size: type,
-        className: circleClassName
+        className: circleClassName,
+        dimmed: dimmed,
+        inline: inline
       });
     };
 
     _this.renderCaption = function (type, caption) {
-      return React.createElement("span", {
-        className: cn(jsStyles[type](_this.theme), jsStyles.captionColor(_this.theme))
+      return /*#__PURE__*/React.createElement("span", {
+        className: cx(styles[type](_this.theme), styles.captionColor(_this.theme))
       }, caption);
     };
 
-    warning(!_this.props.cloud, 'cloud is deprecated, will removed in 3.0. ');
     return _this;
   }
 
@@ -53,57 +54,46 @@ function (_React$Component) {
   _proto.render = function render() {
     var _this2 = this;
 
-    return React.createElement(ThemeContext.Consumer, null, function (theme) {
+    return /*#__PURE__*/React.createElement(ThemeContext.Consumer, null, function (theme) {
       _this2.theme = theme;
-      return !_this2.props.cloud ? _this2.renderMain() : _this2.renderSpinnerOld();
+      return _this2.renderMain();
     });
   };
 
-  _proto.renderSpinnerOld = function renderSpinnerOld() {
-    return React.createElement(SpinnerOld, this.props);
-  };
-
   _proto.renderMain = function renderMain() {
     var _this$props = this.props,
         type = _this$props.type,
         _this$props$caption = _this$props.caption,
         caption = _this$props$caption === void 0 ? this.locale.loading : _this$props$caption,
-        dimmed = _this$props.dimmed;
-    return React.createElement("div", {
-      className: jsStyles.spinner()
-    }, React.createElement("span", {
-      className: jsStyles.inner()
-    }, hasSvgAnimationSupport && this.renderSpinner(type, dimmed), !hasSvgAnimationSupport && React.createElement(SpinnerFallback, {
-      type: type,
-      dimmed: dimmed
-    })), caption && this.renderCaption(type, caption));
+        dimmed = _this$props.dimmed,
+        inline = _this$props.inline;
+    return /*#__PURE__*/React.createElement(CommonWrapper, _extends({
+      rootNodeRef: this.setRootNode
+    }, this.props), /*#__PURE__*/React.createElement("div", {
+      className: styles.spinner()
+    }, /*#__PURE__*/React.createElement("span", {
+      className: styles.inner()
+    }, this.renderSpinner(type, dimmed, inline)), caption && this.renderCaption(type, caption)));
   };
 
   return Spinner;
 }(React.Component), _class2.__KONTUR_REACT_UI__ = 'Spinner', _class2.propTypes = {
-  /**
-   * Текст рядом с мини-лоадером.
-   *
-   * 'Загрузка' - значение по-умолчанию
-   */
+  /**
+  * Текст рядом с мини-лоадером.
+  *
+  * 'Загрузка' - значение по-умолчанию
+  */
   caption: PropTypes.node,
   dimmed: PropTypes.bool,
 
-  /**
-   * Тип спиннера: mini, normal, big
-   *
-   * Значение по-умолчанию - normal
-   *
-   * Spinner.types - все доступные типы
-   */
-  type: PropTypes.oneOf(Object.keys(types)),
-
-  /**
-   * @deprecated Старое поведение спиннера - облачко при среднем и большом размере
-   *
-   * @default false - исчезнет в 3.0
-   */
-  cloud: PropTypes.bool
+  /**
+  * Тип спиннера: mini, normal, big
+  *
+  * Значение по-умолчанию - normal
+  *
+  * Spinner.types - все доступные типы
+  */
+  type: PropTypes.oneOf(Object.keys(types))
 }, _class2.defaultProps = {
   type: 'normal'
-}, _class2.Types = types, _temp)) || _class);
+}, _class2.Types = types, _temp)) || _class) || _class);

package/components/Spinner/Spinner/Spinner.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Spinner.tsx"],"names":["React","PropTypes","warning","cn","locale","ThemeContext","hasSvgAnimationSupport","SpinnerIcon","SpinnerOld","jsStyles","SpinnerFallback","types","SpinnerLocaleHelper","Spinner","props","theme","renderSpinner","type","dimmed","circleClassName","circleDimmed","circle","renderCaption","caption","captionColor","cloud","render","renderMain","renderSpinnerOld","loading","spinner","inner","Component","__KONTUR_REACT_UI__","propTypes","node","bool","oneOf","Object","keys","defaultProps","Types"],"mappings":"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","sourcesContent":["import React from 'react';\r\nimport PropTypes from 'prop-types';\r\nimport warning from 'warning';\r\nimport cn from 'classnames';\r\n\r\nimport { locale } from '../../lib/locale/decorators';\r\nimport { Theme } from '../../lib/theming/Theme';\r\nimport { ThemeContext } from '../../lib/theming/ThemeContext';\r\nimport { hasSvgAnimationSupport } from '../../lib/utils';\r\nimport { SpinnerIcon } from '../../internal/icons/SpinnerIcon';\r\nimport { SpinnerOld } from '../../internal/SpinnerOld';\r\n\r\nimport { jsStyles } from './Spinner.styles';\r\nimport { SpinnerFallback, types } from './SpinnerFallback';\r\nimport { SpinnerLocale, SpinnerLocaleHelper } from './locale';\r\n\r\nexport type SpinnerType = 'mini' | 'normal' | 'big';\r\n\r\nexport interface SpinnerProps {\r\n  caption?: React.ReactNode;\r\n  dimmed?: boolean;\r\n  /**\r\n   * Тип спиннера\r\n   * @default normal\r\n   */\r\n  type: SpinnerType;\r\n  /**\r\n   * @deprecated Старое поведение спиннера - облачко при среднем и большом размере - исчезнет в 3.0 поведение пересено в `@skbkontur/react-ui-addons` смотри [миграцию](https://github.com/skbkontur/retail-ui/blob/master/packages/react-ui/MIGRATION.md)\r\n   *\r\n   * @default false\r\n   */\r\n  cloud?: boolean;\r\n}\r\n\r\n/**\r\n * DRAFT - инлайн-лоадер\r\n */\r\n\r\n@locale('Spinner', SpinnerLocaleHelper)\r\nexport class Spinner extends React.Component<SpinnerProps> {\r\n  public static __KONTUR_REACT_UI__ = 'Spinner';\r\n\r\n  public static propTypes = {\r\n    /**\r\n     * Текст рядом с мини-лоадером.\r\n     *\r\n     * 'Загрузка' - значение по-умолчанию\r\n     */\r\n    caption: PropTypes.node,\r\n\r\n    dimmed: PropTypes.bool,\r\n\r\n    /**\r\n     * Тип спиннера: mini, normal, big\r\n     *\r\n     * Значение по-умолчанию - normal\r\n     *\r\n     * Spinner.types - все доступные типы\r\n     */\r\n    type: PropTypes.oneOf(Object.keys(types)),\r\n    /**\r\n     * @deprecated Старое поведение спиннера - облачко при среднем и большом размере\r\n     *\r\n     * @default false - исчезнет в 3.0\r\n     */\r\n    cloud: PropTypes.bool,\r\n  };\r\n\r\n  public static defaultProps: SpinnerProps = {\r\n    type: 'normal',\r\n  };\r\n\r\n  public static Types: typeof types = types;\r\n  private theme!: Theme;\r\n  private readonly locale!: SpinnerLocale;\r\n\r\n  constructor(props: SpinnerProps) {\r\n    super(props);\r\n    warning(!this.props.cloud, 'cloud is deprecated, will removed in 3.0. ');\r\n  }\r\n\r\n  public render() {\r\n    return (\r\n      <ThemeContext.Consumer>\r\n        {theme => {\r\n          this.theme = theme;\r\n          return !this.props.cloud ? this.renderMain() : this.renderSpinnerOld();\r\n        }}\r\n      </ThemeContext.Consumer>\r\n    );\r\n  }\r\n\r\n  private renderSpinnerOld() {\r\n    return <SpinnerOld {...this.props} />;\r\n  }\r\n\r\n  private renderMain() {\r\n    const { type, caption = this.locale.loading, dimmed } = this.props;\r\n\r\n    return (\r\n      <div className={jsStyles.spinner()}>\r\n        <span className={jsStyles.inner()}>\r\n          {hasSvgAnimationSupport && this.renderSpinner(type, dimmed)}\r\n          {!hasSvgAnimationSupport && <SpinnerFallback type={type} dimmed={dimmed} />}\r\n        </span>\r\n        {caption && this.renderCaption(type, caption)}\r\n      </div>\r\n    );\r\n  }\r\n\r\n  private renderSpinner = (type: SpinnerType, dimmed?: boolean) => {\r\n    const circleClassName = dimmed ? jsStyles.circleDimmed(this.theme) : jsStyles.circle(this.theme);\r\n\r\n    return <SpinnerIcon size={type} className={circleClassName} />;\r\n  };\r\n\r\n  private renderCaption = (type: SpinnerType, caption: React.ReactNode) => (\r\n    <span className={cn(jsStyles[type](this.theme), jsStyles.captionColor(this.theme))}>{caption}</span>\r\n  );\r\n}\r\n"]}
+{"version":3,"sources":["Spinner.tsx"],"names":["React","PropTypes","locale","ThemeContext","SpinnerIcon","CommonWrapper","cx","rootNode","styles","SpinnerLocaleHelper","types","big","mini","normal","Spinner","props","renderSpinner","type","dimmed","inline","circleClassName","circleDimmed","theme","circle","renderCaption","caption","captionColor","render","renderMain","loading","setRootNode","spinner","inner","Component","__KONTUR_REACT_UI__","propTypes","node","bool","oneOf","Object","keys","defaultProps","Types"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { locale } from '../../lib/locale/decorators';\nimport { Theme } from '../../lib/theming/Theme';\nimport { ThemeContext } from '../../lib/theming/ThemeContext';\nimport { SpinnerIcon } from '../../internal/icons/SpinnerIcon';\nimport { CommonProps, CommonWrapper } from '../../internal/CommonWrapper';\nimport { cx } from '../../lib/theming/Emotion';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\n\nimport { styles } from './Spinner.styles';\nimport { SpinnerLocale, SpinnerLocaleHelper } from './locale';\n\nconst types: Record<SpinnerType, SpinnerType> = {\n  big: 'big',\n  mini: 'mini',\n  normal: 'normal',\n};\n\nexport type SpinnerType = 'mini' | 'normal' | 'big';\n\nexport interface SpinnerProps extends CommonProps {\n  caption?: React.ReactNode;\n  dimmed?: boolean;\n  /**\n   * Тип спиннера\n   * @default normal\n   */\n  type: SpinnerType;\n  inline?: boolean;\n}\n\n/**\n * DRAFT - инлайн-лоадер\n */\n\n@rootNode\n@locale('Spinner', SpinnerLocaleHelper)\nexport class Spinner extends React.Component<SpinnerProps> {\n  public static __KONTUR_REACT_UI__ = 'Spinner';\n\n  public static propTypes = {\n    /**\n     * Текст рядом с мини-лоадером.\n     *\n     * 'Загрузка' - значение по-умолчанию\n     */\n    caption: PropTypes.node,\n\n    dimmed: PropTypes.bool,\n\n    /**\n     * Тип спиннера: mini, normal, big\n     *\n     * Значение по-умолчанию - normal\n     *\n     * Spinner.types - все доступные типы\n     */\n    type: PropTypes.oneOf(Object.keys(types)),\n  };\n\n  public static defaultProps: SpinnerProps = {\n    type: 'normal',\n  };\n\n  public static Types: typeof types = types;\n  private theme!: Theme;\n  private readonly locale!: SpinnerLocale;\n  private setRootNode!: TSetRootNode;\n\n  constructor(props: SpinnerProps) {\n    super(props);\n  }\n\n  public render() {\n    return (\n      <ThemeContext.Consumer>\n        {(theme) => {\n          this.theme = theme;\n          return this.renderMain();\n        }}\n      </ThemeContext.Consumer>\n    );\n  }\n\n  private renderMain() {\n    const { type, caption = this.locale.loading, dimmed, inline } = this.props;\n\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        <div className={styles.spinner()}>\n          <span className={styles.inner()}>{this.renderSpinner(type, dimmed, inline)}</span>\n          {caption && this.renderCaption(type, caption)}\n        </div>\n      </CommonWrapper>\n    );\n  }\n\n  private renderSpinner = (type: SpinnerType, dimmed?: boolean, inline?: boolean) => {\n    const circleClassName = dimmed ? styles.circleDimmed(this.theme) : styles.circle(this.theme);\n\n    return <SpinnerIcon size={type} className={circleClassName} dimmed={dimmed} inline={inline} />;\n  };\n\n  private renderCaption = (type: SpinnerType, caption: React.ReactNode) => (\n    <span className={cx(styles[type](this.theme), styles.captionColor(this.theme))}>{caption}</span>\n  );\n}\n"]}

package/components/Spinner/Spinner.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { types } from './SpinnerFallback';
+import { CommonProps } from '../../internal/CommonWrapper';
+declare const types: Record<SpinnerType, SpinnerType>;
 export declare type SpinnerType = 'mini' | 'normal' | 'big';
-export interface SpinnerProps {
+export interface SpinnerProps extends CommonProps {
     caption?: React.ReactNode;
     dimmed?: boolean;
     /**
@@ -10,12 +11,7 @@ export interface SpinnerProps {
      * @default normal
      */
     type: SpinnerType;
-    /**
-     * @deprecated Старое поведение спиннера - облачко при среднем и большом размере - исчезнет в 3.0 поведение пересено в `@skbkontur/react-ui-addons` смотри [миграцию](https://github.com/skbkontur/retail-ui/blob/master/packages/react-ui/MIGRATION.md)
-     *
-     * @default false
-     */
-    cloud?: boolean;
+    inline?: boolean;
 }
 /**
  * DRAFT - инлайн-лоадер
@@ -38,21 +34,16 @@ export declare class Spinner extends React.Component<SpinnerProps> {
          * Spinner.types - все доступные типы
          */
         type: PropTypes.Requireable<string>;
-        /**
-         * @deprecated Старое поведение спиннера - облачко при среднем и большом размере
-         *
-         * @default false - исчезнет в 3.0
-         */
-        cloud: PropTypes.Requireable<boolean>;
     };
     static defaultProps: SpinnerProps;
     static Types: typeof types;
     private theme;
     private readonly locale;
+    private setRootNode;
     constructor(props: SpinnerProps);
     render(): JSX.Element;
-    private renderSpinnerOld;
     private renderMain;
     private renderSpinner;
     private renderCaption;
 }
+export {};