@sima-land/ui-nucleons 41.2.0 → 42.0.0

package/alert/index.d.ts

@@ -8,8 +8,6 @@ export interface AlertProps extends WithBodyScrollLock {
     className?: string;
     /** Содержимое "подвала". */
     footer?: React.ReactNode;
-    /** Нужно ли выводить в Layer. */
-    inPortal?: boolean;
     /** Свойства компонента NavBar. */
     navBarProps?: NavBarProps;
     /** Заголовок. */
@@ -26,4 +24,4 @@ export interface AlertProps extends WithBodyScrollLock {
  * @param props Свойства.
  * @return Элемент.
  */
-export declare const Alert: ({ inPortal, ...restProps }: AlertProps) => JSX.Element;
+export declare const Alert: ({ children, className, footer, navBarProps, title, withDivideNavBar, withNavBar, withScrollDisable, scrollDisableOptions, onClose, }: AlertProps) => JSX.Element;

package/alert/index.js

@@ -18,24 +18,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Alert = void 0;
 const react_1 = __importStar(require("react"));
-const portal_1 = require("../portal");
 const nav_bar_1 = require("../nav-bar");
 const bind_1 = __importDefault(require("classnames/bind"));
 const alert_module_scss_1 = __importDefault(require("./alert.module.scss"));
@@ -48,27 +36,15 @@ const cx = bind_1.default.bind(alert_module_scss_1.default);
  * @param props Свойства.
  * @return Элемент.
  */
-const Alert = (_a) => {
-    var { inPortal = true } = _a, restProps = __rest(_a, ["inPortal"]);
+const Alert = ({ children, className, footer, navBarProps, title, withDivideNavBar, withNavBar = Boolean(title), withScrollDisable = false, scrollDisableOptions, onClose, }) => {
     const layer = (0, layer_1.useLayer)() + 100;
-    const Wrapper = inPortal ? portal_1.Portal : react_1.Fragment;
-    return (react_1.default.createElement(layer_1.LayerProvider, { value: layer },
-        react_1.default.createElement(Wrapper, null,
-            react_1.default.createElement(AlertInner, Object.assign({}, restProps)))));
-};
-exports.Alert = Alert;
-/**
- * Промежуточный компонент, необходимый для того чтобы не передавать реф для блокировки прокрутки через портал.
- * @param props Свойства.
- * @return Элемент.
- */
-const AlertInner = ({ children, className, footer, navBarProps, title, withDivideNavBar, withNavBar = Boolean(title), withScrollDisable = false, scrollDisableOptions, onClose, }) => {
     const rootRef = (0, react_1.useRef)(null);
-    const layer = (0, layer_1.useLayer)();
     (0, body_scroll_1.useBodyScrollLock)(rootRef, withScrollDisable, Object.assign({ allowTouchMove: body_scroll_1.allowTouchMove }, scrollDisableOptions));
-    return (react_1.default.createElement("div", { ref: rootRef, className: cx('overlay'), style: { zIndex: layer }, onClick: e => e.target === e.currentTarget && (onClose === null || onClose === void 0 ? void 0 : onClose()), "data-testid": 'alert:overlay' },
-        react_1.default.createElement("div", { className: cx('alert', className), "data-testid": 'alert' },
-            withNavBar && (react_1.default.createElement(nav_bar_1.NavBar, Object.assign({}, navBarProps, { title: title, bottomBordered: withDivideNavBar, className: cx('header') }))),
-            react_1.default.createElement("div", { className: cx('main') }, children),
-            Boolean(footer) && react_1.default.createElement("div", { className: borders_1.InnerBorder.top }, footer))));
+    return (react_1.default.createElement(layer_1.LayerProvider, { value: layer },
+        react_1.default.createElement("div", { ref: rootRef, className: cx('overlay'), style: { zIndex: layer }, onClick: e => e.target === e.currentTarget && (onClose === null || onClose === void 0 ? void 0 : onClose()), "data-testid": 'alert:overlay' },
+            react_1.default.createElement("div", { className: cx('alert', className), "data-testid": 'alert' },
+                withNavBar && (react_1.default.createElement(nav_bar_1.NavBar, Object.assign({}, navBarProps, { title: title, bottomBordered: withDivideNavBar, className: cx('header') }))),
+                react_1.default.createElement("div", { className: cx('main') }, children),
+                Boolean(footer) && react_1.default.createElement("div", { className: borders_1.InnerBorder.top }, footer)))));
 };
+exports.Alert = Alert;

package/carousel/draggable.js

@@ -238,7 +238,9 @@ class Draggable extends react_1.Component {
     render() {
         const { children, containerProps = {}, transitionDuration: duration = 320 } = this.props;
         const { x, y } = this.currentOffset;
-        return (react_1.default.createElement("div", Object.assign({}, containerProps, { className: cx('draggable-container', containerProps.className), onClick: this.handleClick, onMouseDown: this.startCapture, onTouchStart: this.startCapture }),
+        return (react_1.default.createElement("div", Object.assign({}, containerProps, { className: cx('draggable-container', containerProps.className), 
+            // обрабатываем захват чтобы при обработке клика на дочернем элементе defaultPrevented уже был true
+            onClickCapture: this.handleClick, onMouseDown: this.startCapture, onTouchStart: this.startCapture }),
             react_1.default.createElement("div", { ref: this.draggableRef, style: {
                     transform: (0, styles_1.getTranslateStyle)(x, y),
                     transition: this.hasTransition ? (0, styles_1.getTransitionStyle)(duration, 'transform') : '',

package/carousel/index.d.ts

@@ -77,7 +77,7 @@ export declare class Carousel extends Component<CarouselProps, State> {
      * @param index Индекс.
      * @return Элемент списка.
      */
-    static defaultRenderItem(item: any, index: React.Key): JSX.Element;
+    static defaultRenderItem(item: any, index: number): JSX.Element;
     /**
      * Возвращает кнопку управления.
      * @param data Данные для вывода кнопки.
@@ -179,7 +179,7 @@ export declare class Carousel extends Component<CarouselProps, State> {
      */
     moveBackwardFinite(step: number): void;
     /**
-     * Выполняет прокрутка в бесконечном режиме.
+     * Выполняет прокрутку в бесконечном режиме.
      * @param step Количество элементов для прокрутки.
      * @param forward Нужно выполнить прокрутку вперед?
      */

package/carousel/index.js

@@ -276,7 +276,7 @@ class Carousel extends react_1.Component {
         this.setCurrentIndex(newIndex !== -1 && newIndex - step >= 0 ? newIndex - step : 0);
     }
     /**
-     * Выполняет прокрутка в бесконечном режиме.
+     * Выполняет прокрутку в бесконечном режиме.
      * @param step Количество элементов для прокрутки.
      * @param forward Нужно выполнить прокрутку вперед?
      */

package/modal/index.d.ts

@@ -13,8 +13,6 @@ export interface ModalProps extends WithBodyScrollLock {
     onClose?: () => void;
     /** Размер окна. */
     size?: ModalSize;
-    /** Нужно ли выводить элемент в портале (для SSR следует указывать false). */
-    inPortal?: boolean;
     /** Идентификатор для систем автоматизированного тестирования. */
     'data-testid'?: string;
 }

package/modal/index.js

@@ -18,17 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -39,7 +28,6 @@ const top_bar_1 = require("../top-bar");
 const bottom_bar_1 = require("../bottom-bar");
 const utils_1 = require("./utils");
 const shadows_1 = require("../styling/shadows");
-const portal_1 = require("../portal");
 const lodash_1 = require("lodash");
 const slots_1 = require("./slots");
 const layer_1 = require("../helpers/layer");
@@ -53,19 +41,7 @@ const cx = bind_1.default.bind(modal_module_scss_1.default);
  * @param props Свойства.
  * @return Элемент.
  */
-const Modal = (_a) => {
-    var { inPortal } = _a, restProps = __rest(_a, ["inPortal"]);
-    const Wrapper = inPortal ? portal_1.Portal : react_1.Fragment;
-    return (react_1.default.createElement(Wrapper, null,
-        react_1.default.createElement(ModalInner, Object.assign({}, restProps))));
-};
-exports.Modal = Modal;
-/**
- * Внутренний компонент для того чтобы не прокидывать реф через портал.
- * @param props Свойства.
- * @return Элемент.
- */
-const ModalInner = ({ children, height, onClose, scrollDisableOptions = { reserveScrollBarGap: true }, size = 'm', withScrollDisable = false, 'data-testid': testId = 'modal', }) => {
+const Modal = ({ children, height, onClose, scrollDisableOptions = { reserveScrollBarGap: true }, size = 'm', withScrollDisable = false, 'data-testid': testId = 'modal', }) => {
     const layer = (0, layer_1.useLayer)() + 100;
     const rootRef = (0, react_1.useRef)(null);
     const bind = (0, utils_1.useCloseHandler)(onClose);
@@ -102,6 +78,7 @@ const ModalInner = ({ children, height, onClose, scrollDisableOptions = { reserv
             !footer && !fullscreen && react_1.default.createElement("div", { className: cx('footer-stub') }),
             !fullscreen && overlap && react_1.default.createElement("div", { className: cx('overlap') }, overlap))));
 };
+exports.Modal = Modal;
 exports.Modal.Header = slots_1.ModalHeader;
 exports.Modal.Body = slots_1.ModalBody;
 exports.Modal.Footer = slots_1.ModalFooter;

package/modal/utils.d.ts

@@ -1,9 +1,10 @@
+import React from 'react';
 /**
  * Вызывает callback только если клик был начат и закончен по одному и тому же элементу.
  * @param callback Сработает при клике.
  * @return Свойства для целевого элемента.
  */
 export declare const useCloseHandler: (callback?: (() => void) | undefined) => {
-    onMouseUp: ({ target, currentTarget, button }: any) => void;
-    onMouseDown: ({ button, target }: any) => void;
+    onMouseUp: ({ target, currentTarget, button }: React.MouseEvent) => void;
+    onMouseDown: ({ button, target }: React.MouseEvent) => void;
 };

package/modal/utils.js

@@ -2,12 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useCloseHandler = void 0;
 const react_1 = require("react");
+const identity_1 = require("../hooks/identity");
 /**
  * Вызывает callback только если клик был начат и закончен по одному и тому же элементу.
  * @param callback Сработает при клике.
  * @return Свойства для целевого элемента.
  */
 const useCloseHandler = (callback) => {
+    const callbackRef = (0, identity_1.useIdentityRef)(callback);
     const mouseDownTarget = (0, react_1.useRef)();
     const onMouseDown = (0, react_1.useCallback)(({ button, target }) => {
         if (button === 0) {
@@ -15,12 +17,13 @@ const useCloseHandler = (callback) => {
         }
     }, []);
     const onMouseUp = (0, react_1.useCallback)(({ target, currentTarget, button }) => {
-        callback &&
+        const fn = callbackRef.current;
+        fn &&
             button === 0 &&
             target === currentTarget &&
             currentTarget === mouseDownTarget.current &&
-            callback();
-    }, [callback]);
+            fn();
+    }, []);
     return { onMouseUp, onMouseDown };
 };
 exports.useCloseHandler = useCloseHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sima-land/ui-nucleons",
-  "version": "41.2.0",
+  "version": "42.0.0",
   "repository": "ssh://git@github.com:sima-land/ui-nucleons.git",
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",
@@ -22,21 +22,20 @@
   },
   "devDependencies": {
     "@babel/core": "^7.16.0",
-    "@babel/plugin-proposal-class-properties": "^7.16.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
     "@babel/preset-env": "^7.16.4",
     "@babel/preset-react": "^7.16.0",
+    "@babel/preset-typescript": "^7.16.5",
     "@rushstack/eslint-patch": "^1.1.0",
     "@sima-land/linters": "^2.1.1",
-    "@storybook/addon-actions": "^6.3.12",
-    "@storybook/addon-backgrounds": "^6.3.12",
-    "@storybook/addon-docs": "^6.3.12",
-    "@storybook/addon-storysource": "^6.3.12",
-    "@storybook/addons": "^6.3.12",
-    "@storybook/builder-webpack5": "^6.3.12",
-    "@storybook/manager-webpack5": "^6.3.12",
-    "@storybook/react": "^6.3.12",
-    "@storybook/theming": "^6.3.12",
+    "@storybook/addon-actions": "^6.4.13",
+    "@storybook/addon-backgrounds": "^6.4.13",
+    "@storybook/addon-docs": "^6.4.13",
+    "@storybook/addon-storysource": "^6.4.13",
+    "@storybook/addons": "^6.4.13",
+    "@storybook/builder-webpack5": "^6.4.13",
+    "@storybook/manager-webpack5": "^6.4.13",
+    "@storybook/react": "^6.4.13",
+    "@storybook/theming": "^6.4.13",
     "@svgr/core": "^5.5.0",
     "@svgr/plugin-svgo": "^5.5.0",
     "@svgr/webpack": "^5.5.0",
@@ -51,6 +50,7 @@
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.5",
+    "babel-jest": "^27.4.6",
     "babel-loader": "^8.2.3",
     "babel-preset-jest": "^27.2.0",
     "copyfiles": "^2.4.1",
@@ -60,7 +60,6 @@
     "eslint": "^7.31.0",
     "file-loader": "^6.2.0",
     "husky": "^7.0.4",
-    "identity-obj-proxy": "^3.0.0",
     "jest": "^27.3.1",
     "jest-css-modules-transform": "^4.3.0",
     "lint-staged": "^12.1.2",
@@ -74,7 +73,6 @@
     "sass-loader": "^10.1.0",
     "style-loader": "^2.0.0",
     "stylelint": "^14.1.0",
-    "ts-jest": "^27.0.7",
     "typescript": "^4.5.2",
     "typescript-plugin-css-modules": "^3.4.0",
     "webpack": "^5.64.2"
@@ -89,13 +87,13 @@
     "build:main": "tsc --project tsconfig.build.json",
     "build:after": "node dist.js",
     "build": "npm run build:before && npm run build:main && npm run build:after",
-    "test": "jest",
+    "test": "BROWSERSLIST_ENV=\"test\" npx jest",
+    "coverage": "jest --clearCache && BROWSERSLIST_ENV=\"test\" npx jest --coverage",
     "type-check": "tsc -p . --noEmit",
-    "coverage": "jest --clearCache && jest --coverage",
     "lint:scripts": "eslint --cache src/ --ext .js,.jsx,.ts,.tsx",
     "lint:styles": "stylelint 'src/**/*.{css,scss}'",
-    "storybook": "start-storybook -p 9009 -c .storybook",
-    "storybook:build": "build-storybook --quiet --loglevel error -o build-storybook",
+    "storybook": "BROWSERSLIST_ENV=\"storybook\" npx start-storybook -p 9009 -c .storybook",
+    "storybook:build": "BROWSERSLIST_ENV=\"storybook\" npx build-storybook --quiet --loglevel error -o build-storybook",
     "prettier": "prettier --write \"./src/**/*.{js,jsx,ts,tsx,css,scss}\" --loglevel error",
     "prettier:check": "prettier --check \"./src/**/*.{js,jsx,ts,tsx,css,scss}\" --loglevel error"
   }

package/rating/index.js

@@ -27,7 +27,7 @@ const cx = bind_1.default.bind(rating_module_scss_1.default);
  * @return Элемент.
  */
 const Rating = (_a) => {
-    var { size, value, className, 'data-testid': testId = 'rating' } = _a, restProps = __rest(_a, ["size", "value", "className", 'data-testid']);
+    var { size = 's', value, className, 'data-testid': testId = 'rating' } = _a, restProps = __rest(_a, ["size", "value", "className", 'data-testid']);
     return (react_1.default.createElement("div", Object.assign({}, restProps, { className: cx('root', className), "data-testid": testId, "data-rating": value }), (0, utils_1.getStars)(Math.min(5, value), 5).map((type, index) => (react_1.default.createElement(Star, { key: index, type: type, size: size })))));
 };
 exports.Rating = Rating;
@@ -36,7 +36,7 @@ exports.Rating = Rating;
  * @param props Свойства.
  * @return Элемент.
  */
-const Star = ({ type, size = 's' }) => (react_1.default.createElement("div", { className: cx('star', `size-${size}`) },
+const Star = ({ type, size }) => (react_1.default.createElement("div", { className: cx('star', `size-${size}`) },
     type === 'empty' && react_1.default.createElement(star_svg_1.default, { className: cx('svg') }),
     type === 'half' && (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(star_svg_1.default, { className: cx('svg') }),

package/select/index.d.ts

@@ -22,5 +22,5 @@ export interface SelectProps extends Omit<TextFieldProps, 'style'> {
  * @param props Свойства.
  * @return Элемент.
  */
-export declare const Select: React.FC<SelectProps>;
+export declare const Select: ({ options, optionSize, onSelect, style, className, label, onClick, value, loading, onMenuToggle, renderOption, "data-testid": dataTestId, size, ...restProps }: SelectProps) => JSX.Element;
 export {};

package/select/index.js

@@ -45,6 +45,7 @@ const up_1 = __importDefault(require("@sima-land/ui-quarks/icons/16x16/Stroked/A
 const select_module_scss_1 = __importDefault(require("./select.module.scss"));
 const colors_1 = require("../colors");
 const dropdown_loading_1 = require("../_internal/dropdown-loading");
+const hooks_1 = require("../hooks");
 const cx = bind_1.default.bind(select_module_scss_1.default);
 /**
  * Поле выбора из списка.
@@ -52,31 +53,44 @@ const cx = bind_1.default.bind(select_module_scss_1.default);
  * @return Элемент.
  */
 const Select = (_a) => {
-    var { options, optionSize, onSelect, style, className, label, onClick, value, loading, onMenuToggle, renderOption = String, 'data-testid': dataTestId } = _a, restProps = __rest(_a, ["options", "optionSize", "onSelect", "style", "className", "label", "onClick", "value", "loading", "onMenuToggle", "renderOption", 'data-testid']);
+    var { options, optionSize, onSelect, style, className, label, onClick, value, loading, onMenuToggle, renderOption = String, 'data-testid': dataTestId, size } = _a, restProps = __rest(_a, ["options", "optionSize", "onSelect", "style", "className", "label", "onClick", "value", "loading", "onMenuToggle", "renderOption", 'data-testid', "size"]);
+    const rootRef = (0, react_1.useRef)(null);
     const fieldRef = (0, react_1.useRef)(null);
     const menuRef = (0, react_1.useRef)(null);
     const [opened, toggleMenu] = (0, react_1.useState)(false);
     const ArrowSVG = opened ? up_1.default : down_1.default;
     (0, react_1.useEffect)(() => {
-        opened && menuRef.current.focus();
+        opened && menuRef.current && menuRef.current.focus();
         onMenuToggle && onMenuToggle(opened);
     }, [opened]);
-    return (react_1.default.createElement("div", { style: style, className: cx('root', className), "data-testid": dataTestId },
-        react_1.default.createElement(text_field_1.TextField, Object.assign({}, restProps, { readOnly: true, "data-testid": 'select:field', ref: fieldRef, variant: 'desktop', label: label, value: value, multiline: false, focused: opened, onClick: e => {
-                toggleMenu(o => !o);
-                onClick && onClick(e);
-            }, onBlur: ({ relatedTarget }) => {
-                relatedTarget !== menuRef.current && toggleMenu(false);
-            }, onKeyDown: (e) => {
-                e.key === 'Enter' && toggleMenu(true);
-            }, className: cx('field'), endAdornment: react_1.default.createElement(ArrowSVG, { fill: colors_1.COLORS.get('gray38') }) })),
-        opened && (loading || options.length > 0) && (react_1.default.createElement(dropdown_1.Dropdown, Object.assign({}, (0, dropdown_2.placeDropdown)(restProps.size), { ref: menuRef, "data-testid": 'select:menu', tabIndex: -1, className: cx('menu'), onBlur: () => {
-                toggleMenu(false);
-            }, role: 'menu', onKeyDown: (event) => {
+    (0, hooks_1.useOutsideClick)(rootRef, toggleMenu.bind(null, false));
+    return (react_1.default.createElement("div", { ref: rootRef, style: style, className: cx('root', className), "data-testid": dataTestId },
+        react_1.default.createElement(text_field_1.TextField, Object.assign({}, restProps, { size: size, blockProps: {
+                ref: fieldRef,
+                tabIndex: 0,
+                onMouseDown: () => {
+                    toggleMenu(a => !a);
+                },
+                onKeyDown: e => {
+                    e.key === 'Enter' && toggleMenu(true);
+                },
+                onClick: e => {
+                    e.preventDefault();
+                    onClick && onClick(e);
+                },
+            }, className: select_module_scss_1.default.field, "data-testid": 'select:field', label: label, focused: opened, baseInputProps: {
+                // чтобы не ловить фокус на поле
+                style: { pointerEvents: 'none' },
+                tabIndex: -1,
+            }, value: value, multiline: false, variant: 'desktop', readOnly: true, endAdornment: react_1.default.createElement(ArrowSVG, { fill: colors_1.COLORS.get('gray38') }) })),
+        opened && (loading || options.length > 0) && (react_1.default.createElement(dropdown_1.Dropdown, Object.assign({}, (0, dropdown_2.placeDropdown)(size), { ref: menuRef, "data-testid": 'select:menu', role: 'menu', tabIndex: -1, className: cx('menu'), onKeyDown: event => {
                 if (event.key === 'Enter') {
                     toggleMenu(false);
                     fieldRef.current && fieldRef.current.focus();
                 }
+            }, onBlur: () => {
+                toggleMenu(false);
+                fieldRef.current && fieldRef.current.focus();
             } }), loading ? (react_1.default.createElement(dropdown_loading_1.DropdownLoading, { "data-testid": 'select:loading-area' })) : (options.map((option, index) => (react_1.default.createElement(dropdown_item_1.DropdownItem, { size: optionSize, key: index, role: 'menuitem', onClick: () => {
                 toggleMenu(false);
                 onSelect && onSelect(option);

package/side-page/index.d.ts

@@ -41,7 +41,7 @@ export declare const SidePage: {
     };
     Body: {
         ({ children }: {
-            children?: React.ReactNode; /** Обработчик "onExiting" для CSSTransition. */
+            children?: React.ReactNode;
         }): JSX.Element;
         displayName: string;
     };

package/side-page/index.js

@@ -81,10 +81,11 @@ const SidePageInner = ({ size = 'm', children, onClose, withScrollDisable, scrol
     });
     (0, body_scroll_1.useBodyScrollLock)(ref, withScrollDisable, scrollDisableOptions);
     return (react_1.default.createElement("div", Object.assign({ ref: ref, className: cx('overlay'), style: overlayStyles }, (transitionStatus !== 'entering' && overlayBind)),
-        react_1.default.createElement("div", { className: cx('main', `size-${size}`) },
-            header,
-            react_1.default.createElement("div", { className: cx('body') }, body),
-            footer)));
+        react_1.default.createElement(layer_1.LayerProvider, { value: layer },
+            react_1.default.createElement("div", { className: cx('main', `size-${size}`) },
+                header,
+                react_1.default.createElement("div", { className: cx('body') }, body),
+                footer))));
 };
 exports.SidePage.Header = slots_1.SidePageHeader;
 exports.SidePage.Body = slots_1.SidePageBody;

package/text-field/index.d.ts

@@ -46,6 +46,8 @@ export interface TextFieldProps extends Omit<React.InputHTMLAttributes<HTMLInput
     startAdornment?: React.ReactNode;
     /** Вариант отображения. */
     variant?: Variant;
+    /** Свойства элемента-блока. */
+    blockProps?: React.HTMLProps<HTMLDivElement>;
     /** Идентификатор для систем автоматизированного тестирования. */
     'data-testid'?: string;
 }

package/text-field/index.js

@@ -51,7 +51,7 @@ const modifiersToClasses = ({ disabled, failed, focused, variant, }) => cx(disab
  * @param props Свойства.
  * @return Элемент.
  */
-exports.TextField = (0, react_1.forwardRef)(function TextField({ autoFocus, caption, classes = {}, defaultValue, disabled, endAdornment, failed, focused: asFocused, label, onClick, onBlur, onChange, onFocus, onInput, onKeyDown, onKeyUp, placeholder, readOnly, rounds = 'all', size = exports.DEFAULTS.size, startAdornment, value, variant = 'desktop', multiline, baseInputProps = {}, className, restPlaceholder, style, 'data-testid': dataTestId, }, ref) {
+exports.TextField = (0, react_1.forwardRef)(function TextField({ autoFocus, caption, classes = {}, defaultValue, disabled, endAdornment, failed, focused: asFocused, label, onClick, onBlur, onChange, onFocus, onInput, onKeyDown, onKeyUp, placeholder, readOnly, rounds = 'all', size = exports.DEFAULTS.size, startAdornment, value, variant = 'desktop', multiline, baseInputProps = {}, className, restPlaceholder, style, blockProps, 'data-testid': dataTestId, }, ref) {
     const [hasValue, toggleHasValue] = (0, react_1.useState)(isVisible(value) || isVisible(defaultValue));
     const [reallyFocused, toggleFocused] = (0, react_1.useState)(autoFocus);
     const focused = reallyFocused || Boolean(asFocused);
@@ -70,21 +70,25 @@ exports.TextField = (0, react_1.forwardRef)(function TextField({ autoFocus, capt
     (0, react_1.useImperativeHandle)(ref, () => baseInputRef.current);
     (0, react_1.useEffect)(() => toggleHasValue(Boolean(baseInputRef.current.value)));
     return (react_1.default.createElement("div", { "data-testid": dataTestId, className: cx('root', className, classes.root), style: style },
-        react_1.default.createElement("div", { "data-testid": 'text-field:block', className: cx('reset', 'input-block', commonModifyClasses, size && `size-${size}`, focused && classes.blockFocused, multiline && 'multiline', withLabel && 'with-label', variant === 'desktop' && rounds !== 'none' && shapes_1.SmallRounds[rounds]), onClick: event => {
+        react_1.default.createElement("div", Object.assign({ "data-testid": 'text-field:block', className: cx('reset', 'input-block', commonModifyClasses, size && `size-${size}`, focused && classes.blockFocused, multiline && 'multiline', withLabel && 'with-label', variant === 'desktop' && rounds !== 'none' && shapes_1.SmallRounds[rounds], blockProps === null || blockProps === void 0 ? void 0 : blockProps.className), onClick: event => {
                 const input = baseInputRef.current;
                 onClick === null || onClick === void 0 ? void 0 : onClick(event);
-                input && !disabled && input !== document.activeElement && input.focus();
-            } },
+                input &&
+                    !disabled &&
+                    !event.defaultPrevented &&
+                    input !== document.activeElement &&
+                    input.focus();
+            } }, blockProps),
             !multiline && Boolean(startAdornment) && (react_1.default.createElement(box_1.Box, { display: 'flex', alignItems: 'center', marginRight: 4 }, startAdornment)),
             react_1.default.createElement("div", { className: cx('main-column') },
-                withLabel && (react_1.default.createElement("label", { className: cx('label', commonModifyClasses, hasValue && 'filled', labelAsPlaceholder && 'as-placeholder'), children: label })),
+                withLabel && (react_1.default.createElement("label", { className: cx('label', commonModifyClasses, hasValue && 'filled', labelAsPlaceholder && 'as-placeholder'), children: label, "data-testid": 'text-field:label' })),
                 react_1.default.createElement("div", { className: cx('input-wrapper') },
                     react_1.default.createElement(base_input_1.BaseInput, Object.assign({}, baseInputProps, { "data-testid": 'text-field:field', multiline: multiline, ref: baseInputRef, placeholder: withLabel && labelAsPlaceholder ? undefined : placeholder, restPlaceholder: withLabel && labelAsPlaceholder ? undefined : restPlaceholder, autoFocus: autoFocus, className: cx('base-input', commonModifyClasses, classes.baseInput, size && `size-${size}`), defaultValue: defaultValue, value: value, readOnly: readOnly, disabled: disabled, onFocus: (event) => {
-                            (0, lodash_1.isFunction)(onFocus) && onFocus(event);
+                            onFocus && onFocus(event);
                             toggleHasValue(Boolean(event.target.value));
                             toggleFocused(true);
                         }, onBlur: (event) => {
-                            (0, lodash_1.isFunction)(onBlur) && onBlur(event);
+                            onBlur && onBlur(event);
                             toggleHasValue(Boolean(event.target.value));
                             toggleFocused(false);
                         }, onInput: onInput, onChange: onChange, onKeyDown: onKeyDown, onKeyUp: onKeyUp })))),