@cloud-ru/ds-calendar 1.0.22 → 1.1.1

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.1.1 (2026-09-30)
+
+**Note:** Version bump only for package @ds/calendar
+
+# 1.1.0 (2026-09-30)
+
+### Features
+
+- **FF-8984:** add footerMode prop ([66fa2ce](https://github.com/cloud-ru-tech/snack-v2/commit/66fa2cefc77b12ebca3da54680fa5f3cb93cfff6))
+
 ## 1.0.22 (2026-09-29)
 
 **Note:** Version bump only for package @ds/calendar

package/README.md

@@ -608,6 +608,7 @@ export function TimePickerDropdownPlacement() {
 | `disableSpanWrapper` | `boolean` | — | Отключает для `isValidElement` внешнюю обертку триггера <br/> Пригодится для элементов с `position: absolute` <br/> Работает для триггеров, которые умеют отдать свою DOM-ноду: нативные элементы, `forwardRef`-компоненты <br/> и компоненты, помеченные `withInnerRefSupport` из `@cloud-ru/ds-utils`. Остальные всё равно получают `<span>` — <br/> без ноды поповеру не от чего считать позицию; в dev-режиме об этом печатается предупреждение. |
 | `fallbackPlacements` | `Placement` | — | Цепочка расположений которая будет применяться к поповеру от первого к последнему если при текущем он не влезает. |
 | `fitToContainer` | `boolean` | `true` | Отключает предустановленный размер, заставляя компонент подстраиваться к размеру контейнра: (width: 100%, height: 100%). |
+| `footerMode` | `"apply-only"` \| `"current-time-and-apply"` | — | Режим футера. По умолчанию — current-time-and-apply |
 | `hoverDelayClose` | `number` | — | Задержка закрытия по ховеру |
 | `hoverDelayOpen` | `number` | — | Задержка открытия по ховеру |
 | `navigationStartRef` | `RefObject<{ focus(): void; }>` | — | Ссылка на управление первым элементом навигации |
@@ -632,6 +633,8 @@ export function TimePickerDropdownPlacement() {
 
 - `Size` = `"l"` \| `"m"` \| `"s"`
 
+- `TimePickerFooterMode` = `"apply-only"` \| `"current-time-and-apply"`
+
 **TimeValue**
 
 | Prop | Type | Default | Description |

package/dist/cjs/components/TimePickerDropdown/TimePickerDropdown.d.ts

@@ -1,6 +1,7 @@
 import { DropdownProps } from '@cloud-ru/ds-dropdown';
 import { WithSupportProps } from '@cloud-ru/ds-utils';
 import { ReactNode } from 'react';
+import { TimePickerFooterMode } from '../../types';
 import { TimePickerProps } from '../TimePicker';
 type DropdownBridgeProps = Pick<DropdownProps, 'triggerClassName' | 'trigger' | 'placement' | 'hoverDelayOpen' | 'hoverDelayClose' | 'closeOnEscapeKey' | 'triggerClickByKeys' | 'triggerRef' | 'outsideClick' | 'fallbackPlacements' | 'disableSpanWrapper' | 'closeOnPopstate' | 'open' | 'onOpenChange'>;
 /**
@@ -11,6 +12,8 @@ type DropdownBridgeProps = Pick<DropdownProps, 'triggerClassName' | 'trigger' |
 export type TimePickerDropdownProps = WithSupportProps<TimePickerProps & DropdownBridgeProps & {
     /** Контент триггера открытия dropdown */
     children?: ReactNode;
+    /** Режим футера. По умолчанию — current-time-and-apply */
+    footerMode?: TimePickerFooterMode;
     /** Закрыть dropdown после нажатия кнопки Apply */
     closeOnApply?: boolean;
     /** Колбек по нажатию Apply */

package/dist/cjs/constants.d.ts

@@ -12,6 +12,10 @@ export declare const CALENDAR_MODE: {
     readonly Year: "year";
     readonly YearRange: "year-range";
 };
+export declare const TIME_PICKER_FOOTER_MODE: {
+    readonly CurrentTimeAndApply: "current-time-and-apply";
+    readonly ApplyOnly: "apply-only";
+};
 export declare const RANGE_POSITION: {
     readonly Out: "out";
     readonly Start: "start";

package/dist/cjs/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SECONDS = exports.MINUTES = exports.HOURS = exports.TEST_IDS = exports.AUTOFOCUS = exports.GRID_SIZE = exports.SIZE = exports.RANGE_POSITION = exports.CALENDAR_MODE = exports.VIEW_MODE = void 0;
+exports.SECONDS = exports.MINUTES = exports.HOURS = exports.TEST_IDS = exports.AUTOFOCUS = exports.GRID_SIZE = exports.SIZE = exports.RANGE_POSITION = exports.TIME_PICKER_FOOTER_MODE = exports.CALENDAR_MODE = exports.VIEW_MODE = void 0;
 exports.VIEW_MODE = {
     Month: 'month',
     Year: 'year',
@@ -15,6 +15,10 @@ exports.CALENDAR_MODE = {
     Year: 'year',
     YearRange: 'year-range',
 };
+exports.TIME_PICKER_FOOTER_MODE = {
+    CurrentTimeAndApply: 'current-time-and-apply',
+    ApplyOnly: 'apply-only',
+};
 exports.RANGE_POSITION = {
     Out: 'out',
     Start: 'start',

package/dist/cjs/helperComponents/DesktopTimePickerDropdown/DesktopTimePickerDropdown.d.ts

@@ -1,2 +1,2 @@
 import { TimePickerDropdownProps } from '../../components/TimePickerDropdown/TimePickerDropdown';
-export declare function DesktopTimePickerDropdown({ className, size, fitToContainer, value: valueProp, defaultValue, onChangeValue, onFocusLeave, 'data-test-id': testId, navigationStartRef, showSeconds, today: todayProp, children, closeOnApply, onApply, onCurrent, open: openProp, onOpenChange, triggerClassName, trigger, placement, hoverDelayOpen, hoverDelayClose, closeOnEscapeKey, triggerClickByKeys, triggerRef, outsideClick, fallbackPlacements, disableSpanWrapper, closeOnPopstate, }: TimePickerDropdownProps): import("react/jsx-runtime").JSX.Element;
+export declare function DesktopTimePickerDropdown({ className, size, fitToContainer, value: valueProp, defaultValue, onChangeValue, onFocusLeave, 'data-test-id': testId, navigationStartRef, showSeconds, today: todayProp, children, closeOnApply, footerMode, onApply, onCurrent, open: openProp, onOpenChange, triggerClassName, trigger, placement, hoverDelayOpen, hoverDelayClose, closeOnEscapeKey, triggerClickByKeys, triggerRef, outsideClick, fallbackPlacements, disableSpanWrapper, closeOnPopstate, }: TimePickerDropdownProps): import("react/jsx-runtime").JSX.Element;

package/dist/cjs/helperComponents/DesktopTimePickerDropdown/DesktopTimePickerDropdown.js

@@ -20,7 +20,7 @@ const Footer_1 = require("../Footer");
 const TimePickerBase_1 = require("../TimePickerBase");
 const stubFunc = () => { };
 const stubBuildCellProps = () => ({ isDisabled: false, isHoliday: false });
-function DesktopTimePickerDropdown({ className, size = constants_2.SIZE.M, fitToContainer = false, value: valueProp, defaultValue, onChangeValue, onFocusLeave, 'data-test-id': testId, navigationStartRef, showSeconds = true, today: todayProp, children, closeOnApply = false, onApply, onCurrent, open: openProp, onOpenChange, triggerClassName, trigger = 'click', placement = 'bottom-start', hoverDelayOpen, hoverDelayClose, closeOnEscapeKey, triggerClickByKeys, triggerRef, outsideClick, fallbackPlacements, disableSpanWrapper, closeOnPopstate, }) {
+function DesktopTimePickerDropdown({ className, size = constants_2.SIZE.M, fitToContainer = false, value: valueProp, defaultValue, onChangeValue, onFocusLeave, 'data-test-id': testId, navigationStartRef, showSeconds = true, today: todayProp, children, closeOnApply = false, footerMode = constants_2.TIME_PICKER_FOOTER_MODE.CurrentTimeAndApply, onApply, onCurrent, open: openProp, onOpenChange, triggerClassName, trigger = 'click', placement = 'bottom-start', hoverDelayOpen, hoverDelayClose, closeOnEscapeKey, triggerClickByKeys, triggerRef, outsideClick, fallbackPlacements, disableSpanWrapper, closeOnPopstate, }) {
     const [open, setOpen] = (0, utils_1.useUncontrolledProp)(openProp, false, onOpenChange);
     const [focus, setFocus] = (0, react_1.useState)(undefined);
     const today = (0, react_1.useMemo)(() => (typeof todayProp === 'number' ? new Date(todayProp) : todayProp), [todayProp]);
@@ -112,6 +112,6 @@ function DesktopTimePickerDropdown({ className, size = constants_2.SIZE.M, fitTo
     // Футер вынесен в `bottomBar` дропдауна (`footer` + `footerDivider`) — divider и
     // паддинги даёт сам Dropdown. Провайдер контекста дублируется здесь, т.к. `footer` —
     // отдельный от `content` регион.
-    const footer = ((0, jsx_runtime_1.jsx)(CalendarContext_1.CalendarContext.Provider, { value: calendarContextValue, children: (0, jsx_runtime_1.jsx)(Footer_1.Footer, { onApply: handleApply, onCurrent: onCurrent }) }));
+    const footer = ((0, jsx_runtime_1.jsx)(CalendarContext_1.CalendarContext.Provider, { value: calendarContextValue, children: (0, jsx_runtime_1.jsx)(Footer_1.Footer, { onApply: handleApply, onCurrent: onCurrent, showCurrent: footerMode === constants_2.TIME_PICKER_FOOTER_MODE.CurrentTimeAndApply }) }));
     return ((0, jsx_runtime_1.jsx)(dropdown_1.Dropdown, { className: styles_module_scss_1.default.dropdown, "data-test-id": testId, triggerClassName: triggerClassName, trigger: trigger, placement: placement, hoverDelayOpen: hoverDelayOpen, hoverDelayClose: hoverDelayClose, closeOnEscapeKey: closeOnEscapeKey, triggerClickByKeys: triggerClickByKeys, triggerRef: triggerRef, outsideClick: outsideClick, fallbackPlacements: fallbackPlacements, disableSpanWrapper: disableSpanWrapper, closeOnPopstate: closeOnPopstate, open: open, onOpenChange: setOpen, content: content, footer: footer, footerDivider: true, bodyPadding: false, widthStrategy: 'gte', children: children }));
 }

package/dist/cjs/helperComponents/Footer/Footer.d.ts

@@ -10,6 +10,7 @@ export type FooterProps = {
      * где обвязку даёт сам Dropdown.
      */
     inline?: boolean;
+    showCurrent?: boolean;
 };
 /**
  * Футер календарных дропдаунов (Apply / Current). Кнопки собираются общим
@@ -17,4 +18,4 @@ export type FooterProps = {
  * modal / drawer / bottom-sheet (Figma `popupDropdownFooter`). Читает состояние из
  * `CalendarContext`, поэтому рендерится только внутри провайдера контекста.
  */
-export declare function Footer({ onApply, onCurrent, inline }: FooterProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function Footer({ onApply, onCurrent, inline, showCurrent }: FooterProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/cjs/helperComponents/Footer/Footer.js

@@ -20,7 +20,7 @@ const styles_module_scss_1 = __importDefault(require('./styles.module.css'));
  * modal / drawer / bottom-sheet (Figma `popupDropdownFooter`). Читает состояние из
  * `CalendarContext`, поэтому рендерится только внутри провайдера контекста.
  */
-function Footer({ onApply, onCurrent, inline = false }) {
+function Footer({ onApply, onCurrent, inline = false, showCurrent = true }) {
     const { viewMode, mode, today, setValue, dateAndTime, isTimeFilled, isDateAndTimeFilled, onDateAndTimeChange, applyButtonRef, currentButtonRef, hoursKeyboardNavigationRef, minutesKeyboardNavigationRef, secondsKeyboardNavigationRef, showSeconds, getTestId, referenceDate, setViewShift, onFocusLeave, size, } = (0, hooks_1.useCalendarContext)();
     const { t } = locale_1.calendarLocale.useTranslations();
     if (![constants_1.CALENDAR_MODE.DateTime, 'time'].includes(mode) || viewMode !== 'month') {
@@ -46,6 +46,9 @@ function Footer({ onApply, onCurrent, inline = false }) {
         }
     };
     const handleApplyKeyDown = event => {
+        if (event.key === 'Tab' && event.shiftKey && !showCurrent) {
+            handleCurrentKeyDown(event);
+        }
         if (event.key === 'Tab' && !event.shiftKey) {
             onFocusLeave?.('next');
         }
@@ -80,15 +83,17 @@ function Footer({ onApply, onCurrent, inline = false }) {
             innerRef: applyButtonRef,
             onClick: handleApplySelection,
             onKeyDown: handleApplyKeyDown,
-        }, additionalButton: {
-            label: t('current'),
-            // `popupDropdownFooter` держит третью кнопку на `function`, а не на дефолтном
-            // из `FooterActions` `simple`: у `simple` остаётся горизонтальный паддинг.
-            view: button_1.VIEW.Function,
-            innerRef: currentButtonRef,
-            onClick: handleCurrentClick,
-            onKeyDown: handleCurrentKeyDown,
-        }, testIds: {
+        }, additionalButton: showCurrent
+            ? {
+                label: t('current'),
+                // `popupDropdownFooter` держит третью кнопку на `function`, а не на дефолтном
+                // из `FooterActions` `simple`: у `simple` остаётся горизонтальный паддинг.
+                view: button_1.VIEW.Function,
+                innerRef: currentButtonRef,
+                onClick: handleCurrentClick,
+                onKeyDown: handleCurrentKeyDown,
+            }
+            : undefined, testIds: {
             approve: getTestId('apply-button') ?? '',
             additional: getTestId('current-button') ?? '',
             cancel: '',

package/dist/cjs/helperComponents/MobileTimePickerDropdown/MobileTimePickerDropdown.d.ts

@@ -3,4 +3,4 @@ import { TimePickerDropdownProps } from '../../components/TimePickerDropdown/Tim
  * Черновик + Apply модель: правки берутся в локальный черновик, коммитятся наружу только по Apply.
  * Закрытие/свайп = отмена (убирает авто-коммит после каждого оседания).
  */
-export declare function MobileTimePickerDropdown({ children, size, value, defaultValue, onChangeValue, showSeconds, today: todayProp, closeOnApply, onApply, onCurrent, open: openProp, onOpenChange, closeOnPopstate, 'data-test-id': testId, ...rest }: TimePickerDropdownProps): import("react/jsx-runtime").JSX.Element;
+export declare function MobileTimePickerDropdown({ children, size, value, defaultValue, onChangeValue, showSeconds, today: todayProp, closeOnApply, footerMode, onApply, onCurrent, open: openProp, onOpenChange, closeOnPopstate, 'data-test-id': testId, ...rest }: TimePickerDropdownProps): import("react/jsx-runtime").JSX.Element;

package/dist/cjs/helperComponents/MobileTimePickerDropdown/MobileTimePickerDropdown.js

@@ -13,7 +13,7 @@ const TimePickerDrum_1 = require("../TimePickerDrum");
  * Черновик + Apply модель: правки берутся в локальный черновик, коммитятся наружу только по Apply.
  * Закрытие/свайп = отмена (убирает авто-коммит после каждого оседания).
  */
-function MobileTimePickerDropdown({ children, size = constants_1.SIZE.M, value, defaultValue, onChangeValue, showSeconds = true, today: todayProp, closeOnApply = false, onApply, onCurrent, open: openProp, onOpenChange, closeOnPopstate, 'data-test-id': testId, ...rest }) {
+function MobileTimePickerDropdown({ children, size = constants_1.SIZE.M, value, defaultValue, onChangeValue, showSeconds = true, today: todayProp, closeOnApply = false, footerMode = constants_1.TIME_PICKER_FOOTER_MODE.CurrentTimeAndApply, onApply, onCurrent, open: openProp, onOpenChange, closeOnPopstate, 'data-test-id': testId, ...rest }) {
     const { t } = locale_1.calendarLocale.useTranslations();
     const [open, setOpen] = (0, utils_1.useValueControl)({ value: openProp, defaultValue: false, onChange: onOpenChange });
     const today = (0, react_1.useMemo)(() => (typeof todayProp === 'number' ? new Date(todayProp) : todayProp), [todayProp]);
@@ -65,5 +65,7 @@ function MobileTimePickerDropdown({ children, size = constants_1.SIZE.M, value,
         }
     }, [dateAndTime, showSeconds, commit, onApply, closeOnApply, handleClose]);
     const trigger = (0, hooks_1.useOpenTrigger)(children, handleOpen);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [trigger, (0, jsx_runtime_1.jsx)(bottom_sheet_1.BottomSheet, { withDividers: false, open: open ?? false, onClose: handleClose, onBackButtonClick: handleClose, title: t('time'), closeOnPopstate: closeOnPopstate, approveButton: { label: t('apply'), disabled: !isTimeFilled(), onClick: handleApply }, additionalButton: { label: t('current'), view: 'function', onClick: handleCurrent }, footerTestIds: { approve: constants_1.TEST_IDS.timePickerMobileApply, additional: constants_1.TEST_IDS.timePickerMobileCurrent }, content: (0, jsx_runtime_1.jsx)(TimePickerDrum_1.TimePickerDrum, { ref: drumRef, size: size, showSeconds: showSeconds, hours: dateAndTime?.hours ?? 0, minutes: dateAndTime?.minutes ?? 0, seconds: dateAndTime?.seconds ?? 0, ...drumHandlers }), ...(0, utils_1.extractSupportProps)(rest), "data-test-id": testId })] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [trigger, (0, jsx_runtime_1.jsx)(bottom_sheet_1.BottomSheet, { withDividers: false, open: open ?? false, onClose: handleClose, onBackButtonClick: handleClose, title: t('time'), closeOnPopstate: closeOnPopstate, approveButton: { label: t('apply'), disabled: !isTimeFilled(), onClick: handleApply }, additionalButton: footerMode === constants_1.TIME_PICKER_FOOTER_MODE.CurrentTimeAndApply
+                    ? { label: t('current'), view: 'function', onClick: handleCurrent }
+                    : undefined, footerTestIds: { approve: constants_1.TEST_IDS.timePickerMobileApply, additional: constants_1.TEST_IDS.timePickerMobileCurrent }, content: (0, jsx_runtime_1.jsx)(TimePickerDrum_1.TimePickerDrum, { ref: drumRef, size: size, showSeconds: showSeconds, hours: dateAndTime?.hours ?? 0, minutes: dateAndTime?.minutes ?? 0, seconds: dateAndTime?.seconds ?? 0, ...drumHandlers }), ...(0, utils_1.extractSupportProps)(rest), "data-test-id": testId })] }));
 }

package/dist/cjs/helperComponents/TimePickerBase/TimePickerBase.js

@@ -71,7 +71,7 @@ function TimePickerBase({ className, fixedWidth }) {
                         secondsKeyboardNavigationRef.current?.focusItem((0, list_1.getDefaultItemId)(seconds ?? 0));
                     }
                     else {
-                        currentButtonRef.current?.focus();
+                        (currentButtonRef.current ?? applyButtonRef.current)?.focus();
                     }
                 }
                 break;
@@ -104,7 +104,7 @@ function TimePickerBase({ className, fixedWidth }) {
                     minutesKeyboardNavigationRef.current?.focusItem((0, list_1.getDefaultItemId)(minutes ?? 0));
                 }
                 else {
-                    currentButtonRef.current?.focus();
+                    (currentButtonRef.current ?? applyButtonRef.current)?.focus();
                 }
                 break;
             case 'Enter':

package/dist/cjs/types.d.ts

@@ -1,6 +1,6 @@
 import { ValueOf } from '@cloud-ru/ds-utils';
 import { KeyboardEventHandler } from 'react';
-import { CALENDAR_MODE, RANGE_POSITION, SIZE, VIEW_MODE } from './constants';
+import { CALENDAR_MODE, RANGE_POSITION, SIZE, TIME_PICKER_FOOTER_MODE, VIEW_MODE } from './constants';
 export type RangePosition = ValueOf<typeof RANGE_POSITION>;
 export type ViewMode = ValueOf<typeof VIEW_MODE>;
 export type Size = ValueOf<typeof SIZE>;
@@ -48,6 +48,7 @@ export type BuildCellProps = {
     isHoliday?: boolean;
 };
 export type BuildCellPropsFunction = (date: Date, viewMode: ViewMode) => BuildCellProps;
+export type TimePickerFooterMode = ValueOf<typeof TIME_PICKER_FOOTER_MODE>;
 export type TimeValue = {
     hours?: number;
     minutes?: number;

package/dist/esm/components/TimePickerDropdown/TimePickerDropdown.d.ts

@@ -1,6 +1,7 @@
 import { DropdownProps } from '@cloud-ru/ds-dropdown';
 import { WithSupportProps } from '@cloud-ru/ds-utils';
 import { ReactNode } from 'react';
+import { TimePickerFooterMode } from '../../types.js';
 import { TimePickerProps } from '../TimePicker/index.js';
 type DropdownBridgeProps = Pick<DropdownProps, 'triggerClassName' | 'trigger' | 'placement' | 'hoverDelayOpen' | 'hoverDelayClose' | 'closeOnEscapeKey' | 'triggerClickByKeys' | 'triggerRef' | 'outsideClick' | 'fallbackPlacements' | 'disableSpanWrapper' | 'closeOnPopstate' | 'open' | 'onOpenChange'>;
 /**
@@ -11,6 +12,8 @@ type DropdownBridgeProps = Pick<DropdownProps, 'triggerClassName' | 'trigger' |
 export type TimePickerDropdownProps = WithSupportProps<TimePickerProps & DropdownBridgeProps & {
     /** Контент триггера открытия dropdown */
     children?: ReactNode;
+    /** Режим футера. По умолчанию — current-time-and-apply */
+    footerMode?: TimePickerFooterMode;
     /** Закрыть dropdown после нажатия кнопки Apply */
     closeOnApply?: boolean;
     /** Колбек по нажатию Apply */

package/dist/esm/constants.d.ts

@@ -12,6 +12,10 @@ export declare const CALENDAR_MODE: {
     readonly Year: "year";
     readonly YearRange: "year-range";
 };
+export declare const TIME_PICKER_FOOTER_MODE: {
+    readonly CurrentTimeAndApply: "current-time-and-apply";
+    readonly ApplyOnly: "apply-only";
+};
 export declare const RANGE_POSITION: {
     readonly Out: "out";
     readonly Start: "start";

package/dist/esm/constants.js

@@ -12,6 +12,10 @@ export const CALENDAR_MODE = {
     Year: 'year',
     YearRange: 'year-range',
 };
+export const TIME_PICKER_FOOTER_MODE = {
+    CurrentTimeAndApply: 'current-time-and-apply',
+    ApplyOnly: 'apply-only',
+};
 export const RANGE_POSITION = {
     Out: 'out',
     Start: 'start',

package/dist/esm/helperComponents/DesktopTimePickerDropdown/DesktopTimePickerDropdown.d.ts

@@ -1,2 +1,2 @@
 import { TimePickerDropdownProps } from '../../components/TimePickerDropdown/TimePickerDropdown.js';
-export declare function DesktopTimePickerDropdown({ className, size, fitToContainer, value: valueProp, defaultValue, onChangeValue, onFocusLeave, 'data-test-id': testId, navigationStartRef, showSeconds, today: todayProp, children, closeOnApply, onApply, onCurrent, open: openProp, onOpenChange, triggerClassName, trigger, placement, hoverDelayOpen, hoverDelayClose, closeOnEscapeKey, triggerClickByKeys, triggerRef, outsideClick, fallbackPlacements, disableSpanWrapper, closeOnPopstate, }: TimePickerDropdownProps): import("react/jsx-runtime").JSX.Element;
+export declare function DesktopTimePickerDropdown({ className, size, fitToContainer, value: valueProp, defaultValue, onChangeValue, onFocusLeave, 'data-test-id': testId, navigationStartRef, showSeconds, today: todayProp, children, closeOnApply, footerMode, onApply, onCurrent, open: openProp, onOpenChange, triggerClassName, trigger, placement, hoverDelayOpen, hoverDelayClose, closeOnEscapeKey, triggerClickByKeys, triggerRef, outsideClick, fallbackPlacements, disableSpanWrapper, closeOnPopstate, }: TimePickerDropdownProps): import("react/jsx-runtime").JSX.Element;

package/dist/esm/helperComponents/DesktopTimePickerDropdown/DesktopTimePickerDropdown.js

@@ -6,7 +6,7 @@ import cn from 'classnames';
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { DEFAULT_LOCALE } from '../../components/TimePicker/constants.js';
 import styles from '../../components/TimePickerDropdown/styles.module.css';
-import { SIZE } from '../../constants.js';
+import { SIZE, TIME_PICKER_FOOTER_MODE } from '../../constants.js';
 import { useTimePickerValueBridge } from '../../hooks/index.js';
 import { getLocale, getTestIdBuilder } from '../../utils.js';
 import { CalendarContext } from '../CalendarContext/index.js';
@@ -14,7 +14,7 @@ import { Footer } from '../Footer/index.js';
 import { TimePickerBase } from '../TimePickerBase/index.js';
 const stubFunc = () => { };
 const stubBuildCellProps = () => ({ isDisabled: false, isHoliday: false });
-export function DesktopTimePickerDropdown({ className, size = SIZE.M, fitToContainer = false, value: valueProp, defaultValue, onChangeValue, onFocusLeave, 'data-test-id': testId, navigationStartRef, showSeconds = true, today: todayProp, children, closeOnApply = false, onApply, onCurrent, open: openProp, onOpenChange, triggerClassName, trigger = 'click', placement = 'bottom-start', hoverDelayOpen, hoverDelayClose, closeOnEscapeKey, triggerClickByKeys, triggerRef, outsideClick, fallbackPlacements, disableSpanWrapper, closeOnPopstate, }) {
+export function DesktopTimePickerDropdown({ className, size = SIZE.M, fitToContainer = false, value: valueProp, defaultValue, onChangeValue, onFocusLeave, 'data-test-id': testId, navigationStartRef, showSeconds = true, today: todayProp, children, closeOnApply = false, footerMode = TIME_PICKER_FOOTER_MODE.CurrentTimeAndApply, onApply, onCurrent, open: openProp, onOpenChange, triggerClassName, trigger = 'click', placement = 'bottom-start', hoverDelayOpen, hoverDelayClose, closeOnEscapeKey, triggerClickByKeys, triggerRef, outsideClick, fallbackPlacements, disableSpanWrapper, closeOnPopstate, }) {
     const [open, setOpen] = useUncontrolledProp(openProp, false, onOpenChange);
     const [focus, setFocus] = useState(undefined);
     const today = useMemo(() => (typeof todayProp === 'number' ? new Date(todayProp) : todayProp), [todayProp]);
@@ -106,6 +106,6 @@ export function DesktopTimePickerDropdown({ className, size = SIZE.M, fitToConta
     // Футер вынесен в `bottomBar` дропдауна (`footer` + `footerDivider`) — divider и
     // паддинги даёт сам Dropdown. Провайдер контекста дублируется здесь, т.к. `footer` —
     // отдельный от `content` регион.
-    const footer = (_jsx(CalendarContext.Provider, { value: calendarContextValue, children: _jsx(Footer, { onApply: handleApply, onCurrent: onCurrent }) }));
+    const footer = (_jsx(CalendarContext.Provider, { value: calendarContextValue, children: _jsx(Footer, { onApply: handleApply, onCurrent: onCurrent, showCurrent: footerMode === TIME_PICKER_FOOTER_MODE.CurrentTimeAndApply }) }));
     return (_jsx(Dropdown, { className: styles.dropdown, "data-test-id": testId, triggerClassName: triggerClassName, trigger: trigger, placement: placement, hoverDelayOpen: hoverDelayOpen, hoverDelayClose: hoverDelayClose, closeOnEscapeKey: closeOnEscapeKey, triggerClickByKeys: triggerClickByKeys, triggerRef: triggerRef, outsideClick: outsideClick, fallbackPlacements: fallbackPlacements, disableSpanWrapper: disableSpanWrapper, closeOnPopstate: closeOnPopstate, open: open, onOpenChange: setOpen, content: content, footer: footer, footerDivider: true, bodyPadding: false, widthStrategy: 'gte', children: children }));
 }

package/dist/esm/helperComponents/Footer/Footer.d.ts

@@ -10,6 +10,7 @@ export type FooterProps = {
      * где обвязку даёт сам Dropdown.
      */
     inline?: boolean;
+    showCurrent?: boolean;
 };
 /**
  * Футер календарных дропдаунов (Apply / Current). Кнопки собираются общим
@@ -17,4 +18,4 @@ export type FooterProps = {
  * modal / drawer / bottom-sheet (Figma `popupDropdownFooter`). Читает состояние из
  * `CalendarContext`, поэтому рендерится только внутри провайдера контекста.
  */
-export declare function Footer({ onApply, onCurrent, inline }: FooterProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function Footer({ onApply, onCurrent, inline, showCurrent }: FooterProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/esm/helperComponents/Footer/Footer.js

@@ -14,7 +14,7 @@ import styles from './styles.module.css';
  * modal / drawer / bottom-sheet (Figma `popupDropdownFooter`). Читает состояние из
  * `CalendarContext`, поэтому рендерится только внутри провайдера контекста.
  */
-export function Footer({ onApply, onCurrent, inline = false }) {
+export function Footer({ onApply, onCurrent, inline = false, showCurrent = true }) {
     const { viewMode, mode, today, setValue, dateAndTime, isTimeFilled, isDateAndTimeFilled, onDateAndTimeChange, applyButtonRef, currentButtonRef, hoursKeyboardNavigationRef, minutesKeyboardNavigationRef, secondsKeyboardNavigationRef, showSeconds, getTestId, referenceDate, setViewShift, onFocusLeave, size, } = useCalendarContext();
     const { t } = calendarLocale.useTranslations();
     if (![CALENDAR_MODE.DateTime, 'time'].includes(mode) || viewMode !== 'month') {
@@ -40,6 +40,9 @@ export function Footer({ onApply, onCurrent, inline = false }) {
         }
     };
     const handleApplyKeyDown = event => {
+        if (event.key === 'Tab' && event.shiftKey && !showCurrent) {
+            handleCurrentKeyDown(event);
+        }
         if (event.key === 'Tab' && !event.shiftKey) {
             onFocusLeave?.('next');
         }
@@ -74,15 +77,17 @@ export function Footer({ onApply, onCurrent, inline = false }) {
             innerRef: applyButtonRef,
             onClick: handleApplySelection,
             onKeyDown: handleApplyKeyDown,
-        }, additionalButton: {
-            label: t('current'),
-            // `popupDropdownFooter` держит третью кнопку на `function`, а не на дефолтном
-            // из `FooterActions` `simple`: у `simple` остаётся горизонтальный паддинг.
-            view: VIEW.Function,
-            innerRef: currentButtonRef,
-            onClick: handleCurrentClick,
-            onKeyDown: handleCurrentKeyDown,
-        }, testIds: {
+        }, additionalButton: showCurrent
+            ? {
+                label: t('current'),
+                // `popupDropdownFooter` держит третью кнопку на `function`, а не на дефолтном
+                // из `FooterActions` `simple`: у `simple` остаётся горизонтальный паддинг.
+                view: VIEW.Function,
+                innerRef: currentButtonRef,
+                onClick: handleCurrentClick,
+                onKeyDown: handleCurrentKeyDown,
+            }
+            : undefined, testIds: {
             approve: getTestId('apply-button') ?? '',
             additional: getTestId('current-button') ?? '',
             cancel: '',

package/dist/esm/helperComponents/MobileTimePickerDropdown/MobileTimePickerDropdown.d.ts

@@ -3,4 +3,4 @@ import { TimePickerDropdownProps } from '../../components/TimePickerDropdown/Tim
  * Черновик + Apply модель: правки берутся в локальный черновик, коммитятся наружу только по Apply.
  * Закрытие/свайп = отмена (убирает авто-коммит после каждого оседания).
  */
-export declare function MobileTimePickerDropdown({ children, size, value, defaultValue, onChangeValue, showSeconds, today: todayProp, closeOnApply, onApply, onCurrent, open: openProp, onOpenChange, closeOnPopstate, 'data-test-id': testId, ...rest }: TimePickerDropdownProps): import("react/jsx-runtime").JSX.Element;
+export declare function MobileTimePickerDropdown({ children, size, value, defaultValue, onChangeValue, showSeconds, today: todayProp, closeOnApply, footerMode, onApply, onCurrent, open: openProp, onOpenChange, closeOnPopstate, 'data-test-id': testId, ...rest }: TimePickerDropdownProps): import("react/jsx-runtime").JSX.Element;

package/dist/esm/helperComponents/MobileTimePickerDropdown/MobileTimePickerDropdown.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { BottomSheet } from '@cloud-ru/ds-bottom-sheet';
 import { extractSupportProps, useLayoutEffect, useUncontrolledProp, useValueControl } from '@cloud-ru/ds-utils';
 import { useCallback, useMemo, useRef } from 'react';
-import { SIZE, TEST_IDS } from '../../constants.js';
+import { SIZE, TEST_IDS, TIME_PICKER_FOOTER_MODE } from '../../constants.js';
 import { useDateAndTime, useOpenTrigger, useTimeDrumHandlers } from '../../hooks/index.js';
 import { calendarLocale } from '../../locale/index.js';
 import { TimePickerDrum } from '../TimePickerDrum/index.js';
@@ -10,7 +10,7 @@ import { TimePickerDrum } from '../TimePickerDrum/index.js';
  * Черновик + Apply модель: правки берутся в локальный черновик, коммитятся наружу только по Apply.
  * Закрытие/свайп = отмена (убирает авто-коммит после каждого оседания).
  */
-export function MobileTimePickerDropdown({ children, size = SIZE.M, value, defaultValue, onChangeValue, showSeconds = true, today: todayProp, closeOnApply = false, onApply, onCurrent, open: openProp, onOpenChange, closeOnPopstate, 'data-test-id': testId, ...rest }) {
+export function MobileTimePickerDropdown({ children, size = SIZE.M, value, defaultValue, onChangeValue, showSeconds = true, today: todayProp, closeOnApply = false, footerMode = TIME_PICKER_FOOTER_MODE.CurrentTimeAndApply, onApply, onCurrent, open: openProp, onOpenChange, closeOnPopstate, 'data-test-id': testId, ...rest }) {
     const { t } = calendarLocale.useTranslations();
     const [open, setOpen] = useValueControl({ value: openProp, defaultValue: false, onChange: onOpenChange });
     const today = useMemo(() => (typeof todayProp === 'number' ? new Date(todayProp) : todayProp), [todayProp]);
@@ -62,5 +62,7 @@ export function MobileTimePickerDropdown({ children, size = SIZE.M, value, defau
         }
     }, [dateAndTime, showSeconds, commit, onApply, closeOnApply, handleClose]);
     const trigger = useOpenTrigger(children, handleOpen);
-    return (_jsxs(_Fragment, { children: [trigger, _jsx(BottomSheet, { withDividers: false, open: open ?? false, onClose: handleClose, onBackButtonClick: handleClose, title: t('time'), closeOnPopstate: closeOnPopstate, approveButton: { label: t('apply'), disabled: !isTimeFilled(), onClick: handleApply }, additionalButton: { label: t('current'), view: 'function', onClick: handleCurrent }, footerTestIds: { approve: TEST_IDS.timePickerMobileApply, additional: TEST_IDS.timePickerMobileCurrent }, content: _jsx(TimePickerDrum, { ref: drumRef, size: size, showSeconds: showSeconds, hours: dateAndTime?.hours ?? 0, minutes: dateAndTime?.minutes ?? 0, seconds: dateAndTime?.seconds ?? 0, ...drumHandlers }), ...extractSupportProps(rest), "data-test-id": testId })] }));
+    return (_jsxs(_Fragment, { children: [trigger, _jsx(BottomSheet, { withDividers: false, open: open ?? false, onClose: handleClose, onBackButtonClick: handleClose, title: t('time'), closeOnPopstate: closeOnPopstate, approveButton: { label: t('apply'), disabled: !isTimeFilled(), onClick: handleApply }, additionalButton: footerMode === TIME_PICKER_FOOTER_MODE.CurrentTimeAndApply
+                    ? { label: t('current'), view: 'function', onClick: handleCurrent }
+                    : undefined, footerTestIds: { approve: TEST_IDS.timePickerMobileApply, additional: TEST_IDS.timePickerMobileCurrent }, content: _jsx(TimePickerDrum, { ref: drumRef, size: size, showSeconds: showSeconds, hours: dateAndTime?.hours ?? 0, minutes: dateAndTime?.minutes ?? 0, seconds: dateAndTime?.seconds ?? 0, ...drumHandlers }), ...extractSupportProps(rest), "data-test-id": testId })] }));
 }

package/dist/esm/helperComponents/TimePickerBase/TimePickerBase.js

@@ -65,7 +65,7 @@ export function TimePickerBase({ className, fixedWidth }) {
                         secondsKeyboardNavigationRef.current?.focusItem(getDefaultItemId(seconds ?? 0));
                     }
                     else {
-                        currentButtonRef.current?.focus();
+                        (currentButtonRef.current ?? applyButtonRef.current)?.focus();
                     }
                 }
                 break;
@@ -98,7 +98,7 @@ export function TimePickerBase({ className, fixedWidth }) {
                     minutesKeyboardNavigationRef.current?.focusItem(getDefaultItemId(minutes ?? 0));
                 }
                 else {
-                    currentButtonRef.current?.focus();
+                    (currentButtonRef.current ?? applyButtonRef.current)?.focus();
                 }
                 break;
             case 'Enter':

package/dist/esm/types.d.ts

@@ -1,6 +1,6 @@
 import { ValueOf } from '@cloud-ru/ds-utils';
 import { KeyboardEventHandler } from 'react';
-import { CALENDAR_MODE, RANGE_POSITION, SIZE, VIEW_MODE } from './constants.js';
+import { CALENDAR_MODE, RANGE_POSITION, SIZE, TIME_PICKER_FOOTER_MODE, VIEW_MODE } from './constants.js';
 export type RangePosition = ValueOf<typeof RANGE_POSITION>;
 export type ViewMode = ValueOf<typeof VIEW_MODE>;
 export type Size = ValueOf<typeof SIZE>;
@@ -48,6 +48,7 @@ export type BuildCellProps = {
     isHoliday?: boolean;
 };
 export type BuildCellPropsFunction = (date: Date, viewMode: ViewMode) => BuildCellProps;
+export type TimePickerFooterMode = ValueOf<typeof TIME_PICKER_FOOTER_MODE>;
 export type TimeValue = {
     hours?: number;
     minutes?: number;