@skbkontur/react-ui 4.8.0 → 4.9.0-theme2022.1

package/components/GlobalLoader/GlobalLoaderView.styles.d.ts

@@ -1,16 +1,16 @@
-import { Theme } from '../../lib/theming/Theme';
-export declare const styles: {
-    outer(t: Theme): string;
-    inner(t: Theme): string;
-    standardWithoutAnimation(): string;
-    successWithoutAnimation(): string;
-    errorWithoutAnimation(): string;
-};
-export declare const animations: {
-    successAnimation(delayBeforeHide: number, width: number, left: number): string;
-    errorAnimation(t: Theme): string;
-    standardAnimation(t: Theme, expectedTime: number): string;
-    acceptAnimation(t: Theme, startWidth: number, expectedTime: number, width: number, left: number): string;
-    slowAcceptAnimation(t: Theme, startWidth: number, width: number, left: number): string;
-    acceptWithoutAnimation(startWidth: number): string;
-};
+import { Theme } from '../../lib/theming/Theme';
+export declare const styles: {
+    outer(t: Theme): string;
+    inner(t: Theme): string;
+    standardWithoutAnimation(): string;
+    successWithoutAnimation(): string;
+    errorWithoutAnimation(): string;
+};
+export declare const animations: {
+    successAnimation(delayBeforeHide: number, width: number, left: number): string;
+    errorAnimation(t: Theme): string;
+    standardAnimation(t: Theme, expectedTime: number): string;
+    acceptAnimation(t: Theme, startWidth: number, expectedTime: number, width: number, left: number): string;
+    slowAcceptAnimation(t: Theme, startWidth: number, width: number, left: number): string;
+    acceptWithoutAnimation(startWidth: number): string;
+};

package/components/GlobalLoader/index.d.ts

@@ -1 +1 @@
-export * from './GlobalLoader';
+export * from './GlobalLoader';

package/components/GlobalLoader/useParams.d.ts

@@ -1,22 +1,22 @@
-import { GlobalLoaderViewProps, GlobalLoaderViewRef } from './GlobalLoaderView';
-/**
- * Вычисляет положение `GlobalLoader`
- *
- * @param ref - ref `GlobalLoader`
- * @returns - возвращает положение полоски `GlobalLoader`
- */
-export declare const useGlobalLoaderPosition: (ref: GlobalLoaderViewRef['refObject']) => {
-    left: number;
-};
-/**
- * Вычисляет ширину `GlobalLoader`
- *
- * @param status - статус `GlobalLoader`
- * @param ref - ref `GlobalLoader`
- * @returns - возвращает ширину полоски `GlobalLoader`
- */
-export declare const useGlobalLoaderWidth: (status: GlobalLoaderViewProps['status'], ref: GlobalLoaderViewRef['refObject']) => {
-    width: number;
-    startWidth: number;
-    fullWidth: number;
-};
+import { GlobalLoaderViewProps, GlobalLoaderViewRef } from './GlobalLoaderView';
+/**
+ * Вычисляет положение `GlobalLoader`
+ *
+ * @param ref - ref `GlobalLoader`
+ * @returns - возвращает положение полоски `GlobalLoader`
+ */
+export declare const useGlobalLoaderPosition: (ref: GlobalLoaderViewRef['refObject']) => {
+    left: number;
+};
+/**
+ * Вычисляет ширину `GlobalLoader`
+ *
+ * @param status - статус `GlobalLoader`
+ * @param ref - ref `GlobalLoader`
+ * @returns - возвращает ширину полоски `GlobalLoader`
+ */
+export declare const useGlobalLoaderWidth: (status: GlobalLoaderViewProps['status'], ref: GlobalLoaderViewRef['refObject']) => {
+    width: number;
+    startWidth: number;
+    fullWidth: number;
+};

package/components/Group/Group/Group.js

@@ -1,5 +1,5 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
 import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
+import _extends from "@babel/runtime/helpers/esm/extends";
 
 var _class, _class2, _temp;
 
