@skbkontur/react-ui 4.2.1 → 4.3.1

package/components/DatePicker/DatePicker.d.ts

@@ -11,8 +11,8 @@ export interface DatePickerProps<T> extends CommonProps {
      * Состояние валидации при ошибке.
      */
     error?: boolean;
-    minDate: T;
-    maxDate: T;
+    minDate?: T;
+    maxDate?: T;
     menuAlign?: 'left' | 'right';
     size?: 'small' | 'medium' | 'large';
     value?: T | null;
@@ -47,7 +47,7 @@ export interface DatePickerProps<T> extends CommonProps {
      *
      * @returns {boolean} `true` для выходного или `false` для рабочего дня
      */
-    isHoliday: (day: T, isWeekend: boolean) => boolean;
+    isHoliday?: (day: T, isWeekend: boolean) => boolean;
 }
 export interface DatePickerState {
     opened: boolean;
@@ -59,6 +59,7 @@ export declare const DatePickerDataTids: {
     readonly pickerRoot: "Picker__root";
     readonly pickerTodayWrapper: "Picker__todayWrapper";
 };
+declare type DefaultProps<T> = Required<Pick<DatePickerProps<T>, 'minDate' | 'maxDate' | 'isHoliday'>>;
 export declare class DatePicker extends React.PureComponent<DatePickerProps<DatePickerValue>, DatePickerState> {
     static __KONTUR_REACT_UI__: string;
     static propTypes: {
@@ -93,11 +94,8 @@ export declare class DatePicker extends React.PureComponent<DatePickerProps<Date
         onMouseOver: PropTypes.Requireable<(...args: any[]) => any>;
         isHoliday: PropTypes.Validator<(...args: any[]) => any>;
     };
-    static defaultProps: {
-        minDate: string;
-        maxDate: string;
-        isHoliday: (_day: DatePickerValue, isWeekend: boolean) => boolean;
-    };
+    static defaultProps: DefaultProps<string>;
+    private getProps;
     static validate: (value: Nullable<string>, range?: {
         minDate?: string | undefined;
         maxDate?: string | undefined;
@@ -123,7 +121,7 @@ export declare class DatePicker extends React.PureComponent<DatePickerProps<Date
     close(): void;
     render(): JSX.Element;
     renderMain: (props: CommonWrapperRestProps<DatePickerProps<DatePickerValue>>) => JSX.Element;
-    getParent: () => Nullable<HTMLElement>;
+    getParent: () => Nullable<Element>;
     private getRootStyle;
     private getInputRef;
     private parseValueToDate;

package/components/DropdownMenu/DropdownMenu/DropdownMenu.js

@@ -10,6 +10,7 @@ import { PopupMenu } from "../../../internal/PopupMenu";
 import { isProductionEnv, isTestEnv } from "../../../lib/currentEnvironment";
 import { CommonWrapper } from "../../../internal/CommonWrapper";
 import { rootNode } from "../../../lib/rootNode";
+import { createPropsGetter } from "../../../lib/createPropsGetter";
 export
 /**
 * Меню, раскрывающееся по клику на переданный в `caption` элемент
@@ -21,6 +22,7 @@ var DropdownMenu = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_
     var _this;
 
     _this = _React$Component.call(this, props) || this;
+    _this.getProps = createPropsGetter(DropdownMenu.defaultProps);
     _this.popupMenu = null;
 
     _this.open = function () {
@@ -65,6 +67,10 @@ var DropdownMenu = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_
       return null;
     }
 
+    var _this$getProps = this.getProps(),
+        positions = _this$getProps.positions,
+        disableAnimations = _this$getProps.disableAnimations;
+
     return /*#__PURE__*/React.createElement(CommonWrapper, _extends({
       rootNodeRef: this.setRootNode
     }, this.props), /*#__PURE__*/React.createElement(PopupMenu, {
@@ -73,8 +79,8 @@ var DropdownMenu = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_
       menuMaxHeight: this.props.menuMaxHeight,
       menuWidth: this.props.menuWidth,
       popupHasPin: false,
-      positions: this.props.positions,
-      disableAnimations: this.props.disableAnimations,
+      positions: positions,
+      disableAnimations: disableAnimations,
       header: this.props.header,
       footer: this.props.footer,
       width: this.props.width,

package/components/DropdownMenu/DropdownMenu/DropdownMenu.js.map

@@ -1 +1 @@
-{"version":3,"sources":["DropdownMenu.tsx"],"names":["React","ThemeContext","ThemeFactory","PopupMenu","isProductionEnv","isTestEnv","CommonWrapper","rootNode","DropdownMenu","props","popupMenu","open","close","refPopupMenu","ref","caption","Error","render","theme","create","popupMargin","renderMain","setRootNode","menuMaxHeight","menuWidth","positions","disableAnimations","header","footer","width","onClose","onOpen","children","Component","__KONTUR_REACT_UI__","defaultProps"],"mappings":"2JAAA,OAAOA,KAAP,MAAkB,OAAlB;;AAEA,SAASC,YAAT,QAA6B,gCAA7B;AACA,SAASC,YAAT,QAA6B,gCAA7B;;AAEA,SAASC,SAAT,QAA0C,0BAA1C;AACA,SAASC,eAAT,EAA0BC,SAA1B,QAA2C,8BAA3C;;AAEA,SAASC,aAAT,QAA2C,8BAA3C;AACA,SAASC,QAAT,QAAuC,oBAAvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkDA,OAJA;AACA;AACA,GAEA,IAAaC,YAAb,GADCD,QACD;;;;;;;;;AAWE,wBAAYE,KAAZ,EAAsC;AACpC,wCAAMA,KAAN,UADoC,MAH9BC,SAG8B,GAHG,IAGH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuD/BC,IAAAA,IAvD+B,GAuDxB,YAAY;AACxB,UAAI,MAAKD,SAAT,EAAoB;AAClB,cAAKA,SAAL,CAAeC,IAAf;AACD;AACF,KA3DqC;;AA6D/BC,IAAAA,KA7D+B,GA6DvB,YAAY;AACzB,UAAI,MAAKF,SAAT,EAAoB;AAClB,cAAKA,SAAL,CAAeE,KAAf;AACD;AACF,KAjEqC;;AAmE9BC,IAAAA,YAnE8B,GAmEf,UAACC,GAAD,UAA+B,MAAKJ,SAAL,GAAiBI,GAAhD,EAnEe,CAGpC,IAAI,CAACL,KAAK,CAACM,OAAP,IAAkB,CAACX,eAAvB,EAAwC,CACtC,MAAM,IAAIY,KAAJ,CAAU,+BAAV,CAAN,CACD,CALmC,aAMrC,CAjBH,2CAmBSC,MAnBT,GAmBE,kBAAgB,mBACd,oBACE,oBAAC,YAAD,CAAc,QAAd,QACG,UAACC,KAAD,EAAW,CACV,oBACE,oBAAC,YAAD,CAAc,QAAd,IACE,KAAK,EAAEhB,YAAY,CAACiB,MAAb,CACL,EACEC,WAAW,EAAE,KADf,EADK,EAILF,KAJK,CADT,IAQG,MAAI,CAACG,UAAL,EARH,CADF,CAYD,CAdH,CADF,CAkBD,CAtCH,QAwCSA,UAxCT,GAwCE,sBAAoB,CAClB,IAAI,CAAC,KAAKZ,KAAL,CAAWM,OAAhB,EAAyB,CACvB,OAAO,IAAP,CACD,CACD,oBACE,oBAAC,aAAD,aAAe,WAAW,EAAE,KAAKO,WAAjC,IAAkD,KAAKb,KAAvD,gBACE,oBAAC,SAAD,IACE,GAAG,EAAE,KAAKI,YADZ,EAEE,OAAO,EAAE,KAAKJ,KAAL,CAAWM,OAFtB,EAGE,aAAa,EAAE,KAAKN,KAAL,CAAWc,aAH5B,EAIE,SAAS,EAAE,KAAKd,KAAL,CAAWe,SAJxB,EAKE,WAAW,EAAE,KALf,EAME,SAAS,EAAE,KAAKf,KAAL,CAAWgB,SANxB,EAOE,iBAAiB,EAAE,KAAKhB,KAAL,CAAWiB,iBAPhC,EAQE,MAAM,EAAE,KAAKjB,KAAL,CAAWkB,MARrB,EASE,MAAM,EAAE,KAAKlB,KAAL,CAAWmB,MATrB,EAUE,KAAK,EAAE,KAAKnB,KAAL,CAAWoB,KAVpB,EAWE,OAAO,EAAE,KAAKpB,KAAL,CAAWqB,OAXtB,EAYE,MAAM,EAAE,KAAKrB,KAAL,CAAWsB,MAZrB,IAcG,KAAKtB,KAAL,CAAWuB,QAdd,CADF,CADF,CAoBD,CAhEH,uBAAkChC,KAAK,CAACiC,SAAxC,WACgBC,mBADhB,GACsC,cADtC,UAGgBC,YAHhB,GAG+B,EAC3BT,iBAAiB,EAAErB,SADQ,EAE3BoB,SAAS,EAAE,CAAC,aAAD,EAAgB,cAAhB,EAAgC,UAAhC,EAA4C,WAA5C,CAFgB,EAH/B","sourcesContent":["import React from 'react';\n\nimport { ThemeContext } from '../../lib/theming/ThemeContext';\nimport { ThemeFactory } from '../../lib/theming/ThemeFactory';\nimport { Nullable } from '../../typings/utility-types';\nimport { PopupMenu, PopupMenuProps } from '../../internal/PopupMenu';\nimport { isProductionEnv, isTestEnv } from '../../lib/currentEnvironment';\nimport { PopupPositionsType } from '../../internal/Popup';\nimport { CommonWrapper, CommonProps } from '../../internal/CommonWrapper';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\n\nexport interface DropdownMenuProps extends CommonProps, Pick<PopupMenuProps, 'onOpen' | 'onClose'> {\n  /** Максимальная высота меню */\n  menuMaxHeight?: React.CSSProperties['maxWidth'];\n  /** Ширина меню */\n  menuWidth?: React.CSSProperties['width'];\n  /** Ширина caption */\n  width?: React.CSSProperties['width'];\n\n  /**\n   * Элемент или функция возвращающая элемент,\n   * если передана, используется вместо `caption`,\n   * в таком случае управлять открытием и закрытием меню\n   * придется в этой функции\n   */\n  caption: PopupMenuProps['caption'];\n\n  /**\n   * Произвольный элемент, который будет отрендерен в шапке меню.\n   *\n   * _Примечание_: контрол [`MenuHeader`](#/Components/MenuHeader) передаётся только в `children` меню-контролов. Не стоит передавать `MenuHeader` в `header`.\n   */\n  header?: React.ReactNode;\n  /**\n   * Произвольный элемент, который будет отрендерен в подвале меню.\n   *\n   * Перед элементом переданным в `footer` будет отрендерен [`MenuSeparator`](#/Components/MenuSeparator).\n   */\n  footer?: React.ReactNode;\n  /**\n   *  Список позиций доступных для расположения выпадашки относительно `caption`.\n   *\n   * Если во всех позициях выпадашка вылезает за пределы `viewport`, будет использована первая из этого списка.\n   *\n   * **Возможные значения**: `top left`, `top center`, `top right`, `right top`, `right middle`, `right bottom`, `bottom left`, `bottom center`, `bottom right`, `left top`, `left middle`, `left bottom`\n   * @default ['bottom left', 'bottom right', 'top left', 'top right']\n   */\n  positions?: PopupPositionsType[];\n\n  /**\n   * Не показывать анимацию\n   */\n  disableAnimations: boolean;\n}\n\n/**\n * Меню, раскрывающееся по клику на переданный в `caption` элемент\n */\n@rootNode\nexport class DropdownMenu extends React.Component<DropdownMenuProps> {\n  public static __KONTUR_REACT_UI__ = 'DropdownMenu';\n\n  public static defaultProps = {\n    disableAnimations: isTestEnv,\n    positions: ['bottom left', 'bottom right', 'top left', 'top right'],\n  };\n\n  private popupMenu: Nullable<PopupMenu> = null;\n  private setRootNode!: TSetRootNode;\n\n  constructor(props: DropdownMenuProps) {\n    super(props);\n\n    if (!props.caption && !isProductionEnv) {\n      throw new Error('Prop \"caption\" is required!!!');\n    }\n  }\n\n  public render() {\n    return (\n      <ThemeContext.Consumer>\n        {(theme) => {\n          return (\n            <ThemeContext.Provider\n              value={ThemeFactory.create(\n                {\n                  popupMargin: '0px',\n                },\n                theme,\n              )}\n            >\n              {this.renderMain()}\n            </ThemeContext.Provider>\n          );\n        }}\n      </ThemeContext.Consumer>\n    );\n  }\n\n  public renderMain() {\n    if (!this.props.caption) {\n      return null;\n    }\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        <PopupMenu\n          ref={this.refPopupMenu}\n          caption={this.props.caption}\n          menuMaxHeight={this.props.menuMaxHeight}\n          menuWidth={this.props.menuWidth}\n          popupHasPin={false}\n          positions={this.props.positions}\n          disableAnimations={this.props.disableAnimations}\n          header={this.props.header}\n          footer={this.props.footer}\n          width={this.props.width}\n          onClose={this.props.onClose}\n          onOpen={this.props.onOpen}\n        >\n          {this.props.children}\n        </PopupMenu>\n      </CommonWrapper>\n    );\n  }\n\n  public open = (): void => {\n    if (this.popupMenu) {\n      this.popupMenu.open();\n    }\n  };\n\n  public close = (): void => {\n    if (this.popupMenu) {\n      this.popupMenu.close();\n    }\n  };\n\n  private refPopupMenu = (ref: Nullable<PopupMenu>) => (this.popupMenu = ref);\n}\n"]}
+{"version":3,"sources":["DropdownMenu.tsx"],"names":["React","ThemeContext","ThemeFactory","PopupMenu","isProductionEnv","isTestEnv","CommonWrapper","rootNode","createPropsGetter","DropdownMenu","props","getProps","defaultProps","popupMenu","open","close","refPopupMenu","ref","caption","Error","render","theme","create","popupMargin","renderMain","positions","disableAnimations","setRootNode","menuMaxHeight","menuWidth","header","footer","width","onClose","onOpen","children","Component","__KONTUR_REACT_UI__"],"mappings":"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","sourcesContent":["import React from 'react';\n\nimport { ThemeContext } from '../../lib/theming/ThemeContext';\nimport { ThemeFactory } from '../../lib/theming/ThemeFactory';\nimport { Nullable } from '../../typings/utility-types';\nimport { PopupMenu, PopupMenuProps } from '../../internal/PopupMenu';\nimport { isProductionEnv, isTestEnv } from '../../lib/currentEnvironment';\nimport { PopupPositionsType } from '../../internal/Popup';\nimport { CommonWrapper, CommonProps } from '../../internal/CommonWrapper';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\nimport { createPropsGetter } from '../../lib/createPropsGetter';\n\nexport interface DropdownMenuProps extends CommonProps, Pick<PopupMenuProps, 'onOpen' | 'onClose'> {\n  /** Максимальная высота меню */\n  menuMaxHeight?: React.CSSProperties['maxWidth'];\n  /** Ширина меню */\n  menuWidth?: React.CSSProperties['width'];\n  /** Ширина caption */\n  width?: React.CSSProperties['width'];\n\n  /**\n   * Элемент или функция возвращающая элемент,\n   * если передана, используется вместо `caption`,\n   * в таком случае управлять открытием и закрытием меню\n   * придется в этой функции\n   */\n  caption: PopupMenuProps['caption'];\n\n  /**\n   * Произвольный элемент, который будет отрендерен в шапке меню.\n   *\n   * _Примечание_: контрол [`MenuHeader`](#/Components/MenuHeader) передаётся только в `children` меню-контролов. Не стоит передавать `MenuHeader` в `header`.\n   */\n  header?: React.ReactNode;\n  /**\n   * Произвольный элемент, который будет отрендерен в подвале меню.\n   *\n   * Перед элементом переданным в `footer` будет отрендерен [`MenuSeparator`](#/Components/MenuSeparator).\n   */\n  footer?: React.ReactNode;\n  /**\n   *  Список позиций доступных для расположения выпадашки относительно `caption`.\n   *\n   * Если во всех позициях выпадашка вылезает за пределы `viewport`, будет использована первая из этого списка.\n   *\n   * **Возможные значения**: `top left`, `top center`, `top right`, `right top`, `right middle`, `right bottom`, `bottom left`, `bottom center`, `bottom right`, `left top`, `left middle`, `left bottom`\n   * @default ['bottom left', 'bottom right', 'top left', 'top right']\n   */\n  positions?: PopupPositionsType[];\n\n  /**\n   * Не показывать анимацию\n   */\n  disableAnimations?: boolean;\n}\n\ntype DefaultProps = Required<Pick<DropdownMenuProps, 'disableAnimations' | 'positions'>>;\n\n/**\n * Меню, раскрывающееся по клику на переданный в `caption` элемент\n */\n@rootNode\nexport class DropdownMenu extends React.Component<DropdownMenuProps> {\n  public static __KONTUR_REACT_UI__ = 'DropdownMenu';\n\n  public static defaultProps: DefaultProps = {\n    disableAnimations: isTestEnv,\n    positions: ['bottom left', 'bottom right', 'top left', 'top right'],\n  };\n\n  private getProps = createPropsGetter(DropdownMenu.defaultProps);\n\n  private popupMenu: Nullable<PopupMenu> = null;\n  private setRootNode!: TSetRootNode;\n\n  constructor(props: DropdownMenuProps) {\n    super(props);\n\n    if (!props.caption && !isProductionEnv) {\n      throw new Error('Prop \"caption\" is required!!!');\n    }\n  }\n\n  public render() {\n    return (\n      <ThemeContext.Consumer>\n        {(theme) => {\n          return (\n            <ThemeContext.Provider\n              value={ThemeFactory.create(\n                {\n                  popupMargin: '0px',\n                },\n                theme,\n              )}\n            >\n              {this.renderMain()}\n            </ThemeContext.Provider>\n          );\n        }}\n      </ThemeContext.Consumer>\n    );\n  }\n\n  public renderMain() {\n    if (!this.props.caption) {\n      return null;\n    }\n    const { positions, disableAnimations } = this.getProps();\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        <PopupMenu\n          ref={this.refPopupMenu}\n          caption={this.props.caption}\n          menuMaxHeight={this.props.menuMaxHeight}\n          menuWidth={this.props.menuWidth}\n          popupHasPin={false}\n          positions={positions}\n          disableAnimations={disableAnimations}\n          header={this.props.header}\n          footer={this.props.footer}\n          width={this.props.width}\n          onClose={this.props.onClose}\n          onOpen={this.props.onOpen}\n        >\n          {this.props.children}\n        </PopupMenu>\n      </CommonWrapper>\n    );\n  }\n\n  public open = (): void => {\n    if (this.popupMenu) {\n      this.popupMenu.open();\n    }\n  };\n\n  public close = (): void => {\n    if (this.popupMenu) {\n      this.popupMenu.close();\n    }\n  };\n\n  private refPopupMenu = (ref: Nullable<PopupMenu>) => (this.popupMenu = ref);\n}\n"]}

package/components/DropdownMenu/DropdownMenu.d.ts

@@ -40,17 +40,16 @@ export interface DropdownMenuProps extends CommonProps, Pick<PopupMenuProps, 'on
     /**
      * Не показывать анимацию
      */
-    disableAnimations: boolean;
+    disableAnimations?: boolean;
 }
+declare type DefaultProps = Required<Pick<DropdownMenuProps, 'disableAnimations' | 'positions'>>;
 /**
  * Меню, раскрывающееся по клику на переданный в `caption` элемент
  */
 export declare class DropdownMenu extends React.Component<DropdownMenuProps> {
     static __KONTUR_REACT_UI__: string;
-    static defaultProps: {
-        disableAnimations: boolean;
-        positions: string[];
-    };
+    static defaultProps: DefaultProps;
+    private getProps;
     private popupMenu;
     private setRootNode;
     constructor(props: DropdownMenuProps);
@@ -60,3 +59,4 @@ export declare class DropdownMenu extends React.Component<DropdownMenuProps> {
     close: () => void;
     private refPopupMenu;
 }
+export {};

package/components/FileUploader/FileUploader.md

@@ -27,11 +27,18 @@ const request = () => Promise.reject();
 <FileUploader request={request} multiple />
 ```
 
+Использование `accept`
+```jsx harmony
+import { FileUploader } from '@skbkontur/react-ui';
+
+<FileUploader multiple accept="image/*" />
+```
+
 Валидация файла в списке
 ```jsx harmony
 import { FileUploader } from '@skbkontur/react-ui';
 
-<FileUploader multiple getFileValidationText={({originalFile}) => `У файла ${originalFile.name} неверный формат`} />
+<FileUploader multiple validateBeforeUpload={({originalFile}) => `У файла ${originalFile.name} неверный формат`} />
 ```
 
 Валидация контрола

package/components/FxInput/FxInput/FxInput.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
-var _excluded = ["type", "onRestore", "auto", "refInput"];
+var _excluded = ["type", "onRestore", "auto", "refInput", "value", "width"];
 
 var _class, _class2, _temp;
 
@@ -18,9 +18,9 @@ import { rootNode } from "../../../lib/rootNode";
 export var FxInputDataTids = {
   root: 'FxInput__root'
 };
+export
 /** Принимает все свойства `Input`'a */
-
-export var FxInput = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$Component) {
+var FxInput = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(FxInput, _React$Component);
 
   function FxInput() {
@@ -39,6 +39,8 @@ export var FxInput = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function
           onRestore = props.onRestore,
           auto = props.auto,
           refInput = props.refInput,
+          value = props.value,
+          width = props.width,
           rest = _objectWithoutPropertiesLoose(props, _excluded);
 
       var inputProps = {
@@ -60,17 +62,17 @@ export var FxInput = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function
 
       return /*#__PURE__*/React.createElement(Group, {
         "data-tid": FxInputDataTids.root,
-        width: _this.props.width
-      }, button, _this.getProps().type === 'currency' ? /*#__PURE__*/React.createElement(CurrencyInput, _extends({}, inputProps, rest, {
+        width: width
+      }, button, type === 'currency' ? /*#__PURE__*/React.createElement(CurrencyInput, _extends({}, inputProps, rest, {
         width: '100%',
         ref: _this.refInput,
-        value: _this.props.value,
+        value: value,
         onValueChange: _this.props.onValueChange
       })) : /*#__PURE__*/React.createElement(Input, _extends({}, inputProps, rest, {
         width: '100%',
         ref: _this.refInput,
-        type: _this.props.type,
-        value: _this.props.value,
+        type: type,
+        value: value,
         onValueChange: _this.props.onValueChange
       })));
     };
@@ -103,7 +105,7 @@ export var FxInput = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function
   _proto.render = function render() {
     return /*#__PURE__*/React.createElement(CommonWrapper, _extends({
       rootNodeRef: this.setRootNode
-    }, this.props), this.renderMain);
+    }, this.getProps()), this.renderMain);
   };
 
   return FxInput;

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

@@ -1 +1 @@
-{"version":3,"sources":["FxInput.tsx"],"names":["React","PropTypes","Button","Group","Input","CurrencyInput","createPropsGetter","FunctionIcon","UndoIcon","CommonWrapper","rootNode","FxInputDataTids","root","FxInput","input","getProps","defaultProps","renderMain","props","type","onRestore","auto","refInput","rest","inputProps","align","button","leftIcon","size","borderless","disabled","width","value","onValueChange","focus","blur","element","render","setRootNode","Component","__KONTUR_REACT_UI__","propTypes","bool","string"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { Button } from '../Button';\nimport { Group } from '../Group';\nimport { Input, InputProps, InputType } from '../Input';\nimport { CurrencyInput, CurrencyInputProps } from '../CurrencyInput';\nimport { createPropsGetter } from '../../lib/createPropsGetter';\nimport { Override } from '../../typings/utility-types';\nimport { FunctionIcon, UndoIcon } from '../../internal/icons/16px';\nimport { CommonWrapper, CommonProps, CommonWrapperRestProps } from '../../internal/CommonWrapper';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\n\nexport interface FxInputProps\n  extends CommonProps,\n    Override<\n      CurrencyInputProps,\n      {\n        /** Авто-режим */\n        auto?: boolean;\n        /** Тип инпута */\n        type?: 'currency' | InputProps['type'];\n        /** onRestore */\n        onRestore?: () => void;\n        /** onValueChange */\n        onValueChange: CurrencyInputProps['onValueChange'] | InputProps['onValueChange'];\n        /** Значение */\n        value?: React.ReactText;\n        /** ref Input'а */\n        refInput?: (element: CurrencyInput | Input | null) => void;\n        /** Убрать лишние нули после запятой */\n        hideTrailingZeros?: boolean;\n      }\n    > {}\n\nexport const FxInputDataTids = {\n  root: 'FxInput__root',\n} as const;\n\n/** Принимает все свойства `Input`'a */\n@rootNode\nexport class FxInput extends React.Component<FxInputProps> {\n  public static __KONTUR_REACT_UI__ = 'FxInput';\n\n  public static propTypes = {\n    auto: PropTypes.bool,\n    type: PropTypes.string,\n  };\n\n  public static defaultProps = {\n    width: 250,\n    type: 'text',\n    value: '',\n  };\n\n  private input: Input | CurrencyInput | null = null;\n\n  private getProps = createPropsGetter(FxInput.defaultProps);\n  private setRootNode!: TSetRootNode;\n\n  public render() {\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.props}>\n        {this.renderMain}\n      </CommonWrapper>\n    );\n  }\n\n  public renderMain = (props: CommonWrapperRestProps<FxInputProps>) => {\n    const { type, onRestore, auto, refInput, ...rest } = props;\n    const inputProps: Partial<CurrencyInputProps> = {\n      align: 'right',\n    };\n\n    let button = null;\n\n    if (auto) {\n      inputProps.leftIcon = <FunctionIcon />;\n    } else {\n      button = (\n        <Button\n          size={this.props.size}\n          narrow\n          onClick={this.props.onRestore}\n          borderless={this.props.borderless}\n          disabled={this.props.disabled}\n        >\n          <UndoIcon />\n        </Button>\n      );\n    }\n\n    return (\n      <Group data-tid={FxInputDataTids.root} width={this.props.width}>\n        {button}\n        {this.getProps().type === 'currency' ? (\n          <CurrencyInput\n            {...inputProps}\n            {...rest}\n            width={'100%'}\n            ref={this.refInput}\n            value={this.props.value as CurrencyInputProps['value']}\n            onValueChange={this.props.onValueChange as CurrencyInputProps['onValueChange']}\n          />\n        ) : (\n          <Input\n            {...inputProps}\n            {...rest}\n            width={'100%'}\n            ref={this.refInput}\n            type={this.props.type as InputType}\n            value={this.props.value as InputProps['value']}\n            onValueChange={this.props.onValueChange as InputProps['onValueChange']}\n          />\n        )}\n      </Group>\n    );\n  };\n\n  /**\n   * @public\n   */\n  public focus = () => {\n    if (this.input) {\n      this.input.focus();\n    }\n  };\n\n  /**\n   * @public\n   */\n  public blur = () => {\n    if (this.input) {\n      this.input.blur();\n    }\n  };\n\n  private refInput = (element: Input | CurrencyInput | null) => {\n    this.input = element;\n\n    if (this.props.refInput) {\n      this.props.refInput(this.input);\n    }\n  };\n}\n"]}
+{"version":3,"sources":["FxInput.tsx"],"names":["React","PropTypes","Button","Group","Input","CurrencyInput","createPropsGetter","FunctionIcon","UndoIcon","CommonWrapper","rootNode","FxInputDataTids","root","FxInput","input","getProps","defaultProps","renderMain","props","type","onRestore","auto","refInput","value","width","rest","inputProps","align","button","leftIcon","size","borderless","disabled","onValueChange","focus","blur","element","render","setRootNode","Component","__KONTUR_REACT_UI__","propTypes","bool","string"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nimport { Button } from '../Button';\nimport { Group } from '../Group';\nimport { Input, InputProps } from '../Input';\nimport { CurrencyInput, CurrencyInputProps } from '../CurrencyInput';\nimport { createPropsGetter, DefaultizedProps } from '../../lib/createPropsGetter';\nimport { Override } from '../../typings/utility-types';\nimport { FunctionIcon, UndoIcon } from '../../internal/icons/16px';\nimport { CommonWrapper, CommonProps, CommonWrapperRestProps } from '../../internal/CommonWrapper';\nimport { rootNode, TSetRootNode } from '../../lib/rootNode';\n\nexport interface FxInputProps\n  extends CommonProps,\n    Override<\n      CurrencyInputProps,\n      {\n        /** Авто-режим */\n        auto?: boolean;\n        /** Тип инпута */\n        type?: 'currency' | InputProps['type'];\n        /** onRestore */\n        onRestore?: () => void;\n        /** onValueChange */\n        onValueChange: CurrencyInputProps['onValueChange'] | InputProps['onValueChange'];\n        /** Значение */\n        value?: React.ReactText;\n        /** ref Input'а */\n        refInput?: (element: CurrencyInput | Input | null) => void;\n        /** Убрать лишние нули после запятой */\n        hideTrailingZeros?: boolean;\n      }\n    > {}\n\nexport const FxInputDataTids = {\n  root: 'FxInput__root',\n} as const;\n\ntype DefaultProps = Required<Pick<FxInputProps, 'width' | 'type' | 'value'>>;\ntype DefaultizedFxInputProps = DefaultizedProps<FxInputProps, DefaultProps>;\n\n/** Принимает все свойства `Input`'a */\n@rootNode\nexport class FxInput extends React.Component<FxInputProps> {\n  public static __KONTUR_REACT_UI__ = 'FxInput';\n\n  public static propTypes = {\n    auto: PropTypes.bool,\n    type: PropTypes.string,\n  };\n\n  public static defaultProps: DefaultProps = {\n    width: 250,\n    type: 'text',\n    value: '',\n  };\n\n  private input: Input | CurrencyInput | null = null;\n\n  private getProps = createPropsGetter(FxInput.defaultProps);\n  private setRootNode!: TSetRootNode;\n\n  public render() {\n    return (\n      <CommonWrapper rootNodeRef={this.setRootNode} {...this.getProps()}>\n        {this.renderMain}\n      </CommonWrapper>\n    );\n  }\n\n  public renderMain = (props: CommonWrapperRestProps<DefaultizedFxInputProps>) => {\n    const { type, onRestore, auto, refInput, value, width, ...rest } = props;\n    const inputProps: Partial<CurrencyInputProps> = {\n      align: 'right',\n    };\n\n    let button = null;\n\n    if (auto) {\n      inputProps.leftIcon = <FunctionIcon />;\n    } else {\n      button = (\n        <Button\n          size={this.props.size}\n          narrow\n          onClick={this.props.onRestore}\n          borderless={this.props.borderless}\n          disabled={this.props.disabled}\n        >\n          <UndoIcon />\n        </Button>\n      );\n    }\n\n    return (\n      <Group data-tid={FxInputDataTids.root} width={width}>\n        {button}\n        {type === 'currency' ? (\n          <CurrencyInput\n            {...inputProps}\n            {...rest}\n            width={'100%'}\n            ref={this.refInput}\n            value={value as CurrencyInputProps['value']}\n            onValueChange={this.props.onValueChange as CurrencyInputProps['onValueChange']}\n          />\n        ) : (\n          <Input\n            {...inputProps}\n            {...rest}\n            width={'100%'}\n            ref={this.refInput}\n            type={type}\n            value={value as InputProps['value']}\n            onValueChange={this.props.onValueChange as InputProps['onValueChange']}\n          />\n        )}\n      </Group>\n    );\n  };\n\n  /**\n   * @public\n   */\n  public focus = () => {\n    if (this.input) {\n      this.input.focus();\n    }\n  };\n\n  /**\n   * @public\n   */\n  public blur = () => {\n    if (this.input) {\n      this.input.blur();\n    }\n  };\n\n  private refInput = (element: Input | CurrencyInput | null) => {\n    this.input = element;\n\n    if (this.props.refInput) {\n      this.props.refInput(this.input);\n    }\n  };\n}\n"]}

package/components/FxInput/FxInput.d.ts

@@ -2,6 +2,7 @@ import React 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, {
@@ -24,6 +25,8 @@ export interface FxInputProps extends CommonProps, Override<CurrencyInputProps,
 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;
@@ -31,16 +34,12 @@ export declare class FxInput extends React.Component<FxInputProps> {
         auto: PropTypes.Requireable<boolean>;
         type: PropTypes.Requireable<string>;
     };
-    static defaultProps: {
-        width: number;
-        type: string;
-        value: string;
-    };
+    static defaultProps: DefaultProps;
     private input;
     private getProps;
     private setRootNode;
     render(): JSX.Element;
-    renderMain: (props: CommonWrapperRestProps<FxInputProps>) => JSX.Element;
+    renderMain: (props: CommonWrapperRestProps<DefaultizedFxInputProps>) => JSX.Element;
     /**
      * @public
      */
@@ -51,3 +50,4 @@ export declare class FxInput extends React.Component<FxInputProps> {
     blur: () => void;
     private refInput;
 }
+export {};

package/components/Gapped/Gapped/Gapped.js

@@ -8,19 +8,28 @@ 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`.
- */
-
-export var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$Component) {
+* Контейнер, расстояние между элементами в котором равно `gap`.
+*/
+var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (_React$Component) {
   _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;
@@ -28,7 +37,7 @@ export var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (
   _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() {
@@ -61,8 +70,8 @@ export var Gapped = rootNode(_class = (_temp = _class2 = /*#__PURE__*/function (
   _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({

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

@@ -1 +1 @@
-{"version":3,"sources":["Gapped.tsx"],"names":["React","PropTypes","isNonNullable","CommonWrapper","rootNode","GappedDataTids","vertical","horizontal","Gapped","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__","propTypes","number","bool","oneOf","defaultProps"],"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';\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\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 (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, 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 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"]}
+{"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__","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\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,23 +11,24 @@ 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`.
  */
@@ -48,14 +49,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

@@ -9,6 +9,7 @@ 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'
@@ -23,13 +24,14 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
     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,
@@ -38,15 +40,19 @@ 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.setActive = function () {
+      var _this$getProps = _this.getProps(),
+          delayBeforeHide = _this$getProps.delayBeforeHide,
+          rejected = _this$getProps.rejected;
+
       _this.startTask.cancel();
 
       if (_this.state.successAnimationInProgress) {
         _this.successAnimationInProgressTimeout = setTimeout(function () {
           _this.setActive();
-        }, _this.props.delayBeforeHide);
+        }, delayBeforeHide);
       } else {
         _this.setState({
           visible: false,
@@ -56,7 +62,7 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
           started: true
         });
 
-        if (_this.props.rejected) {
+        if (rejected) {
           _this.setReject(true);
         } else {
           _this.stopTask.cancel();
@@ -78,7 +84,7 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
     };
 
     _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
         });
@@ -121,7 +127,7 @@ 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();
@@ -132,28 +138,37 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
   var _proto = GlobalLoader.prototype;
 
   _proto.componentDidMount = function componentDidMount() {
-    if (this.props.active) {
+    var _this$getProps2 = this.getProps(),
+        active = _this$getProps2.active,
+        rejected = _this$getProps2.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$getProps3 = this.getProps(),
+        expectedResponseTime = _this$getProps3.expectedResponseTime,
+        rejected = _this$getProps3.rejected,
+        active = _this$getProps3.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();
@@ -176,14 +191,18 @@ export var GlobalLoader = rootNode(_class = (_temp = _class2 = /*#__PURE__*/func
       status = 'accept';
     }
 
+    var _this$getProps4 = this.getProps(),
+        delayBeforeHide = _this$getProps4.delayBeforeHide,
+        disableAnimations = _this$getProps4.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": GlobalLoaderDataTids.root,
-      disableAnimations: this.props.disableAnimations
+      disableAnimations: disableAnimations
     }));
   }
   /**