@skbkontur/react-ui 0.0.0-ce2a893b1a → 0.0.0-d1bb8f344a

package/components/FxInput/FxInput.d.ts

@@ -1,10 +1,11 @@
-import React from 'react';
+import React, { AriaAttributes } from 'react';
 import PropTypes from 'prop-types';
 import { Input, InputProps } from '../Input';
 import { CurrencyInput, CurrencyInputProps } from '../CurrencyInput';
+import { DefaultizedProps } from '../../lib/createPropsGetter';
 import { Override } from '../../typings/utility-types';
 import { CommonProps, CommonWrapperRestProps } from '../../internal/CommonWrapper';
-export interface FxInputProps extends CommonProps, Override<CurrencyInputProps, {
+export interface FxInputProps extends Pick<AriaAttributes, 'aria-label'>, CommonProps, Override<CurrencyInputProps, {
     /** Авто-режим */
     auto?: boolean;
     /** Тип инпута */
@@ -19,25 +20,30 @@ export interface FxInputProps extends CommonProps, Override<CurrencyInputProps,
     refInput?: (element: CurrencyInput | Input | null) => void;
     /** Убрать лишние нули после запятой */
     hideTrailingZeros?: boolean;
+    /** Позвоялет задать атрибут aria-label кнопке восстановления (restore button) */
+    buttonAriaLabel?: AriaAttributes['aria-label'];
 }> {
 }
+export declare const FxInputDataTids: {
+    readonly root: "FxInput__root";
+};
+declare type DefaultProps = Required<Pick<FxInputProps, 'width' | 'type' | 'value'>>;
+declare type DefaultizedFxInputProps = DefaultizedProps<FxInputProps, DefaultProps>;
 /** Принимает все свойства `Input`'a */
 export declare class FxInput extends React.Component<FxInputProps> {
     static __KONTUR_REACT_UI__: string;
+    static displayName: string;
     static propTypes: {
         auto: PropTypes.Requireable<boolean>;
         type: PropTypes.Requireable<string>;
     };
-    static defaultProps: {
-        width: number;
-        type: string;
-        value: string;
-    };
+    static defaultProps: DefaultProps;
+    private theme;
     private input;
     private getProps;
     private setRootNode;
     render(): JSX.Element;
-    renderMain: (props: CommonWrapperRestProps<FxInputProps>) => JSX.Element;
+    renderMain: (props: CommonWrapperRestProps<DefaultizedFxInputProps>) => JSX.Element;
     /**
      * @public
      */
@@ -48,3 +54,4 @@ export declare class FxInput extends React.Component<FxInputProps> {
     blur: () => void;
     private refInput;
 }
+export {};

package/components/FxInput/FxInput.md

@@ -14,3 +14,16 @@ function handleRestore() {
 
 <FxInput auto={auto} value={value} onValueChange={handleValueChange} onRestore={handleRestore} />;
 ```
+
+Очистить значение в `FxInput`'е можно с помощью пустой строки или `undefined`
+```jsx harmony
+import { Group, Button } from '@skbkontur/react-ui';
+
+const [value, setValue] = React.useState(12345);
+
+<Group>
+  <FxInput value={value} onValueChange={setValue} />
+  <Button onClick={() => setValue(undefined)}>Undefined</Button>
+  <Button onClick={() => setValue('')}>Пустая строка</Button>
+</Group>
+```

package/components/FxInput/FxInputRestoreBtn/FxInputRestoreBtn.js

@@ -0,0 +1,64 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import React, { useContext } from 'react';
+import { Input } from "../../Input";
+import { ThemeContext } from "../../../lib/theming/ThemeContext";
+import { isTheme2022 } from "../../../lib/theming/ThemeHelpers";
+import { Button } from "../../Button";
+import { UndoIcon } from "../../../internal/icons/16px";
+import { UndoIcon as UndoIcon2022 } from "../UndoIcon";
+export var FxInputRestoreBtn = function FxInputRestoreBtn(props) {
+  var theme = useContext(ThemeContext);
+  var iconUndo = /*#__PURE__*/React.createElement(UndoIcon, null);
+  var buttonCorners;
+
+  if (isTheme2022(theme)) {
+    var size = props.size || Input.defaultProps.size;
+    var iconSizes = {
+      small: parseInt(theme.inputIconSizeSmall),
+      medium: parseInt(theme.inputIconSizeMedium),
+      large: parseInt(theme.inputIconSizeLarge)
+    };
+    var cornersSizes = {
+      small: {
+        borderTopLeftRadius: theme.inputBorderRadiusSmall,
+        borderBottomLeftRadius: theme.inputBorderRadiusSmall
+      },
+      medium: {
+        borderTopLeftRadius: theme.inputBorderRadiusMedium,
+        borderBottomLeftRadius: theme.inputBorderRadiusMedium
+      },
+      large: {
+        borderTopLeftRadius: theme.inputBorderRadiusLarge,
+        borderBottomLeftRadius: theme.inputBorderRadiusLarge
+      }
+    };
+    buttonCorners = cornersSizes[size];
+    iconUndo = /*#__PURE__*/React.createElement(UndoIcon2022, {
+      size: iconSizes[size]
+    });
+  }
+
+  return isTheme2022(theme) ? /*#__PURE__*/React.createElement(Button, {
+    size: props.size,
+    onClick: props.onRestore,
+    borderless: props.borderless,
+    disabled: props.disabled,
+    corners: _extends({
+      borderTopRightRadius: 0,
+      borderBottomRightRadius: 0
+    }, buttonCorners),
+    icon: iconUndo,
+    "aria-label": props['aria-label']
+  }) : /*#__PURE__*/React.createElement(Button, {
+    size: props.size,
+    narrow: true,
+    onClick: props.onRestore,
+    borderless: props.borderless,
+    disabled: props.disabled,
+    corners: _extends({
+      borderTopRightRadius: 0,
+      borderBottomRightRadius: 0
+    }, buttonCorners),
+    "aria-label": props['aria-label']
+  }, iconUndo);
+};

package/components/FxInput/FxInputRestoreBtn/FxInputRestoreBtn.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["FxInputRestoreBtn.tsx"],"names":["React","useContext","Input","ThemeContext","isTheme2022","Button","UndoIcon","UndoIcon2022","FxInputRestoreBtn","props","theme","iconUndo","buttonCorners","size","defaultProps","iconSizes","small","parseInt","inputIconSizeSmall","medium","inputIconSizeMedium","large","inputIconSizeLarge","cornersSizes","borderTopLeftRadius","inputBorderRadiusSmall","borderBottomLeftRadius","inputBorderRadiusMedium","inputBorderRadiusLarge","onRestore","borderless","disabled","borderTopRightRadius","borderBottomRightRadius"],"mappings":"0DAAA,OAAOA,KAAP,IAAgCC,UAAhC,QAAkD,OAAlD;;AAEA,SAASC,KAAT,QAAsB,UAAtB;AACA,SAASC,YAAT,QAA6B,gCAA7B;AACA,SAASC,WAAT,QAA4B,gCAA5B;AACA,SAASC,MAAT,QAAuB,WAAvB;AACA,SAASC,QAAT,QAAyB,2BAAzB;;;AAGA,SAASA,QAAQ,IAAIC,YAArB,QAAyC,YAAzC;;;;;;;AAOA,OAAO,IAAMC,iBAAkE,GAAG,SAArEA,iBAAqE,CAACC,KAAD,EAAW;AAC3F,MAAMC,KAAK,GAAGT,UAAU,CAACE,YAAD,CAAxB;;AAEA,MAAIQ,QAAQ,gBAAG,oBAAC,QAAD,OAAf;AACA,MAAIC,aAAJ;;AAEA,MAAIR,WAAW,CAACM,KAAD,CAAf,EAAwB;AACtB,QAAMG,IAAI,GAAGJ,KAAK,CAACI,IAAN,IAAcX,KAAK,CAACY,YAAN,CAAmBD,IAA9C;;AAEA,QAAME,SAAmC,GAAG;AAC1CC,MAAAA,KAAK,EAAEC,QAAQ,CAACP,KAAK,CAACQ,kBAAP,CAD2B;AAE1CC,MAAAA,MAAM,EAAEF,QAAQ,CAACP,KAAK,CAACU,mBAAP,CAF0B;AAG1CC,MAAAA,KAAK,EAAEJ,QAAQ,CAACP,KAAK,CAACY,kBAAP,CAH2B,EAA5C;;AAKA,QAAMC,YAAmD,GAAG;AAC1DP,MAAAA,KAAK,EAAE;AACLQ,QAAAA,mBAAmB,EAAEd,KAAK,CAACe,sBADtB;AAELC,QAAAA,sBAAsB,EAAEhB,KAAK,CAACe,sBAFzB,EADmD;;AAK1DN,MAAAA,MAAM,EAAE;AACNK,QAAAA,mBAAmB,EAAEd,KAAK,CAACiB,uBADrB;AAEND,QAAAA,sBAAsB,EAAEhB,KAAK,CAACiB,uBAFxB,EALkD;;AAS1DN,MAAAA,KAAK,EAAE;AACLG,QAAAA,mBAAmB,EAAEd,KAAK,CAACkB,sBADtB;AAELF,QAAAA,sBAAsB,EAAEhB,KAAK,CAACkB,sBAFzB,EATmD,EAA5D;;;AAcAhB,IAAAA,aAAa,GAAGW,YAAY,CAACV,IAAD,CAA5B;AACAF,IAAAA,QAAQ,gBAAG,oBAAC,YAAD,IAAc,IAAI,EAAEI,SAAS,CAACF,IAAD,CAA7B,GAAX;AACD;;AAED,SAAOT,WAAW,CAACM,KAAD,CAAX;AACL,sBAAC,MAAD;AACE,IAAA,IAAI,EAAED,KAAK,CAACI,IADd;AAEE,IAAA,OAAO,EAAEJ,KAAK,CAACoB,SAFjB;AAGE,IAAA,UAAU,EAAEpB,KAAK,CAACqB,UAHpB;AAIE,IAAA,QAAQ,EAAErB,KAAK,CAACsB,QAJlB;AAKE,IAAA,OAAO;AACLC,MAAAA,oBAAoB,EAAE,CADjB;AAELC,MAAAA,uBAAuB,EAAE,CAFpB;AAGFrB,IAAAA,aAHE,CALT;;AAUE,IAAA,IAAI,EAAED,QAVR;AAWE,kBAAYF,KAAK,CAAC,YAAD,CAXnB,GADK;;;AAeL,sBAAC,MAAD;AACE,IAAA,IAAI,EAAEA,KAAK,CAACI,IADd;AAEE,IAAA,MAAM,MAFR;AAGE,IAAA,OAAO,EAAEJ,KAAK,CAACoB,SAHjB;AAIE,IAAA,UAAU,EAAEpB,KAAK,CAACqB,UAJpB;AAKE,IAAA,QAAQ,EAAErB,KAAK,CAACsB,QALlB;AAME,IAAA,OAAO;AACLC,MAAAA,oBAAoB,EAAE,CADjB;AAELC,MAAAA,uBAAuB,EAAE,CAFpB;AAGFrB,IAAAA,aAHE,CANT;;AAWE,kBAAYH,KAAK,CAAC,YAAD,CAXnB;;AAaGE,EAAAA,QAbH,CAfF;;;AA+BD,CA/DM","sourcesContent":["import React, { AriaAttributes, useContext } from 'react';\n\nimport { Input } from '../Input';\nimport { ThemeContext } from '../../lib/theming/ThemeContext';\nimport { isTheme2022 } from '../../lib/theming/ThemeHelpers';\nimport { Button } from '../Button';\nimport { UndoIcon } from '../../internal/icons/16px';\nimport { SizeProp } from '../../lib/types/props';\n\nimport { UndoIcon as UndoIcon2022 } from './UndoIcon';\nimport { FxInputProps } from './FxInput';\n\ninterface FxInputRestoreBtnProps\n  extends Pick<AriaAttributes, 'aria-label'>,\n    Pick<FxInputProps, 'size' | 'onRestore' | 'borderless' | 'disabled'> {}\n\nexport const FxInputRestoreBtn: React.FunctionComponent<FxInputRestoreBtnProps> = (props) => {\n  const theme = useContext(ThemeContext);\n\n  let iconUndo = <UndoIcon />;\n  let buttonCorners;\n\n  if (isTheme2022(theme)) {\n    const size = props.size || Input.defaultProps.size;\n\n    const iconSizes: Record<SizeProp, number> = {\n      small: parseInt(theme.inputIconSizeSmall),\n      medium: parseInt(theme.inputIconSizeMedium),\n      large: parseInt(theme.inputIconSizeLarge),\n    };\n    const cornersSizes: Record<SizeProp, React.CSSProperties> = {\n      small: {\n        borderTopLeftRadius: theme.inputBorderRadiusSmall,\n        borderBottomLeftRadius: theme.inputBorderRadiusSmall,\n      },\n      medium: {\n        borderTopLeftRadius: theme.inputBorderRadiusMedium,\n        borderBottomLeftRadius: theme.inputBorderRadiusMedium,\n      },\n      large: {\n        borderTopLeftRadius: theme.inputBorderRadiusLarge,\n        borderBottomLeftRadius: theme.inputBorderRadiusLarge,\n      },\n    };\n    buttonCorners = cornersSizes[size];\n    iconUndo = <UndoIcon2022 size={iconSizes[size]} />;\n  }\n\n  return isTheme2022(theme) ? (\n    <Button\n      size={props.size}\n      onClick={props.onRestore}\n      borderless={props.borderless}\n      disabled={props.disabled}\n      corners={{\n        borderTopRightRadius: 0,\n        borderBottomRightRadius: 0,\n        ...buttonCorners,\n      }}\n      icon={iconUndo}\n      aria-label={props['aria-label']}\n    />\n  ) : (\n    <Button\n      size={props.size}\n      narrow\n      onClick={props.onRestore}\n      borderless={props.borderless}\n      disabled={props.disabled}\n      corners={{\n        borderTopRightRadius: 0,\n        borderBottomRightRadius: 0,\n        ...buttonCorners,\n      }}\n      aria-label={props['aria-label']}\n    >\n      {iconUndo}\n    </Button>\n  );\n};\n"]}

package/components/FxInput/FxInputRestoreBtn/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../../../cjs/components/FxInput/FxInputRestoreBtn.js",
+  "module": "FxInputRestoreBtn",
+  "types": "../FxInputRestoreBtn.d.ts",
+  "sideEffects": false
+}

package/components/FxInput/FxInputRestoreBtn.d.ts

@@ -0,0 +1,6 @@
+import React, { AriaAttributes } from 'react';
+import { FxInputProps } from './FxInput';
+interface FxInputRestoreBtnProps extends Pick<AriaAttributes, 'aria-label'>, Pick<FxInputProps, 'size' | 'onRestore' | 'borderless' | 'disabled'> {
+}
+export declare const FxInputRestoreBtn: React.FunctionComponent<FxInputRestoreBtnProps>;
+export {};

package/components/FxInput/MathFunctionIcon/MathFunctionIcon.js

@@ -0,0 +1,17 @@
+/* eslint-disable react/display-name */
+import React from 'react';
+import { iconSizer } from "../../../internal/icons2022/iconSizer";
+import { MathFunctionIcon16Light } from "../../../internal/icons2022/MathFunctionIcon/MathFunctionIcon16Light";
+import { MathFunctionIcon20Light } from "../../../internal/icons2022/MathFunctionIcon/MathFunctionIcon20Light";
+import { MathFunctionIcon24Regular } from "../../../internal/icons2022/MathFunctionIcon/MathFunctionIcon24Regular";
+export var MathFunctionIcon = iconSizer({
+  small: function small() {
+    return /*#__PURE__*/React.createElement(MathFunctionIcon16Light, null);
+  },
+  medium: function medium() {
+    return /*#__PURE__*/React.createElement(MathFunctionIcon20Light, null);
+  },
+  large: function large() {
+    return /*#__PURE__*/React.createElement(MathFunctionIcon24Regular, null);
+  }
+}, 'MathFunctionIcon');

package/components/FxInput/MathFunctionIcon/MathFunctionIcon.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["MathFunctionIcon.tsx"],"names":["React","iconSizer","MathFunctionIcon16Light","MathFunctionIcon20Light","MathFunctionIcon24Regular","MathFunctionIcon","small","medium","large"],"mappings":"AAAA;AACA,OAAOA,KAAP,MAAkB,OAAlB;;AAEA,SAASC,SAAT,QAA0B,oCAA1B;AACA,SAASC,uBAAT,QAAwC,mEAAxC;AACA,SAASC,uBAAT,QAAwC,mEAAxC;AACA,SAASC,yBAAT,QAA0C,qEAA1C;;AAEA,OAAO,IAAMC,gBAAgB,GAAGJ,SAAS;AACvC;AACEK,EAAAA,KAAK,EAAE,sCAAM,oBAAC,uBAAD,OAAN,EADT;AAEEC,EAAAA,MAAM,EAAE,uCAAM,oBAAC,uBAAD,OAAN,EAFV;AAGEC,EAAAA,KAAK,EAAE,sCAAM,oBAAC,yBAAD,OAAN,EAHT,EADuC;;AAMvC,kBANuC,CAAlC","sourcesContent":["/* eslint-disable react/display-name */\nimport React from 'react';\n\nimport { iconSizer } from '../../internal/icons2022/iconSizer';\nimport { MathFunctionIcon16Light } from '../../internal/icons2022/MathFunctionIcon/MathFunctionIcon16Light';\nimport { MathFunctionIcon20Light } from '../../internal/icons2022/MathFunctionIcon/MathFunctionIcon20Light';\nimport { MathFunctionIcon24Regular } from '../../internal/icons2022/MathFunctionIcon/MathFunctionIcon24Regular';\n\nexport const MathFunctionIcon = iconSizer(\n  {\n    small: () => <MathFunctionIcon16Light />,\n    medium: () => <MathFunctionIcon20Light />,\n    large: () => <MathFunctionIcon24Regular />,\n  },\n  'MathFunctionIcon',\n);\n"]}

package/components/FxInput/MathFunctionIcon/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../../../cjs/components/FxInput/MathFunctionIcon.js",
+  "module": "MathFunctionIcon",
+  "types": "../MathFunctionIcon.d.ts",
+  "sideEffects": false
+}

package/components/FxInput/MathFunctionIcon.d.ts

@@ -0,0 +1,3 @@
+export declare const MathFunctionIcon: import("../../lib/forwardRefAndName").ReactUIIconWithRef<SVGSVGElement, Omit<import("../../internal/icons2022/BaseIcon").IconProps, "size"> & {
+    size?: number | "small" | "medium" | "large" | undefined;
+}>;

package/components/FxInput/UndoIcon/UndoIcon.js

@@ -0,0 +1,17 @@
+/* eslint-disable react/display-name */
+import React from 'react';
+import { iconSizer } from "../../../internal/icons2022/iconSizer";
+import { ArrowShapeDRadiusUpLeftIcon16Light } from "../../../internal/icons2022/ArrowShapeDRadiusUpLeftIcon/ArrowShapeDRadiusUpLeftIcon16Light";
+import { ArrowShapeDRadiusUpLeftIcon24Regular } from "../../../internal/icons2022/ArrowShapeDRadiusUpLeftIcon/ArrowShapeDRadiusUpLeftIcon24Regular";
+import { ArrowShapeDRadiusUpLeftIcon20Light } from "../../../internal/icons2022/ArrowShapeDRadiusUpLeftIcon/ArrowShapeDRadiusUpLeftIcon20Light";
+export var UndoIcon = iconSizer({
+  small: function small() {
+    return /*#__PURE__*/React.createElement(ArrowShapeDRadiusUpLeftIcon16Light, null);
+  },
+  medium: function medium() {
+    return /*#__PURE__*/React.createElement(ArrowShapeDRadiusUpLeftIcon20Light, null);
+  },
+  large: function large() {
+    return /*#__PURE__*/React.createElement(ArrowShapeDRadiusUpLeftIcon24Regular, null);
+  }
+}, 'UndoIcon');

package/components/FxInput/UndoIcon/UndoIcon.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["UndoIcon.tsx"],"names":["React","iconSizer","ArrowShapeDRadiusUpLeftIcon16Light","ArrowShapeDRadiusUpLeftIcon24Regular","ArrowShapeDRadiusUpLeftIcon20Light","UndoIcon","small","medium","large"],"mappings":"AAAA;AACA,OAAOA,KAAP,MAAkB,OAAlB;;AAEA,SAASC,SAAT,QAA0B,oCAA1B;AACA,SAASC,kCAAT,QAAmD,yFAAnD;AACA,SAASC,oCAAT,QAAqD,2FAArD;AACA,SAASC,kCAAT,QAAmD,yFAAnD;;AAEA,OAAO,IAAMC,QAAQ,GAAGJ,SAAS;AAC/B;AACEK,EAAAA,KAAK,EAAE,sCAAM,oBAAC,kCAAD,OAAN,EADT;AAEEC,EAAAA,MAAM,EAAE,uCAAM,oBAAC,kCAAD,OAAN,EAFV;AAGEC,EAAAA,KAAK,EAAE,sCAAM,oBAAC,oCAAD,OAAN,EAHT,EAD+B;;AAM/B,UAN+B,CAA1B","sourcesContent":["/* eslint-disable react/display-name */\nimport React from 'react';\n\nimport { iconSizer } from '../../internal/icons2022/iconSizer';\nimport { ArrowShapeDRadiusUpLeftIcon16Light } from '../../internal/icons2022/ArrowShapeDRadiusUpLeftIcon/ArrowShapeDRadiusUpLeftIcon16Light';\nimport { ArrowShapeDRadiusUpLeftIcon24Regular } from '../../internal/icons2022/ArrowShapeDRadiusUpLeftIcon/ArrowShapeDRadiusUpLeftIcon24Regular';\nimport { ArrowShapeDRadiusUpLeftIcon20Light } from '../../internal/icons2022/ArrowShapeDRadiusUpLeftIcon/ArrowShapeDRadiusUpLeftIcon20Light';\n\nexport const UndoIcon = iconSizer(\n  {\n    small: () => <ArrowShapeDRadiusUpLeftIcon16Light />,\n    medium: () => <ArrowShapeDRadiusUpLeftIcon20Light />,\n    large: () => <ArrowShapeDRadiusUpLeftIcon24Regular />,\n  },\n  'UndoIcon',\n);\n"]}

package/components/FxInput/UndoIcon/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../../../cjs/components/FxInput/UndoIcon.js",
+  "module": "UndoIcon",
+  "types": "../UndoIcon.d.ts",
+  "sideEffects": false
+}

package/components/FxInput/UndoIcon.d.ts

@@ -0,0 +1,3 @@
+export declare const UndoIcon: import("../../lib/forwardRefAndName").ReactUIIconWithRef<SVGSVGElement, Omit<import("../../internal/icons2022/BaseIcon").IconProps, "size"> & {
+    size?: number | "small" | "medium" | "large" | undefined;
+}>;

package/components/Gapped/Gapped/Gapped.js

@@ -5,8 +5,14 @@ var _class, _class2, _temp;
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import { isNonNullable } from "../../../lib/utils";
 import { CommonWrapper } from "../../../internal/CommonWrapper";
 import { rootNode } from "../../../lib/rootNode";
+import { createPropsGetter } from "../../../lib/createPropsGetter";
+export var GappedDataTids = {
+  vertical: 'Gapped__vertical',
+  horizontal: 'Gapped__horizontal'
+};
 export
 /**
 * Контейнер, расстояние между элементами в котором равно `gap`.
@@ -15,7 +21,15 @@ var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$
   _inheritsLoose(Gapped, _React$Component);
 
   function Gapped() {
-    return _React$Component.apply(this, arguments) || this;
+    var _this;
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _React$Component.call.apply(_React$Component, [this].concat(args)) || this;
+    _this.getProps = createPropsGetter(Gapped.defaultProps);
+    return _this;
   }
 
   var _proto = Gapped.prototype;
@@ -23,14 +37,14 @@ var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$
   _proto.render = function render() {
     return /*#__PURE__*/React.createElement(CommonWrapper, _extends({
       rootNodeRef: this.setRootNode
-    }, this.props), this.props.vertical ? this.renderVertical() : this.renderHorizontal());
+    }, this.props), this.getProps().vertical ? this.renderVertical() : this.renderHorizontal());
   };
 
   _proto.getGapValue = function getGapValue() {
     // DEPRECATED remove in 4.0
     var propsGap = this.props.gap;
 
-    if (propsGap !== undefined && propsGap !== null) {
+    if (isNonNullable(propsGap)) {
       return propsGap;
     }
 
@@ -48,14 +62,16 @@ var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$
         key: index
       }, child);
     });
-    return /*#__PURE__*/React.createElement("div", null, children);
+    return /*#__PURE__*/React.createElement("div", {
+      "data-tid": GappedDataTids.vertical
+    }, children);
   };
 
   _proto.renderHorizontal = function renderHorizontal() {
     var _this$props = this.props,
         children = _this$props.children,
-        verticalAlign = _this$props.verticalAlign,
-        wrap = _this$props.wrap;
+        verticalAlign = _this$props.verticalAlign;
+    var wrap = this.getProps().wrap;
     var gap = this.getGapValue();
 
     var itemStyle = _extends({
@@ -76,6 +92,7 @@ var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$
       whiteSpace: 'nowrap'
     };
     return /*#__PURE__*/React.createElement("div", {
+      "data-tid": GappedDataTids.horizontal,
       style: rootStyle
     }, /*#__PURE__*/React.createElement("div", {
       style: contStyle
@@ -95,7 +112,7 @@ var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$
   };
 
   return Gapped;
-}(React.Component), _class2.__KONTUR_REACT_UI__ = 'Gapped', _class2.propTypes = {
+}(React.Component), _class2.__KONTUR_REACT_UI__ = 'Gapped', _class2.displayName = 'Gapped', _class2.propTypes = {
   /**
   * Расстояние между элементами.
   */

package/components/Gapped/Gapped/Gapped.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Gapped.tsx"],"names":["React","PropTypes","CommonWrapper","rootNode","Gapped","render","setRootNode","props","vertical","renderVertical","renderHorizontal","getGapValue","propsGap","gap","undefined","subsequentItemStyle","paddingTop","children","Children","toArray","filter","filterChildren","map","child","index","style","verticalAlign","wrap","itemStyle","display","marginLeft","marginTop","rootStyle","contStyle","whiteSpace","Boolean","Component","__KONTUR_REACT_UI__","propTypes","number","bool","oneOf","defaultProps"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { CommonWrapper, CommonProps } from '../../internal/CommonWrapper';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\n\nexport interface GappedProps extends CommonProps {\n  /**\n   * Расстояние между элементами в пикселях\n   * @default 8\n   */\n  gap?: number;\n  /**\n   * Вертикальное выравнивание\n   * @default \"baseline\"\n   */\n  verticalAlign: 'top' | 'middle' | 'baseline' | 'bottom';\n  /**\n   * Расположение элементов по вертикали\n   * @default false\n   */\n  vertical: boolean;\n  /**\n   * Перенос элементов на новую строку при горизонтальном расположении\n   * @default false\n   */\n  wrap: boolean;\n  children: React.ReactNode;\n}\n\n/**\n * Контейнер, расстояние между элементами в котором равно `gap`.\n */\n@rootNode\nexport class Gapped extends React.Component<GappedProps> {\n  public static __KONTUR_REACT_UI__ = 'Gapped';\n\n  public static propTypes = {\n    /**\n     * Расстояние между элементами.\n     */\n    gap: PropTypes.number,\n\n    /**\n     * Располагать элементы вертикально.\n     */\n    vertical: PropTypes.bool,\n\n    /**\n     * Вертикальное выравнивание элементов.\n     */\n    verticalAlign: PropTypes.oneOf(['top', 'middle', 'baseline', 'bottom']),\n  };\n\n  private setRootNode!: TSetRootNode;\n\n  public static defaultProps = {\n    wrap: false,\n    vertical: false,\n    verticalAlign: 'baseline',\n  };\n\n  public render() {\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        {this.props.vertical ? this.renderVertical() : this.renderHorizontal()}\n      </CommonWrapper>\n    );\n  }\n\n  private getGapValue() {\n    // DEPRECATED remove in 4.0\n    const { gap: propsGap } = this.props;\n    if (propsGap !== undefined && propsGap !== null) {\n      return propsGap;\n    }\n\n    return 8;\n  }\n\n  private renderVertical() {\n    const subsequentItemStyle: React.CSSProperties = {\n      paddingTop: this.getGapValue(),\n    };\n    const children = React.Children.toArray(this.props.children)\n      .filter(this.filterChildren)\n      .map((child, index) => {\n        const style = index === 0 ? undefined : subsequentItemStyle;\n        return (\n          <div style={style} key={index}>\n            {child}\n          </div>\n        );\n      });\n\n    return <div>{children}</div>;\n  }\n\n  private renderHorizontal() {\n    const { children, verticalAlign, wrap } = this.props;\n    const gap = this.getGapValue();\n    const itemStyle: React.CSSProperties = {\n      display: 'inline-block',\n      verticalAlign,\n      ...(wrap ? { marginLeft: gap, marginTop: gap } : {}),\n    };\n    const rootStyle: React.CSSProperties = wrap ? { paddingTop: 1 } : {};\n    const contStyle: React.CSSProperties = wrap ? { marginTop: -gap - 1, marginLeft: -gap } : { whiteSpace: 'nowrap' };\n\n    return (\n      <div style={rootStyle}>\n        <div style={contStyle}>\n          {React.Children.toArray(children)\n            .filter(this.filterChildren)\n            .map((child, index) => {\n              const marginLeft = index === 0 ? undefined : gap;\n              return (\n                <span key={index} style={{ marginLeft, ...itemStyle }}>\n                  {child}\n                </span>\n              );\n            })}\n        </div>\n      </div>\n    );\n  }\n\n  private filterChildren(child: React.ReactNode): boolean {\n    return Boolean(child) || typeof child === 'number';\n  }\n}\n"]}
+{"version":3,"sources":["Gapped.tsx"],"names":["React","PropTypes","isNonNullable","CommonWrapper","rootNode","createPropsGetter","GappedDataTids","vertical","horizontal","Gapped","getProps","defaultProps","render","setRootNode","props","renderVertical","renderHorizontal","getGapValue","propsGap","gap","subsequentItemStyle","paddingTop","children","Children","toArray","filter","filterChildren","map","child","index","style","undefined","verticalAlign","wrap","itemStyle","display","marginLeft","marginTop","rootStyle","contStyle","whiteSpace","Boolean","Component","__KONTUR_REACT_UI__","displayName","propTypes","number","bool","oneOf"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { isNonNullable } from '../../lib/utils';\nimport { CommonWrapper, CommonProps } from '../../internal/CommonWrapper';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\nimport { createPropsGetter } from '../../lib/createPropsGetter';\n\nexport interface GappedProps extends CommonProps {\n  /**\n   * Расстояние между элементами в пикселях\n   * @default 8\n   */\n  gap?: number;\n  /**\n   * Вертикальное выравнивание\n   * @default \"baseline\"\n   */\n  verticalAlign?: 'top' | 'middle' | 'baseline' | 'bottom';\n  /**\n   * Расположение элементов по вертикали\n   * @default false\n   */\n  vertical?: boolean;\n  /**\n   * Перенос элементов на новую строку при горизонтальном расположении\n   * @default false\n   */\n  wrap?: boolean;\n  children: React.ReactNode;\n}\n\nexport const GappedDataTids = {\n  vertical: 'Gapped__vertical',\n  horizontal: 'Gapped__horizontal',\n} as const;\n\ntype DefaultProps = Required<Pick<GappedProps, 'wrap' | 'vertical' | 'verticalAlign'>>;\n\n/**\n * Контейнер, расстояние между элементами в котором равно `gap`.\n */\n@rootNode\nexport class Gapped extends React.Component<GappedProps> {\n  public static __KONTUR_REACT_UI__ = 'Gapped';\n  public static displayName = 'Gapped';\n\n  public static propTypes = {\n    /**\n     * Расстояние между элементами.\n     */\n    gap: PropTypes.number,\n\n    /**\n     * Располагать элементы вертикально.\n     */\n    vertical: PropTypes.bool,\n\n    /**\n     * Вертикальное выравнивание элементов.\n     */\n    verticalAlign: PropTypes.oneOf(['top', 'middle', 'baseline', 'bottom']),\n  };\n\n  private setRootNode!: TSetRootNode;\n\n  public static defaultProps: DefaultProps = {\n    wrap: false,\n    vertical: false,\n    verticalAlign: 'baseline',\n  };\n\n  private getProps = createPropsGetter(Gapped.defaultProps);\n\n  public render() {\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        {this.getProps().vertical ? this.renderVertical() : this.renderHorizontal()}\n      </CommonWrapper>\n    );\n  }\n\n  private getGapValue() {\n    // DEPRECATED remove in 4.0\n    const { gap: propsGap } = this.props;\n    if (isNonNullable(propsGap)) {\n      return propsGap;\n    }\n\n    return 8;\n  }\n\n  private renderVertical() {\n    const subsequentItemStyle: React.CSSProperties = {\n      paddingTop: this.getGapValue(),\n    };\n    const children = React.Children.toArray(this.props.children)\n      .filter(this.filterChildren)\n      .map((child, index) => {\n        const style = index === 0 ? undefined : subsequentItemStyle;\n        return (\n          <div style={style} key={index}>\n            {child}\n          </div>\n        );\n      });\n\n    return <div data-tid={GappedDataTids.vertical}>{children}</div>;\n  }\n\n  private renderHorizontal() {\n    const { children, verticalAlign } = this.props;\n    const wrap = this.getProps().wrap;\n    const gap = this.getGapValue();\n    const itemStyle: React.CSSProperties = {\n      display: 'inline-block',\n      verticalAlign,\n      ...(wrap ? { marginLeft: gap, marginTop: gap } : {}),\n    };\n    const rootStyle: React.CSSProperties = wrap ? { paddingTop: 1 } : {};\n    const contStyle: React.CSSProperties = wrap ? { marginTop: -gap - 1, marginLeft: -gap } : { whiteSpace: 'nowrap' };\n\n    return (\n      <div data-tid={GappedDataTids.horizontal} style={rootStyle}>\n        <div style={contStyle}>\n          {React.Children.toArray(children)\n            .filter(this.filterChildren)\n            .map((child, index) => {\n              const marginLeft = index === 0 ? undefined : gap;\n              return (\n                <span key={index} style={{ marginLeft, ...itemStyle }}>\n                  {child}\n                </span>\n              );\n            })}\n        </div>\n      </div>\n    );\n  }\n\n  private filterChildren(child: React.ReactNode): boolean {\n    return Boolean(child) || typeof child === 'number';\n  }\n}\n"]}

package/components/Gapped/Gapped.d.ts

@@ -11,24 +11,30 @@ export interface GappedProps extends CommonProps {
      * Вертикальное выравнивание
      * @default "baseline"
      */
-    verticalAlign: 'top' | 'middle' | 'baseline' | 'bottom';
+    verticalAlign?: 'top' | 'middle' | 'baseline' | 'bottom';
     /**
      * Расположение элементов по вертикали
      * @default false
      */
-    vertical: boolean;
+    vertical?: boolean;
     /**
      * Перенос элементов на новую строку при горизонтальном расположении
      * @default false
      */
-    wrap: boolean;
+    wrap?: boolean;
     children: React.ReactNode;
 }
+export declare const GappedDataTids: {
+    readonly vertical: "Gapped__vertical";
+    readonly horizontal: "Gapped__horizontal";
+};
+declare type DefaultProps = Required<Pick<GappedProps, 'wrap' | 'vertical' | 'verticalAlign'>>;
 /**
  * Контейнер, расстояние между элементами в котором равно `gap`.
  */
 export declare class Gapped extends React.Component<GappedProps> {
     static __KONTUR_REACT_UI__: string;
+    static displayName: string;
     static propTypes: {
         /**
          * Расстояние между элементами.
@@ -44,14 +50,12 @@ export declare class Gapped extends React.Component<GappedProps> {
         verticalAlign: PropTypes.Requireable<string>;
     };
     private setRootNode;
-    static defaultProps: {
-        wrap: boolean;
-        vertical: boolean;
-        verticalAlign: string;
-    };
+    static defaultProps: DefaultProps;
+    private getProps;
     render(): JSX.Element;
     private getGapValue;
     private renderVertical;
     private renderHorizontal;
     private filterChildren;
 }
+export {};

package/components/GlobalLoader/GlobalLoader/GlobalLoader.js

@@ -1,5 +1,4 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
 import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
 
 var _class, _class2, _temp;
@@ -9,24 +8,27 @@ import debounce from 'lodash.debounce';
 import { isTestEnv } from "../../../lib/currentEnvironment";
 import { CommonWrapper } from "../../../internal/CommonWrapper";
 import { rootNode } from "../../../lib/rootNode";
+import { createPropsGetter } from "../../../lib/createPropsGetter";
 import { GlobalLoaderView } from "../GlobalLoaderView";
+export var GlobalLoaderDataTids = {
+  root: 'GlobalLoader'
+};
 var currentGlobalLoader;
 export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(GlobalLoader, _React$Component);
 
   function GlobalLoader(props) {
-    var _currentGlobalLoader;
-
     var _this;
 
     _this = _React$Component.call(this, props) || this;
+    _this.getProps = createPropsGetter(GlobalLoader.defaultProps);
     _this.startTask = debounce(function () {
       _this.setState({
         visible: true
       });
 
       _this.props.onStart == null ? void 0 : _this.props.onStart();
-    }, _this.props.delayBeforeShow);
+    }, _this.getProps().delayBeforeShow);
     _this.stopTask = debounce(function () {
       _this.setState({
         visible: false,
@@ -35,15 +37,16 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
       });
 
       _this.props.onDone == null ? void 0 : _this.props.onDone();
-    }, _this.props.delayBeforeHide);
+    }, _this.getProps().delayBeforeHide);
+    _this.resumeTaskAfterSuccessAnimation = debounce(function () {
+      _this.setActive();
+    }, _this.getProps().delayBeforeHide);
 
     _this.setActive = function () {
       _this.startTask.cancel();
 
       if (_this.state.successAnimationInProgress) {
-        _this.successAnimationInProgressTimeout = setTimeout(function () {
-          _this.setActive();
-        }, _this.props.delayBeforeHide);
+        _this.resumeTaskAfterSuccessAnimation();
       } else {
         _this.setState({
           visible: false,
@@ -53,7 +56,7 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
           started: true
         });
 
-        if (_this.props.rejected) {
+        if (_this.getProps().rejected) {
           _this.setReject(true);
         } else {
           _this.stopTask.cancel();
@@ -64,6 +67,10 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
     };
 
     _this.setDone = function () {
+      if (!_this.state.started) {
+        return;
+      }
+
       _this.setState({
         done: true,
         successAnimationInProgress: true
@@ -71,11 +78,13 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
 
       _this.startTask.cancel();
 
+      _this.resumeTaskAfterSuccessAnimation.cancel();
+
       _this.stopTask();
     };
 
     _this.setReject = function (reject) {
-      if (!_this.state.visible && (_this.state.started || _this.props.active)) {
+      if (!_this.state.visible && (_this.state.started || _this.getProps().active)) {
         _this.setState({
           visible: true
         });
@@ -105,6 +114,8 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
 
       _this.startTask.cancel();
 
+      _this.resumeTaskAfterSuccessAnimation.cancel();
+
       _this.setState({
         dead: true
       });
@@ -118,39 +129,50 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
       accept: false,
       dead: false,
       successAnimationInProgress: false,
-      expectedResponseTime: _this.props.expectedResponseTime
+      expectedResponseTime: _this.getProps().expectedResponseTime
     };
-    _this.successAnimationInProgressTimeout = null;
-    (_currentGlobalLoader = currentGlobalLoader) == null ? void 0 : _currentGlobalLoader.kill();
-    currentGlobalLoader = _assertThisInitialized(_this);
     return _this;
   }
 
   var _proto = GlobalLoader.prototype;
 
   _proto.componentDidMount = function componentDidMount() {
-    if (this.props.active) {
+    var _currentGlobalLoader;
+
+    (_currentGlobalLoader = currentGlobalLoader) == null ? void 0 : _currentGlobalLoader.kill();
+    currentGlobalLoader = this;
+
+    var _this$getProps = this.getProps(),
+        active = _this$getProps.active,
+        rejected = _this$getProps.rejected;
+
+    if (active) {
       this.setActive();
     }
 
-    if (this.props.rejected) {
+    if (rejected) {
       this.setReject(true);
     }
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
-    if (this.props.expectedResponseTime !== prevProps.expectedResponseTime) {
+    var _this$getProps2 = this.getProps(),
+        expectedResponseTime = _this$getProps2.expectedResponseTime,
+        rejected = _this$getProps2.rejected,
+        active = _this$getProps2.active;
+
+    if (expectedResponseTime !== prevProps.expectedResponseTime) {
       this.setState({
-        expectedResponseTime: this.props.expectedResponseTime
+        expectedResponseTime: expectedResponseTime
       });
     }
 
-    if (this.props.rejected !== prevProps.rejected) {
-      this.setReject(!!this.props.rejected);
+    if (rejected !== prevProps.rejected) {
+      this.setReject(rejected);
     }
 
-    if (this.props.active !== prevProps.active) {
-      if (this.props.active) {
+    if (active !== prevProps.active) {
+      if (active) {
         this.setActive();
       } else {
         this.setDone();
@@ -158,10 +180,6 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
     }
   };
 
-  _proto.componentWillUnmount = function componentWillUnmount() {
-    this.successAnimationInProgressTimeout && clearTimeout(this.successAnimationInProgressTimeout);
-  };
-
   _proto.render = function render() {
     var status = 'standard';
 
@@ -173,14 +191,18 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
       status = 'accept';
     }
 
+    var _this$getProps3 = this.getProps(),
+        delayBeforeHide = _this$getProps3.delayBeforeHide,
+        disableAnimations = _this$getProps3.disableAnimations;
+
     return !this.state.dead && this.state.visible && /*#__PURE__*/React.createElement(CommonWrapper, _extends({
       rootNodeRef: this.setRootNode
     }, this.props), /*#__PURE__*/React.createElement(GlobalLoaderView, {
       expectedResponseTime: this.state.expectedResponseTime,
-      delayBeforeHide: this.props.delayBeforeHide,
+      delayBeforeHide: delayBeforeHide,
       status: status,
-      "data-tid": "GlobalLoader",
-      disableAnimations: this.props.disableAnimations
+      "data-tid": GlobalLoaderDataTids.root,
+      disableAnimations: disableAnimations
     }));
   }
   /**
@@ -198,7 +220,7 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
   };
 
   return GlobalLoader;
-}(React.Component), _class2.defaultProps = {
+}(React.Component), _class2.__KONTUR_REACT_UI__ = 'GlobalLoader', _class2.displayName = 'GlobalLoader', _class2.defaultProps = {
   expectedResponseTime: 1000,
   delayBeforeShow: 1000,
   delayBeforeHide: 1000,