@vkontakte/vkui 4.28.1 → 4.30.0

package/dist/components/ModalCardBase/ModalCardBase.js

@@ -1,9 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["getRootRef", "icon", "header", "subheader", "children", "actions", "actionsLayout", "viewWidth", "hasMouse", "viewHeight", "onClose"];
+var _excluded = ["getRootRef", "icon", "header", "subheader", "children", "actions", "actionsLayout", "viewWidth", "hasMouse", "viewHeight", "onClose", "dismissLabel"];
 import { createScopedElement } from "../../lib/jsxRuntime";
 import { hasReactNode } from "../../lib/utils";
-import Title from "../Typography/Title/Title";
+import { Title } from "../Typography/Title/Title";
 import Headline from "../Typography/Headline/Headline";
 import { classNames } from "../../lib/classNames";
 import { getClassName } from "../../helpers/getClassName";
@@ -26,6 +26,8 @@ export var ModalCardBase = withAdaptivity(function (_ref) {
       hasMouse = _ref.hasMouse,
       viewHeight = _ref.viewHeight,
       onClose = _ref.onClose,
+      _ref$dismissLabel = _ref.dismissLabel,
+      dismissLabel = _ref$dismissLabel === void 0 ? "Скрыть" : _ref$dismissLabel,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var platform = usePlatform();
@@ -34,11 +36,13 @@ export var ModalCardBase = withAdaptivity(function (_ref) {
   var canShowCloseBtn = viewWidth >= ViewWidth.SMALL_TABLET;
   var canShowCloseBtnIos = platform === IOS && !canShowCloseBtn;
   return createScopedElement("div", _extends({}, restProps, {
+    // eslint-disable-next-line vkui/no-object-expression-in-arguments
     vkuiClass: classNames(getClassName("ModalCardBase", platform), {
       "ModalCardBase--desktop": isDesktop
     }),
     ref: getRootRef
   }), createScopedElement("div", {
+    // eslint-disable-next-line vkui/no-object-expression-in-arguments
     vkuiClass: classNames("ModalCardBase__container", {
       "ModalCardBase__container--softwareKeyboardOpened": isSoftwareKeyboardOpened
     })
@@ -52,13 +56,15 @@ export var ModalCardBase = withAdaptivity(function (_ref) {
     weight: "regular",
     vkuiClass: "ModalCardBase__subheader"
   }, subheader), children, hasReactNode(actions) && createScopedElement("div", {
+    // eslint-disable-next-line vkui/no-object-expression-in-arguments
     vkuiClass: classNames("ModalCardBase__actions", {
       "ModalCardBase__actions--v": actionsLayout === "vertical"
     })
   }, actions), canShowCloseBtn && createScopedElement(ModalDismissButton, {
     onClick: onClose
   }), canShowCloseBtnIos && createScopedElement(PanelHeaderButton, {
-    vkuiClass: "ModalCard__dismiss",
+    "aria-label": dismissLabel,
+    vkuiClass: "ModalCardBase__dismiss",
     onClick: onClose
   }, createScopedElement(Icon24Dismiss, null))));
 }, {

package/dist/components/ModalCardBase/ModalCardBase.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/ModalCardBase/ModalCardBase.tsx"],"names":["hasReactNode","Title","Headline","classNames","getClassName","usePlatform","ViewHeight","ViewWidth","withAdaptivity","PanelHeaderButton","ANDROID","IOS","ModalDismissButton","Icon24Dismiss","useKeyboard","ModalCardBase","getRootRef","icon","header","subheader","children","actions","actionsLayout","viewWidth","hasMouse","viewHeight","onClose","restProps","platform","isDesktop","SMALL_TABLET","MEDIUM","isSoftwareKeyboardOpened","isOpened","canShowCloseBtn","canShowCloseBtnIos"],"mappings":";;;;AACA,SAASA,YAAT;AACA,OAAOC,KAAP;AACA,OAAOC,QAAP;AACA,SAASC,UAAT;AACA,SAASC,YAAT;AACA,SAASC,WAAT;AACA,SACEC,UADF,EAEEC,SAFF,EAGEC,cAHF;AAMA,SAASC,iBAAT;AACA,SAASC,OAAT,EAAkBC,GAAlB;AACA,OAAOC,kBAAP;AACA,SAASC,aAAT,QAA8B,kBAA9B;AACA,SAASC,WAAT;AAsCA,OAAO,IAAMC,aAAa,GAAGP,cAAc,CAGzC,gBAaM;AAAA,MAZJQ,UAYI,QAZJA,UAYI;AAAA,MAXJC,IAWI,QAXJA,IAWI;AAAA,MAVJC,MAUI,QAVJA,MAUI;AAAA,MATJC,SASI,QATJA,SASI;AAAA,MARJC,QAQI,QARJA,QAQI;AAAA,MAPJC,OAOI,QAPJA,OAOI;AAAA,MANJC,aAMI,QANJA,aAMI;AAAA,MALJC,SAKI,QALJA,SAKI;AAAA,MAJJC,QAII,QAJJA,QAII;AAAA,MAHJC,UAGI,QAHJA,UAGI;AAAA,MAFJC,OAEI,QAFJA,OAEI;AAAA,MADDC,SACC;;AACJ,MAAMC,QAAQ,GAAGvB,WAAW,EAA5B;AACA,MAAMwB,SAAS,GACbN,SAAS,IAAIhB,SAAS,CAACuB,YAAvB,KACCN,QAAQ,IAAIC,UAAU,IAAInB,UAAU,CAACyB,MADtC,CADF;AAGA,MAAMC,wBAAwB,GAAGlB,WAAW,GAAGmB,QAA/C;AAEA,MAAMC,eAAe,GAAGX,SAAS,IAAIhB,SAAS,CAACuB,YAA/C;AACA,MAAMK,kBAAkB,GAAGP,QAAQ,KAAKjB,GAAb,IAAoB,CAACuB,eAAhD;AAEA,SACE,wCACMP,SADN;AAEE,IAAA,SAAS,EAAExB,UAAU,CAACC,YAAY,CAAC,eAAD,EAAkBwB,QAAlB,CAAb,EAA0C;AAC7D,gCAA0BC;AADmC,KAA1C,CAFvB;AAKE,IAAA,GAAG,EAAEb;AALP,MAOE;AACE,IAAA,SAAS,EAAEb,UAAU,CAAC,0BAAD,EAA6B;AAChD,0DACE6B;AAF8C,KAA7B;AADvB,KAMGhC,YAAY,CAACiB,IAAD,CAAZ,IACC;AAAK,IAAA,SAAS,EAAC;AAAf,KAAsCA,IAAtC,CAPJ,EASGjB,YAAY,CAACkB,MAAD,CAAZ,IACC,oBAAC,KAAD;AACE,IAAA,KAAK,EAAC,GADR;AAEE,IAAA,MAAM,EAAEU,QAAQ,KAAKlB,OAAb,GAAuB,GAAvB,GAA6B,GAFvC;AAGE,IAAA,SAAS,EAAC;AAHZ,KAKGQ,MALH,CAVJ,EAkBGlB,YAAY,CAACmB,SAAD,CAAZ,IACC,oBAAC,QAAD;AAAU,IAAA,MAAM,EAAC,SAAjB;AAA2B,IAAA,SAAS,EAAC;AAArC,KACGA,SADH,CAnBJ,EAwBGC,QAxBH,EA0BGpB,YAAY,CAACqB,OAAD,CAAZ,IACC;AACE,IAAA,SAAS,EAAElB,UAAU,CAAC,wBAAD,EAA2B;AAC9C,mCAA6BmB,aAAa,KAAK;AADD,KAA3B;AADvB,KAKGD,OALH,CA3BJ,EAoCGa,eAAe,IAAI,oBAAC,kBAAD;AAAoB,IAAA,OAAO,EAAER;AAA7B,IApCtB,EAqCGS,kBAAkB,IACjB,oBAAC,iBAAD;AAAmB,IAAA,SAAS,EAAC,oBAA7B;AAAkD,IAAA,OAAO,EAAET;AAA3D,KACE,oBAAC,aAAD,OADF,CAtCJ,CAPF,CADF;AAqDD,CA/EwC,EAgFzC;AACEH,EAAAA,SAAS,EAAE,IADb;AAEEE,EAAAA,UAAU,EAAE,IAFd;AAGED,EAAAA,QAAQ,EAAE;AAHZ,CAhFyC,CAApC","sourcesContent":["import * as React from \"react\";\nimport { hasReactNode } from \"../../lib/utils\";\nimport Title from \"../Typography/Title/Title\";\nimport Headline from \"../Typography/Headline/Headline\";\nimport { classNames } from \"../../lib/classNames\";\nimport { getClassName } from \"../../helpers/getClassName\";\nimport { usePlatform } from \"../../hooks/usePlatform\";\nimport {\n  ViewHeight,\n  ViewWidth,\n  withAdaptivity,\n} from \"../../hoc/withAdaptivity\";\nimport { HasRootRef } from \"../../types\";\nimport { PanelHeaderButton } from \"../PanelHeaderButton/PanelHeaderButton\";\nimport { ANDROID, IOS } from \"../../lib/platform\";\nimport ModalDismissButton from \"../ModalDismissButton/ModalDismissButton\";\nimport { Icon24Dismiss } from \"@vkontakte/icons\";\nimport { useKeyboard } from \"../../hooks/useKeyboard\";\nimport { AdaptivityContextInterface } from \"../AdaptivityProvider/AdaptivityContext\";\nimport \"./ModalCardBase.css\";\n\nexport interface ModalCardBaseProps\n  extends React.HTMLAttributes<HTMLDivElement>,\n    HasRootRef<HTMLDivElement> {\n  /**\n   * Иконка.\n   *\n   * Может быть компонентом иконки, например, `<Icon56MoneyTransferOutline />`, или `<Avatar size={72} src=\"\" />`\n   */\n  icon?: React.ReactNode;\n\n  /**\n   * Заголовок карточки\n   */\n  header?: React.ReactNode;\n\n  /**\n   * Подзаголовок\n   */\n  subheader?: React.ReactNode;\n\n  /**\n   * Кнопки-действия.\n   *\n   * Рекомендуется использовать `<Button size=\"l\" mode=\"primary\" />` или `<Button size=\"l\" mode=\"secondary\" />`\n   */\n  actions?: React.ReactNode;\n\n  /**\n   * Тип отображения кнопок: вертикальный или горизонтальный\n   */\n  actionsLayout?: \"vertical\" | \"horizontal\";\n  onClose?: VoidFunction;\n}\n\nexport const ModalCardBase = withAdaptivity<\n  ModalCardBaseProps & AdaptivityContextInterface\n>(\n  ({\n    getRootRef,\n    icon,\n    header,\n    subheader,\n    children,\n    actions,\n    actionsLayout,\n    viewWidth,\n    hasMouse,\n    viewHeight,\n    onClose,\n    ...restProps\n  }) => {\n    const platform = usePlatform();\n    const isDesktop =\n      viewWidth >= ViewWidth.SMALL_TABLET &&\n      (hasMouse || viewHeight >= ViewHeight.MEDIUM);\n    const isSoftwareKeyboardOpened = useKeyboard().isOpened;\n\n    const canShowCloseBtn = viewWidth >= ViewWidth.SMALL_TABLET;\n    const canShowCloseBtnIos = platform === IOS && !canShowCloseBtn;\n\n    return (\n      <div\n        {...restProps}\n        vkuiClass={classNames(getClassName(\"ModalCardBase\", platform), {\n          \"ModalCardBase--desktop\": isDesktop,\n        })}\n        ref={getRootRef}\n      >\n        <div\n          vkuiClass={classNames(\"ModalCardBase__container\", {\n            \"ModalCardBase__container--softwareKeyboardOpened\":\n              isSoftwareKeyboardOpened,\n          })}\n        >\n          {hasReactNode(icon) && (\n            <div vkuiClass=\"ModalCardBase__icon\">{icon}</div>\n          )}\n          {hasReactNode(header) && (\n            <Title\n              level=\"2\"\n              weight={platform === ANDROID ? \"2\" : \"1\"}\n              vkuiClass=\"ModalCardBase__header\"\n            >\n              {header}\n            </Title>\n          )}\n          {hasReactNode(subheader) && (\n            <Headline weight=\"regular\" vkuiClass=\"ModalCardBase__subheader\">\n              {subheader}\n            </Headline>\n          )}\n\n          {children}\n\n          {hasReactNode(actions) && (\n            <div\n              vkuiClass={classNames(\"ModalCardBase__actions\", {\n                \"ModalCardBase__actions--v\": actionsLayout === \"vertical\",\n              })}\n            >\n              {actions}\n            </div>\n          )}\n\n          {canShowCloseBtn && <ModalDismissButton onClick={onClose} />}\n          {canShowCloseBtnIos && (\n            <PanelHeaderButton vkuiClass=\"ModalCard__dismiss\" onClick={onClose}>\n              <Icon24Dismiss />\n            </PanelHeaderButton>\n          )}\n        </div>\n      </div>\n    );\n  },\n  {\n    viewWidth: true,\n    viewHeight: true,\n    hasMouse: true,\n  }\n);\n"],"file":"ModalCardBase.js"}
+{"version":3,"sources":["../../../src/components/ModalCardBase/ModalCardBase.tsx"],"names":["hasReactNode","Title","Headline","classNames","getClassName","usePlatform","ViewHeight","ViewWidth","withAdaptivity","PanelHeaderButton","ANDROID","IOS","ModalDismissButton","Icon24Dismiss","useKeyboard","ModalCardBase","getRootRef","icon","header","subheader","children","actions","actionsLayout","viewWidth","hasMouse","viewHeight","onClose","dismissLabel","restProps","platform","isDesktop","SMALL_TABLET","MEDIUM","isSoftwareKeyboardOpened","isOpened","canShowCloseBtn","canShowCloseBtnIos"],"mappings":";;;;AACA,SAASA,YAAT;AACA,SAASC,KAAT;AACA,OAAOC,QAAP;AACA,SAASC,UAAT;AACA,SAASC,YAAT;AACA,SAASC,WAAT;AACA,SACEC,UADF,EAEEC,SAFF,EAGEC,cAHF;AAMA,SAASC,iBAAT;AACA,SAASC,OAAT,EAAkBC,GAAlB;AACA,OAAOC,kBAAP;AACA,SAASC,aAAT,QAA8B,kBAA9B;AACA,SAASC,WAAT;AA2CA,OAAO,IAAMC,aAAa,GAAGP,cAAc,CAGzC,gBAcM;AAAA,MAbJQ,UAaI,QAbJA,UAaI;AAAA,MAZJC,IAYI,QAZJA,IAYI;AAAA,MAXJC,MAWI,QAXJA,MAWI;AAAA,MAVJC,SAUI,QAVJA,SAUI;AAAA,MATJC,QASI,QATJA,QASI;AAAA,MARJC,OAQI,QARJA,OAQI;AAAA,MAPJC,aAOI,QAPJA,aAOI;AAAA,MANJC,SAMI,QANJA,SAMI;AAAA,MALJC,QAKI,QALJA,QAKI;AAAA,MAJJC,UAII,QAJJA,UAII;AAAA,MAHJC,OAGI,QAHJA,OAGI;AAAA,+BAFJC,YAEI;AAAA,MAFJA,YAEI,kCAFW,QAEX;AAAA,MADDC,SACC;;AACJ,MAAMC,QAAQ,GAAGxB,WAAW,EAA5B;AACA,MAAMyB,SAAS,GACbP,SAAS,IAAIhB,SAAS,CAACwB,YAAvB,KACCP,QAAQ,IAAIC,UAAU,IAAInB,UAAU,CAAC0B,MADtC,CADF;AAGA,MAAMC,wBAAwB,GAAGnB,WAAW,GAAGoB,QAA/C;AAEA,MAAMC,eAAe,GAAGZ,SAAS,IAAIhB,SAAS,CAACwB,YAA/C;AACA,MAAMK,kBAAkB,GAAGP,QAAQ,KAAKlB,GAAb,IAAoB,CAACwB,eAAhD;AAEA,SACE,wCACMP,SADN;AAEE;AACA,IAAA,SAAS,EAAEzB,UAAU,CAACC,YAAY,CAAC,eAAD,EAAkByB,QAAlB,CAAb,EAA0C;AAC7D,gCAA0BC;AADmC,KAA1C,CAHvB;AAME,IAAA,GAAG,EAAEd;AANP,MAQE;AACE;AACA,IAAA,SAAS,EAAEb,UAAU,CAAC,0BAAD,EAA6B;AAChD,0DACE8B;AAF8C,KAA7B;AAFvB,KAOGjC,YAAY,CAACiB,IAAD,CAAZ,IACC;AAAK,IAAA,SAAS,EAAC;AAAf,KAAsCA,IAAtC,CARJ,EAUGjB,YAAY,CAACkB,MAAD,CAAZ,IACC,oBAAC,KAAD;AACE,IAAA,KAAK,EAAC,GADR;AAEE,IAAA,MAAM,EAAEW,QAAQ,KAAKnB,OAAb,GAAuB,GAAvB,GAA6B,GAFvC;AAGE,IAAA,SAAS,EAAC;AAHZ,KAKGQ,MALH,CAXJ,EAmBGlB,YAAY,CAACmB,SAAD,CAAZ,IACC,oBAAC,QAAD;AAAU,IAAA,MAAM,EAAC,SAAjB;AAA2B,IAAA,SAAS,EAAC;AAArC,KACGA,SADH,CApBJ,EAyBGC,QAzBH,EA2BGpB,YAAY,CAACqB,OAAD,CAAZ,IACC;AACE;AACA,IAAA,SAAS,EAAElB,UAAU,CAAC,wBAAD,EAA2B;AAC9C,mCAA6BmB,aAAa,KAAK;AADD,KAA3B;AAFvB,KAMGD,OANH,CA5BJ,EAsCGc,eAAe,IAAI,oBAAC,kBAAD;AAAoB,IAAA,OAAO,EAAET;AAA7B,IAtCtB,EAuCGU,kBAAkB,IACjB,oBAAC,iBAAD;AACE,kBAAYT,YADd;AAEE,IAAA,SAAS,EAAC,wBAFZ;AAGE,IAAA,OAAO,EAAED;AAHX,KAKE,oBAAC,aAAD,OALF,CAxCJ,CARF,CADF;AA4DD,CAvFwC,EAwFzC;AACEH,EAAAA,SAAS,EAAE,IADb;AAEEE,EAAAA,UAAU,EAAE,IAFd;AAGED,EAAAA,QAAQ,EAAE;AAHZ,CAxFyC,CAApC","sourcesContent":["import * as React from \"react\";\nimport { hasReactNode } from \"../../lib/utils\";\nimport { Title } from \"../Typography/Title/Title\";\nimport Headline from \"../Typography/Headline/Headline\";\nimport { classNames } from \"../../lib/classNames\";\nimport { getClassName } from \"../../helpers/getClassName\";\nimport { usePlatform } from \"../../hooks/usePlatform\";\nimport {\n  ViewHeight,\n  ViewWidth,\n  withAdaptivity,\n} from \"../../hoc/withAdaptivity\";\nimport { HasRootRef } from \"../../types\";\nimport { PanelHeaderButton } from \"../PanelHeaderButton/PanelHeaderButton\";\nimport { ANDROID, IOS } from \"../../lib/platform\";\nimport ModalDismissButton from \"../ModalDismissButton/ModalDismissButton\";\nimport { Icon24Dismiss } from \"@vkontakte/icons\";\nimport { useKeyboard } from \"../../hooks/useKeyboard\";\nimport { AdaptivityContextInterface } from \"../AdaptivityProvider/AdaptivityContext\";\nimport \"./ModalCardBase.css\";\n\nexport interface ModalCardBaseProps\n  extends React.HTMLAttributes<HTMLDivElement>,\n    HasRootRef<HTMLDivElement> {\n  /**\n   * Иконка.\n   *\n   * Может быть компонентом иконки, например, `<Icon56MoneyTransferOutline />`, или `<Avatar size={72} src=\"\" />`\n   */\n  icon?: React.ReactNode;\n\n  /**\n   * Заголовок карточки\n   */\n  header?: React.ReactNode;\n\n  /**\n   * Подзаголовок\n   */\n  subheader?: React.ReactNode;\n\n  /**\n   * Кнопки-действия.\n   *\n   * Рекомендуется использовать `<Button size=\"l\" mode=\"primary\" />` или `<Button size=\"l\" mode=\"secondary\" />`\n   */\n  actions?: React.ReactNode;\n\n  /**\n   * Тип отображения кнопок: вертикальный или горизонтальный\n   */\n  actionsLayout?: \"vertical\" | \"horizontal\";\n  onClose?: VoidFunction;\n\n  /**\n   * `aria-label` для кнопки закрытия. Необходим, чтобы кнопка была доступной.\n   */\n  dismissLabel?: string;\n}\n\nexport const ModalCardBase = withAdaptivity<\n  ModalCardBaseProps & AdaptivityContextInterface\n>(\n  ({\n    getRootRef,\n    icon,\n    header,\n    subheader,\n    children,\n    actions,\n    actionsLayout,\n    viewWidth,\n    hasMouse,\n    viewHeight,\n    onClose,\n    dismissLabel = \"Скрыть\",\n    ...restProps\n  }) => {\n    const platform = usePlatform();\n    const isDesktop =\n      viewWidth >= ViewWidth.SMALL_TABLET &&\n      (hasMouse || viewHeight >= ViewHeight.MEDIUM);\n    const isSoftwareKeyboardOpened = useKeyboard().isOpened;\n\n    const canShowCloseBtn = viewWidth >= ViewWidth.SMALL_TABLET;\n    const canShowCloseBtnIos = platform === IOS && !canShowCloseBtn;\n\n    return (\n      <div\n        {...restProps}\n        // eslint-disable-next-line vkui/no-object-expression-in-arguments\n        vkuiClass={classNames(getClassName(\"ModalCardBase\", platform), {\n          \"ModalCardBase--desktop\": isDesktop,\n        })}\n        ref={getRootRef}\n      >\n        <div\n          // eslint-disable-next-line vkui/no-object-expression-in-arguments\n          vkuiClass={classNames(\"ModalCardBase__container\", {\n            \"ModalCardBase__container--softwareKeyboardOpened\":\n              isSoftwareKeyboardOpened,\n          })}\n        >\n          {hasReactNode(icon) && (\n            <div vkuiClass=\"ModalCardBase__icon\">{icon}</div>\n          )}\n          {hasReactNode(header) && (\n            <Title\n              level=\"2\"\n              weight={platform === ANDROID ? \"2\" : \"1\"}\n              vkuiClass=\"ModalCardBase__header\"\n            >\n              {header}\n            </Title>\n          )}\n          {hasReactNode(subheader) && (\n            <Headline weight=\"regular\" vkuiClass=\"ModalCardBase__subheader\">\n              {subheader}\n            </Headline>\n          )}\n\n          {children}\n\n          {hasReactNode(actions) && (\n            <div\n              // eslint-disable-next-line vkui/no-object-expression-in-arguments\n              vkuiClass={classNames(\"ModalCardBase__actions\", {\n                \"ModalCardBase__actions--v\": actionsLayout === \"vertical\",\n              })}\n            >\n              {actions}\n            </div>\n          )}\n\n          {canShowCloseBtn && <ModalDismissButton onClick={onClose} />}\n          {canShowCloseBtnIos && (\n            <PanelHeaderButton\n              aria-label={dismissLabel}\n              vkuiClass=\"ModalCardBase__dismiss\"\n              onClick={onClose}\n            >\n              <Icon24Dismiss />\n            </PanelHeaderButton>\n          )}\n        </div>\n      </div>\n    );\n  },\n  {\n    viewWidth: true,\n    viewHeight: true,\n    hasMouse: true,\n  }\n);\n"],"file":"ModalCardBase.js"}

package/dist/components/ModalPage/ModalPage.d.ts

@@ -7,7 +7,22 @@ export interface ModalPageProps extends React.HTMLAttributes<HTMLDivElement>, Ad
      * Шапка модальной страницы, `<ModalPageHeader />`
      */
     header?: React.ReactNode;
+    /**
+     * Будет вызвано при начале открытия модалки.
+     */
+    onOpen?: VoidFunction;
+    /**
+     * Будет вызвано при окончательном открытии модалки.
+     */
+    onOpened?: VoidFunction;
+    /**
+     * Будет вызвано при начале закрытия модалки.
+     */
     onClose?: VoidFunction;
+    /**
+     * Будет вызвано при окончательном закрытии модалки.
+     */
+    onClosed?: VoidFunction;
     /**
      * Процент, на который изначально будет открыта модальная страница. При `settlingHeight={100}` модальная страница раскрывается на всю высоту.
      */
@@ -18,5 +33,5 @@ export interface ModalPageProps extends React.HTMLAttributes<HTMLDivElement>, Ad
     dynamicContentHeight?: boolean;
     getModalContentRef?: React.Ref<HTMLDivElement>;
 }
-declare const _default: React.FC<Pick<ModalPageProps & AdaptivityContextInterface, "hidden" | "dir" | "header" | "nav" | "slot" | "style" | "title" | "color" | "translate" | "prefix" | "children" | "className" | "id" | "lang" | "role" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "onClose" | "settlingHeight" | "dynamicContentHeight" | "getModalContentRef"> & import("../AdaptivityProvider/AdaptivityContext").SizeProps>;
+declare const _default: React.FC<Pick<ModalPageProps & AdaptivityContextInterface, "hidden" | "dir" | "header" | "nav" | "slot" | "style" | "title" | "color" | "translate" | "prefix" | "children" | "className" | "id" | "lang" | "role" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "onOpen" | "onOpened" | "onClose" | "onClosed" | "settlingHeight" | "dynamicContentHeight" | "getModalContentRef"> & import("../AdaptivityProvider/AdaptivityContext").SizeProps>;
 export default _default;

package/dist/components/ModalPage/ModalPage.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "header", "viewWidth", "viewHeight", "sizeX", "hasMouse", "onClose", "settlingHeight", "dynamicContentHeight", "getModalContentRef", "nav"];
+var _excluded = ["children", "header", "viewWidth", "viewHeight", "sizeX", "hasMouse", "onOpen", "onOpened", "onClose", "onClosed", "settlingHeight", "dynamicContentHeight", "getModalContentRef", "nav"];
 import { createScopedElement } from "../../lib/jsxRuntime";
 import * as React from "react";
 import { getClassName } from "../../helpers/getClassName";
@@ -26,7 +26,10 @@ var ModalPage = function ModalPage(props) {
       viewHeight = props.viewHeight,
       sizeX = props.sizeX,
       hasMouse = props.hasMouse,
+      onOpen = props.onOpen,
+      onOpened = props.onOpened,
       onClose = props.onClose,
+      onClosed = props.onClosed,
       settlingHeight = props.settlingHeight,
       dynamicContentHeight = props.dynamicContentHeight,
       getModalContentRef = props.getModalContentRef,
@@ -44,6 +47,7 @@ var ModalPage = function ModalPage(props) {
       refs = _useModalRegistry.refs;
 
   return createScopedElement("div", _extends({}, restProps, {
+    // eslint-disable-next-line vkui/no-object-expression-in-arguments
     vkuiClass: classNames(getClassName("ModalPage", platform), "ModalPage--sizeX-".concat(sizeX), {
       "ModalPage--desktop": isDesktop
     })

package/dist/components/ModalPage/ModalPage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/ModalPage/ModalPage.tsx"],"names":["React","getClassName","classNames","ModalRootContext","useModalRegistry","usePlatform","useOrientationChange","withAdaptivity","ViewHeight","ViewWidth","ModalDismissButton","multiRef","ModalType","getNavId","warnOnce","warn","ModalPage","props","useContext","updateModalHeight","children","header","viewWidth","viewHeight","sizeX","hasMouse","onClose","settlingHeight","dynamicContentHeight","getModalContentRef","nav","restProps","platform","orientation","useEffect","isDesktop","SMALL_TABLET","MEDIUM","canShowCloseBtn","modalContext","PAGE","refs","innerElement","headerElement","contentElement","defaultProps"],"mappings":"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","sourcesContent":["import * as React from \"react\";\nimport { getClassName } from \"../../helpers/getClassName\";\nimport { classNames } from \"../../lib/classNames\";\nimport {\n  ModalRootContext,\n  useModalRegistry,\n} from \"../ModalRoot/ModalRootContext\";\nimport { usePlatform } from \"../../hooks/usePlatform\";\nimport { useOrientationChange } from \"../../hooks/useOrientationChange\";\nimport {\n  withAdaptivity,\n  ViewHeight,\n  ViewWidth,\n} from \"../../hoc/withAdaptivity\";\nimport {\n  AdaptivityContextInterface,\n  AdaptivityProps,\n} from \"../AdaptivityProvider/AdaptivityContext\";\nimport ModalDismissButton from \"../ModalDismissButton/ModalDismissButton\";\nimport { multiRef } from \"../../lib/utils\";\nimport { ModalType } from \"../ModalRoot/types\";\nimport { getNavId, NavIdProps } from \"../../lib/getNavId\";\nimport { warnOnce } from \"../../lib/warnOnce\";\nimport \"./ModalPage.css\";\n\nexport interface ModalPageProps\n  extends React.HTMLAttributes<HTMLDivElement>,\n    AdaptivityProps,\n    NavIdProps {\n  /**\n   * Шапка модальной страницы, `<ModalPageHeader />`\n   */\n  header?: React.ReactNode;\n  onClose?: VoidFunction;\n  /**\n   * Процент, на который изначально будет открыта модальная страница. При `settlingHeight={100}` модальная страница раскрывается на всю высоту.\n   */\n  settlingHeight?: number;\n  /**\n   * Если высота контента в модальной странице может поменяться, нужно установить это свойство\n   */\n  dynamicContentHeight?: boolean;\n  getModalContentRef?: React.Ref<HTMLDivElement>;\n}\n\nconst warn = warnOnce(\"ModalPage\");\nconst ModalPage: React.FC<ModalPageProps & AdaptivityContextInterface> = (\n  props\n) => {\n  const { updateModalHeight } = React.useContext(ModalRootContext);\n\n  const {\n    children,\n    header,\n    viewWidth,\n    viewHeight,\n    sizeX,\n    hasMouse,\n    onClose,\n    settlingHeight,\n    dynamicContentHeight,\n    getModalContentRef,\n    nav,\n    ...restProps\n  } = props;\n\n  const platform = usePlatform();\n  const orientation = useOrientationChange();\n\n  React.useEffect(updateModalHeight, [\n    children,\n    orientation,\n    updateModalHeight,\n  ]);\n\n  const isDesktop =\n    viewWidth >= ViewWidth.SMALL_TABLET &&\n    (hasMouse || viewHeight >= ViewHeight.MEDIUM);\n  const canShowCloseBtn = viewWidth >= ViewWidth.SMALL_TABLET;\n\n  const modalContext = React.useContext(ModalRootContext);\n  const { refs } = useModalRegistry(getNavId(props, warn), ModalType.PAGE);\n\n  return (\n    <div\n      {...restProps}\n      vkuiClass={classNames(\n        getClassName(\"ModalPage\", platform),\n        `ModalPage--sizeX-${sizeX}`,\n        {\n          \"ModalPage--desktop\": isDesktop,\n        }\n      )}\n    >\n      <div vkuiClass=\"ModalPage__in-wrap\" ref={refs.innerElement}>\n        <div vkuiClass=\"ModalPage__in\">\n          <div vkuiClass=\"ModalPage__header\" ref={refs.headerElement}>\n            {header}\n          </div>\n\n          <div vkuiClass=\"ModalPage__content-wrap\">\n            <div\n              vkuiClass=\"ModalPage__content\"\n              ref={multiRef<HTMLDivElement>(\n                refs.contentElement,\n                getModalContentRef\n              )}\n            >\n              <div vkuiClass=\"ModalPage__content-in\">{children}</div>\n            </div>\n          </div>\n          {canShowCloseBtn && (\n            <ModalDismissButton onClick={onClose || modalContext.onClose} />\n          )}\n        </div>\n      </div>\n    </div>\n  );\n};\n\nModalPage.defaultProps = {\n  settlingHeight: 75,\n};\n\n// eslint-disable-next-line import/no-default-export\nexport default withAdaptivity(ModalPage, {\n  viewWidth: true,\n  viewHeight: true,\n  sizeX: true,\n  hasMouse: true,\n});\n"],"file":"ModalPage.js"}
+{"version":3,"sources":["../../../src/components/ModalPage/ModalPage.tsx"],"names":["React","getClassName","classNames","ModalRootContext","useModalRegistry","usePlatform","useOrientationChange","withAdaptivity","ViewHeight","ViewWidth","ModalDismissButton","multiRef","ModalType","getNavId","warnOnce","warn","ModalPage","props","useContext","updateModalHeight","children","header","viewWidth","viewHeight","sizeX","hasMouse","onOpen","onOpened","onClose","onClosed","settlingHeight","dynamicContentHeight","getModalContentRef","nav","restProps","platform","orientation","useEffect","isDesktop","SMALL_TABLET","MEDIUM","canShowCloseBtn","modalContext","PAGE","refs","innerElement","headerElement","contentElement","defaultProps"],"mappings":"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","sourcesContent":["import * as React from \"react\";\nimport { getClassName } from \"../../helpers/getClassName\";\nimport { classNames } from \"../../lib/classNames\";\nimport {\n  ModalRootContext,\n  useModalRegistry,\n} from \"../ModalRoot/ModalRootContext\";\nimport { usePlatform } from \"../../hooks/usePlatform\";\nimport { useOrientationChange } from \"../../hooks/useOrientationChange\";\nimport {\n  withAdaptivity,\n  ViewHeight,\n  ViewWidth,\n} from \"../../hoc/withAdaptivity\";\nimport {\n  AdaptivityContextInterface,\n  AdaptivityProps,\n} from \"../AdaptivityProvider/AdaptivityContext\";\nimport ModalDismissButton from \"../ModalDismissButton/ModalDismissButton\";\nimport { multiRef } from \"../../lib/utils\";\nimport { ModalType } from \"../ModalRoot/types\";\nimport { getNavId, NavIdProps } from \"../../lib/getNavId\";\nimport { warnOnce } from \"../../lib/warnOnce\";\nimport \"./ModalPage.css\";\n\nexport interface ModalPageProps\n  extends React.HTMLAttributes<HTMLDivElement>,\n    AdaptivityProps,\n    NavIdProps {\n  /**\n   * Шапка модальной страницы, `<ModalPageHeader />`\n   */\n  header?: React.ReactNode;\n  /**\n   * Будет вызвано при начале открытия модалки.\n   */\n  onOpen?: VoidFunction;\n  /**\n   * Будет вызвано при окончательном открытии модалки.\n   */\n  onOpened?: VoidFunction;\n  /**\n   * Будет вызвано при начале закрытия модалки.\n   */\n  onClose?: VoidFunction;\n  /**\n   * Будет вызвано при окончательном закрытии модалки.\n   */\n  onClosed?: VoidFunction;\n  /**\n   * Процент, на который изначально будет открыта модальная страница. При `settlingHeight={100}` модальная страница раскрывается на всю высоту.\n   */\n  settlingHeight?: number;\n  /**\n   * Если высота контента в модальной странице может поменяться, нужно установить это свойство\n   */\n  dynamicContentHeight?: boolean;\n  getModalContentRef?: React.Ref<HTMLDivElement>;\n}\n\nconst warn = warnOnce(\"ModalPage\");\nconst ModalPage: React.FC<ModalPageProps & AdaptivityContextInterface> = (\n  props\n) => {\n  const { updateModalHeight } = React.useContext(ModalRootContext);\n\n  const {\n    children,\n    header,\n    viewWidth,\n    viewHeight,\n    sizeX,\n    hasMouse,\n    onOpen,\n    onOpened,\n    onClose,\n    onClosed,\n    settlingHeight,\n    dynamicContentHeight,\n    getModalContentRef,\n    nav,\n    ...restProps\n  } = props;\n\n  const platform = usePlatform();\n  const orientation = useOrientationChange();\n\n  React.useEffect(updateModalHeight, [\n    children,\n    orientation,\n    updateModalHeight,\n  ]);\n\n  const isDesktop =\n    viewWidth >= ViewWidth.SMALL_TABLET &&\n    (hasMouse || viewHeight >= ViewHeight.MEDIUM);\n  const canShowCloseBtn = viewWidth >= ViewWidth.SMALL_TABLET;\n\n  const modalContext = React.useContext(ModalRootContext);\n  const { refs } = useModalRegistry(getNavId(props, warn), ModalType.PAGE);\n\n  return (\n    <div\n      {...restProps}\n      // eslint-disable-next-line vkui/no-object-expression-in-arguments\n      vkuiClass={classNames(\n        getClassName(\"ModalPage\", platform),\n        `ModalPage--sizeX-${sizeX}`,\n        {\n          \"ModalPage--desktop\": isDesktop,\n        }\n      )}\n    >\n      <div vkuiClass=\"ModalPage__in-wrap\" ref={refs.innerElement}>\n        <div vkuiClass=\"ModalPage__in\">\n          <div vkuiClass=\"ModalPage__header\" ref={refs.headerElement}>\n            {header}\n          </div>\n\n          <div vkuiClass=\"ModalPage__content-wrap\">\n            <div\n              vkuiClass=\"ModalPage__content\"\n              ref={multiRef<HTMLDivElement>(\n                refs.contentElement,\n                getModalContentRef\n              )}\n            >\n              <div vkuiClass=\"ModalPage__content-in\">{children}</div>\n            </div>\n          </div>\n          {canShowCloseBtn && (\n            <ModalDismissButton onClick={onClose || modalContext.onClose} />\n          )}\n        </div>\n      </div>\n    </div>\n  );\n};\n\nModalPage.defaultProps = {\n  settlingHeight: 75,\n};\n\n// eslint-disable-next-line import/no-default-export\nexport default withAdaptivity(ModalPage, {\n  viewWidth: true,\n  viewHeight: true,\n  sizeX: true,\n  hasMouse: true,\n});\n"],"file":"ModalPage.js"}

package/dist/components/ModalPageHeader/ModalPageHeader.js

@@ -27,6 +27,7 @@ var ModalPageHeader = function ModalPageHeader(_ref) {
   var hasSeparator = separator && platform === VKCOM;
   var isDesktop = viewWidth >= ViewWidth.SMALL_TABLET && (hasMouse || viewHeight >= ViewHeight.MEDIUM);
   return createScopedElement("div", {
+    // eslint-disable-next-line vkui/no-object-expression-in-arguments
     vkuiClass: classNames(getClassName("ModalPageHeader", platform), {
       "ModalPageHeader--desktop": isDesktop
     }),

package/dist/components/ModalPageHeader/ModalPageHeader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/ModalPageHeader/ModalPageHeader.tsx"],"names":["usePlatform","VKCOM","PanelHeader","Separator","useAdaptivity","classNames","getClassName","ViewHeight","ViewWidth","ModalPageHeader","children","separator","getRef","restProps","platform","viewWidth","viewHeight","hasMouse","hasSeparator","isDesktop","SMALL_TABLET","MEDIUM","defaultProps"],"mappings":";;;;AACA,SAASA,WAAT;AAEA,SAASC,KAAT;AACA,OAAOC,WAAP;AACA,OAAOC,SAAP;AACA,SAASC,aAAT;AACA,SAASC,UAAT;AACA,SAASC,YAAT;AACA,SAASC,UAAT,EAAqBC,SAArB;;AAQA,IAAMC,eAA8D,GAAG,SAAjEA,eAAiE,OAK3C;AAAA,MAJ1BC,QAI0B,QAJ1BA,QAI0B;AAAA,MAH1BC,SAG0B,QAH1BA,SAG0B;AAAA,MAF1BC,MAE0B,QAF1BA,MAE0B;AAAA,MADvBC,SACuB;;AAC1B,MAAMC,QAAQ,GAAGd,WAAW,EAA5B;;AACA,uBAA4CI,aAAa,EAAzD;AAAA,MAAQW,SAAR,kBAAQA,SAAR;AAAA,MAAmBC,UAAnB,kBAAmBA,UAAnB;AAAA,MAA+BC,QAA/B,kBAA+BA,QAA/B;;AACA,MAAMC,YAAY,GAAGP,SAAS,IAAIG,QAAQ,KAAKb,KAA/C;AACA,MAAMkB,SAAS,GACbJ,SAAS,IAAIP,SAAS,CAACY,YAAvB,KACCH,QAAQ,IAAID,UAAU,IAAIT,UAAU,CAACc,MADtC,CADF;AAIA,SACE;AACE,IAAA,SAAS,EAAEhB,UAAU,CAACC,YAAY,CAAC,iBAAD,EAAoBQ,QAApB,CAAb,EAA4C;AAC/D,kCAA4BK;AADmC,KAA5C,CADvB;AAIE,IAAA,GAAG,EAAEP;AAJP,KAME,oBAAC,WAAD;AACE,IAAA,SAAS,EAAC;AADZ,KAEMC,SAFN;AAGE,IAAA,KAAK,EAAE,KAHT;AAIE,IAAA,SAAS,EAAE,KAJb;AAKE,IAAA,WAAW;AALb,MAOGH,QAPH,CANF,EAeGQ,YAAY,IAAI,oBAAC,SAAD;AAAW,IAAA,IAAI;AAAf,IAfnB,CADF;AAmBD,CAhCD;;AAkCAT,eAAe,CAACa,YAAhB,GAA+B;AAC7BX,EAAAA,SAAS,EAAE;AADkB,CAA/B,C,CAIA;;AACA,eAAeF,eAAf","sourcesContent":["import * as React from \"react\";\nimport { usePlatform } from \"../../hooks/usePlatform\";\nimport { HasRef } from \"../../types\";\nimport { VKCOM } from \"../../lib/platform\";\nimport PanelHeader, { PanelHeaderProps } from \"../PanelHeader/PanelHeader\";\nimport Separator from \"../Separator/Separator\";\nimport { useAdaptivity } from \"../../hooks/useAdaptivity\";\nimport { classNames } from \"../../lib/classNames\";\nimport { getClassName } from \"../../helpers/getClassName\";\nimport { ViewHeight, ViewWidth } from \"../AdaptivityProvider/AdaptivityContext\";\nimport \"./ModalPageHeader.css\";\n\nexport interface ModalPageHeaderProps\n  extends React.HTMLAttributes<HTMLDivElement>,\n    Omit<PanelHeaderProps, \"fixed\" | \"shadow\">,\n    HasRef<HTMLDivElement> {}\n\nconst ModalPageHeader: React.FunctionComponent<ModalPageHeaderProps> = ({\n  children,\n  separator,\n  getRef,\n  ...restProps\n}: ModalPageHeaderProps) => {\n  const platform = usePlatform();\n  const { viewWidth, viewHeight, hasMouse } = useAdaptivity();\n  const hasSeparator = separator && platform === VKCOM;\n  const isDesktop =\n    viewWidth >= ViewWidth.SMALL_TABLET &&\n    (hasMouse || viewHeight >= ViewHeight.MEDIUM);\n\n  return (\n    <div\n      vkuiClass={classNames(getClassName(\"ModalPageHeader\", platform), {\n        \"ModalPageHeader--desktop\": isDesktop,\n      })}\n      ref={getRef}\n    >\n      <PanelHeader\n        vkuiClass=\"ModalPageHeader__in\"\n        {...restProps}\n        fixed={false}\n        separator={false}\n        transparent\n      >\n        {children}\n      </PanelHeader>\n      {hasSeparator && <Separator wide />}\n    </div>\n  );\n};\n\nModalPageHeader.defaultProps = {\n  separator: true,\n};\n\n// eslint-disable-next-line import/no-default-export\nexport default ModalPageHeader;\n"],"file":"ModalPageHeader.js"}
+{"version":3,"sources":["../../../src/components/ModalPageHeader/ModalPageHeader.tsx"],"names":["usePlatform","VKCOM","PanelHeader","Separator","useAdaptivity","classNames","getClassName","ViewHeight","ViewWidth","ModalPageHeader","children","separator","getRef","restProps","platform","viewWidth","viewHeight","hasMouse","hasSeparator","isDesktop","SMALL_TABLET","MEDIUM","defaultProps"],"mappings":";;;;AACA,SAASA,WAAT;AAEA,SAASC,KAAT;AACA,OAAOC,WAAP;AACA,OAAOC,SAAP;AACA,SAASC,aAAT;AACA,SAASC,UAAT;AACA,SAASC,YAAT;AACA,SAASC,UAAT,EAAqBC,SAArB;;AAQA,IAAMC,eAA8D,GAAG,SAAjEA,eAAiE,OAK3C;AAAA,MAJ1BC,QAI0B,QAJ1BA,QAI0B;AAAA,MAH1BC,SAG0B,QAH1BA,SAG0B;AAAA,MAF1BC,MAE0B,QAF1BA,MAE0B;AAAA,MADvBC,SACuB;;AAC1B,MAAMC,QAAQ,GAAGd,WAAW,EAA5B;;AACA,uBAA4CI,aAAa,EAAzD;AAAA,MAAQW,SAAR,kBAAQA,SAAR;AAAA,MAAmBC,UAAnB,kBAAmBA,UAAnB;AAAA,MAA+BC,QAA/B,kBAA+BA,QAA/B;;AACA,MAAMC,YAAY,GAAGP,SAAS,IAAIG,QAAQ,KAAKb,KAA/C;AACA,MAAMkB,SAAS,GACbJ,SAAS,IAAIP,SAAS,CAACY,YAAvB,KACCH,QAAQ,IAAID,UAAU,IAAIT,UAAU,CAACc,MADtC,CADF;AAIA,SACE;AACE;AACA,IAAA,SAAS,EAAEhB,UAAU,CAACC,YAAY,CAAC,iBAAD,EAAoBQ,QAApB,CAAb,EAA4C;AAC/D,kCAA4BK;AADmC,KAA5C,CAFvB;AAKE,IAAA,GAAG,EAAEP;AALP,KAOE,oBAAC,WAAD;AACE,IAAA,SAAS,EAAC;AADZ,KAEMC,SAFN;AAGE,IAAA,KAAK,EAAE,KAHT;AAIE,IAAA,SAAS,EAAE,KAJb;AAKE,IAAA,WAAW;AALb,MAOGH,QAPH,CAPF,EAgBGQ,YAAY,IAAI,oBAAC,SAAD;AAAW,IAAA,IAAI;AAAf,IAhBnB,CADF;AAoBD,CAjCD;;AAmCAT,eAAe,CAACa,YAAhB,GAA+B;AAC7BX,EAAAA,SAAS,EAAE;AADkB,CAA/B,C,CAIA;;AACA,eAAeF,eAAf","sourcesContent":["import * as React from \"react\";\nimport { usePlatform } from \"../../hooks/usePlatform\";\nimport { HasRef } from \"../../types\";\nimport { VKCOM } from \"../../lib/platform\";\nimport PanelHeader, { PanelHeaderProps } from \"../PanelHeader/PanelHeader\";\nimport Separator from \"../Separator/Separator\";\nimport { useAdaptivity } from \"../../hooks/useAdaptivity\";\nimport { classNames } from \"../../lib/classNames\";\nimport { getClassName } from \"../../helpers/getClassName\";\nimport { ViewHeight, ViewWidth } from \"../AdaptivityProvider/AdaptivityContext\";\nimport \"./ModalPageHeader.css\";\n\nexport interface ModalPageHeaderProps\n  extends React.HTMLAttributes<HTMLDivElement>,\n    Omit<PanelHeaderProps, \"fixed\" | \"shadow\">,\n    HasRef<HTMLDivElement> {}\n\nconst ModalPageHeader: React.FunctionComponent<ModalPageHeaderProps> = ({\n  children,\n  separator,\n  getRef,\n  ...restProps\n}: ModalPageHeaderProps) => {\n  const platform = usePlatform();\n  const { viewWidth, viewHeight, hasMouse } = useAdaptivity();\n  const hasSeparator = separator && platform === VKCOM;\n  const isDesktop =\n    viewWidth >= ViewWidth.SMALL_TABLET &&\n    (hasMouse || viewHeight >= ViewHeight.MEDIUM);\n\n  return (\n    <div\n      // eslint-disable-next-line vkui/no-object-expression-in-arguments\n      vkuiClass={classNames(getClassName(\"ModalPageHeader\", platform), {\n        \"ModalPageHeader--desktop\": isDesktop,\n      })}\n      ref={getRef}\n    >\n      <PanelHeader\n        vkuiClass=\"ModalPageHeader__in\"\n        {...restProps}\n        fixed={false}\n        separator={false}\n        transparent\n      >\n        {children}\n      </PanelHeader>\n      {hasSeparator && <Separator wide />}\n    </div>\n  );\n};\n\nModalPageHeader.defaultProps = {\n  separator: true,\n};\n\n// eslint-disable-next-line import/no-default-export\nexport default ModalPageHeader;\n"],"file":"ModalPageHeader.js"}

package/dist/components/ModalRoot/ModalRoot.d.ts

@@ -5,12 +5,24 @@ import "./ModalRoot.css";
 export interface ModalRootProps extends HasPlatform {
     activeModal?: string | null;
     /**
-     * Будет вызвано при закрытии активной модалки с её id
+     * Будет вызвано при начале открытия активной модалки с её id
+     */
+    onOpen?(modalId: string): void;
+    /**
+     * Будет вызвано при окончательном открытии активной модалки с её id
+     */
+    onOpened?(modalId: string): void;
+    /**
+     * Будет вызвано при начале закрытия активной модалки с её id
      */
     onClose?(modalId: string): void;
+    /**
+     * Будет вызвано при окончательном закрытии активной модалки с её id
+     */
+    onClosed?(modalId: string): void;
     /**
      * @ignore
      */
     configProvider?: ConfigProviderContextInterface;
 }
-export declare const ModalRootTouch: React.FC<Pick<ModalRootProps, "configProvider" | "onClose" | "activeModal">>;
+export declare const ModalRootTouch: React.FC<Pick<ModalRootProps, "configProvider" | "onOpen" | "onOpened" | "onClose" | "onClosed" | "activeModal">>;

package/dist/components/ModalRoot/ModalRoot.js

@@ -182,7 +182,7 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
         return Object.assign(_this.getModalState(id), data);
       },
       onClose: function onClose() {
-        return _this.props.closeActiveModal();
+        return _this.props.onExit();
       },
       isInsideModal: true
     };
@@ -249,12 +249,13 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
       if (this.props.enteringModal && this.props.enteringModal !== prevProps.enteringModal) {
         var enteringModal = this.props.enteringModal;
         var enteringState = this.getModalState(enteringModal);
+        this.props.onEnter();
         this.waitTransitionFinish(enteringState, function () {
           if (enteringState !== null && enteringState !== void 0 && enteringState.innerElement) {
             enteringState.innerElement.style.transitionDelay = "";
           }
 
-          _this2.props.onEnter(enteringModal);
+          _this2.props.onEntered(enteringModal);
         });
 
         if (enteringState !== null && enteringState !== void 0 && enteringState.innerElement) {
@@ -342,7 +343,7 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
       var prevModalState = this.getModalState(id);
 
       if (!prevModalState) {
-        id && warn("[closeActiveModal] Modal ".concat(id, " does not exist - not closing"));
+        id && warn("closeActiveModal: \u043C\u043E\u0434\u0430\u043B\u044C\u043D\u043E\u0435 \u043E\u043A\u043D\u043E (\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430) ".concat(id, " \u043D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442"), "error");
         return;
       }
 
@@ -350,7 +351,7 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
       var nextIsPage = !!nextModalState && nextModalState.type === ModalType.PAGE;
       var prevIsPage = !!prevModalState && prevModalState.type === ModalType.PAGE;
       this.waitTransitionFinish(prevModalState, function () {
-        return _this3.props.onExit(id);
+        return _this3.props.onExited(id);
       });
       var exitTranslate = prevIsPage && nextIsPage && ((_prevModalState$trans = prevModalState.translateY) !== null && _prevModalState$trans !== void 0 ? _prevModalState$trans : 0) <= ((_nextModalState$trans = nextModalState === null || nextModalState === void 0 ? void 0 : nextModalState.translateYFrom) !== null && _nextModalState$trans !== void 0 ? _nextModalState$trans : 0) && !this.props.isBack ? ((_nextModalState$trans2 = nextModalState === null || nextModalState === void 0 ? void 0 : nextModalState.translateYFrom) !== null && _nextModalState$trans2 !== void 0 ? _nextModalState$trans2 : 0) + 10 : 100;
       this.animateTranslate(prevModalState, exitTranslate);
@@ -507,7 +508,7 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
         modalState.hidden = translateY === 100;
 
         if (modalState.hidden) {
-          this.props.closeActiveModal();
+          this.props.onExit();
         }
 
         setStateCallback = function setStateCallback() {
@@ -549,7 +550,7 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
         modalState.hidden = translateY === 100;
 
         if (modalState.hidden) {
-          this.props.closeActiveModal();
+          this.props.onExit();
         }
 
         setStateCallback = function setStateCallback() {
@@ -651,7 +652,8 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
         value: true
       }, createScopedElement(ModalRootContext.Provider, {
         value: this.modalRootContext
-      }, createScopedElement(Touch, {
+      }, createScopedElement(Touch // eslint-disable-next-line vkui/no-object-expression-in-arguments
+      , {
         vkuiClass: classNames(getClassName("ModalRoot", this.props.platform), {
           "ModalRoot--vkapps": ((_this$props$configPro = this.props.configProvider) === null || _this$props$configPro === void 0 ? void 0 : _this$props$configPro.webviewType) === WebviewType.VKAPPS,
           "ModalRoot--touched": touchDown,
@@ -662,7 +664,7 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
         onScroll: this.onScroll
       }, createScopedElement("div", {
         vkuiClass: "ModalRoot__mask",
-        onClick: this.props.closeActiveModal,
+        onClick: this.props.onExit,
         ref: this.maskElementRef
       }), createScopedElement("div", {
         vkuiClass: "ModalRoot__viewport",
@@ -689,8 +691,9 @@ var ModalRootTouchComponent = /*#__PURE__*/function (_React$Component) {
               modalState.modalElement = e;
             }
           },
-          onClose: _this7.props.closeActiveModal,
-          timeout: _this7.timeout,
+          onClose: _this7.props.onExit,
+          timeout: _this7.timeout // eslint-disable-next-line vkui/no-object-expression-in-arguments
+          ,
           vkuiClass: classNames("ModalRoot__modal", {
             "ModalRoot__modal--active": modalId === activeModal,
             "ModalRoot__modal--prev": modalId === exitingModal,
@@ -724,7 +727,7 @@ function initModal(modalState) {
       return initCardModal(modalState);
 
     default:
-      IS_DEV && warn("[initActiveModal] modalState.type is unknown");
+      IS_DEV && warn("initActiveModal: modalState.type=\"".concat(modalState.type, "\" \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F"), "error");
   }
 }