diff --git a/packages/vkui/src/components/CalendarHeader/CalendarHeader.tsx b/packages/vkui/src/components/CalendarHeader/CalendarHeader.tsx index 550e864f0a0..5d741db8c9e 100644 --- a/packages/vkui/src/components/CalendarHeader/CalendarHeader.tsx +++ b/packages/vkui/src/components/CalendarHeader/CalendarHeader.tsx @@ -221,15 +221,6 @@ export const CalendarHeader = ({ ); } - const stopPropogationOfEscapeKeyboardEventWhenSelectIsOpen = React.useCallback( - (event: React.KeyboardEvent, isOpen: boolean) => { - if (isOpen && event.key === 'Escape') { - event.stopPropagation(); - } - }, - [], - ); - return ( {!prevMonthHidden && ( @@ -271,7 +262,6 @@ export const CalendarHeader = ({ onChange={onMonthsChange} forceDropdownPortal={false} selectType="accent" - onInputKeyDown={stopPropogationOfEscapeKeyboardEventWhenSelectIsOpen} slotProps={{ input: { 'aria-label': changeMonthLabel, @@ -292,7 +282,6 @@ export const CalendarHeader = ({ onChange={onYearChange} forceDropdownPortal={false} selectType="accent" - onInputKeyDown={stopPropogationOfEscapeKeyboardEventWhenSelectIsOpen} slotProps={{ input: { 'aria-label': changeYearLabel, diff --git a/packages/vkui/src/components/ChipsSelect/ChipsSelect.tsx b/packages/vkui/src/components/ChipsSelect/ChipsSelect.tsx index 19c81a2d555..93aa5007c4b 100644 --- a/packages/vkui/src/components/ChipsSelect/ChipsSelect.tsx +++ b/packages/vkui/src/components/ChipsSelect/ChipsSelect.tsx @@ -4,6 +4,7 @@ import * as React from 'react'; import type { MouseEventHandler } from 'react'; import { classNames } from '@vkontakte/vkjs'; import { useExternRef } from '../../hooks/useExternRef'; +import { useGlobalEscKeyDown } from '../../hooks/useGlobalEscKeyDown'; import { useGlobalOnEventOutside } from '../../hooks/useGlobalOnClickOutside'; import { useMergeProps } from '../../hooks/useMergeProps'; import { Keys } from '../../lib/accessibility'; @@ -438,13 +439,13 @@ export const ChipsSelect =