@gravity-ui/date-components 1.1.0 → 1.2.0

package/dist/esm/components/Calendar/Calendar.css

@@ -50,43 +50,6 @@
   height: 100%;
   padding: 0 var(--_--calendar-padding) var(--_--calendar-padding);
 }
-.g-date-calendar__content_animation_forward {
-  transform: translateX(-100%);
-  animation: calendar-forward 0.25s ease forwards;
-}
-.g-date-calendar__content_animation_forward.g-date-calendar__current-state {
-  left: -100%;
-}
-.g-date-calendar__content_animation_backward {
-  transform: translateX(0);
-  animation: calendar-backward 0.25s ease forwards;
-}
-.g-date-calendar__content_animation_backward.g-date-calendar__current-state {
-  left: 100%;
-}
-.g-date-calendar__content_animation_zoom-in {
-  transform: scale();
-}
-.g-date-calendar__content_animation_zoom-in.g-date-calendar__previous-state {
-  animation: calendar-zoom-in-hiding 0.25s ease forwards;
-}
-.g-date-calendar__content_animation_zoom-in.g-date-calendar__current-state {
-  animation: calendar-zoom-in-showing 0.25s ease forwards;
-}
-.g-date-calendar__content_animation_zoom-out {
-  transform: scale();
-}
-.g-date-calendar__content_animation_zoom-out.g-date-calendar__current-state {
-  animation: calendar-zoom-out-showing 0.25s ease forwards;
-}
-.g-date-calendar__content_animation_zoom-out.g-date-calendar__previous-state {
-  animation: calendar-zoom-out-hiding 0.25s ease forwards;
-}
-@media screen and (prefers-reduced-motion: reduce), (update: slow) {
-  .g-date-calendar__content[class] {
-    animation-duration: 0.001ms;
-  }
-}
 @keyframes calendar-forward {
   from {
     transform: translateX(0);
@@ -143,6 +106,43 @@
     transform: scale(2);
   }
 }
+.g-date-calendar__content_animation_forward {
+  transform: translateX(-100%);
+  animation: calendar-forward 0.25s ease forwards;
+}
+.g-date-calendar__content_animation_forward.g-date-calendar__current-state {
+  left: -100%;
+}
+.g-date-calendar__content_animation_backward {
+  transform: translateX(0);
+  animation: calendar-backward 0.25s ease forwards;
+}
+.g-date-calendar__content_animation_backward.g-date-calendar__current-state {
+  left: 100%;
+}
+.g-date-calendar__content_animation_zoom-in {
+  transform: scale();
+}
+.g-date-calendar__content_animation_zoom-in.g-date-calendar__previous-state {
+  animation: calendar-zoom-in-hiding 0.25s ease forwards;
+}
+.g-date-calendar__content_animation_zoom-in.g-date-calendar__current-state {
+  animation: calendar-zoom-in-showing 0.25s ease forwards;
+}
+.g-date-calendar__content_animation_zoom-out {
+  transform: scale();
+}
+.g-date-calendar__content_animation_zoom-out.g-date-calendar__current-state {
+  animation: calendar-zoom-out-showing 0.25s ease forwards;
+}
+.g-date-calendar__content_animation_zoom-out.g-date-calendar__previous-state {
+  animation: calendar-zoom-out-hiding 0.25s ease forwards;
+}
+@media screen and (prefers-reduced-motion: reduce), (update: slow) {
+  .g-date-calendar__content[class] {
+    animation-duration: 0.001ms;
+  }
+}
 .g-date-calendar__grid-rowgroup {
   display: grid;
   gap: var(--_--calendar-days-gap);

package/dist/esm/components/Calendar/hooks/useCalendarGridProps.js

@@ -10,36 +10,47 @@ export function useCalendarGridProps(state) {
             ? `${state.startDate.year()} — ${state.endDate.year()}`
             : state.focusedDate.format(state.mode === 'days' ? 'MMMM YYYY' : 'YYYY'), 'aria-disabled': state.disabled ? 'true' : undefined, 'aria-readonly': state.readOnly ? 'true' : undefined }, focusWithinProps), { onKeyDown: (e) => {
             if (e.key === 'ArrowRight') {
+                e.preventDefault();
                 state.focusNextCell();
             }
             else if (e.key === 'ArrowLeft') {
+                e.preventDefault();
                 state.focusPreviousCell();
             }
             else if (e.key === 'ArrowDown') {
+                e.preventDefault();
                 state.focusNextRow();
             }
             else if (e.key === 'ArrowUp') {
+                e.preventDefault();
                 state.focusPreviousRow();
             }
             else if (e.key === 'PageDown') {
+                e.preventDefault();
                 state.focusNextPage(e.shiftKey);
             }
             else if (e.key === 'PageUp') {
+                e.preventDefault();
                 state.focusPreviousPage(e.shiftKey);
             }
             else if (e.key === 'End') {
+                e.preventDefault();
                 state.focusSectionEnd();
             }
             else if (e.key === 'Home') {
+                e.preventDefault();
                 state.focusSectionStart();
             }
             else if (e.code === 'Minus') {
+                e.preventDefault();
                 state.zoomOut();
             }
             else if (e.code === 'Equal') {
+                e.preventDefault();
                 state.zoomIn();
             }
             else if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
                 state.selectDate(state.focusedDate);
             }
         } });

