@salutejs/plasma-new-hope 0.327.0-canary.1741.15743877104.0 → 0.327.0-canary.1741.15775036215.0

package/es/components/Calendar/ui/CalendarYears/CalendarYears.js.map

@@ -1 +1 @@
-{"version":3,"file":"CalendarYears.js","sources":["../../../../../src/components/Calendar/ui/CalendarYears/CalendarYears.tsx"],"sourcesContent":["import React, { Fragment, useCallback, useEffect, useRef } from 'react';\n\nimport { useYears } from '../../hooks';\nimport { innerTokens, tokens } from '../../Calendar.tokens';\nimport { ROW_YEAR_STEP, canSelectDate, getInRange, getSideInRange, isSameDay, isSelectProcess } from '../../utils';\nimport { DateStructureItem } from '../DateStructureItem/DateStructureItem';\n\nimport type { CalendarYearsProps } from './CalendarYears.types';\nimport { StyledCalendarYears } from './CalendarYears.styles';\n\n/**\n * Компонент годов в календаре.\n */\nexport const CalendarYears: React.FC<CalendarYearsProps> = ({\n    date: currentDate,\n    value,\n    startYear,\n    selectIndexes,\n    eventList,\n    disabledList,\n    min,\n    max,\n    outerRefs,\n    isDouble,\n    isSecond,\n    hoveredYear,\n    onChangeYear,\n    onHoverYear,\n    onSetSelected,\n    onKeyDown,\n}) => {\n    const minDate = min ? new Date(min.getFullYear(), 0, 1) : undefined;\n    const maxDate = max ? new Date(max.getFullYear(), 11, 31) : undefined;\n\n    const [years, selected] = useYears({\n        date: currentDate,\n        value,\n        startYear,\n        eventList,\n        disabledList,\n        min: minDate,\n        max: maxDate,\n    });\n    const selectedRef = useRef(selected);\n    const onSetSelectedRef = useRef(onSetSelected);\n\n    const offset = isSecond ? ROW_YEAR_STEP : 0;\n\n    const yearItemTokens = {\n        [`${innerTokens.dateStructureFontFamily}`]: `var(${tokens.calendarYearFontFamily})`,\n        [`${innerTokens.dateStructureFontSize}`]: `var(${tokens.calendarYearFontSize})`,\n        [`${innerTokens.dateStructureFontWeight}`]: `var(${tokens.calendarYearFontWeight})`,\n        [`${innerTokens.dateStructureFontLineHeight}`]: `var(${tokens.calendarYearFontLineHeight})`,\n        [`${innerTokens.dateStructureFontLetterSpacing}`]: `var(${tokens.calendarYearFontLetterSpacing})`,\n        [`${innerTokens.dateStructureFontStyle}`]: `var(${tokens.calendarYearFontStyle})`,\n        [`${innerTokens.dateStructureSelectedFontWeight}`]: `var(${tokens.calendarYearSelectedFontWeight})`,\n        [`${innerTokens.dateStructureBorderRadius}`]: `var(${tokens.calendarYearItemBorderRadius})`,\n    };\n\n    const getSelectedDate = useCallback(\n        (event: React.MouseEvent<HTMLDivElement>) => {\n            const { day, monthIndex, year } = event.currentTarget.dataset;\n\n            const selectedDate = {\n                day: Number(day),\n                monthIndex: Number(monthIndex),\n                year: Number(year),\n            };\n\n            if (!canSelectDate(selectedDate, value, disabledList)) {\n                return;\n            }\n\n            return selectedDate;\n        },\n        [disabledList, value],\n    );\n\n    const handleOnChangeYear = useCallback(\n        (i: number, j: number) => (event: React.MouseEvent<HTMLDivElement>) => {\n            /**\n             * нужно вызвать stopImmediatePropagation для случаев, когда\n             * обработчик события onClick навешивается снаружи.\n             * Как, например, в компоненте Popup\n             */\n            event.nativeEvent.stopImmediatePropagation();\n\n            const selectedDate = getSelectedDate(event);\n\n            if (!selectedDate) {\n                return;\n            }\n\n            onChangeYear(selectedDate, [i + offset, j]);\n\n            if (isSelectProcess(value)) {\n                onHoverYear?.(undefined);\n            }\n        },\n        [getSelectedDate, onChangeYear, offset, value, onHoverYear],\n    );\n\n    const handleOnHoverYear = useCallback(\n        (event: React.MouseEvent<HTMLDivElement>) => {\n            const selectedDate = getSelectedDate(event);\n            const isSelectedDone = Array.isArray(value) && value[0] && value[1];\n\n            if (!selectedDate || !Array.isArray(value) || isSelectedDone) {\n                return;\n            }\n\n            onHoverYear?.(selectedDate);\n        },\n        [getSelectedDate, onHoverYear, value],\n    );\n\n    const handleMouseOutGrid = () => onHoverYear?.(undefined);\n\n    const getRefs = useCallback(\n        (element: HTMLDivElement, i: number, j: number) => {\n            outerRefs.current[i + offset][j] = element;\n        },\n        [outerRefs],\n    );\n\n    useEffect(() => {\n        if (selectedRef.current) {\n            onSetSelectedRef.current?.(selectedRef.current);\n        }\n    }, []);\n\n    return (\n        <StyledCalendarYears\n            role=\"grid\"\n            aria-labelledby=\"id-grid-label\"\n            onKeyDown={onKeyDown}\n            onMouseLeave={handleMouseOutGrid}\n        >\n            {years.map((year, i) => (\n                <Fragment key={i}>\n                    {year.map(\n                        (\n                            {\n                                yearValue,\n                                isSelected,\n                                isCurrent,\n                                date,\n                                events,\n                                isOutOfMinMaxRange,\n                                inRange,\n                                disabled,\n                                disabledArrowKey,\n                                disabledDates,\n                            },\n                            j,\n                        ) => {\n                            return (\n                                <DateStructureItem\n                                    ref={(element: HTMLDivElement) => getRefs(element, i, j)}\n                                    style={yearItemTokens}\n                                    eventList={events}\n                                    disabled={disabled}\n                                    day={date.day}\n                                    year={yearValue}\n                                    monthIndex={date.monthIndex}\n                                    isFocused={\n                                        i + offset === selectIndexes?.[0] &&\n                                        j === selectIndexes?.[1] &&\n                                        !isOutOfMinMaxRange\n                                    }\n                                    isSelected={isSelected}\n                                    isCurrent={isCurrent}\n                                    isDouble={isDouble}\n                                    isHovered={isSameDay(date, hoveredYear)}\n                                    inRange={getInRange(value, date, hoveredYear, inRange)}\n                                    sideInRange={getSideInRange(value, date, hoveredYear, isSelected)}\n                                    onClick={disabled ? undefined : handleOnChangeYear(i, j)}\n                                    onMouseOver={disabled ? undefined : handleOnHoverYear}\n                                    key={`StyledYear-${i}-${j}`}\n                                    role=\"gridcell\"\n                                    data-year={yearValue}\n                                    data-month-index={date.monthIndex}\n                                    data-day={date.day}\n                                    aria-label={String(yearValue)}\n                                    disabledArrowKey={disabledArrowKey}\n                                    disabledMonths={disabledDates}\n                                    isDayInCurrentMonth\n                                >\n                                    {yearValue}\n                                </DateStructureItem>\n                            );\n                        },\n                    )}\n                </Fragment>\n            ))}\n        </StyledCalendarYears>\n    );\n};\n"],"names":["CalendarYears","date","currentDate","value","startYear","selectIndexes","eventList","disabledList","min","max","outerRefs","isDouble","isSecond","hoveredYear","onChangeYear","onHoverYear","onSetSelected","onKeyDown","minDate","Date","getFullYear","undefined","maxDate","years","selected","useYears","selectedRef","useRef","onSetSelectedRef","offset","ROW_YEAR_STEP","yearItemTokens","innerTokens","dateStructureFontFamily","tokens","calendarYearFontFamily","dateStructureFontSize","calendarYearFontSize","dateStructureFontWeight","calendarYearFontWeight","dateStructureFontLineHeight","calendarYearFontLineHeight","dateStructureFontLetterSpacing","calendarYearFontLetterSpacing","dateStructureFontStyle","calendarYearFontStyle","dateStructureSelectedFontWeight","calendarYearSelectedFontWeight","dateStructureBorderRadius","calendarYearItemBorderRadius","getSelectedDate","useCallback","event","day","monthIndex","year","currentTarget","dataset","selectedDate","Number","canSelectDate","handleOnChangeYear","i","j","nativeEvent","stopImmediatePropagation","isSelectProcess","handleOnHoverYear","isSelectedDone","Array","isArray","handleMouseOutGrid","getRefs","element","current","useEffect","React","createElement","StyledCalendarYears","role","onMouseLeave","map","Fragment","key","yearValue","isSelected","isCurrent","events","isOutOfMinMaxRange","inRange","disabled","disabledArrowKey","disabledDates","DateStructureItem","ref","style","isFocused","isHovered","isSameDay","getInRange","sideInRange","getSideInRange","onClick","onMouseOver","String","disabledMonths","isDayInCurrentMonth"],"mappings":"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"}
+{"version":3,"file":"CalendarYears.js","sources":["../../../../../src/components/Calendar/ui/CalendarYears/CalendarYears.tsx"],"sourcesContent":["import React, { Fragment, useCallback, useEffect, useRef } from 'react';\n\nimport { useYears } from '../../hooks';\nimport { innerTokens, tokens } from '../../Calendar.tokens';\nimport { ROW_YEAR_STEP, canSelectDate, getInRange, getSideInRange, isSameDay, isSelectProcess } from '../../utils';\nimport { DateStructureItem } from '../DateStructureItem/DateStructureItem';\n\nimport type { CalendarYearsProps } from './CalendarYears.types';\nimport { StyledCalendarYears } from './CalendarYears.styles';\n\n/**\n * Компонент годов в календаре.\n */\nexport const CalendarYears: React.FC<CalendarYearsProps> = ({\n    date: currentDate,\n    value,\n    startYear,\n    selectIndexes,\n    eventList,\n    disabledList,\n    min,\n    max,\n    outerRefs,\n    isDouble,\n    isSecond,\n    hoveredYear,\n    onChangeYear,\n    onHoverYear,\n    onSetSelected,\n    onKeyDown,\n}) => {\n    const minDate = min ? new Date(min.getFullYear(), 0, 1) : undefined;\n    const maxDate = max ? new Date(max.getFullYear(), 11, 31) : undefined;\n\n    const [years, selected] = useYears({\n        date: currentDate,\n        value,\n        startYear,\n        eventList,\n        disabledList,\n        min: minDate,\n        max: maxDate,\n    });\n    const selectedRef = useRef(selected);\n    const onSetSelectedRef = useRef(onSetSelected);\n\n    const offset = isSecond ? ROW_YEAR_STEP : 0;\n\n    const yearItemTokens = {\n        [`${innerTokens.dateStructureFontFamily}`]: `var(${tokens.calendarYearFontFamily})`,\n        [`${innerTokens.dateStructureFontSize}`]: `var(${tokens.calendarYearFontSize})`,\n        [`${innerTokens.dateStructureFontWeight}`]: `var(${tokens.calendarYearFontWeight})`,\n        [`${innerTokens.dateStructureFontLineHeight}`]: `var(${tokens.calendarYearFontLineHeight})`,\n        [`${innerTokens.dateStructureFontLetterSpacing}`]: `var(${tokens.calendarYearFontLetterSpacing})`,\n        [`${innerTokens.dateStructureFontStyle}`]: `var(${tokens.calendarYearFontStyle})`,\n        [`${innerTokens.dateStructureSelectedFontWeight}`]: `var(${tokens.calendarYearSelectedFontWeight})`,\n        [`${innerTokens.dateStructureBorderRadius}`]: `var(${tokens.calendarYearItemBorderRadius})`,\n    };\n\n    const getSelectedDate = useCallback(\n        (event: React.MouseEvent<HTMLDivElement>) => {\n            const { day, monthIndex, year } = event.currentTarget.dataset;\n\n            const selectedDate = {\n                day: Number(day),\n                monthIndex: Number(monthIndex),\n                year: Number(year),\n            };\n\n            if (!canSelectDate(selectedDate, value, disabledList)) {\n                return;\n            }\n\n            return selectedDate;\n        },\n        [disabledList, value],\n    );\n\n    const handleOnChangeYear = useCallback(\n        (i: number, j: number) => (event: React.MouseEvent<HTMLDivElement>) => {\n            /**\n             * нужно вызвать stopImmediatePropagation для случаев, когда\n             * обработчик события onClick навешивается снаружи.\n             * Как, например, в компоненте Popup\n             */\n            event.nativeEvent.stopImmediatePropagation();\n\n            const selectedDate = getSelectedDate(event);\n\n            if (!selectedDate) {\n                return;\n            }\n\n            onChangeYear(selectedDate, [i + offset, j]);\n\n            if (isSelectProcess(value)) {\n                onHoverYear?.(undefined);\n            }\n        },\n        [getSelectedDate, onChangeYear, offset, value, onHoverYear],\n    );\n\n    const handleOnHoverYear = useCallback(\n        (event: React.MouseEvent<HTMLDivElement>) => {\n            const selectedDate = getSelectedDate(event);\n            const isSelectedDone = Array.isArray(value) && value[0] && value[1];\n\n            if (!selectedDate || !Array.isArray(value) || isSelectedDone) {\n                return;\n            }\n\n            onHoverYear?.(selectedDate);\n        },\n        [getSelectedDate, onHoverYear, value],\n    );\n\n    const handleMouseOutGrid = () => onHoverYear?.(undefined);\n\n    const getRefs = useCallback(\n        (element: HTMLDivElement, i: number, j: number) => {\n            if (!outerRefs.current[i + offset]) {\n                outerRefs.current[i + offset] = [];\n            }\n\n            outerRefs.current[i + offset][j] = element;\n        },\n        [outerRefs],\n    );\n\n    useEffect(() => {\n        if (selectedRef.current) {\n            onSetSelectedRef.current?.(selectedRef.current);\n        }\n    }, []);\n\n    return (\n        <StyledCalendarYears\n            role=\"grid\"\n            aria-labelledby=\"id-grid-label\"\n            onKeyDown={onKeyDown}\n            onMouseLeave={handleMouseOutGrid}\n        >\n            {years.map((year, i) => (\n                <Fragment key={i}>\n                    {year.map(\n                        (\n                            {\n                                yearValue,\n                                isSelected,\n                                isCurrent,\n                                date,\n                                events,\n                                isOutOfMinMaxRange,\n                                inRange,\n                                disabled,\n                                disabledArrowKey,\n                                disabledDates,\n                            },\n                            j,\n                        ) => {\n                            return (\n                                <DateStructureItem\n                                    ref={(element: HTMLDivElement) => getRefs(element, i, j)}\n                                    style={yearItemTokens}\n                                    eventList={events}\n                                    disabled={disabled}\n                                    day={date.day}\n                                    year={yearValue}\n                                    monthIndex={date.monthIndex}\n                                    isFocused={\n                                        i + offset === selectIndexes?.[0] &&\n                                        j === selectIndexes?.[1] &&\n                                        !isOutOfMinMaxRange\n                                    }\n                                    isSelected={isSelected}\n                                    isCurrent={isCurrent}\n                                    isDouble={isDouble}\n                                    isHovered={isSameDay(date, hoveredYear)}\n                                    inRange={getInRange(value, date, hoveredYear, inRange)}\n                                    sideInRange={getSideInRange(value, date, hoveredYear, isSelected)}\n                                    onClick={disabled ? undefined : handleOnChangeYear(i, j)}\n                                    onMouseOver={disabled ? undefined : handleOnHoverYear}\n                                    key={`StyledYear-${i}-${j}`}\n                                    role=\"gridcell\"\n                                    data-year={yearValue}\n                                    data-month-index={date.monthIndex}\n                                    data-day={date.day}\n                                    aria-label={String(yearValue)}\n                                    disabledArrowKey={disabledArrowKey}\n                                    disabledMonths={disabledDates}\n                                    isDayInCurrentMonth\n                                >\n                                    {yearValue}\n                                </DateStructureItem>\n                            );\n                        },\n                    )}\n                </Fragment>\n            ))}\n        </StyledCalendarYears>\n    );\n};\n"],"names":["CalendarYears","date","currentDate","value","startYear","selectIndexes","eventList","disabledList","min","max","outerRefs","isDouble","isSecond","hoveredYear","onChangeYear","onHoverYear","onSetSelected","onKeyDown","minDate","Date","getFullYear","undefined","maxDate","years","selected","useYears","selectedRef","useRef","onSetSelectedRef","offset","ROW_YEAR_STEP","yearItemTokens","innerTokens","dateStructureFontFamily","tokens","calendarYearFontFamily","dateStructureFontSize","calendarYearFontSize","dateStructureFontWeight","calendarYearFontWeight","dateStructureFontLineHeight","calendarYearFontLineHeight","dateStructureFontLetterSpacing","calendarYearFontLetterSpacing","dateStructureFontStyle","calendarYearFontStyle","dateStructureSelectedFontWeight","calendarYearSelectedFontWeight","dateStructureBorderRadius","calendarYearItemBorderRadius","getSelectedDate","useCallback","event","day","monthIndex","year","currentTarget","dataset","selectedDate","Number","canSelectDate","handleOnChangeYear","i","j","nativeEvent","stopImmediatePropagation","isSelectProcess","handleOnHoverYear","isSelectedDone","Array","isArray","handleMouseOutGrid","getRefs","element","current","useEffect","React","createElement","StyledCalendarYears","role","onMouseLeave","map","Fragment","key","yearValue","isSelected","isCurrent","events","isOutOfMinMaxRange","inRange","disabled","disabledArrowKey","disabledDates","DateStructureItem","ref","style","isFocused","isHovered","isSameDay","getInRange","sideInRange","getSideInRange","onClick","onMouseOver","String","disabledMonths","isDayInCurrentMonth"],"mappings":"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"}