@@ -10,6 +10,9 @@ import { isButton } from "../../Button";
 import { CommonWrapper } from "../../../internal/CommonWrapper";
 import { cx } from "../../../lib/theming/Emotion";
 import { rootNode } from "../../../lib/rootNode";
+import { isInputLike } from "../../../lib/utils";
+import { ThemeContext } from "../../../lib/theming/ThemeContext";
+import { isTheme2022 } from "../../../lib/theming/ThemeHelpers";
 import { styles } from "../Group.styles";
 
 var getFirstChild = function getFirstChild(children) {
@@ -29,19 +32,19 @@ var getLastChild = function getLastChild(children) {
   return children == null ? void 0 : children[numberOfChildren - 1];
 };
 
-var getButtonCorners = function getButtonCorners(child, firstChild, lastChild) {
-  if (firstChild === lastChild) {
+export var getButtonCorners = function getButtonCorners(isFirstChild, isLastChild) {
+  if (isFirstChild && isLastChild) {
     return {};
   }
 
-  if (child === firstChild) {
+  if (isFirstChild) {
     return {
       borderTopRightRadius: 0,
       borderBottomRightRadius: 0
     };
   }
 
-  if (child === lastChild) {
+  if (isLastChild) {
     return {
       borderTopLeftRadius: 0,
       borderBottomLeftRadius: 0
@@ -53,11 +56,22 @@ var getButtonCorners = function getButtonCorners(child, firstChild, lastChild) {
   };
 };
 
-var passCornersIfButton = function passCornersIfButton(child, firstChild, lastChild) {
+var passCornersIfButton = function passCornersIfButton(child, firstChild, lastChild, isInputLikeToo) {
+  if (isInputLikeToo === void 0) {
+    isInputLikeToo = false;
+  }
+
+  var corners = getButtonCorners(child === firstChild, child === lastChild);
+
   if (isButton(child)) {
-    var corners = getButtonCorners(child, firstChild, lastChild);
     return /*#__PURE__*/React.cloneElement(child, {
-      corners: corners
+      corners: _extends({}, corners, child.props.corners)
+    });
+  }
+
+  if (isInputLikeToo && isInputLike(child)) {
+    return /*#__PURE__*/React.cloneElement(child, {
+      corners: _extends({}, corners, child.props.corners)
     });
   }
 
@@ -79,6 +93,15 @@ export var Group = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_
   _proto.render = function render() {
     var _this = this;
 
+    return /*#__PURE__*/React.createElement(ThemeContext.Consumer, null, function (theme) {
+      _this.theme = theme;
+      return _this.renderMain();
+    });
+  };
+
+  _proto.renderMain = function renderMain() {
+    var _this2 = this;
+
     var style = {
       width: this.props.width
     };
@@ -99,10 +122,10 @@ export var Group = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_
       }
 
       var isWidthInPercent = Boolean(child.props.width && child.props.width.toString().includes('%'));
-      var modifiedChild = passCornersIfButton(child, firstChild, lastChild);
+      var modifiedChild = passCornersIfButton(child, firstChild, lastChild, isTheme2022(_this2.theme));
       var isFirstChild = child === firstChild;
       return /*#__PURE__*/React.createElement("div", {
-        className: cx((_cx = {}, _cx[styles.fixed()] = !isWidthInPercent, _cx[styles.stretch()] = isWidthInPercent, _cx[styles.stretchFallback()] = Boolean(isWidthInPercent && _this.props.width && (isIE11 || isEdge)), _cx))
+        className: cx((_cx = {}, _cx[styles.fixed()] = !isWidthInPercent, _cx[styles.stretch()] = isWidthInPercent, _cx[styles.stretchFallback()] = Boolean(isWidthInPercent && _this2.props.width && (isIE11 || isEdge)), _cx))
       }, /*#__PURE__*/React.createElement("div", {
         className: cx((_cx2 = {}, _cx2[styles.item()] = true, _cx2[styles.itemFirst()] = isFirstChild, _cx2))
       }, modifiedChild));

package/components/Group/Group/Group.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Group.tsx"],"names":["React","PropTypes","isIE11","isEdge","isButton","CommonWrapper","cx","rootNode","styles","getFirstChild","children","Array","isArray","getLastChild","numberOfChildren","Children","count","getButtonCorners","child","firstChild","lastChild","borderTopRightRadius","borderBottomRightRadius","borderTopLeftRadius","borderBottomLeftRadius","borderRadius","passCornersIfButton","corners","cloneElement","GroupDataTids","root","Group","render","style","width","props","childrenArray","toArray","setRootNode","map","isValidElement","isWidthInPercent","Boolean","toString","includes","modifiedChild","isFirstChild","fixed","stretch","stretchFallback","item","itemFirst","Component","__KONTUR_REACT_UI__","propTypes","oneOfType","number","string"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { isIE11, isEdge } from '../../lib/client';\nimport { isButton } from '../Button';\nimport { CommonWrapper, CommonProps } from '../../internal/CommonWrapper';\nimport { cx } from '../../lib/theming/Emotion';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\n\nimport { styles } from './Group.styles';\n\nexport interface GroupProps extends CommonProps {\n  width?: React.CSSProperties['width'];\n}\n\ninterface GroupChildProps {\n  width?: React.CSSProperties['width'];\n  corners?: number;\n}\n\nconst getFirstChild = (children: React.ReactNode) => {\n  if (!Array.isArray(children)) {\n    return children;\n  }\n\n  return children?.[0] as React.ReactNode;\n};\n\nconst getLastChild = (children: React.ReactNode) => {\n  if (!Array.isArray(children)) {\n    return children;\n  }\n\n  const numberOfChildren = React.Children.count(children);\n\n  return children?.[numberOfChildren - 1] as React.ReactNode;\n};\n\nconst getButtonCorners = (\n  child: React.ReactNode,\n  firstChild: React.ReactNode,\n  lastChild: React.ReactNode,\n): React.CSSProperties => {\n  if (firstChild === lastChild) {\n    return {};\n  }\n\n  if (child === firstChild) {\n    return {\n      borderTopRightRadius: 0,\n      borderBottomRightRadius: 0,\n    };\n  }\n\n  if (child === lastChild) {\n    return {\n      borderTopLeftRadius: 0,\n      borderBottomLeftRadius: 0,\n    };\n  }\n\n  return {\n    borderRadius: 0,\n  };\n};\n\nconst passCornersIfButton = (child: React.ReactNode, firstChild: React.ReactNode, lastChild: React.ReactNode) => {\n  if (isButton(child)) {\n    const corners = getButtonCorners(child, firstChild, lastChild);\n\n    return React.cloneElement(child, { corners });\n  }\n\n  return child;\n};\n\nexport const GroupDataTids = {\n  root: 'Group__root',\n} as const;\n\n@rootNode\nexport class Group extends React.Component<GroupProps> {\n  public static __KONTUR_REACT_UI__ = 'Group';\n  private setRootNode!: TSetRootNode;\n\n  public static propTypes = {\n    width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),\n  };\n\n  public render() {\n    const style: React.CSSProperties = {\n      width: this.props.width,\n    };\n\n    const childrenArray = React.Children.toArray(this.props.children);\n    const firstChild = getFirstChild(childrenArray);\n    const lastChild = getLastChild(childrenArray);\n\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        <span data-tid={GroupDataTids.root} className={styles.root()} style={style}>\n          {React.Children.map(childrenArray, (child) => {\n            if (!child || !React.isValidElement<GroupChildProps>(child)) {\n              return null;\n            }\n\n            const isWidthInPercent = Boolean(child.props.width && child.props.width.toString().includes('%'));\n\n            const modifiedChild = passCornersIfButton(child, firstChild, lastChild);\n\n            const isFirstChild = child === firstChild;\n\n            return (\n              <div\n                className={cx({\n                  [styles.fixed()]: !isWidthInPercent,\n                  [styles.stretch()]: isWidthInPercent,\n                  [styles.stretchFallback()]: Boolean(isWidthInPercent && this.props.width && (isIE11 || isEdge)),\n                })}\n              >\n                <div\n                  className={cx({\n                    [styles.item()]: true,\n                    [styles.itemFirst()]: isFirstChild,\n                  })}\n                >\n                  {modifiedChild}\n                </div>\n              </div>\n            );\n          })}\n        </span>\n      </CommonWrapper>\n    );\n  }\n}\n"]}
+{"version":3,"sources":["Group.tsx"],"names":["React","PropTypes","isIE11","isEdge","isButton","CommonWrapper","cx","rootNode","isInputLike","ThemeContext","isTheme2022","styles","getFirstChild","children","Array","isArray","getLastChild","numberOfChildren","Children","count","getButtonCorners","isFirstChild","isLastChild","borderTopRightRadius","borderBottomRightRadius","borderTopLeftRadius","borderBottomLeftRadius","borderRadius","passCornersIfButton","child","firstChild","lastChild","isInputLikeToo","corners","cloneElement","props","GroupDataTids","root","Group","render","theme","renderMain","style","width","childrenArray","toArray","setRootNode","map","isValidElement","isWidthInPercent","Boolean","toString","includes","modifiedChild","fixed","stretch","stretchFallback","item","itemFirst","Component","__KONTUR_REACT_UI__","propTypes","oneOfType","number","string"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { isIE11, isEdge } from '../../lib/client';\nimport { isButton } from '../Button';\nimport { CommonWrapper, CommonProps } from '../../internal/CommonWrapper';\nimport { cx } from '../../lib/theming/Emotion';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\nimport { isInputLike } from '../../lib/utils';\nimport { ThemeContext } from '../../lib/theming/ThemeContext';\nimport { Theme } from '../../lib/theming/Theme';\nimport { isTheme2022 } from '../../lib/theming/ThemeHelpers';\n\nimport { styles } from './Group.styles';\n\nexport interface GroupProps extends CommonProps {\n  width?: React.CSSProperties['width'];\n}\n\ninterface GroupChildProps {\n  width?: React.CSSProperties['width'];\n  corners?: number;\n}\n\nconst getFirstChild = (children: React.ReactNode) => {\n  if (!Array.isArray(children)) {\n    return children;\n  }\n\n  return children?.[0] as React.ReactNode;\n};\n\nconst getLastChild = (children: React.ReactNode) => {\n  if (!Array.isArray(children)) {\n    return children;\n  }\n\n  const numberOfChildren = React.Children.count(children);\n\n  return children?.[numberOfChildren - 1] as React.ReactNode;\n};\n\nexport const getButtonCorners = (isFirstChild: boolean, isLastChild: boolean): React.CSSProperties => {\n  if (isFirstChild && isLastChild) {\n    return {};\n  }\n\n  if (isFirstChild) {\n    return {\n      borderTopRightRadius: 0,\n      borderBottomRightRadius: 0,\n    };\n  }\n\n  if (isLastChild) {\n    return {\n      borderTopLeftRadius: 0,\n      borderBottomLeftRadius: 0,\n    };\n  }\n\n  return {\n    borderRadius: 0,\n  };\n};\n\nconst passCornersIfButton = (\n  child: React.ReactNode,\n  firstChild: React.ReactNode,\n  lastChild: React.ReactNode,\n  isInputLikeToo = false,\n) => {\n  const corners = getButtonCorners(child === firstChild, child === lastChild);\n  if (isButton(child)) {\n    return React.cloneElement(child, { corners: { ...corners, ...child.props.corners } });\n  }\n  if (isInputLikeToo && isInputLike(child)) {\n    return React.cloneElement(child, { corners: { ...corners, ...child.props.corners } });\n  }\n\n  return child;\n};\n\nexport const GroupDataTids = {\n  root: 'Group__root',\n} as const;\n\n@rootNode\nexport class Group extends React.Component<GroupProps> {\n  public static __KONTUR_REACT_UI__ = 'Group';\n  private setRootNode!: TSetRootNode;\n  private theme!: Theme;\n\n  public static propTypes = {\n    width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),\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  public renderMain() {\n    const style: React.CSSProperties = {\n      width: this.props.width,\n    };\n\n    const childrenArray = React.Children.toArray(this.props.children);\n    const firstChild = getFirstChild(childrenArray);\n    const lastChild = getLastChild(childrenArray);\n\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        <span data-tid={GroupDataTids.root} className={styles.root()} style={style}>\n          {React.Children.map(childrenArray, (child) => {\n            if (!child || !React.isValidElement<GroupChildProps>(child)) {\n              return null;\n            }\n\n            const isWidthInPercent = Boolean(child.props.width && child.props.width.toString().includes('%'));\n\n            const modifiedChild = passCornersIfButton(child, firstChild, lastChild, isTheme2022(this.theme));\n\n            const isFirstChild = child === firstChild;\n\n            return (\n              <div\n                className={cx({\n                  [styles.fixed()]: !isWidthInPercent,\n                  [styles.stretch()]: isWidthInPercent,\n                  [styles.stretchFallback()]: Boolean(isWidthInPercent && this.props.width && (isIE11 || isEdge)),\n                })}\n              >\n                <div\n                  className={cx({\n                    [styles.item()]: true,\n                    [styles.itemFirst()]: isFirstChild,\n                  })}\n                >\n                  {modifiedChild}\n                </div>\n              </div>\n            );\n          })}\n        </span>\n      </CommonWrapper>\n    );\n  }\n}\n"]}

package/components/Group/Group.d.ts

@@ -1,17 +1,20 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { CommonProps } from '../../internal/CommonWrapper';
-export interface GroupProps extends CommonProps {
-    width?: React.CSSProperties['width'];
-}
-export declare const GroupDataTids: {
-    readonly root: "Group__root";
-};
-export declare class Group extends React.Component<GroupProps> {
-    static __KONTUR_REACT_UI__: string;
-    private setRootNode;
-    static propTypes: {
-        width: PropTypes.Requireable<string | number>;
-    };
-    render(): JSX.Element;
-}
+import React from 'react';
+import PropTypes from 'prop-types';
+import { CommonProps } from '../../internal/CommonWrapper';
+export interface GroupProps extends CommonProps {
+    width?: React.CSSProperties['width'];
+}
+export declare const getButtonCorners: (isFirstChild: boolean, isLastChild: boolean) => React.CSSProperties;
+export declare const GroupDataTids: {
+    readonly root: "Group__root";
+};
+export declare class Group extends React.Component<GroupProps> {
+    static __KONTUR_REACT_UI__: string;
+    private setRootNode;
+    private theme;
+    static propTypes: {
+        width: PropTypes.Requireable<string | number>;
+    };
+    render(): JSX.Element;
+    renderMain(): JSX.Element;
+}

package/components/Group/Group.styles.d.ts

@@ -1,8 +1,8 @@
-export declare const styles: {
-    root(): string;
-    fixed(): string;
-    stretch(): string;
-    stretchFallback(): string;
-    item(): string;
-    itemFirst(): string;
-};
+export declare const styles: {
+    root(): string;
+    fixed(): string;
+    stretch(): string;
+    stretchFallback(): string;
+    item(): string;
+    itemFirst(): string;
+};

package/components/Group/index.d.ts

@@ -1 +1 @@
-export * from './Group';
+export * from './Group';

package/components/Hint/Hint.d.ts

@@ -1,85 +1,85 @@
-import React from 'react';
-import { PopupPositionsType } from '../../internal/Popup';
-import { Nullable } from '../../typings/utility-types';
-import { MouseEventType } from '../../typings/event-types';
-import { CommonProps } from '../../internal/CommonWrapper';
-import { InstanceWithAnchorElement } from '../../lib/InstanceWithAnchorElement';
-export interface HintProps extends CommonProps {
-    children?: React.ReactNode;
-    /**
-     * Переводит отображение подсказки в _"ручной режим"_.
-     *
-     * В _"ручном режиме"_ подсказку можно активировать только задав значение пропу `opened`.
-     */
-    manual?: boolean;
-    /**
-     * Задаёт максимальную ширину подсказки.
-     */
-    maxWidth?: React.CSSProperties['maxWidth'];
-    /**
-     * HTML-событие `mouseenter`.
-     */
-    onMouseEnter?: (event: MouseEventType) => void;
-    /**
-     * HTML-событие `mouseleave`.
-     */
-    onMouseLeave?: (event: MouseEventType) => void;
-    /**
-     * Если `true` - подсказка будет открыта.
-     *
-     * _Примечание_: работает только при `manual=true`.
-     */
-    opened?: boolean;
-    /**
-     * Расположение подсказки относительно текста.
-     *
-     * **Допустимые значения**: `"top"`, `"right"`, `"bottom"`, `"left"`, `"top left"`, `"top center"`, `"top right"`, `"right top"`, `"right middle"`, `"right bottom"`, `"bottom left"`, `"bottom center"`, `"bottom right"`, `"left top"`, `"left middle"`, `"left bottom"`.
-     */
-    pos?: 'top' | 'right' | 'bottom' | 'left' | PopupPositionsType;
-    /**
-     * Текст подсказки.
-     */
-    text: React.ReactNode;
-    /**
-     * Отключает анимацию.
-     */
-    disableAnimations?: boolean;
-    /**
-     * Явно указывает, что вложенные элементы должны быть обёрнуты в `<span/>`. <br/> Используется для корректного позиционирования тултипа при двух и более вложенных элементах.
-     *
-     * _Примечание_: при **двух и более** вложенных элементах обёртка будет добавлена автоматически.
-     */
-    useWrapper?: boolean;
-}
-export interface HintState {
-    opened: boolean;
-    position: PopupPositionsType;
-}
-declare type DefaultProps = Required<Pick<HintProps, 'pos' | 'manual' | 'opened' | 'maxWidth' | 'disableAnimations' | 'useWrapper'>>;
-/**
- * Всплывающая подсказка, которая по умолчанию отображается при наведении на элемент. <br/> Можно задать другие условия отображения.
- */
-export declare class Hint extends React.PureComponent<HintProps, HintState> implements InstanceWithAnchorElement {
-    static __KONTUR_REACT_UI__: string;
-    private isMobileLayout;
-    static defaultProps: DefaultProps;
-    private getProps;
-    state: HintState;
-    private timer;
-    private theme;
-    private setRootNode;
-    private popupRef;
-    componentDidUpdate(prevProps: HintProps): void;
-    componentWillUnmount(): void;
-    render(): JSX.Element;
-    renderMobile(): JSX.Element;
-    renderMain(): JSX.Element;
-    getAnchorElement: () => Nullable<Element>;
-    private renderContent;
-    private getPositions;
-    private handleMouseEnter;
-    private handleMouseLeave;
-    private close;
-    private open;
-}
-export {};
+import React from 'react';
+import { PopupPositionsType } from '../../internal/Popup';
+import { Nullable } from '../../typings/utility-types';
+import { MouseEventType } from '../../typings/event-types';
+import { CommonProps } from '../../internal/CommonWrapper';
+import { InstanceWithAnchorElement } from '../../lib/InstanceWithAnchorElement';
+export interface HintProps extends CommonProps {
+    children?: React.ReactNode;
+    /**
+     * Переводит отображение подсказки в _"ручной режим"_.
+     *
+     * В _"ручном режиме"_ подсказку можно активировать только задав значение пропу `opened`.
+     */
+    manual?: boolean;
+    /**
+     * Задаёт максимальную ширину подсказки.
+     */
+    maxWidth?: React.CSSProperties['maxWidth'];
+    /**
+     * HTML-событие `mouseenter`.
+     */
+    onMouseEnter?: (event: MouseEventType) => void;
+    /**
+     * HTML-событие `mouseleave`.
+     */
+    onMouseLeave?: (event: MouseEventType) => void;
+    /**
+     * Если `true` - подсказка будет открыта.
+     *
+     * _Примечание_: работает только при `manual=true`.
+     */
+    opened?: boolean;
+    /**
+     * Расположение подсказки относительно текста.
+     *
+     * **Допустимые значения**: `"top"`, `"right"`, `"bottom"`, `"left"`, `"top left"`, `"top center"`, `"top right"`, `"right top"`, `"right middle"`, `"right bottom"`, `"bottom left"`, `"bottom center"`, `"bottom right"`, `"left top"`, `"left middle"`, `"left bottom"`.
+     */
+    pos?: 'top' | 'right' | 'bottom' | 'left' | PopupPositionsType;
+    /**
+     * Текст подсказки.
+     */
+    text: React.ReactNode;
+    /**
+     * Отключает анимацию.
+     */
+    disableAnimations?: boolean;
+    /**
+     * Явно указывает, что вложенные элементы должны быть обёрнуты в `<span/>`. <br/> Используется для корректного позиционирования тултипа при двух и более вложенных элементах.
+     *
+     * _Примечание_: при **двух и более** вложенных элементах обёртка будет добавлена автоматически.
+     */
+    useWrapper?: boolean;
+}
+export interface HintState {
+    opened: boolean;
+    position: PopupPositionsType;
+}
+declare type DefaultProps = Required<Pick<HintProps, 'pos' | 'manual' | 'opened' | 'maxWidth' | 'disableAnimations' | 'useWrapper'>>;
+/**
+ * Всплывающая подсказка, которая по умолчанию отображается при наведении на элемент. <br/> Можно задать другие условия отображения.
+ */
+export declare class Hint extends React.PureComponent<HintProps, HintState> implements InstanceWithAnchorElement {
+    static __KONTUR_REACT_UI__: string;
+    private isMobileLayout;
+    static defaultProps: DefaultProps;
+    private getProps;
+    state: HintState;
+    private timer;
+    private theme;
+    private setRootNode;
+    private popupRef;
+    componentDidUpdate(prevProps: HintProps): void;
+    componentWillUnmount(): void;
+    render(): JSX.Element;
+    renderMobile(): JSX.Element;
+    renderMain(): JSX.Element;
+    getAnchorElement: () => Nullable<Element>;
+    private renderContent;
+    private getPositions;
+    private handleMouseEnter;
+    private handleMouseLeave;
+    private close;
+    private open;
+}
+export {};

package/components/Hint/Hint.styles.d.ts

@@ -1,6 +1,6 @@
-import { Theme } from '../../lib/theming/Theme';
-export declare const styles: {
-    content(t: Theme): string;
-    mobileContent(t: Theme): string;
-    contentCenter(t: Theme): string;
-};
+import { Theme } from '../../lib/theming/Theme';
+export declare const styles: {
+    content(t: Theme): string;
+    mobileContent(t: Theme): string;
+    contentCenter(t: Theme): string;
+};

package/components/Hint/index.d.ts

@@ -1 +1 @@
-export * from './Hint';
+export * from './Hint';

package/components/Input/Input/Input.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
-var _excluded = ["onMouseEnter", "onMouseLeave", "onMouseOver", "onKeyDown", "onKeyPress", "onValueChange", "width", "error", "warning", "leftIcon", "rightIcon", "borderless", "value", "align", "type", "mask", "maskChar", "alwaysShowMask", "size", "placeholder", "selectAllOnFocus", "disabled", "onUnexpectedInput", "prefix", "suffix", "formatChars"];
+var _excluded = ["onMouseEnter", "onMouseLeave", "onMouseOver", "onKeyDown", "onKeyPress", "onValueChange", "width", "error", "warning", "leftIcon", "rightIcon", "borderless", "value", "align", "type", "mask", "maskChar", "alwaysShowMask", "size", "placeholder", "selectAllOnFocus", "disabled", "onUnexpectedInput", "prefix", "suffix", "formatChars", "corners"];
 
 var _class, _class2, _temp; // TODO: Enable this rule in functional components.
 
@@ -12,7 +12,7 @@ var _class, _class2, _temp; // TODO: Enable this rule in functional components.
 import invariant from 'invariant';
 import React from 'react';
 import raf from 'raf';
-import { isIE11, isEdge } from "../../../lib/client";
+import { isEdge, isIE11 } from "../../../lib/client";
 import { isKeyBackspace, isKeyDelete, someKeys } from "../../../lib/events/keyboard/identifiers";
 import { needsPolyfillPlaceholder } from "../../../lib/needsPolyfillPlaceholder";
 import { MaskedInput } from "../../../internal/MaskedInput";
@@ -21,7 +21,10 @@ import { CommonWrapper } from "../../../internal/CommonWrapper";
 import { cx } from "../../../lib/theming/Emotion";
 import { rootNode } from "../../../lib/rootNode";
 import { createPropsGetter } from "../../../lib/createPropsGetter";
+import { isTheme2022 } from "../../../lib/theming/ThemeHelpers";
 import { styles } from "../Input.styles";
+import { InputLayout } from "../InputLayout/InputLayout";
+import { PolyfillPlaceholder } from "../InputLayout/PolyfillPlaceholder";
 export var InputDataTids = {
   root: 'Input__root'
 };
@@ -116,6 +119,7 @@ var Input = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$C
           prefix = props.prefix,
           suffix = props.suffix,
           formatChars = props.formatChars,
+          corners = props.corners,
           rest = _objectWithoutPropertiesLoose(props, _excluded);
 
       var _this$state = _this.state,
@@ -123,9 +127,9 @@ var Input = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$C
           focused = _this$state.focused;
       var labelProps = {
         className: cx(styles.root(_this.theme), _this.getSizeClassName(), (_cx = {}, _cx[styles.focus(_this.theme)] = focused, _cx[styles.blink(_this.theme)] = blinking, _cx[styles.borderless()] = borderless && !focused, _cx[styles.disabled(_this.theme)] = disabled, _cx[styles.warning(_this.theme)] = warning, _cx[styles.error(_this.theme)] = error, _cx[styles.focusFallback(_this.theme)] = focused && (isIE11 || isEdge), _cx[styles.warningFallback(_this.theme)] = warning && (isIE11 || isEdge), _cx[styles.errorFallback(_this.theme)] = error && (isIE11 || isEdge), _cx)),
-        style: {
+        style: _extends({
           width: width
-        },
+        }, corners),
         onMouseEnter: onMouseEnter,
         onMouseLeave: onMouseLeave,
         onMouseOver: onMouseOver
@@ -153,6 +157,27 @@ var Input = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$C
       }
 
       var input = mask ? _this.renderMaskedInput(inputProps, mask) : /*#__PURE__*/React.createElement('input', inputProps);
+
+      if (isTheme2022(_this.theme)) {
+        return /*#__PURE__*/React.createElement(InputLayout, {
+          leftIcon: leftIcon,
+          rightIcon: rightIcon,
+          prefix: prefix,
+          suffix: suffix,
+          labelProps: labelProps,
+          context: {
+            disabled: Boolean(disabled),
+            focused: focused,
+            size: size
+          }
+        }, input, /*#__PURE__*/React.createElement(PolyfillPlaceholder, {
+          isMaskVisible: _this.isMaskVisible,
+          value: value,
+          defaultValue: _this.props.defaultValue,
+          align: align
+        }, placeholder));
+      }
+
       return /*#__PURE__*/React.createElement("label", _extends({
         "data-tid": InputDataTids.root
       }, labelProps), /*#__PURE__*/React.createElement("span", {