package/dist/esm/components/Calendar/hooks/useRangeCalendarState.js

@@ -1,14 +1,4 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
+import { __rest } from "tslib";
 import React from 'react';
 import { useControlledState } from '../../hooks/useControlledState';
 import { constrainValue } from '../utils';
@@ -22,8 +12,16 @@ export function useRangeCalendarState(props) {
     const highlightedRange = anchorDate
         ? makeRange(anchorDate, calendar.focusedDate, calendar.mode)
         : (_b = (value && makeRange(value.start, value.end, calendar.mode))) !== null && _b !== void 0 ? _b : undefined;
-    const selectDate = (date) => {
-        if (props.disabled || props.readOnly) {
+    const minMode = calendar.availableModes[0];
+    const selectDate = (date, force = false) => {
+        if (props.disabled) {
+            return;
+        }
+        if (!force && calendar.mode !== minMode) {
+            calendar.zoomIn();
+            return;
+        }
+        if (props.readOnly) {
             return;
         }
         date = constrainValue(date, props.minValue, props.maxValue);
@@ -43,9 +41,6 @@ export function useRangeCalendarState(props) {
         setValue,
         selectDate,
         anchorDate, setAnchorDate: setAnchorDateState, highlightedRange,
-        selectFocusedDate() {
-            selectDate(calendar.focusedDate);
-        },
         isSelected(date) {
             if (!highlightedRange) {
                 return false;

package/dist/esm/components/DateField/DateField.js

@@ -1,14 +1,4 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
+import { __rest } from "tslib";
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { TextInput, useFocusWithin } from '@gravity-ui/uikit';

package/dist/esm/components/DateField/hooks/useDateFieldProps.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CtrlCmd } from '../utils';
+import { cleanString } from '../utils';
 export function useDateFieldProps(state, props) {
     const inputRef = React.useRef(null);
     const [, setInnerState] = React.useState({});
@@ -80,12 +80,16 @@ export function useDateFieldProps(state, props) {
                 if (state.selectedSectionIndexes !== null) {
                     return;
                 }
-                const input = inputRef.current;
+                const input = e.target;
+                const isAutofocus = !inputRef.current;
                 setTimeout(() => {
                     if (!input || input !== inputRef.current) {
                         return;
                     }
-                    if (
+                    if (isAutofocus) {
+                        state.focusSectionInPosition(0);
+                    }
+                    else if (
                     // avoid selecting all sections when focusing empty field without value
                     input.value.length &&
                         Number(input.selectionEnd) - Number(input.selectionStart) ===
@@ -141,7 +145,7 @@ export function useDateFieldProps(state, props) {
                     e.preventDefault();
                     state.clearSection();
                 }
-                else if (e.key === 'a' && e[CtrlCmd]) {
+                else if (e.key === 'a' && (e['ctrlKey'] || e['metaKey'])) {
                     e.preventDefault();
                     setSelectedSections('all');
                 }
@@ -163,32 +167,35 @@ export function useDateFieldProps(state, props) {
                 onBeforeInput(e) {
                     e.preventDefault();
                     // @ts-expect-error
-                    const key = e.nativeEvent.data;
-                    // eslint-disable-next-line no-eq-null, eqeqeq
-                    if (key != null) {
+                    const key = e.data;
+                    if (key !== undefined && key !== null) {
                         state.onInput(key);
                     }
                 },
                 onPaste(e) {
+                    e.preventDefault();
                     if (state.readOnly) {
-                        e.preventDefault();
                         return;
                     }
-                    const pastedValue = e.clipboardData.getData('text');
-                    if (state.setValueFromString(pastedValue)) {
-                        e.preventDefault();
-                    }
-                    else if (state.selectedSectionIndexes &&
+                    const pastedValue = cleanString(e.clipboardData.getData('text'));
+                    if (state.selectedSectionIndexes &&
                         state.selectedSectionIndexes.startIndex ===
                             state.selectedSectionIndexes.endIndex) {
                         const activeSection = state.sections[state.selectedSectionIndexes.startIndex];
+                        const digitsOnly = /^\d+$/.test(pastedValue);
+                        const lettersOnly = /^[a-zA-Z]+$/.test(pastedValue);
                         const isValidValue = Boolean(activeSection) &&
-                            ((activeSection.contentType === 'digit' && /^\d+$/.test(pastedValue)) ||
-                                activeSection.contentType === 'letter');
-                        if (!isValidValue) {
-                            e.preventDefault();
+                            ((activeSection.contentType === 'digit' && digitsOnly) ||
+                                (activeSection.contentType === 'letter' && lettersOnly));
+                        if (isValidValue) {
+                            state.onInput(pastedValue);
+                            return;
+                        }
+                        if (digitsOnly || lettersOnly) {
+                            return;
                         }
                     }
+                    state.setValueFromString(pastedValue);
                 },
             },
         },

package/dist/esm/components/DateField/hooks/useDateFieldState.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { dateTime, isValid } from '@gravity-ui/date-utils';
 import { useControlledState } from '../../hooks/useControlledState';
 import { createPlaceholderValue, isInvalid, mergeDateTime } from '../../utils/dates';
-import { splitFormatIntoSections } from '../utils';
+import { addSegment, getDurationUnitFromSectionType, getSectionLimits, getSectionValue, setSegment, splitFormatIntoSections, } from '../utils';
 const EDITABLE_SEGMENTS = {
     year: true,
     month: true,
@@ -13,11 +13,6 @@ const EDITABLE_SEGMENTS = {
     dayPeriod: true,
     weekday: true,
 };
-const TYPE_MAPPING = {
-    weekday: 'day',
-    day: 'date',
-    dayPeriod: 'hour',
-};
 const PAGE_STEP = {
     year: 5,
     month: 2,
@@ -63,10 +58,7 @@ export function useDateFieldState(props) {
         ? value
         : placeholderDate;
     const sectionsState = useSectionsState(sections, displayValue, validSegments);
-    const [selectedSections, setSelectedSections] = React.useState(() => {
-        var _a, _b;
-        return (_b = (_a = sectionsState.editableSections[0]) === null || _a === void 0 ? void 0 : _a.previousEditableSection) !== null && _b !== void 0 ? _b : -1;
-    });
+    const [selectedSections, setSelectedSections] = React.useState(-1);
     const selectedSectionIndexes = React.useMemo(() => {
         if (selectedSections === -1) {
             return null;
@@ -91,9 +83,14 @@ export function useDateFieldState(props) {
             return;
         }
         if (Object.keys(validSegments).length >= Object.keys(allSegments).length) {
-            setDate(newValue);
+            if (!value || !newValue.isSame(value)) {
+                setDate(newValue);
+            }
         }
         else {
+            if (value) {
+                setDate(null);
+            }
             setPlaceholderDate(newValue);
         }
     }
@@ -132,7 +129,8 @@ export function useDateFieldState(props) {
         isEmpty: Object.keys(validSegments).length === 0,
         displayValue,
         setValue,
-        text: sectionsState.editableSections.map((s) => s.textValue).join(''),
+        // use ltr direction context to get predictable navigation inside input
+        text: '\u2066' + sectionsState.editableSections.map((s) => s.textValue).join('') + '\u2069',
         readOnly: props.readOnly,
         disabled: props.disabled,
         sections: sectionsState.editableSections,
@@ -282,9 +280,6 @@ export function useDateFieldState(props) {
                 const type = getDurationUnitFromSectionType(section.type);
                 currentValue = displayValue.set(type, placeholder[type]());
             }
-            if (value) {
-                setDate(null);
-            }
             setValue(currentValue);
         },
         clearAll() {
@@ -302,7 +297,6 @@ export function useDateFieldState(props) {
                 timeZone: props.timeZone,
             }));
         },
-        // eslint-disable-next-line complexity
         onInput(key) {
             if (this.readOnly || this.disabled) {
                 return;
@@ -411,6 +405,7 @@ export function useDateFieldState(props) {
             }
         },
         setValueFromString(str) {
+            enteredKeys.current = '';
             let date = parseDate({ input: str, format, timeZone: props.timeZone });
             if (isValid(date)) {
                 if (props.timeZone && !isDateStringWithTimeZone(str)) {
@@ -434,64 +429,6 @@ function parseDate(options) {
 function isDateStringWithTimeZone(str) {
     return /z$/i.test(str) || /[+-]\d\d:\d\d$/.test(str);
 }
-function addSegment(section, date, amount) {
-    var _a;
-    let val = (_a = section.value) !== null && _a !== void 0 ? _a : 0;
-    if (section.type === 'dayPeriod') {
-        val = date.hour() + (date.hour() > 12 ? -12 : 12);
-    }
-    else {
-        val = val + amount;
-        const min = section.minValue;
-        const max = section.maxValue;
-        if (typeof min === 'number' && typeof max === 'number') {
-            const length = max - min + 1;
-            val = ((val - min + length) % length) + min;
-        }
-    }
-    const type = getDurationUnitFromSectionType(section.type);
-    return date.set(type, val);
-}
-function setSegment(section, date, amount) {
-    const type = section.type;
-    switch (type) {
-        case 'day':
-        case 'weekday':
-        case 'month':
-        case 'year': {
-            return date.set(getDurationUnitFromSectionType(type), amount);
-        }
-        case 'dayPeriod': {
-            const hours = date.hour();
-            const wasPM = hours >= 12;
-            const isPM = amount >= 12;
-            if (isPM === wasPM) {
-                return date;
-            }
-            return date.set('hour', wasPM ? hours - 12 : hours + 12);
-        }
-        case 'hour': {
-            // In 12 hour time, ensure that AM/PM does not change
-            let sectionAmount = amount;
-            if (section.minValue === 12 || section.maxValue === 11) {
-                const hours = date.hour();
-                const wasPM = hours >= 12;
-                if (!wasPM && sectionAmount === 12) {
-                    sectionAmount = 0;
-                }
-                if (wasPM && sectionAmount < 12) {
-                    sectionAmount += 12;
-                }
-            }
-            return date.set('hour', sectionAmount);
-        }
-        case 'minute':
-        case 'second': {
-            return date.set(type, amount);
-        }
-    }
-    return date;
-}
 function getCurrentEditableSectionIndex(sections, selectedSections) {
     const currentIndex = selectedSections === 'all' || selectedSections === -1 ? 0 : selectedSections;
     const section = sections[currentIndex];
@@ -532,7 +469,7 @@ function useSectionsState(sections, value, validSegments) {
     return state;
 }
 function getEditableSections(sections, value, validSegments) {
-    let position = 0;
+    let position = 1;
     const newSections = [];
     let previousEditableSection = -1;
     for (let i = 0; i < sections.length; i++) {
@@ -541,9 +478,15 @@ function getEditableSections(sections, value, validSegments) {
         let renderedValue = section.placeholder;
         if ((isEditable && validSegments[section.type]) || section.type === 'timeZoneName') {
             renderedValue = value.format(section.format);
+            if (section.contentType === 'digit' &&
+                renderedValue.length < section.placeholder.length) {
+                renderedValue = renderedValue.padStart(section.placeholder.length, '0');
+            }
         }
+        // use bidirectional context to allow the browser autodetect text direction
+        renderedValue = '\u2068' + renderedValue + '\u2069';
         const sectionLength = renderedValue.length;
-        const newSection = Object.assign(Object.assign(Object.assign({}, section), { value: getValue(value, section.type), textValue: renderedValue, start: position, end: position + sectionLength, modified: false, previousEditableSection, nextEditableSection: previousEditableSection }), getSectionLimits(value, section.type, { hour12: isHour12(section) }));
+        const newSection = Object.assign(Object.assign(Object.assign({}, section), { value: getSectionValue(section, value), textValue: renderedValue, start: position, end: position + sectionLength, modified: false, previousEditableSection, nextEditableSection: previousEditableSection }), getSectionLimits(section, value));
         newSections.push(newSection);
         if (isEditable) {
             for (let j = Math.max(0, previousEditableSection); j <= i; j++) {
@@ -561,88 +504,3 @@ function getEditableSections(sections, value, validSegments) {
     }
     return newSections;
 }
-function getValue(date, type) {
-    switch (type) {
-        case 'year':
-        case 'month':
-        case 'hour':
-        case 'minute':
-        case 'second': {
-            return date[type]();
-        }
-        case 'day': {
-            return date.date();
-        }
-        case 'weekday': {
-            return date.day();
-        }
-        case 'dayPeriod': {
-            return date.hour() >= 12 ? 12 : 0;
-        }
-    }
-    return undefined;
-}
-function isHour12(section) {
-    if (section.type === 'hour') {
-        return dateTime().set('hour', 15).format(section.format) !== '15';
-    }
-    return false;
-}
-function getSectionLimits(date, type, options) {
-    switch (type) {
-        case 'year': {
-            return {
-                minValue: 1,
-                maxValue: 9999,
-            };
-        }
-        case 'month': {
-            return {
-                minValue: 0,
-                maxValue: 11,
-            };
-        }
-        case 'weekday': {
-            return {
-                minValue: 0,
-                maxValue: 6,
-            };
-        }
-        case 'day': {
-            return {
-                minValue: 1,
-                maxValue: date ? date.daysInMonth() : 31,
-            };
-        }
-        case 'hour': {
-            if (options.hour12) {
-                const isPM = date.hour() >= 12;
-                return {
-                    minValue: isPM ? 12 : 0,
-                    maxValue: isPM ? 23 : 11,
-                };
-            }
-            return {
-                minValue: 0,
-                maxValue: 23,
-            };
-        }
-        case 'minute':
-        case 'second': {
-            return {
-                minValue: 0,
-                maxValue: 59,
-            };
-        }
-    }
-    return {};
-}
-function getDurationUnitFromSectionType(type) {
-    if (type === 'literal' || type === 'timeZoneName' || type === 'unknown') {
-        throw new Error(`${type} section does not have duration unit.`);
-    }
-    if (type in TYPE_MAPPING) {
-        return TYPE_MAPPING[type];
-    }
-    return type;
-}

package/dist/esm/components/DateField/utils.d.ts

@@ -1,5 +1,16 @@
-import type { DateFieldSectionWithoutPosition } from './types';
-export declare const isMac: boolean;
-export declare const CtrlCmd: string;
+import type { DateTime } from '@gravity-ui/date-utils';
+import type { DateFieldSection, DateFieldSectionType, DateFieldSectionWithoutPosition } from './types';
 export declare function expandFormat(format: string): string;
+export declare function getSectionLimits(section: DateFieldSectionWithoutPosition, date: DateTime): {
+    minValue: number;
+    maxValue: number;
+} | {
+    minValue?: undefined;
+    maxValue?: undefined;
+};
+export declare function getSectionValue(sections: DateFieldSectionWithoutPosition, date: DateTime): number | undefined;
+export declare function getDurationUnitFromSectionType(type: DateFieldSectionType): "year" | "month" | "day" | "date" | "hour" | "minute" | "second";
+export declare function addSegment(section: DateFieldSection, date: DateTime, amount: number): DateTime;
+export declare function setSegment(section: DateFieldSection, date: DateTime, amount: number): DateTime;
 export declare function splitFormatIntoSections(format: string): DateFieldSectionWithoutPosition[];
+export declare function cleanString(dirtyString: string): string;