package/es/components/Drawer/Drawer.js

@@ -1,8 +1,8 @@
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React, { forwardRef, useMemo } from 'react';
-import { useForkRef, safeUseId } from '@salutejs/plasma-core';
-import { DEFAULT_Z_INDEX } from '../Popup/utils/index.js';
+import { useForkRef } from '@salutejs/plasma-core';
 import { cx } from '../../utils/index.js';
+import { DEFAULT_Z_INDEX } from '../Popup/utils/index.js';
 import { classes, tokens } from './Drawer.tokens.js';
 import { base } from './variations/_view/base.js';
 import { base as base$1 } from './variations/_size/base.js';
@@ -11,6 +11,7 @@ import { StyledPopup, StyledPanel } from './Drawer.styles.js';
 import { getIdLastDrawer } from './DrawerContext.js';
 import { useFocusTrap } from '../../hooks/useFocusTrap.js';
 import { usePopupContext } from '../Popup/PopupContext.js';
+import { safeUseId } from '../../utils/react.js';
 import { useDrawer } from './hooks/useDrawer.js';
 import { Overlay } from '../Overlay/Overlay.js';
 import { getSizeValueFromProp } from '../../utils/getSizeValueFromProp.js';
@@ -67,7 +68,7 @@ const drawerRoot = Root => /*#__PURE__*/forwardRef(({
     popupInfo,
     disableScroll: asModal
   });
-  const transparent = useMemo(() => getIdLastDrawer(popupController.items) !== innerId, [innerId, popupController.items]);
+  const transparent = useMemo(() => getIdLastDrawer(Array.from(popupController.items.values())) !== innerId, [innerId, popupController.items]);
   const onDrawerOverlayKeyDown = event => {
     if (onOverlayClick) {
       onOverlayClick(event);

package/es/components/Drawer/Drawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Drawer.js","sources":["../../../src/components/Drawer/Drawer.tsx"],"sourcesContent":["import React, { forwardRef, useMemo } from 'react';\nimport { useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport type { RootProps } from '../../engines';\nimport { usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { cx, getSizeValueFromProp } from '../../utils';\nimport { useFocusTrap } from '../../hooks';\n\nimport { classes, tokens } from './Drawer.tokens';\nimport type { DrawerProps } from './Drawer.types';\nimport { base as viewCSS } from './variations/_view/base';\nimport { base as sizeCSS } from './variations/_size/base';\nimport { base as borderRadiusCSS } from './variations/_borderRadius/base';\nimport { StyledPopup, StyledPanel } from './Drawer.styles';\nimport { getIdLastDrawer } from './DrawerContext';\nimport { useDrawer } from './hooks';\n\n// issue #823\n\nexport const drawerRoot = (Root: RootProps<HTMLDivElement, DrawerProps>) =>\n    forwardRef<HTMLDivElement, DrawerProps>(\n        (\n            {\n                id,\n                zIndex,\n                popupInfo,\n                withBlur,\n                children,\n                view,\n                size,\n                width,\n                height,\n                isOpen,\n                opened,\n                initialFocusRef,\n                focusAfterRef,\n                className,\n                customBackgroundColor,\n                customContentBackgroundColor,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                offset,\n                frame,\n                borderRadius = 'none',\n                placement = 'right',\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                asModal = true,\n                ...rest\n            },\n            outerRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.drawerOverlayWithBlurColor})`\n                : `var(${tokens.drawerOverlayColor})`;\n            const innerWidth = width ? getSizeValueFromProp(width) : '100%';\n            const innerHeight = height ? getSizeValueFromProp(height) : '100%';\n\n            const placementClass = placement ? classes[`${placement}Placement` as keyof typeof classes] : undefined;\n\n            const { drawerInfo } = useDrawer({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n                disableScroll: asModal,\n            });\n            const transparent = useMemo(() => getIdLastDrawer(popupController.items) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onDrawerOverlayKeyDown = (event: React.MouseEvent<HTMLDivElement>) => {\n                if (onOverlayClick) {\n                    onOverlayClick(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            };\n\n            return (\n                <StyledPopup\n                    id={innerId}\n                    ref={asModal ? innerRef : outerRef}\n                    className={cx(placementClass)}\n                    opened={innerIsOpen}\n                    zIndex={zIndex}\n                    placement={placement}\n                    popupInfo={drawerInfo}\n                    frame={frame}\n                    width={innerWidth}\n                    height={innerHeight}\n                    offset={offset}\n                    withAnimation\n                    overlay={\n                        asModal && (\n                            <Root view={view}>\n                                <Overlay\n                                    className={classes.overlay}\n                                    zIndex={zIndex || DEFAULT_Z_INDEX}\n                                    backgroundColorProperty={overlayBackgroundToken}\n                                    withBlur={withBlur}\n                                    transparent={transparent}\n                                    isClickable={closeOnOverlayClick}\n                                    onOverlayClick={onDrawerOverlayKeyDown}\n                                />\n                            </Root>\n                        )\n                    }\n                    {...rest}\n                >\n                    <Root\n                        view={view}\n                        size={size}\n                        style={{ width: innerWidth, height: innerHeight }}\n                        borderRadius={borderRadius}\n                    >\n                        <StyledPanel\n                            width={innerWidth}\n                            height={innerHeight}\n                            customBackgroundColor={customBackgroundColor}\n                            customContentBackgroundColor={customContentBackgroundColor}\n                            className={className}\n                        >\n                            {children}\n                        </StyledPanel>\n                    </Root>\n                </StyledPopup>\n            );\n        },\n    );\n\nexport const drawerConfig = {\n    name: 'Drawer',\n    tag: 'div',\n    layout: drawerRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n        size: {\n            css: sizeCSS,\n        },\n        borderRadius: {\n            css: borderRadiusCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n        size: 'm',\n        borderRadius: 'none',\n    },\n};\n"],"names":["drawerRoot","Root","forwardRef","id","zIndex","popupInfo","withBlur","children","view","size","width","height","isOpen","opened","initialFocusRef","focusAfterRef","className","customBackgroundColor","customContentBackgroundColor","onClose","onOverlayClick","onEscKeyDown","offset","frame","borderRadius","placement","closeOnEsc","closeOnOverlayClick","asModal","rest","outerRef","innerIsOpen","Boolean","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","tokens","drawerOverlayWithBlurColor","drawerOverlayColor","innerWidth","getSizeValueFromProp","innerHeight","placementClass","classes","undefined","drawerInfo","useDrawer","disableScroll","transparent","useMemo","getIdLastDrawer","items","onDrawerOverlayKeyDown","event","React","createElement","StyledPopup","_extends","ref","cx","withAnimation","overlay","Overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","style","StyledPanel","drawerConfig","name","tag","layout","base","variations","css","viewCSS","sizeCSS","borderRadiusCSS","defaults"],"mappings":"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"}
+{"version":3,"file":"Drawer.js","sources":["../../../src/components/Drawer/Drawer.tsx"],"sourcesContent":["import React, { forwardRef, useMemo } from 'react';\nimport { useForkRef } from '@salutejs/plasma-core';\nimport { cx, getSizeValueFromProp, safeUseId } from 'src/utils';\nimport type { RootProps } from 'src/engines';\n\nimport { usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { useFocusTrap } from '../../hooks';\n\nimport { classes, tokens } from './Drawer.tokens';\nimport type { DrawerProps } from './Drawer.types';\nimport { base as viewCSS } from './variations/_view/base';\nimport { base as sizeCSS } from './variations/_size/base';\nimport { base as borderRadiusCSS } from './variations/_borderRadius/base';\nimport { StyledPopup, StyledPanel } from './Drawer.styles';\nimport { getIdLastDrawer } from './DrawerContext';\nimport { useDrawer } from './hooks';\n\n// issue #823\n\nexport const drawerRoot = (Root: RootProps<HTMLDivElement, DrawerProps>) =>\n    forwardRef<HTMLDivElement, DrawerProps>(\n        (\n            {\n                id,\n                zIndex,\n                popupInfo,\n                withBlur,\n                children,\n                view,\n                size,\n                width,\n                height,\n                isOpen,\n                opened,\n                initialFocusRef,\n                focusAfterRef,\n                className,\n                customBackgroundColor,\n                customContentBackgroundColor,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                offset,\n                frame,\n                borderRadius = 'none',\n                placement = 'right',\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                asModal = true,\n                ...rest\n            },\n            outerRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.drawerOverlayWithBlurColor})`\n                : `var(${tokens.drawerOverlayColor})`;\n            const innerWidth = width ? getSizeValueFromProp(width) : '100%';\n            const innerHeight = height ? getSizeValueFromProp(height) : '100%';\n\n            const placementClass = placement ? classes[`${placement}Placement` as keyof typeof classes] : undefined;\n\n            const { drawerInfo } = useDrawer({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n                disableScroll: asModal,\n            });\n            const transparent = useMemo(() => getIdLastDrawer(Array.from(popupController.items.values())) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onDrawerOverlayKeyDown = (event: React.MouseEvent<HTMLDivElement>) => {\n                if (onOverlayClick) {\n                    onOverlayClick(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            };\n\n            return (\n                <StyledPopup\n                    id={innerId}\n                    ref={asModal ? innerRef : outerRef}\n                    className={cx(placementClass)}\n                    opened={innerIsOpen}\n                    zIndex={zIndex}\n                    placement={placement}\n                    popupInfo={drawerInfo}\n                    frame={frame}\n                    width={innerWidth}\n                    height={innerHeight}\n                    offset={offset}\n                    withAnimation\n                    overlay={\n                        asModal && (\n                            <Root view={view}>\n                                <Overlay\n                                    className={classes.overlay}\n                                    zIndex={zIndex || DEFAULT_Z_INDEX}\n                                    backgroundColorProperty={overlayBackgroundToken}\n                                    withBlur={withBlur}\n                                    transparent={transparent}\n                                    isClickable={closeOnOverlayClick}\n                                    onOverlayClick={onDrawerOverlayKeyDown}\n                                />\n                            </Root>\n                        )\n                    }\n                    {...rest}\n                >\n                    <Root\n                        view={view}\n                        size={size}\n                        style={{ width: innerWidth, height: innerHeight }}\n                        borderRadius={borderRadius}\n                    >\n                        <StyledPanel\n                            width={innerWidth}\n                            height={innerHeight}\n                            customBackgroundColor={customBackgroundColor}\n                            customContentBackgroundColor={customContentBackgroundColor}\n                            className={className}\n                        >\n                            {children}\n                        </StyledPanel>\n                    </Root>\n                </StyledPopup>\n            );\n        },\n    );\n\nexport const drawerConfig = {\n    name: 'Drawer',\n    tag: 'div',\n    layout: drawerRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n        size: {\n            css: sizeCSS,\n        },\n        borderRadius: {\n            css: borderRadiusCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n        size: 'm',\n        borderRadius: 'none',\n    },\n};\n"],"names":["drawerRoot","Root","forwardRef","id","zIndex","popupInfo","withBlur","children","view","size","width","height","isOpen","opened","initialFocusRef","focusAfterRef","className","customBackgroundColor","customContentBackgroundColor","onClose","onOverlayClick","onEscKeyDown","offset","frame","borderRadius","placement","closeOnEsc","closeOnOverlayClick","asModal","rest","outerRef","innerIsOpen","Boolean","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","tokens","drawerOverlayWithBlurColor","drawerOverlayColor","innerWidth","getSizeValueFromProp","innerHeight","placementClass","classes","undefined","drawerInfo","useDrawer","disableScroll","transparent","useMemo","getIdLastDrawer","Array","from","items","values","onDrawerOverlayKeyDown","event","React","createElement","StyledPopup","_extends","ref","cx","withAnimation","overlay","Overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","style","StyledPanel","drawerConfig","name","tag","layout","base","variations","css","viewCSS","sizeCSS","borderRadiusCSS","defaults"],"mappings":"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"}

package/es/components/Drawer/hooks/useDrawer.js

@@ -21,7 +21,7 @@ const useDrawer = ({
     if (!closeOnEsc) {
       return;
     }
-    if (event.keyCode === ESCAPE_KEYCODE && getIdLastDrawer(popupController.items) === id) {
+    if (event.keyCode === ESCAPE_KEYCODE && getIdLastDrawer(Array.from(popupController.items.values())) === id) {
       if (onEscKeyDown) {
         onEscKeyDown(event);
         return;
@@ -52,7 +52,7 @@ const useDrawer = ({
     if (!canUseDOM) {
       return;
     }
-    if (!isOpen && !hasDrawers(popupController.items)) {
+    if (!isOpen && !hasDrawers(Array.from(popupController.items.values()))) {
       document.body.style.overflow = overflow.current;
     }
   }, [isOpen, popupController.items]);

package/es/components/Drawer/hooks/useDrawer.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDrawer.js","sources":["../../../../src/components/Drawer/hooks/useDrawer.ts"],"sourcesContent":["import { useCallback, useEffect, useRef } from 'react';\n\nimport { DrawerInfo, getIdLastDrawer, hasDrawers } from '../DrawerContext';\nimport { DrawerHookArgs } from '../Drawer.types';\nimport { usePopupContext } from '../../Popup';\nimport { canUseDOM } from '../../../utils';\n\nconst ESCAPE_KEYCODE = 27;\n\nexport const useDrawer = ({\n    id,\n    isOpen,\n    popupInfo,\n    onEscKeyDown,\n    onClose,\n    closeOnEsc = true,\n    disableScroll = true,\n}: DrawerHookArgs) => {\n    const popupController = usePopupContext();\n    const overflow = useRef<string>(canUseDOM ? document.body.style.overflow : 'initial');\n\n    // При ESC закрывает текущее окно, если это возможно\n    const onKeyDown = useCallback(\n        (event: KeyboardEvent) => {\n            if (!closeOnEsc) {\n                return;\n            }\n            if (event.keyCode === ESCAPE_KEYCODE && getIdLastDrawer(popupController.items) === id) {\n                if (onEscKeyDown) {\n                    onEscKeyDown(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            }\n        },\n        [onClose, onEscKeyDown, popupController.items, closeOnEsc],\n    );\n\n    useEffect(() => {\n        window.addEventListener('keydown', onKeyDown);\n        return () => {\n            window.removeEventListener('keydown', onKeyDown);\n        };\n    }, [onKeyDown]);\n\n    // linaria не поддерживает динамический global\n    useEffect(() => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        if (isOpen && disableScroll) {\n            overflow.current = document.body.style.overflow;\n\n            document.body.style.overflow = 'hidden';\n        }\n    }, [isOpen, disableScroll]);\n\n    useEffect(() => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        if (!isOpen && !hasDrawers(popupController.items)) {\n            document.body.style.overflow = overflow.current;\n        }\n    }, [isOpen, popupController.items]);\n\n    const drawerInfo: DrawerInfo = {\n        id,\n        info: {\n            isDrawer: true,\n        },\n        ...popupInfo,\n    };\n\n    return { drawerInfo };\n};\n"],"names":["ESCAPE_KEYCODE","useDrawer","id","isOpen","popupInfo","onEscKeyDown","onClose","closeOnEsc","disableScroll","popupController","usePopupContext","overflow","useRef","canUseDOM","document","body","style","onKeyDown","useCallback","event","keyCode","getIdLastDrawer","items","useEffect","window","addEventListener","removeEventListener","current","hasDrawers","drawerInfo","info","isDrawer"],"mappings":";;;;;AAOA,MAAMA,cAAc,GAAG,EAAE,CAAA;AAElB,MAAMC,SAAS,GAAGA,CAAC;EACtBC,EAAE;EACFC,MAAM;EACNC,SAAS;EACTC,YAAY;EACZC,OAAO;AACPC,EAAAA,UAAU,GAAG,IAAI;AACjBC,EAAAA,aAAa,GAAG,IAAA;AACJ,CAAC,KAAK;AAClB,EAAA,MAAMC,eAAe,GAAGC,eAAe,EAAE,CAAA;AACzC,EAAA,MAAMC,QAAQ,GAAGC,MAAM,CAASC,SAAS,GAAGC,QAAQ,CAACC,IAAI,CAACC,KAAK,CAACL,QAAQ,GAAG,SAAS,CAAC,CAAA;;AAErF;AACA,EAAA,MAAMM,SAAS,GAAGC,WAAW,CACxBC,KAAoB,IAAK;IACtB,IAAI,CAACZ,UAAU,EAAE;AACb,MAAA,OAAA;AACJ,KAAA;AACA,IAAA,IAAIY,KAAK,CAACC,OAAO,KAAKpB,cAAc,IAAIqB,eAAe,CAACZ,eAAe,CAACa,KAAK,CAAC,KAAKpB,EAAE,EAAE;AACnF,MAAA,IAAIG,YAAY,EAAE;QACdA,YAAY,CAACc,KAAK,CAAC,CAAA;AACnB,QAAA,OAAA;AACJ,OAAA;AAEA,MAAA,IAAIb,OAAO,EAAE;AACTA,QAAAA,OAAO,EAAE,CAAA;AACb,OAAA;AACJ,KAAA;AACJ,GAAC,EACD,CAACA,OAAO,EAAED,YAAY,EAAEI,eAAe,CAACa,KAAK,EAAEf,UAAU,CAC7D,CAAC,CAAA;AAEDgB,EAAAA,SAAS,CAAC,MAAM;AACZC,IAAAA,MAAM,CAACC,gBAAgB,CAAC,SAAS,EAAER,SAAS,CAAC,CAAA;AAC7C,IAAA,OAAO,MAAM;AACTO,MAAAA,MAAM,CAACE,mBAAmB,CAAC,SAAS,EAAET,SAAS,CAAC,CAAA;KACnD,CAAA;AACL,GAAC,EAAE,CAACA,SAAS,CAAC,CAAC,CAAA;;AAEf;AACAM,EAAAA,SAAS,CAAC,MAAM;IACZ,IAAI,CAACV,SAAS,EAAE;AACZ,MAAA,OAAA;AACJ,KAAA;IAEA,IAAIV,MAAM,IAAIK,aAAa,EAAE;MACzBG,QAAQ,CAACgB,OAAO,GAAGb,QAAQ,CAACC,IAAI,CAACC,KAAK,CAACL,QAAQ,CAAA;AAE/CG,MAAAA,QAAQ,CAACC,IAAI,CAACC,KAAK,CAACL,QAAQ,GAAG,QAAQ,CAAA;AAC3C,KAAA;AACJ,GAAC,EAAE,CAACR,MAAM,EAAEK,aAAa,CAAC,CAAC,CAAA;AAE3Be,EAAAA,SAAS,CAAC,MAAM;IACZ,IAAI,CAACV,SAAS,EAAE;AACZ,MAAA,OAAA;AACJ,KAAA;IAEA,IAAI,CAACV,MAAM,IAAI,CAACyB,UAAU,CAACnB,eAAe,CAACa,KAAK,CAAC,EAAE;MAC/CR,QAAQ,CAACC,IAAI,CAACC,KAAK,CAACL,QAAQ,GAAGA,QAAQ,CAACgB,OAAO,CAAA;AACnD,KAAA;GACH,EAAE,CAACxB,MAAM,EAAEM,eAAe,CAACa,KAAK,CAAC,CAAC,CAAA;AAEnC,EAAA,MAAMO,UAAsB,GAAG;IAC3B3B,EAAE;AACF4B,IAAAA,IAAI,EAAE;AACFC,MAAAA,QAAQ,EAAE,IAAA;KACb;IACD,GAAG3B,SAAAA;GACN,CAAA;EAED,OAAO;AAAEyB,IAAAA,UAAAA;GAAY,CAAA;AACzB;;;;"}
+{"version":3,"file":"useDrawer.js","sources":["../../../../src/components/Drawer/hooks/useDrawer.ts"],"sourcesContent":["import { useCallback, useEffect, useRef } from 'react';\n\nimport { DrawerInfo, getIdLastDrawer, hasDrawers } from '../DrawerContext';\nimport { DrawerHookArgs } from '../Drawer.types';\nimport { usePopupContext } from '../../Popup';\nimport { canUseDOM } from '../../../utils';\n\nconst ESCAPE_KEYCODE = 27;\n\nexport const useDrawer = ({\n    id,\n    isOpen,\n    popupInfo,\n    onEscKeyDown,\n    onClose,\n    closeOnEsc = true,\n    disableScroll = true,\n}: DrawerHookArgs) => {\n    const popupController = usePopupContext();\n    const overflow = useRef<string>(canUseDOM ? document.body.style.overflow : 'initial');\n\n    // При ESC закрывает текущее окно, если это возможно\n    const onKeyDown = useCallback(\n        (event: KeyboardEvent) => {\n            if (!closeOnEsc) {\n                return;\n            }\n            if (\n                event.keyCode === ESCAPE_KEYCODE &&\n                getIdLastDrawer(Array.from(popupController.items.values())) === id\n            ) {\n                if (onEscKeyDown) {\n                    onEscKeyDown(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            }\n        },\n        [onClose, onEscKeyDown, popupController.items, closeOnEsc],\n    );\n\n    useEffect(() => {\n        window.addEventListener('keydown', onKeyDown);\n        return () => {\n            window.removeEventListener('keydown', onKeyDown);\n        };\n    }, [onKeyDown]);\n\n    // linaria не поддерживает динамический global\n    useEffect(() => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        if (isOpen && disableScroll) {\n            overflow.current = document.body.style.overflow;\n\n            document.body.style.overflow = 'hidden';\n        }\n    }, [isOpen, disableScroll]);\n\n    useEffect(() => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        if (!isOpen && !hasDrawers(Array.from(popupController.items.values()))) {\n            document.body.style.overflow = overflow.current;\n        }\n    }, [isOpen, popupController.items]);\n\n    const drawerInfo: DrawerInfo = {\n        id,\n        info: {\n            isDrawer: true,\n        },\n        ...popupInfo,\n    };\n\n    return { drawerInfo };\n};\n"],"names":["ESCAPE_KEYCODE","useDrawer","id","isOpen","popupInfo","onEscKeyDown","onClose","closeOnEsc","disableScroll","popupController","usePopupContext","overflow","useRef","canUseDOM","document","body","style","onKeyDown","useCallback","event","keyCode","getIdLastDrawer","Array","from","items","values","useEffect","window","addEventListener","removeEventListener","current","hasDrawers","drawerInfo","info","isDrawer"],"mappings":";;;;;AAOA,MAAMA,cAAc,GAAG,EAAE,CAAA;AAElB,MAAMC,SAAS,GAAGA,CAAC;EACtBC,EAAE;EACFC,MAAM;EACNC,SAAS;EACTC,YAAY;EACZC,OAAO;AACPC,EAAAA,UAAU,GAAG,IAAI;AACjBC,EAAAA,aAAa,GAAG,IAAA;AACJ,CAAC,KAAK;AAClB,EAAA,MAAMC,eAAe,GAAGC,eAAe,EAAE,CAAA;AACzC,EAAA,MAAMC,QAAQ,GAAGC,MAAM,CAASC,SAAS,GAAGC,QAAQ,CAACC,IAAI,CAACC,KAAK,CAACL,QAAQ,GAAG,SAAS,CAAC,CAAA;;AAErF;AACA,EAAA,MAAMM,SAAS,GAAGC,WAAW,CACxBC,KAAoB,IAAK;IACtB,IAAI,CAACZ,UAAU,EAAE;AACb,MAAA,OAAA;AACJ,KAAA;IACA,IACIY,KAAK,CAACC,OAAO,KAAKpB,cAAc,IAChCqB,eAAe,CAACC,KAAK,CAACC,IAAI,CAACd,eAAe,CAACe,KAAK,CAACC,MAAM,EAAE,CAAC,CAAC,KAAKvB,EAAE,EACpE;AACE,MAAA,IAAIG,YAAY,EAAE;QACdA,YAAY,CAACc,KAAK,CAAC,CAAA;AACnB,QAAA,OAAA;AACJ,OAAA;AAEA,MAAA,IAAIb,OAAO,EAAE;AACTA,QAAAA,OAAO,EAAE,CAAA;AACb,OAAA;AACJ,KAAA;AACJ,GAAC,EACD,CAACA,OAAO,EAAED,YAAY,EAAEI,eAAe,CAACe,KAAK,EAAEjB,UAAU,CAC7D,CAAC,CAAA;AAEDmB,EAAAA,SAAS,CAAC,MAAM;AACZC,IAAAA,MAAM,CAACC,gBAAgB,CAAC,SAAS,EAAEX,SAAS,CAAC,CAAA;AAC7C,IAAA,OAAO,MAAM;AACTU,MAAAA,MAAM,CAACE,mBAAmB,CAAC,SAAS,EAAEZ,SAAS,CAAC,CAAA;KACnD,CAAA;AACL,GAAC,EAAE,CAACA,SAAS,CAAC,CAAC,CAAA;;AAEf;AACAS,EAAAA,SAAS,CAAC,MAAM;IACZ,IAAI,CAACb,SAAS,EAAE;AACZ,MAAA,OAAA;AACJ,KAAA;IAEA,IAAIV,MAAM,IAAIK,aAAa,EAAE;MACzBG,QAAQ,CAACmB,OAAO,GAAGhB,QAAQ,CAACC,IAAI,CAACC,KAAK,CAACL,QAAQ,CAAA;AAE/CG,MAAAA,QAAQ,CAACC,IAAI,CAACC,KAAK,CAACL,QAAQ,GAAG,QAAQ,CAAA;AAC3C,KAAA;AACJ,GAAC,EAAE,CAACR,MAAM,EAAEK,aAAa,CAAC,CAAC,CAAA;AAE3BkB,EAAAA,SAAS,CAAC,MAAM;IACZ,IAAI,CAACb,SAAS,EAAE;AACZ,MAAA,OAAA;AACJ,KAAA;AAEA,IAAA,IAAI,CAACV,MAAM,IAAI,CAAC4B,UAAU,CAACT,KAAK,CAACC,IAAI,CAACd,eAAe,CAACe,KAAK,CAACC,MAAM,EAAE,CAAC,CAAC,EAAE;MACpEX,QAAQ,CAACC,IAAI,CAACC,KAAK,CAACL,QAAQ,GAAGA,QAAQ,CAACmB,OAAO,CAAA;AACnD,KAAA;GACH,EAAE,CAAC3B,MAAM,EAAEM,eAAe,CAACe,KAAK,CAAC,CAAC,CAAA;AAEnC,EAAA,MAAMQ,UAAsB,GAAG;IAC3B9B,EAAE;AACF+B,IAAAA,IAAI,EAAE;AACFC,MAAAA,QAAQ,EAAE,IAAA;KACb;IACD,GAAG9B,SAAAA;GACN,CAAA;EAED,OAAO;AAAE4B,IAAAA,UAAAA;GAAY,CAAA;AACzB;;;;"}

package/es/components/Mask/Mask.js

@@ -3,11 +3,11 @@ import React, { forwardRef, useState, useImperativeHandle } from 'react';
 import maskInputCompose from '@salutejs/react-maskinput';
 
 const defaultFormatChars = [{
-  str: '0',
-  regexp: /[0-9]/
-}, {
   str: '*',
   regexp: /./
+}, {
+  str: '0',
+  regexp: /[0-9]/
 }, {
   str: 'a',
   regexp: /[a-zA-Z]/

package/es/components/Mask/Mask.js.map

@@ -1 +1 @@
-{"version":3,"file":"Mask.js","sources":["../../../src/components/Mask/Mask.tsx"],"sourcesContent":["import React, { forwardRef, useImperativeHandle, useState } from 'react';\nimport type { FC } from 'react';\nimport maskInputCompose from '@salutejs/react-maskinput';\n\nimport type { CustomInputProps, MaskProps } from './Mask.types';\n\nconst defaultFormatChars = [\n    {\n        str: '0',\n        regexp: /[0-9]/,\n    },\n    {\n        str: '*',\n        regexp: /./,\n    },\n    {\n        str: 'a',\n        regexp: /[a-zA-Z]/,\n    },\n    {\n        str: 'я',\n        regexp: /[а-яА-ЯёЁ]/,\n    },\n];\n\nexport const composeMask = <T extends CustomInputProps>(InputComponent: FC<T>) => {\n    const MaskedInput = maskInputCompose(InputComponent);\n\n    return forwardRef<HTMLInputElement, T & MaskProps>(\n        ({ mask, maskFormat = defaultFormatChars, ...rest }, outerRef) => {\n            // TODO: replace inside react-maskinput 'getReference' on 'forwardRef'\n            const [ref, setRef] = useState<HTMLInputElement | null>(null);\n\n            useImperativeHandle(outerRef, () => ref as HTMLInputElement, [ref]);\n\n            if (!mask) {\n                return <InputComponent ref={setRef} {...(rest as T)} />;\n            }\n\n            return <MaskedInput getReference={setRef} mask={mask} maskFormat={maskFormat} {...(rest as T)} />;\n        },\n    );\n};\n"],"names":["defaultFormatChars","str","regexp","composeMask","InputComponent","MaskedInput","maskInputCompose","forwardRef","mask","maskFormat","rest","outerRef","ref","setRef","useState","useImperativeHandle","React","createElement","_extends","getReference"],"mappings":";;;;AAMA,MAAMA,kBAAkB,GAAG,CACvB;AACIC,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,OAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,GAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,UAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,YAAA;AACZ,CAAC,CACJ,CAAA;AAEYC,MAAAA,WAAW,GAAgCC,cAAqB,IAAK;AAC9E,EAAA,MAAMC,WAAW,GAAGC,gBAAgB,CAACF,cAAc,CAAC,CAAA;EAEpD,oBAAOG,UAAU,CACb,CAAC;IAAEC,IAAI;AAAEC,IAAAA,UAAU,GAAGT,kBAAkB;IAAE,GAAGU,IAAAA;GAAM,EAAEC,QAAQ,KAAK;AAC9D;IACA,MAAM,CAACC,GAAG,EAAEC,MAAM,CAAC,GAAGC,QAAQ,CAA0B,IAAI,CAAC,CAAA;IAE7DC,mBAAmB,CAACJ,QAAQ,EAAE,MAAMC,GAAuB,EAAE,CAACA,GAAG,CAAC,CAAC,CAAA;IAEnE,IAAI,CAACJ,IAAI,EAAE;AACP,MAAA,oBAAOQ,KAAA,CAAAC,aAAA,CAACb,cAAc,EAAAc,QAAA,CAAA;AAACN,QAAAA,GAAG,EAAEC,MAAAA;OAAaH,EAAAA,IAAI,CAAS,CAAC,CAAA;AAC3D,KAAA;AAEA,IAAA,oBAAOM,KAAA,CAAAC,aAAA,CAACZ,WAAW,EAAAa,QAAA,CAAA;AAACC,MAAAA,YAAY,EAAEN,MAAO;AAACL,MAAAA,IAAI,EAAEA,IAAK;AAACC,MAAAA,UAAU,EAAEA,UAAAA;KAAiBC,EAAAA,IAAI,CAAS,CAAC,CAAA;AACrG,GACJ,CAAC,CAAA;AACL;;;;"}
+{"version":3,"file":"Mask.js","sources":["../../../src/components/Mask/Mask.tsx"],"sourcesContent":["import React, { forwardRef, useImperativeHandle, useState } from 'react';\nimport type { FC } from 'react';\nimport maskInputCompose from '@salutejs/react-maskinput';\n\nimport type { CustomInputProps, MaskProps } from './Mask.types';\n\nconst defaultFormatChars = [\n    {\n        str: '*',\n        regexp: /./,\n    },\n    {\n        str: '0',\n        regexp: /[0-9]/,\n    },\n    {\n        str: 'a',\n        regexp: /[a-zA-Z]/,\n    },\n    {\n        str: 'я',\n        regexp: /[а-яА-ЯёЁ]/,\n    },\n];\n\nexport const composeMask = <T extends CustomInputProps>(InputComponent: FC<T>) => {\n    const MaskedInput = maskInputCompose(InputComponent);\n\n    return forwardRef<HTMLInputElement, T & MaskProps>(\n        ({ mask, maskFormat = defaultFormatChars, ...rest }, outerRef) => {\n            // TODO: replace inside react-maskinput 'getReference' on 'forwardRef'\n            const [ref, setRef] = useState<HTMLInputElement | null>(null);\n\n            useImperativeHandle(outerRef, () => ref as HTMLInputElement, [ref]);\n\n            if (!mask) {\n                return <InputComponent ref={setRef} {...(rest as T)} />;\n            }\n\n            return <MaskedInput getReference={setRef} mask={mask} maskFormat={maskFormat} {...(rest as T)} />;\n        },\n    );\n};\n"],"names":["defaultFormatChars","str","regexp","composeMask","InputComponent","MaskedInput","maskInputCompose","forwardRef","mask","maskFormat","rest","outerRef","ref","setRef","useState","useImperativeHandle","React","createElement","_extends","getReference"],"mappings":";;;;AAMA,MAAMA,kBAAkB,GAAG,CACvB;AACIC,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,GAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,OAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,UAAA;AACZ,CAAC,EACD;AACID,EAAAA,GAAG,EAAE,GAAG;AACRC,EAAAA,MAAM,EAAE,YAAA;AACZ,CAAC,CACJ,CAAA;AAEYC,MAAAA,WAAW,GAAgCC,cAAqB,IAAK;AAC9E,EAAA,MAAMC,WAAW,GAAGC,gBAAgB,CAACF,cAAc,CAAC,CAAA;EAEpD,oBAAOG,UAAU,CACb,CAAC;IAAEC,IAAI;AAAEC,IAAAA,UAAU,GAAGT,kBAAkB;IAAE,GAAGU,IAAAA;GAAM,EAAEC,QAAQ,KAAK;AAC9D;IACA,MAAM,CAACC,GAAG,EAAEC,MAAM,CAAC,GAAGC,QAAQ,CAA0B,IAAI,CAAC,CAAA;IAE7DC,mBAAmB,CAACJ,QAAQ,EAAE,MAAMC,GAAuB,EAAE,CAACA,GAAG,CAAC,CAAC,CAAA;IAEnE,IAAI,CAACJ,IAAI,EAAE;AACP,MAAA,oBAAOQ,KAAA,CAAAC,aAAA,CAACb,cAAc,EAAAc,QAAA,CAAA;AAACN,QAAAA,GAAG,EAAEC,MAAAA;OAAaH,EAAAA,IAAI,CAAS,CAAC,CAAA;AAC3D,KAAA;AAEA,IAAA,oBAAOM,KAAA,CAAAC,aAAA,CAACZ,WAAW,EAAAa,QAAA,CAAA;AAACC,MAAAA,YAAY,EAAEN,MAAO;AAACL,MAAAA,IAAI,EAAEA,IAAK;AAACC,MAAAA,UAAU,EAAEA,UAAAA;KAAiBC,EAAAA,IAAI,CAAS,CAAC,CAAA;AACrG,GACJ,CAAC,CAAA;AACL;;;;"}

package/es/components/Modal/Modal.js

@@ -1,6 +1,6 @@
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React, { forwardRef, useMemo, useCallback } from 'react';
-import { useForkRef, safeUseId } from '@salutejs/plasma-core';
+import { useForkRef } from '@salutejs/plasma-core';
 import { DEFAULT_Z_INDEX } from '../Popup/utils/index.js';
 import { IconClose } from '../_Icon/Icons/IconClose.js';
 import { classes, tokens } from './Modal.tokens.js';
@@ -11,6 +11,7 @@ import { component } from '../../engines/common.js';
 import { popupConfig } from '../Popup/Popup.js';
 import { useFocusTrap } from '../../hooks/useFocusTrap.js';
 import { usePopupContext } from '../Popup/PopupContext.js';
+import { safeUseId } from '../../utils/react.js';
 import { useModal } from './hooks/useModal.js';
 import { Overlay } from '../Overlay/Overlay.js';
 
@@ -60,7 +61,7 @@ const modalRoot = Root => /*#__PURE__*/forwardRef(({
     onClose,
     popupInfo
   });
-  const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [innerId, popupController.items]);
+  const transparent = useMemo(() => getIdLastModal(Array.from(popupController.items.values())) !== innerId, [innerId, popupController.items]);
   const onModalOverlayKeyDown = useCallback(event => {
     if (onOverlayClick) {
       onOverlayClick(event);

package/es/components/Modal/Modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { useFocusTrap } from '../../hooks';\nimport { IconClose } from '../_Icon/Icons/IconClose';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\nimport { CloseButton, ModalBody, ModalContent } from './Modal.styles';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n    forwardRef<HTMLDivElement, ModalProps>(\n        (\n            {\n                id,\n                withAnimation,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                withBlur,\n                initialFocusRef,\n                focusAfterRef,\n                zIndex,\n                popupInfo,\n                children,\n                view,\n                opened,\n                isOpen,\n                hasBody,\n                hasClose,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n            const innerHasClose = (hasClose === undefined && hasBody) || hasClose;\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.modalOverlayWithBlurColor})`\n                : `var(${tokens.modalOverlayColor})`;\n\n            const { modalInfo } = useModal({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n            });\n\n            const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onModalOverlayKeyDown = useCallback(\n                (event: React.MouseEvent<HTMLDivElement>) => {\n                    if (onOverlayClick) {\n                        onOverlayClick(event);\n                        return;\n                    }\n\n                    if (onClose) {\n                        onClose();\n                    }\n                },\n                [closeOnOverlayClick, onOverlayClick, onClose],\n            );\n\n            const overlayNode = (\n                <Overlay\n                    className={classes.overlay}\n                    zIndex={zIndex || DEFAULT_Z_INDEX}\n                    backgroundColorProperty={overlayBackgroundToken}\n                    withBlur={withBlur}\n                    transparent={transparent}\n                    isClickable={closeOnOverlayClick}\n                    onOverlayClick={onModalOverlayKeyDown}\n                />\n            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    opened={innerIsOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={hasBody ? overlayNode : <Root view={view}>{overlayNode}</Root>}\n                    {...rest}\n                >\n                    {hasBody ? (\n                        <Root view={view}>\n                            <ModalBody>\n                                <ModalContent>\n                                    {innerHasClose && (\n                                        <CloseButton onClick={onClose} data-test=\"modal-close\">\n                                            <IconClose size=\"s\" color=\"currentColor\" />\n                                        </CloseButton>\n                                    )}\n                                    {children}\n                                </ModalContent>\n                            </ModalBody>\n                        </Root>\n                    ) : (\n                        <>{children}</>\n                    )}\n                </Popup>\n            );\n        },\n    );\n\nexport const modalConfig = {\n    name: 'Modal',\n    tag: 'div',\n    layout: modalRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n    },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","closeOnEsc","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","opened","isOpen","hasBody","hasClose","rest","outerRootRef","innerIsOpen","Boolean","innerHasClose","undefined","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","tokens","modalOverlayWithBlurColor","modalOverlayColor","modalInfo","useModal","transparent","useMemo","getIdLastModal","items","onModalOverlayKeyDown","useCallback","event","overlayNode","React","createElement","Overlay","className","classes","overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","_extends","ref","ModalBody","ModalContent","CloseButton","onClick","IconClose","size","color","Fragment","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":";;;;;;;;;;;;;;;;AAiBA;AACA,MAAMA,KAAK,GAAGC,SAAS,CAACC,WAAW,CAAC,CAAA;;AAEpC;AACA;AACA;AACA;MACaC,SAAS,GAAIC,IAA2C,iBACjEC,UAAU,CACN,CACI;EACIC,EAAE;EACFC,aAAa;EACbC,OAAO;EACPC,cAAc;EACdC,YAAY;AACZC,EAAAA,UAAU,GAAG,IAAI;AACjBC,EAAAA,mBAAmB,GAAG,IAAI;EAC1BC,QAAQ;EACRC,eAAe;EACfC,aAAa;EACbC,MAAM;EACNC,SAAS;EACTC,QAAQ;EACRC,IAAI;EACJC,MAAM;EACNC,MAAM;EACNC,OAAO;EACPC,QAAQ;EACR,GAAGC,IAAAA;AACP,CAAC,EACDC,YAAY,KACX;AACD,EAAA,MAAMC,WAAW,GAAGC,OAAO,CAACN,MAAM,IAAID,MAAM,CAAC,CAAA;EAC7C,MAAMQ,aAAa,GAAIL,QAAQ,KAAKM,SAAS,IAAIP,OAAO,IAAKC,QAAQ,CAAA;EACrE,MAAMO,OAAO,GAAGC,YAAY,CAAC,IAAI,EAAEjB,eAAe,EAAEC,aAAa,EAAE,IAAI,CAAC,CAAA;AACxE,EAAA,MAAMiB,eAAe,GAAGC,eAAe,EAAE,CAAA;AAEzC,EAAA,MAAMC,QAAQ,GAAGC,UAAU,CAAiBL,OAAO,EAAEL,YAAY,CAAC,CAAA;AAElE,EAAA,MAAMW,MAAM,GAAGC,SAAS,EAAE,CAAA;AAC1B,EAAA,MAAMC,OAAO,GAAGhC,EAAE,IAAI8B,MAAM,CAAA;AAC5B,EAAA,MAAMG,sBAAsB,GAAG1B,QAAQ,GACjC,OAAO2B,MAAM,CAACC,yBAAyB,CAAA,CAAA,CAAG,GAC1C,CAAA,IAAA,EAAOD,MAAM,CAACE,iBAAiB,CAAG,CAAA,CAAA,CAAA;EAExC,MAAM;AAAEC,IAAAA,SAAAA;GAAW,GAAGC,QAAQ,CAAC;AAC3BtC,IAAAA,EAAE,EAAEgC,OAAO;AACXjB,IAAAA,MAAM,EAAEK,WAAW;IACnBf,UAAU;IACVD,YAAY;IACZF,OAAO;AACPS,IAAAA,SAAAA;AACJ,GAAC,CAAC,CAAA;EAEF,MAAM4B,WAAW,GAAGC,OAAO,CAAC,MAAMC,cAAc,CAACf,eAAe,CAACgB,KAAK,CAAC,KAAKV,OAAO,EAAE,CACjFA,OAAO,EACPN,eAAe,CAACgB,KAAK,CACxB,CAAC,CAAA;AAEF,EAAA,MAAMC,qBAAqB,GAAGC,WAAW,CACpCC,KAAuC,IAAK;AACzC,IAAA,IAAI1C,cAAc,EAAE;MAChBA,cAAc,CAAC0C,KAAK,CAAC,CAAA;AACrB,MAAA,OAAA;AACJ,KAAA;AAEA,IAAA,IAAI3C,OAAO,EAAE;AACTA,MAAAA,OAAO,EAAE,CAAA;AACb,KAAA;GACH,EACD,CAACI,mBAAmB,EAAEH,cAAc,EAAED,OAAO,CACjD,CAAC,CAAA;AAED,EAAA,MAAM4C,WAAW,gBACbC,KAAA,CAAAC,aAAA,CAACC,OAAO,EAAA;IACJC,SAAS,EAAEC,OAAO,CAACC,OAAQ;IAC3B1C,MAAM,EAAEA,MAAM,IAAI2C,eAAgB;AAClCC,IAAAA,uBAAuB,EAAErB,sBAAuB;AAChD1B,IAAAA,QAAQ,EAAEA,QAAS;AACnBgC,IAAAA,WAAW,EAAEA,WAAY;AACzBgB,IAAAA,WAAW,EAAEjD,mBAAoB;AACjCH,IAAAA,cAAc,EAAEwC,qBAAAA;AAAsB,GACzC,CACJ,CAAA;AAED,EAAA,oBACII,KAAA,CAAAC,aAAA,CAACtD,KAAK,EAAA8D,QAAA,CAAA;AACFxD,IAAAA,EAAE,EAAEgC,OAAQ;AACZlB,IAAAA,MAAM,EAAEM,WAAY;AACpBqC,IAAAA,GAAG,EAAE7B,QAAS;AACdjB,IAAAA,SAAS,EAAE0B,SAAU;AACrBpC,IAAAA,aAAa,EAAEA,aAAc;AAC7BS,IAAAA,MAAM,EAAEA,MAAO;IACf0C,OAAO,EAAEpC,OAAO,GAAG8B,WAAW,gBAAGC,KAAA,CAAAC,aAAA,CAAClD,IAAI,EAAA;AAACe,MAAAA,IAAI,EAAEA,IAAAA;AAAK,KAAA,EAAEiC,WAAkB,CAAA;GAClE5B,EAAAA,IAAI,GAEPF,OAAO,gBACJ+B,KAAA,CAAAC,aAAA,CAAClD,IAAI,EAAA;AAACe,IAAAA,IAAI,EAAEA,IAAAA;AAAK,GAAA,eACbkC,KAAA,CAAAC,aAAA,CAACU,SAAS,EAAA,IAAA,eACNX,KAAA,CAAAC,aAAA,CAACW,YAAY,QACRrC,aAAa,iBACVyB,KAAA,CAAAC,aAAA,CAACY,WAAW,EAAA;AAACC,IAAAA,OAAO,EAAE3D,OAAQ;IAAC,WAAU,EAAA,aAAA;AAAa,GAAA,eAClD6C,KAAA,CAAAC,aAAA,CAACc,SAAS,EAAA;AAACC,IAAAA,IAAI,EAAC,GAAG;AAACC,IAAAA,KAAK,EAAC,cAAA;AAAc,GAAE,CACjC,CAChB,EACApD,QACS,CACP,CACT,CAAC,gBAEPmC,KAAA,CAAAC,aAAA,CAAAD,KAAA,CAAAkB,QAAA,EAAGrD,IAAAA,EAAAA,QAAW,CAEf,CAAC,CAAA;AAEhB,CACJ,EAAC;AAEE,MAAMsD,WAAW,GAAG;AACvBC,EAAAA,IAAI,EAAE,OAAO;AACbC,EAAAA,GAAG,EAAE,KAAK;AACVC,EAAAA,MAAM,EAAExE,SAAS;AACjByE,EAAAA,IAAI,EAAE,EAAE;AACRC,EAAAA,UAAU,EAAE;AACR1D,IAAAA,IAAI,EAAE;AACF2D,MAAAA,GAAG,EAAEC,IAAAA;AACT,KAAA;GACH;AACDC,EAAAA,QAAQ,EAAE;AACN7D,IAAAA,IAAI,EAAE,SAAA;AACV,GAAA;AACJ;;;;"}
+{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useForkRef } from '@salutejs/plasma-core';\nimport { safeUseId } from 'src/utils';\nimport { RootProps, component } from 'src/engines';\nimport { useFocusTrap } from 'src/hooks';\n\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\nimport { IconClose } from '../_Icon/Icons/IconClose';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\nimport { CloseButton, ModalBody, ModalContent } from './Modal.styles';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n    forwardRef<HTMLDivElement, ModalProps>(\n        (\n            {\n                id,\n                withAnimation,\n                onClose,\n                onOverlayClick,\n                onEscKeyDown,\n                closeOnEsc = true,\n                closeOnOverlayClick = true,\n                withBlur,\n                initialFocusRef,\n                focusAfterRef,\n                zIndex,\n                popupInfo,\n                children,\n                view,\n                opened,\n                isOpen,\n                hasBody,\n                hasClose,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = Boolean(isOpen || opened);\n            const innerHasClose = (hasClose === undefined && hasBody) || hasClose;\n            const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);\n            const popupController = usePopupContext();\n\n            const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n            const overlayBackgroundToken = withBlur\n                ? `var(${tokens.modalOverlayWithBlurColor})`\n                : `var(${tokens.modalOverlayColor})`;\n\n            const { modalInfo } = useModal({\n                id: innerId,\n                isOpen: innerIsOpen,\n                closeOnEsc,\n                onEscKeyDown,\n                onClose,\n                popupInfo,\n            });\n\n            const transparent = useMemo(() => getIdLastModal(Array.from(popupController.items.values())) !== innerId, [\n                innerId,\n                popupController.items,\n            ]);\n\n            const onModalOverlayKeyDown = useCallback(\n                (event: React.MouseEvent<HTMLDivElement>) => {\n                    if (onOverlayClick) {\n                        onOverlayClick(event);\n                        return;\n                    }\n\n                    if (onClose) {\n                        onClose();\n                    }\n                },\n                [closeOnOverlayClick, onOverlayClick, onClose],\n            );\n\n            const overlayNode = (\n                <Overlay\n                    className={classes.overlay}\n                    zIndex={zIndex || DEFAULT_Z_INDEX}\n                    backgroundColorProperty={overlayBackgroundToken}\n                    withBlur={withBlur}\n                    transparent={transparent}\n                    isClickable={closeOnOverlayClick}\n                    onOverlayClick={onModalOverlayKeyDown}\n                />\n            );\n\n            return (\n                <Popup\n                    id={innerId}\n                    opened={innerIsOpen}\n                    ref={innerRef}\n                    popupInfo={modalInfo}\n                    withAnimation={withAnimation}\n                    zIndex={zIndex}\n                    overlay={hasBody ? overlayNode : <Root view={view}>{overlayNode}</Root>}\n                    {...rest}\n                >\n                    {hasBody ? (\n                        <Root view={view}>\n                            <ModalBody>\n                                <ModalContent>\n                                    {innerHasClose && (\n                                        <CloseButton onClick={onClose} data-test=\"modal-close\">\n                                            <IconClose size=\"s\" color=\"currentColor\" />\n                                        </CloseButton>\n                                    )}\n                                    {children}\n                                </ModalContent>\n                            </ModalBody>\n                        </Root>\n                    ) : (\n                        <>{children}</>\n                    )}\n                </Popup>\n            );\n        },\n    );\n\nexport const modalConfig = {\n    name: 'Modal',\n    tag: 'div',\n    layout: modalRoot,\n    base: '',\n    variations: {\n        view: {\n            css: viewCSS,\n        },\n    },\n    defaults: {\n        view: 'default',\n    },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","closeOnEsc","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","opened","isOpen","hasBody","hasClose","rest","outerRootRef","innerIsOpen","Boolean","innerHasClose","undefined","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","tokens","modalOverlayWithBlurColor","modalOverlayColor","modalInfo","useModal","transparent","useMemo","getIdLastModal","Array","from","items","values","onModalOverlayKeyDown","useCallback","event","overlayNode","React","createElement","Overlay","className","classes","overlay","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","_extends","ref","ModalBody","ModalContent","CloseButton","onClick","IconClose","size","color","Fragment","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":";;;;;;;;;;;;;;;;;AAkBA;AACA,MAAMA,KAAK,GAAGC,SAAS,CAACC,WAAW,CAAC,CAAA;;AAEpC;AACA;AACA;AACA;MACaC,SAAS,GAAIC,IAA2C,iBACjEC,UAAU,CACN,CACI;EACIC,EAAE;EACFC,aAAa;EACbC,OAAO;EACPC,cAAc;EACdC,YAAY;AACZC,EAAAA,UAAU,GAAG,IAAI;AACjBC,EAAAA,mBAAmB,GAAG,IAAI;EAC1BC,QAAQ;EACRC,eAAe;EACfC,aAAa;EACbC,MAAM;EACNC,SAAS;EACTC,QAAQ;EACRC,IAAI;EACJC,MAAM;EACNC,MAAM;EACNC,OAAO;EACPC,QAAQ;EACR,GAAGC,IAAAA;AACP,CAAC,EACDC,YAAY,KACX;AACD,EAAA,MAAMC,WAAW,GAAGC,OAAO,CAACN,MAAM,IAAID,MAAM,CAAC,CAAA;EAC7C,MAAMQ,aAAa,GAAIL,QAAQ,KAAKM,SAAS,IAAIP,OAAO,IAAKC,QAAQ,CAAA;EACrE,MAAMO,OAAO,GAAGC,YAAY,CAAC,IAAI,EAAEjB,eAAe,EAAEC,aAAa,EAAE,IAAI,CAAC,CAAA;AACxE,EAAA,MAAMiB,eAAe,GAAGC,eAAe,EAAE,CAAA;AAEzC,EAAA,MAAMC,QAAQ,GAAGC,UAAU,CAAiBL,OAAO,EAAEL,YAAY,CAAC,CAAA;AAElE,EAAA,MAAMW,MAAM,GAAGC,SAAS,EAAE,CAAA;AAC1B,EAAA,MAAMC,OAAO,GAAGhC,EAAE,IAAI8B,MAAM,CAAA;AAC5B,EAAA,MAAMG,sBAAsB,GAAG1B,QAAQ,GACjC,OAAO2B,MAAM,CAACC,yBAAyB,CAAA,CAAA,CAAG,GAC1C,CAAA,IAAA,EAAOD,MAAM,CAACE,iBAAiB,CAAG,CAAA,CAAA,CAAA;EAExC,MAAM;AAAEC,IAAAA,SAAAA;GAAW,GAAGC,QAAQ,CAAC;AAC3BtC,IAAAA,EAAE,EAAEgC,OAAO;AACXjB,IAAAA,MAAM,EAAEK,WAAW;IACnBf,UAAU;IACVD,YAAY;IACZF,OAAO;AACPS,IAAAA,SAAAA;AACJ,GAAC,CAAC,CAAA;AAEF,EAAA,MAAM4B,WAAW,GAAGC,OAAO,CAAC,MAAMC,cAAc,CAACC,KAAK,CAACC,IAAI,CAACjB,eAAe,CAACkB,KAAK,CAACC,MAAM,EAAE,CAAC,CAAC,KAAKb,OAAO,EAAE,CACtGA,OAAO,EACPN,eAAe,CAACkB,KAAK,CACxB,CAAC,CAAA;AAEF,EAAA,MAAME,qBAAqB,GAAGC,WAAW,CACpCC,KAAuC,IAAK;AACzC,IAAA,IAAI7C,cAAc,EAAE;MAChBA,cAAc,CAAC6C,KAAK,CAAC,CAAA;AACrB,MAAA,OAAA;AACJ,KAAA;AAEA,IAAA,IAAI9C,OAAO,EAAE;AACTA,MAAAA,OAAO,EAAE,CAAA;AACb,KAAA;GACH,EACD,CAACI,mBAAmB,EAAEH,cAAc,EAAED,OAAO,CACjD,CAAC,CAAA;AAED,EAAA,MAAM+C,WAAW,gBACbC,KAAA,CAAAC,aAAA,CAACC,OAAO,EAAA;IACJC,SAAS,EAAEC,OAAO,CAACC,OAAQ;IAC3B7C,MAAM,EAAEA,MAAM,IAAI8C,eAAgB;AAClCC,IAAAA,uBAAuB,EAAExB,sBAAuB;AAChD1B,IAAAA,QAAQ,EAAEA,QAAS;AACnBgC,IAAAA,WAAW,EAAEA,WAAY;AACzBmB,IAAAA,WAAW,EAAEpD,mBAAoB;AACjCH,IAAAA,cAAc,EAAE2C,qBAAAA;AAAsB,GACzC,CACJ,CAAA;AAED,EAAA,oBACII,KAAA,CAAAC,aAAA,CAACzD,KAAK,EAAAiE,QAAA,CAAA;AACF3D,IAAAA,EAAE,EAAEgC,OAAQ;AACZlB,IAAAA,MAAM,EAAEM,WAAY;AACpBwC,IAAAA,GAAG,EAAEhC,QAAS;AACdjB,IAAAA,SAAS,EAAE0B,SAAU;AACrBpC,IAAAA,aAAa,EAAEA,aAAc;AAC7BS,IAAAA,MAAM,EAAEA,MAAO;IACf6C,OAAO,EAAEvC,OAAO,GAAGiC,WAAW,gBAAGC,KAAA,CAAAC,aAAA,CAACrD,IAAI,EAAA;AAACe,MAAAA,IAAI,EAAEA,IAAAA;AAAK,KAAA,EAAEoC,WAAkB,CAAA;GAClE/B,EAAAA,IAAI,GAEPF,OAAO,gBACJkC,KAAA,CAAAC,aAAA,CAACrD,IAAI,EAAA;AAACe,IAAAA,IAAI,EAAEA,IAAAA;AAAK,GAAA,eACbqC,KAAA,CAAAC,aAAA,CAACU,SAAS,EAAA,IAAA,eACNX,KAAA,CAAAC,aAAA,CAACW,YAAY,QACRxC,aAAa,iBACV4B,KAAA,CAAAC,aAAA,CAACY,WAAW,EAAA;AAACC,IAAAA,OAAO,EAAE9D,OAAQ;IAAC,WAAU,EAAA,aAAA;AAAa,GAAA,eAClDgD,KAAA,CAAAC,aAAA,CAACc,SAAS,EAAA;AAACC,IAAAA,IAAI,EAAC,GAAG;AAACC,IAAAA,KAAK,EAAC,cAAA;AAAc,GAAE,CACjC,CAChB,EACAvD,QACS,CACP,CACT,CAAC,gBAEPsC,KAAA,CAAAC,aAAA,CAAAD,KAAA,CAAAkB,QAAA,EAAGxD,IAAAA,EAAAA,QAAW,CAEf,CAAC,CAAA;AAEhB,CACJ,EAAC;AAEE,MAAMyD,WAAW,GAAG;AACvBC,EAAAA,IAAI,EAAE,OAAO;AACbC,EAAAA,GAAG,EAAE,KAAK;AACVC,EAAAA,MAAM,EAAE3E,SAAS;AACjB4E,EAAAA,IAAI,EAAE,EAAE;AACRC,EAAAA,UAAU,EAAE;AACR7D,IAAAA,IAAI,EAAE;AACF8D,MAAAA,GAAG,EAAEC,IAAAA;AACT,KAAA;GACH;AACDC,EAAAA,QAAQ,EAAE;AACNhE,IAAAA,IAAI,EAAE,SAAA;AACV,GAAA;AACJ;;;;"}

package/es/components/Modal/hooks/useModal.js

@@ -17,7 +17,7 @@ const useModal = ({
     if (!closeOnEsc) {
       return;
     }
-    if (event.keyCode === ESCAPE_KEYCODE && getIdLastModal(popupController.items) === id) {
+    if (event.keyCode === ESCAPE_KEYCODE && getIdLastModal(Array.from(popupController.items.values())) === id) {
       if (onEscKeyDown) {
         onEscKeyDown(event);
         return;

package/es/components/Modal/hooks/useModal.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModal.js","sources":["../../../../src/components/Modal/hooks/useModal.ts"],"sourcesContent":["import { useCallback, useEffect } from 'react';\n\nimport { ModalInfo, getIdLastModal } from '../ModalContext';\nimport { ModalHookArgs } from '../Modal.types';\nimport { usePopupContext } from '../../Popup';\n\nconst ESCAPE_KEYCODE = 27;\n\nexport const useModal = ({ id, popupInfo, onEscKeyDown, onClose, closeOnEsc = true }: ModalHookArgs) => {\n    const popupController = usePopupContext();\n\n    // При ESC закрывает текущее окно, если это возможно\n    const onKeyDown = useCallback(\n        (event: KeyboardEvent) => {\n            if (!closeOnEsc) {\n                return;\n            }\n            if (event.keyCode === ESCAPE_KEYCODE && getIdLastModal(popupController.items) === id) {\n                if (onEscKeyDown) {\n                    onEscKeyDown(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            }\n        },\n        [onClose, onEscKeyDown, popupController.items, closeOnEsc],\n    );\n\n    useEffect(() => {\n        window.addEventListener('keydown', onKeyDown);\n        return () => {\n            window.removeEventListener('keydown', onKeyDown);\n        };\n    }, [onClose, onEscKeyDown, popupController.items, closeOnEsc]);\n\n    const modalInfo: ModalInfo = {\n        id,\n        info: {\n            isModal: true,\n        },\n        ...popupInfo,\n    };\n\n    return { modalInfo };\n};\n"],"names":["ESCAPE_KEYCODE","useModal","id","popupInfo","onEscKeyDown","onClose","closeOnEsc","popupController","usePopupContext","onKeyDown","useCallback","event","keyCode","getIdLastModal","items","useEffect","window","addEventListener","removeEventListener","modalInfo","info","isModal"],"mappings":";;;;AAMA,MAAMA,cAAc,GAAG,EAAE,CAAA;AAElB,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,EAAE;EAAEC,SAAS;EAAEC,YAAY;EAAEC,OAAO;AAAEC,EAAAA,UAAU,GAAG,IAAA;AAAoB,CAAC,KAAK;AACpG,EAAA,MAAMC,eAAe,GAAGC,eAAe,EAAE,CAAA;;AAEzC;AACA,EAAA,MAAMC,SAAS,GAAGC,WAAW,CACxBC,KAAoB,IAAK;IACtB,IAAI,CAACL,UAAU,EAAE;AACb,MAAA,OAAA;AACJ,KAAA;AACA,IAAA,IAAIK,KAAK,CAACC,OAAO,KAAKZ,cAAc,IAAIa,cAAc,CAACN,eAAe,CAACO,KAAK,CAAC,KAAKZ,EAAE,EAAE;AAClF,MAAA,IAAIE,YAAY,EAAE;QACdA,YAAY,CAACO,KAAK,CAAC,CAAA;AACnB,QAAA,OAAA;AACJ,OAAA;AAEA,MAAA,IAAIN,OAAO,EAAE;AACTA,QAAAA,OAAO,EAAE,CAAA;AACb,OAAA;AACJ,KAAA;AACJ,GAAC,EACD,CAACA,OAAO,EAAED,YAAY,EAAEG,eAAe,CAACO,KAAK,EAAER,UAAU,CAC7D,CAAC,CAAA;AAEDS,EAAAA,SAAS,CAAC,MAAM;AACZC,IAAAA,MAAM,CAACC,gBAAgB,CAAC,SAAS,EAAER,SAAS,CAAC,CAAA;AAC7C,IAAA,OAAO,MAAM;AACTO,MAAAA,MAAM,CAACE,mBAAmB,CAAC,SAAS,EAAET,SAAS,CAAC,CAAA;KACnD,CAAA;AACL,GAAC,EAAE,CAACJ,OAAO,EAAED,YAAY,EAAEG,eAAe,CAACO,KAAK,EAAER,UAAU,CAAC,CAAC,CAAA;AAE9D,EAAA,MAAMa,SAAoB,GAAG;IACzBjB,EAAE;AACFkB,IAAAA,IAAI,EAAE;AACFC,MAAAA,OAAO,EAAE,IAAA;KACZ;IACD,GAAGlB,SAAAA;GACN,CAAA;EAED,OAAO;AAAEgB,IAAAA,SAAAA;GAAW,CAAA;AACxB;;;;"}
+{"version":3,"file":"useModal.js","sources":["../../../../src/components/Modal/hooks/useModal.ts"],"sourcesContent":["import { useCallback, useEffect } from 'react';\n\nimport { ModalInfo, getIdLastModal } from '../ModalContext';\nimport { ModalHookArgs } from '../Modal.types';\nimport { usePopupContext } from '../../Popup';\n\nconst ESCAPE_KEYCODE = 27;\n\nexport const useModal = ({ id, popupInfo, onEscKeyDown, onClose, closeOnEsc = true }: ModalHookArgs) => {\n    const popupController = usePopupContext();\n\n    // При ESC закрывает текущее окно, если это возможно\n    const onKeyDown = useCallback(\n        (event: KeyboardEvent) => {\n            if (!closeOnEsc) {\n                return;\n            }\n            if (event.keyCode === ESCAPE_KEYCODE && getIdLastModal(Array.from(popupController.items.values())) === id) {\n                if (onEscKeyDown) {\n                    onEscKeyDown(event);\n                    return;\n                }\n\n                if (onClose) {\n                    onClose();\n                }\n            }\n        },\n        [onClose, onEscKeyDown, popupController.items, closeOnEsc],\n    );\n\n    useEffect(() => {\n        window.addEventListener('keydown', onKeyDown);\n        return () => {\n            window.removeEventListener('keydown', onKeyDown);\n        };\n    }, [onClose, onEscKeyDown, popupController.items, closeOnEsc]);\n\n    const modalInfo: ModalInfo = {\n        id,\n        info: {\n            isModal: true,\n        },\n        ...popupInfo,\n    };\n\n    return { modalInfo };\n};\n"],"names":["ESCAPE_KEYCODE","useModal","id","popupInfo","onEscKeyDown","onClose","closeOnEsc","popupController","usePopupContext","onKeyDown","useCallback","event","keyCode","getIdLastModal","Array","from","items","values","useEffect","window","addEventListener","removeEventListener","modalInfo","info","isModal"],"mappings":";;;;AAMA,MAAMA,cAAc,GAAG,EAAE,CAAA;AAElB,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,EAAE;EAAEC,SAAS;EAAEC,YAAY;EAAEC,OAAO;AAAEC,EAAAA,UAAU,GAAG,IAAA;AAAoB,CAAC,KAAK;AACpG,EAAA,MAAMC,eAAe,GAAGC,eAAe,EAAE,CAAA;;AAEzC;AACA,EAAA,MAAMC,SAAS,GAAGC,WAAW,CACxBC,KAAoB,IAAK;IACtB,IAAI,CAACL,UAAU,EAAE;AACb,MAAA,OAAA;AACJ,KAAA;IACA,IAAIK,KAAK,CAACC,OAAO,KAAKZ,cAAc,IAAIa,cAAc,CAACC,KAAK,CAACC,IAAI,CAACR,eAAe,CAACS,KAAK,CAACC,MAAM,EAAE,CAAC,CAAC,KAAKf,EAAE,EAAE;AACvG,MAAA,IAAIE,YAAY,EAAE;QACdA,YAAY,CAACO,KAAK,CAAC,CAAA;AACnB,QAAA,OAAA;AACJ,OAAA;AAEA,MAAA,IAAIN,OAAO,EAAE;AACTA,QAAAA,OAAO,EAAE,CAAA;AACb,OAAA;AACJ,KAAA;AACJ,GAAC,EACD,CAACA,OAAO,EAAED,YAAY,EAAEG,eAAe,CAACS,KAAK,EAAEV,UAAU,CAC7D,CAAC,CAAA;AAEDY,EAAAA,SAAS,CAAC,MAAM;AACZC,IAAAA,MAAM,CAACC,gBAAgB,CAAC,SAAS,EAAEX,SAAS,CAAC,CAAA;AAC7C,IAAA,OAAO,MAAM;AACTU,MAAAA,MAAM,CAACE,mBAAmB,CAAC,SAAS,EAAEZ,SAAS,CAAC,CAAA;KACnD,CAAA;AACL,GAAC,EAAE,CAACJ,OAAO,EAAED,YAAY,EAAEG,eAAe,CAACS,KAAK,EAAEV,UAAU,CAAC,CAAC,CAAA;AAE9D,EAAA,MAAMgB,SAAoB,GAAG;IACzBpB,EAAE;AACFqB,IAAAA,IAAI,EAAE;AACFC,MAAAA,OAAO,EAAE,IAAA;KACZ;IACD,GAAGrB,SAAAA;GACN,CAAA;EAED,OAAO;AAAEmB,IAAAA,SAAAA;GAAW,CAAA;AACxB;;;;"}

package/es/components/Popup/Popup.js

@@ -1,10 +1,11 @@
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React, { forwardRef, useRef } from 'react';
-import { safeUseId, useForkRef } from '@salutejs/plasma-core';
+import { useForkRef } from '@salutejs/plasma-core';
 import { cx } from '../../utils/index.js';
 import { PopupRoot } from './PopupRoot.js';
 import { classes } from './Popup.tokens.js';
 import { StyledPortalContainer } from './Popup.styles.js';
+import { safeUseId } from '../../utils/react.js';
 import { usePopup } from './hooks/usePopup.js';
 import { canUseDOM } from '../../utils/canUseDOM.js';
 import { Portal } from '../Portal/Portal.js';

package/es/components/Popup/Popup.js.map

@@ -1 +1 @@
-{"version":3,"file":"Popup.js","sources":["../../../src/components/Popup/Popup.tsx"],"sourcesContent":["import React, { forwardRef, useRef } from 'react';\nimport { useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps } from '../../engines/types';\nimport { canUseDOM, cx } from '../../utils';\nimport { Portal } from '../Portal';\n\nimport type { PopupPlacementBasic, PopupPlacement, PopupPositionType, PopupProps } from './Popup.types';\nimport { PopupRoot } from './PopupRoot';\nimport { usePopup } from './hooks';\nimport { classes } from './Popup.tokens';\nimport { StyledPortalContainer } from './Popup.styles';\n\nexport const handlePosition = (\n    placement: PopupPlacement,\n    offset: [number, number] | [string, string],\n): PopupPositionType => {\n    let x = '0rem';\n    let y = '0rem';\n\n    if (offset) {\n        const [_x, _y] = offset;\n        x = typeof _x === 'number' ? `${_x}rem` : _x;\n        y = typeof _y === 'number' ? `${_y}rem` : _y;\n    }\n\n    if (!placement || placement === 'center') {\n        return {\n            left: `calc(50% + ${x})`,\n            top: `calc(50% - ${y})`,\n            transform: 'translate(-50%, -50%)',\n        };\n    }\n\n    let left;\n    let right;\n    let top;\n    let bottom;\n    let transform;\n    const placements = placement.split('-') as PopupPlacementBasic[];\n\n    placements.forEach((placementValue: PopupPlacementBasic) => {\n        switch (placementValue) {\n            case 'left':\n                left = x;\n                break;\n            case 'right':\n                right = x;\n                break;\n            case 'top':\n                top = y;\n                break;\n            case 'bottom':\n                bottom = y;\n                break;\n            default:\n                break;\n        }\n    });\n\n    const isCenteredX = left === undefined && right === undefined;\n    const isCenteredY = top === undefined && bottom === undefined;\n\n    if (isCenteredX) {\n        transform = 'translateX(-50%)';\n    }\n\n    if (isCenteredY) {\n        transform = 'translateY(-50%)';\n    }\n\n    return {\n        left: isCenteredX ? `calc(50% + ${x})` : left,\n        right,\n        top: isCenteredY ? `calc(50% - ${y})` : top,\n        bottom,\n        transform,\n    };\n};\n\n/**\n * Базовый компонент Popup.\n */\nexport const popupRoot = (Root: RootProps<HTMLDivElement, PopupProps>) =>\n    forwardRef<HTMLDivElement, PopupProps>(\n        (\n            {\n                id,\n                isOpen = false,\n                opened = false,\n                placement = 'center',\n                offset = [0, 0],\n                frame = 'document',\n                children,\n                overlay,\n                // eslint-disable-next-line @typescript-eslint/no-unused-vars\n                role,\n                zIndex,\n                popupInfo,\n                withAnimation = false,\n                className,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = isOpen || opened;\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n\n            const { isVisible, animationInfo, setVisible, rootId } = usePopup({\n                isOpen: innerIsOpen,\n                id: innerId,\n                popupInfo,\n                withAnimation,\n            });\n\n            const portalRef = useRef<HTMLDivElement | null>(null);\n            const contentRef = useRef<HTMLDivElement | null>(null);\n\n            const innerRef = useForkRef<HTMLDivElement>(contentRef, outerRootRef);\n\n            if (!isVisible && !innerIsOpen) {\n                return null;\n            }\n\n            const cls = cx(\n                className,\n                animationInfo?.endAnimation ? classes.endAnimation : '',\n                animationInfo?.endTransition ? classes.endTransition : '',\n            );\n\n            const rootNode = (\n                <Root className={cls}>\n                    {overlay}\n                    <PopupRoot\n                        id={innerId}\n                        ref={innerRef}\n                        position={handlePosition(placement, offset)}\n                        zIndex={zIndex}\n                        frame={frame}\n                        animationInfo={animationInfo}\n                        setVisible={setVisible}\n                        {...rest}\n                    >\n                        {children}\n                    </PopupRoot>\n                </Root>\n            );\n\n            if (typeof frame !== 'string' && frame && frame.current && canUseDOM) {\n                return <Portal container={frame.current}>{rootNode}</Portal>;\n            }\n\n            const withFrameId = typeof frame === 'string' && frame !== 'document';\n            const containerElement = withFrameId && canUseDOM && document.getElementById(frame as string);\n\n            if (containerElement) {\n                return (\n                    <Portal container={containerElement}>\n                        <StyledPortalContainer ref={portalRef}>\n                            {portalRef.current && <Portal container={portalRef.current}>{rootNode}</Portal>}\n                        </StyledPortalContainer>{' '}\n                    </Portal>\n                );\n            }\n\n            const globalPortal = canUseDOM && document.getElementById(rootId);\n\n            return <>{globalPortal && <Portal container={globalPortal}>{rootNode}</Portal>}</>;\n        },\n    );\n\nexport const popupConfig = {\n    name: 'Popup',\n    tag: 'div',\n    layout: popupRoot,\n    base: '',\n    variations: {},\n    defaults: {},\n};\n"],"names":["handlePosition","placement","offset","x","y","_x","_y","left","top","transform","right","bottom","placements","split","forEach","placementValue","isCenteredX","undefined","isCenteredY","popupRoot","Root","forwardRef","id","isOpen","opened","frame","children","overlay","role","zIndex","popupInfo","withAnimation","className","rest","outerRootRef","innerIsOpen","uniqId","safeUseId","innerId","isVisible","animationInfo","setVisible","rootId","usePopup","portalRef","useRef","contentRef","innerRef","useForkRef","cls","cx","endAnimation","classes","endTransition","rootNode","React","createElement","PopupRoot","_extends","ref","position","current","canUseDOM","Portal","container","withFrameId","containerElement","document","getElementById","StyledPortalContainer","globalPortal","Fragment","popupConfig","name","tag","layout","base","variations","defaults"],"mappings":"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"}
+{"version":3,"file":"Popup.js","sources":["../../../src/components/Popup/Popup.tsx"],"sourcesContent":["import React, { forwardRef, useRef } from 'react';\nimport { useForkRef } from '@salutejs/plasma-core';\nimport { canUseDOM, cx, safeUseId } from 'src/utils';\nimport { RootProps } from 'src/engines/types';\n\nimport { Portal } from '../Portal';\n\nimport type { PopupPlacementBasic, PopupPlacement, PopupPositionType, PopupProps } from './Popup.types';\nimport { PopupRoot } from './PopupRoot';\nimport { usePopup } from './hooks';\nimport { classes } from './Popup.tokens';\nimport { StyledPortalContainer } from './Popup.styles';\n\nexport const handlePosition = (\n    placement: PopupPlacement,\n    offset: [number, number] | [string, string],\n): PopupPositionType => {\n    let x = '0rem';\n    let y = '0rem';\n\n    if (offset) {\n        const [_x, _y] = offset;\n        x = typeof _x === 'number' ? `${_x}rem` : _x;\n        y = typeof _y === 'number' ? `${_y}rem` : _y;\n    }\n\n    if (!placement || placement === 'center') {\n        return {\n            left: `calc(50% + ${x})`,\n            top: `calc(50% - ${y})`,\n            transform: 'translate(-50%, -50%)',\n        };\n    }\n\n    let left;\n    let right;\n    let top;\n    let bottom;\n    let transform;\n    const placements = placement.split('-') as PopupPlacementBasic[];\n\n    placements.forEach((placementValue: PopupPlacementBasic) => {\n        switch (placementValue) {\n            case 'left':\n                left = x;\n                break;\n            case 'right':\n                right = x;\n                break;\n            case 'top':\n                top = y;\n                break;\n            case 'bottom':\n                bottom = y;\n                break;\n            default:\n                break;\n        }\n    });\n\n    const isCenteredX = left === undefined && right === undefined;\n    const isCenteredY = top === undefined && bottom === undefined;\n\n    if (isCenteredX) {\n        transform = 'translateX(-50%)';\n    }\n\n    if (isCenteredY) {\n        transform = 'translateY(-50%)';\n    }\n\n    return {\n        left: isCenteredX ? `calc(50% + ${x})` : left,\n        right,\n        top: isCenteredY ? `calc(50% - ${y})` : top,\n        bottom,\n        transform,\n    };\n};\n\n/**\n * Базовый компонент Popup.\n */\nexport const popupRoot = (Root: RootProps<HTMLDivElement, PopupProps>) =>\n    forwardRef<HTMLDivElement, PopupProps>(\n        (\n            {\n                id,\n                isOpen = false,\n                opened = false,\n                placement = 'center',\n                offset = [0, 0],\n                frame = 'document',\n                children,\n                overlay,\n                // eslint-disable-next-line @typescript-eslint/no-unused-vars\n                role,\n                zIndex,\n                popupInfo,\n                withAnimation = false,\n                className,\n                ...rest\n            },\n            outerRootRef,\n        ) => {\n            const innerIsOpen = isOpen || opened;\n\n            const uniqId = safeUseId();\n            const innerId = id || uniqId;\n\n            const { isVisible, animationInfo, setVisible, rootId } = usePopup({\n                isOpen: innerIsOpen,\n                id: innerId,\n                popupInfo,\n                withAnimation,\n            });\n\n            const portalRef = useRef<HTMLDivElement | null>(null);\n            const contentRef = useRef<HTMLDivElement | null>(null);\n\n            const innerRef = useForkRef<HTMLDivElement>(contentRef, outerRootRef);\n\n            if (!isVisible && !innerIsOpen) {\n                return null;\n            }\n\n            const cls = cx(\n                className,\n                animationInfo?.endAnimation ? classes.endAnimation : '',\n                animationInfo?.endTransition ? classes.endTransition : '',\n            );\n\n            const rootNode = (\n                <Root className={cls}>\n                    {overlay}\n                    <PopupRoot\n                        id={innerId}\n                        ref={innerRef}\n                        position={handlePosition(placement, offset)}\n                        zIndex={zIndex}\n                        frame={frame}\n                        animationInfo={animationInfo}\n                        setVisible={setVisible}\n                        {...rest}\n                    >\n                        {children}\n                    </PopupRoot>\n                </Root>\n            );\n\n            if (typeof frame !== 'string' && frame && frame.current && canUseDOM) {\n                return <Portal container={frame.current}>{rootNode}</Portal>;\n            }\n\n            const withFrameId = typeof frame === 'string' && frame !== 'document';\n            const containerElement = withFrameId && canUseDOM && document.getElementById(frame as string);\n\n            if (containerElement) {\n                return (\n                    <Portal container={containerElement}>\n                        <StyledPortalContainer ref={portalRef}>\n                            {portalRef.current && <Portal container={portalRef.current}>{rootNode}</Portal>}\n                        </StyledPortalContainer>{' '}\n                    </Portal>\n                );\n            }\n\n            const globalPortal = canUseDOM && document.getElementById(rootId);\n\n            return <>{globalPortal && <Portal container={globalPortal}>{rootNode}</Portal>}</>;\n        },\n    );\n\nexport const popupConfig = {\n    name: 'Popup',\n    tag: 'div',\n    layout: popupRoot,\n    base: '',\n    variations: {},\n    defaults: {},\n};\n"],"names":["handlePosition","placement","offset","x","y","_x","_y","left","top","transform","right","bottom","placements","split","forEach","placementValue","isCenteredX","undefined","isCenteredY","popupRoot","Root","forwardRef","id","isOpen","opened","frame","children","overlay","role","zIndex","popupInfo","withAnimation","className","rest","outerRootRef","innerIsOpen","uniqId","safeUseId","innerId","isVisible","animationInfo","setVisible","rootId","usePopup","portalRef","useRef","contentRef","innerRef","useForkRef","cls","cx","endAnimation","classes","endTransition","rootNode","React","createElement","PopupRoot","_extends","ref","position","current","canUseDOM","Portal","container","withFrameId","containerElement","document","getElementById","StyledPortalContainer","globalPortal","Fragment","popupConfig","name","tag","layout","base","variations","defaults"],"mappings":"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"}

package/es/components/Popup/PopupContext.js

@@ -7,9 +7,9 @@ import { safeUseId } from '../../utils/react.js';
 import { Portal } from '../Portal/Portal.js';
 
 const POPUP_PORTAL_ID = 'plasma-popup-root';
-const items = [];
+const initialItems = new Map();
 const PopupContext = /*#__PURE__*/createContext({
-  items,
+  items: initialItems,
   rootId: POPUP_PORTAL_ID,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   register(_info) {
@@ -28,7 +28,7 @@ const PopupProvider = ({
   UNSAFE_SSR_ENABLED
 }) => {
   const prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');
-  const [items, setItems] = useState([]);
+  const [items, setItems] = useState(initialItems);
   const uuid = safeUseId();
   const rootId = `${POPUP_PORTAL_ID}-${uuid}`;
   const register = info => {
@@ -36,11 +36,13 @@ const PopupProvider = ({
       return;
     }
     setItems(prevItems => {
-      if (info.info?.isModal && !hasModals(prevItems)) {
+      const newItems = new Map(prevItems);
+      if (info.info?.isModal && !hasModals(Array.from(prevItems.values()))) {
         prevBodyOverflowY.current = document.body.style.overflowY;
         document.body.style.overflowY = 'hidden';
       }
-      return [...prevItems, info];
+      newItems.set(info.id, info);
+      return newItems;
     });
   };
   const unregister = id => {
@@ -48,18 +50,16 @@ const PopupProvider = ({
       return;
     }
     setItems(prevItems => {
-      const index = prevItems.findIndex(item => id === item.id);
-      if (index === -1) {
+      if (!prevItems.has(id)) {
         return prevItems;
       }
-      const prevHasModals = hasModals(prevItems);
-      prevItems.splice(index, 1);
-      if (prevHasModals && !hasModals(prevItems)) {
+      const newItems = new Map(prevItems);
+      const prevHasModals = hasModals(Array.from(newItems.values()));
+      newItems.delete(id);
+      if (prevHasModals && !hasModals(Array.from(newItems.values()))) {
         document.body.style.overflowY = prevBodyOverflowY.current;
       }
-
-      // при return prevItems не обновится контекст
-      return [...prevItems];
+      return newItems;
     });
   };
   const context = {

package/es/components/Popup/PopupContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"PopupContext.js","sources":["../../../src/components/Popup/PopupContext.tsx"],"sourcesContent":["import React, { createContext, useState, useContext, FC, PropsWithChildren, useRef } from 'react';\n\nimport { Portal } from '../Portal';\nimport { hasModals } from '../Modal/ModalContext';\nimport { canUseDOM, safeUseId } from '../../utils';\n\nimport { ClientOnlyPortal } from './ClientOnlyPortal';\nimport type { PopupContextType, PopupInfo } from './Popup.types';\nimport { StyledPortal } from './Popup.styles';\n\nexport const POPUP_PORTAL_ID = 'plasma-popup-root';\n\nconst items: PopupInfo[] = [];\n\nconst PopupContext = createContext<PopupContextType>({\n    items,\n    rootId: POPUP_PORTAL_ID,\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    register(_info: PopupInfo): void {\n        throw new Error('Function not implemented. Add PopupProvider');\n    },\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    unregister(_id: string): void {\n        throw new Error('Function not implemented. Add PopupProvider');\n    },\n});\n\nexport const usePopupContext = () => useContext(PopupContext);\n\n// TODO: #1599\nexport const PopupProvider: FC<\n    PropsWithChildren & {\n        /**\n         * @description Только для применения в рамках SSR.\n         */\n        UNSAFE_SSR_ENABLED?: boolean;\n    }\n> = ({ children, UNSAFE_SSR_ENABLED }) => {\n    const prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');\n    const [items, setItems] = useState<PopupInfo[]>([]);\n\n    const uuid = safeUseId();\n    const rootId = `${POPUP_PORTAL_ID}-${uuid}`;\n\n    const register = (info: PopupInfo) => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        setItems((prevItems) => {\n            if (info.info?.isModal && !hasModals(prevItems)) {\n                prevBodyOverflowY.current = document.body.style.overflowY;\n                document.body.style.overflowY = 'hidden';\n            }\n\n            return [...prevItems, info];\n        });\n    };\n\n    const unregister = (id: string) => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        setItems((prevItems) => {\n            const index = prevItems.findIndex((item: PopupInfo) => id === item.id);\n\n            if (index === -1) {\n                return prevItems;\n            }\n\n            const prevHasModals = hasModals(prevItems);\n            prevItems.splice(index, 1);\n\n            if (prevHasModals && !hasModals(prevItems)) {\n                document.body.style.overflowY = prevBodyOverflowY.current;\n            }\n\n            // при return prevItems не обновится контекст\n            return [...prevItems];\n        });\n    };\n\n    const context = {\n        items,\n        rootId,\n        register,\n        unregister,\n    };\n\n    return (\n        <PopupContext.Provider value={context}>\n            {children}\n\n            {UNSAFE_SSR_ENABLED ? (\n                <ClientOnlyPortal>\n                    <StyledPortal id={rootId} />\n                </ClientOnlyPortal>\n            ) : (\n                <Portal container={document.body}>\n                    <StyledPortal id={rootId} />\n                </Portal>\n            )}\n        </PopupContext.Provider>\n    );\n};\n"],"names":["POPUP_PORTAL_ID","items","PopupContext","createContext","rootId","register","_info","Error","unregister","_id","usePopupContext","useContext","PopupProvider","children","UNSAFE_SSR_ENABLED","prevBodyOverflowY","useRef","canUseDOM","document","body","style","overflowY","setItems","useState","uuid","safeUseId","info","prevItems","isModal","hasModals","current","id","index","findIndex","item","prevHasModals","splice","context","React","createElement","Provider","value","ClientOnlyPortal","StyledPortal","Portal","container"],"mappings":"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"}
+{"version":3,"file":"PopupContext.js","sources":["../../../src/components/Popup/PopupContext.tsx"],"sourcesContent":["import React, { createContext, useState, useContext, FC, PropsWithChildren, useRef } from 'react';\nimport { canUseDOM, safeUseId } from 'src/utils';\n\nimport { Portal } from '../Portal';\nimport { hasModals } from '../Modal/ModalContext';\n\nimport { ClientOnlyPortal } from './ClientOnlyPortal';\nimport type { PopupContextType, PopupInfo } from './Popup.types';\nimport { StyledPortal } from './Popup.styles';\n\nexport const POPUP_PORTAL_ID = 'plasma-popup-root';\n\nconst initialItems = new Map<string, PopupInfo>();\n\nconst PopupContext = createContext<PopupContextType>({\n    items: initialItems,\n    rootId: POPUP_PORTAL_ID,\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    register(_info: PopupInfo): void {\n        throw new Error('Function not implemented. Add PopupProvider');\n    },\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    unregister(_id: string): void {\n        throw new Error('Function not implemented. Add PopupProvider');\n    },\n});\n\nexport const usePopupContext = () => useContext(PopupContext);\n\n// TODO: #1599\nexport const PopupProvider: FC<\n    PropsWithChildren & {\n        /**\n         * @description Только для применения в рамках SSR.\n         */\n        UNSAFE_SSR_ENABLED?: boolean;\n    }\n> = ({ children, UNSAFE_SSR_ENABLED }) => {\n    const prevBodyOverflowY = useRef(canUseDOM ? document.body.style.overflowY : '');\n    const [items, setItems] = useState(initialItems);\n\n    const uuid = safeUseId();\n    const rootId = `${POPUP_PORTAL_ID}-${uuid}`;\n\n    const register = (info: PopupInfo) => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        setItems((prevItems) => {\n            const newItems = new Map(prevItems);\n\n            if (info.info?.isModal && !hasModals(Array.from(prevItems.values()))) {\n                prevBodyOverflowY.current = document.body.style.overflowY;\n                document.body.style.overflowY = 'hidden';\n            }\n\n            newItems.set(info.id, info);\n            return newItems;\n        });\n    };\n\n    const unregister = (id: string) => {\n        if (!canUseDOM) {\n            return;\n        }\n\n        setItems((prevItems) => {\n            if (!prevItems.has(id)) {\n                return prevItems;\n            }\n\n            const newItems = new Map(prevItems);\n            const prevHasModals = hasModals(Array.from(newItems.values()));\n\n            newItems.delete(id);\n\n            if (prevHasModals && !hasModals(Array.from(newItems.values()))) {\n                document.body.style.overflowY = prevBodyOverflowY.current;\n            }\n\n            return newItems;\n        });\n    };\n\n    const context = {\n        items,\n        rootId,\n        register,\n        unregister,\n    };\n\n    return (\n        <PopupContext.Provider value={context}>\n            {children}\n\n            {UNSAFE_SSR_ENABLED ? (\n                <ClientOnlyPortal>\n                    <StyledPortal id={rootId} />\n                </ClientOnlyPortal>\n            ) : (\n                <Portal container={document.body}>\n                    <StyledPortal id={rootId} />\n                </Portal>\n            )}\n        </PopupContext.Provider>\n    );\n};\n"],"names":["POPUP_PORTAL_ID","initialItems","Map","PopupContext","createContext","items","rootId","register","_info","Error","unregister","_id","usePopupContext","useContext","PopupProvider","children","UNSAFE_SSR_ENABLED","prevBodyOverflowY","useRef","canUseDOM","document","body","style","overflowY","setItems","useState","uuid","safeUseId","info","prevItems","newItems","isModal","hasModals","Array","from","values","current","set","id","has","prevHasModals","delete","context","React","createElement","Provider","value","ClientOnlyPortal","StyledPortal","Portal","container"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-new-hope",
-  "version": "0.327.0-canary.1741.15743877104.0",
+  "version": "0.327.0-canary.1741.15775036215.0",
   "description": "Salute Design System blueprint",
   "main": "cjs/index.js",
   "module": "es/index.js",
@@ -79,7 +79,7 @@
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-node-resolve": "^15.1.0",
-    "@salutejs/plasma-sb-utils": "0.200.0-canary.1741.15743877104.0",
+    "@salutejs/plasma-sb-utils": "0.200.0-canary.1741.15775036215.0",
     "@salutejs/plasma-themes": "0.34.0",
     "@storybook/addon-docs": "8.6.12",
     "@storybook/addon-essentials": "8.6.12",
@@ -117,7 +117,7 @@
     "@linaria/react": "5.0.3",
     "@popperjs/core": "2.11.8",
     "@salutejs/input-core": "2.1.2",
-    "@salutejs/plasma-core": "1.199.0-canary.1741.15743877104.0",
+    "@salutejs/plasma-core": "1.199.0-canary.1741.15775036215.0",
     "@salutejs/react-maskinput": "3.2.6",
     "@tanstack/react-table": "8.21.2",
     "@tanstack/react-virtual": "3.13.2",
@@ -137,5 +137,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "081487a2336ceaaf7ba5ee5b2c8317ed210a857a"
+  "gitHead": "2a7b409486214f81e0d883b2c879362f9712841f"
 }

package/styled-components/cjs/components/Calendar/CalendarBase/CalendarBase.js

@@ -255,6 +255,20 @@ var calendarBaseRoot = function(Root) {
         }, [
             calendarState
         ]);
+        (0, _react.useEffect)(function() {
+            if (prevType !== type) {
+                dispatch({
+                    type: _types.ActionType.UPDATE_CALENDAR_STATE,
+                    payload: {
+                        calendarState: type,
+                        size: _reducer.sizeMap[type].single
+                    }
+                });
+                setPrevType(type);
+            }
+        }, [
+            type
+        ]);
         (0, _react.useEffect)(function() {
             if (value && prevValue && (0, _utils.isValueUpdate)(value, prevValue) || value && !prevValue) {
                 dispatch({