@gravity-ui/date-components 2.8.0 → 2.8.2

package/dist/esm/components/RelativeRangeDatePicker/components/Presets/i18n/en.json

@@ -25,13 +25,23 @@
   "From start of month": "From start of month",
   "From start of year": "From start of year",
   "Previous month": "Previous month",
-  "Last {count} {unit}": "Last {{count}} {{unit}}",
-  "m": ["minute", "minutes", "minutes"],
-  "h": ["hour", "hours", "hours"],
-  "d": ["day", "days", "days"],
-  "w": ["week", "weeks", "weeks"],
-  "M": ["month", "months", "months"],
-  "y": ["year", "years", "years"],
+  "Last second": "Last second",
+  "Last minute": "Last minute",
+  "Last {count} second": [
+    "Last {{count}} second",
+    "Last {{count}} seconds",
+    "Last {{count}} seconds"
+  ],
+  "Last {count} minute": [
+    "Last {{count}} minute",
+    "Last {{count}} minutes",
+    "Last {{count}} minutes"
+  ],
+  "Last {count} hour": ["Last {{count}} hour", "Last {{count}} hours", "Last {{count}} hours"],
+  "Last {count} day": ["Last {{count}} day", "Last {{count}} days", "Last {{count}} days"],
+  "Last {count} week": ["Last {{count}} week", "Last {{count}} weeks", "Last {{count}} weeks"],
+  "Last {count} month": ["Last {{count}} month", "Last {{count}} months", "Last {{count}} months"],
+  "Last {count} year": ["Last {{count}} year", "Last {{count}} years", "Last {{count}} years"],
   "Main": "Main",
   "Other": "Other",
   "Range": "Range",

package/dist/esm/components/RelativeRangeDatePicker/components/Presets/i18n/index.d.ts

@@ -1 +1 @@
-export declare const i18n: (key: "m" | "y" | "M" | "d" | "h" | "w" | "Last 5 minutes" | "Last 15 minutes" | "Last 30 minutes" | "Last hour" | "Last 3 hours" | "Last 6 hours" | "Last 12 hours" | "Last day" | "Last 3 days" | "Last week" | "Last month" | "Last 3 months" | "Last 6 months" | "Last year" | "Last 3 years" | "Today" | "Yesterday" | "Day before yesterday" | "This week" | "This month" | "This year" | "From start of day" | "From start of week" | "From start of month" | "From start of year" | "Previous month" | "Main" | "Other" | "Range" | "From" | "To" | "Last {count} {unit}", params?: import("@gravity-ui/i18n").Params | undefined) => string;
+export declare const i18n: (key: "Last 5 minutes" | "Last 15 minutes" | "Last 30 minutes" | "Last hour" | "Last 3 hours" | "Last 6 hours" | "Last 12 hours" | "Last day" | "Last 3 days" | "Last week" | "Last month" | "Last 3 months" | "Last 6 months" | "Last year" | "Last 3 years" | "Today" | "Yesterday" | "Day before yesterday" | "This week" | "This month" | "This year" | "From start of day" | "From start of week" | "From start of month" | "From start of year" | "Previous month" | "Last second" | "Last minute" | "Main" | "Other" | "Range" | "From" | "To" | "Last {count} second" | "Last {count} minute" | "Last {count} hour" | "Last {count} day" | "Last {count} week" | "Last {count} month" | "Last {count} year", params?: import("@gravity-ui/i18n").Params | undefined) => string;

package/dist/esm/components/RelativeRangeDatePicker/components/Presets/i18n/ru.json

@@ -25,13 +25,43 @@
   "From start of month": "С начала месяца",
   "From start of year": "С начала года",
   "Previous month": "Предыдущий месяц",
-  "Last {count} {unit}": "Last {{count}} {{unit}}",
-  "m": ["minute", "minutes", "minutes"],
-  "h": ["hour", "hours", "hours"],
-  "d": ["day", "days", "days"],
-  "w": ["week", "weeks", "weeks"],
-  "M": ["month", "months", "months"],
-  "y": ["year", "years", "years"],
+  "Last second": "Последняя секунда",
+  "Last minute": "Последняя минута",
+  "Last {count} second": [
+    "Последняя {{count}} секунда",
+    "Последние {{count}} секунды",
+    "Последние {{count}} секунд"
+  ],
+  "Last {count} minute": [
+    "Последняя {{count}} минута",
+    "Последние {{count}} минуты",
+    "Последние {{count}} минут"
+  ],
+  "Last {count} hour": [
+    "Последний {{count}} час",
+    "Последние {{count}} часа",
+    "Последние {{count}} часов"
+  ],
+  "Last {count} day": [
+    "Последний {{count}} день",
+    "Последние {{count}} дня",
+    "Последние {{count}} дней"
+  ],
+  "Last {count} week": [
+    "Последняя {{count}} неделя",
+    "Последние {{count}} недели",
+    "Последние {{count}} недель"
+  ],
+  "Last {count} month": [
+    "Последний {{count}} месяц",
+    "Последние {{count}} месяца",
+    "Последние {{count}} месяцев"
+  ],
+  "Last {count} year": [
+    "Последний {{count}} год",
+    "Последние {{count}} года",
+    "Последние {{count}} лет"
+  ],
   "Main": "Основные",
   "Other": "Другие",
   "Range": "Период",

package/dist/esm/components/RelativeRangeDatePicker/components/Presets/utils.js

@@ -1,6 +1,25 @@
 import { dateTimeParse } from '@gravity-ui/date-utils';
 import { DEFAULT_DATE_PRESETS, DEFAULT_OTHERS_PRESETS, DEFAULT_TIME_PRESETS, allPresets, } from './defaultPresets';
 import { i18n } from './i18n';
+const lastRe = /^now-(\d+)([smhdwMy])$/;
+const oneUnit = {
+    s: 'Last second',
+    m: 'Last minute',
+    h: 'Last hour',
+    d: 'Last day',
+    w: 'Last week',
+    M: 'Last month',
+    y: 'Last year',
+};
+const countUnit = {
+    s: 'Last {count} second',
+    m: 'Last {count} minute',
+    h: 'Last {count} hour',
+    d: 'Last {count} day',
+    w: 'Last {count} week',
+    M: 'Last {count} month',
+    y: 'Last {count} year',
+};
 export function getPresetTitle(start, end, presets = allPresets) {
     const startText = start.replace(/\s+/g, '');
     const endText = end.replace(/\s+/g, '');
@@ -10,21 +29,19 @@ export function getPresetTitle(start, end, presets = allPresets) {
         }
     }
     if (end === 'now') {
-        const match = /^now-(\d+)([m|h|d|w|M|y])$/.exec(start);
+        const match = lastRe.exec(startText);
         if (match) {
             const [, count, unit] = match;
             if (isDateUnit(unit)) {
-                return i18n('Last {count} {unit}', {
-                    count,
-                    unit: i18n(unit, { count: Number(count) }),
-                });
+                const template = Number(count) === 1 ? oneUnit[unit] : countUnit[unit];
+                return i18n(template, { count });
             }
         }
     }
     return startText + ' — ' + endText;
 }
 function isDateUnit(value) {
-    return ['m', 'h', 'd', 'w', 'M', 'y'].includes(value);
+    return ['s', 'm', 'h', 'd', 'w', 'M', 'y'].includes(value);
 }
 export function filterPresets(presets, minValue) {
     return presets.filter((preset) => {

package/dist/esm/components/RelativeRangeDatePicker/i18n/en.json

@@ -4,5 +4,6 @@
   "\"To\"": "\"To\"",
   "\"To\" is required.": "\"To\" is required.",
   "\"From\" can't be after \"To\".": "\"From\" can't be after \"To\".",
-  "to": "to"
+  "to": "to",
+  "Range date picker": "Range date picker"
 }

package/dist/esm/components/RelativeRangeDatePicker/i18n/index.d.ts

@@ -1 +1 @@
-export declare const i18n: (key: "\"From\"" | "\"From\" is required." | "\"To\"" | "\"To\" is required." | "\"From\" can't be after \"To\"." | "to", params?: import("@gravity-ui/i18n").Params | undefined) => string;
+export declare const i18n: (key: "\"From\"" | "\"From\" is required." | "\"To\"" | "\"To\" is required." | "\"From\" can't be after \"To\"." | "to" | "Range date picker", params?: import("@gravity-ui/i18n").Params | undefined) => string;

package/dist/esm/components/RelativeRangeDatePicker/i18n/ru.json

@@ -4,5 +4,6 @@
   "\"To\"": "«До»",
   "\"To\" is required.": "«До» обязательно.",
   "\"From\" can't be after \"To\".": "«От» не может быть позже чем «До».",
-  "to": "до"
+  "to": "до",
+  "Range date picker": "Выбор диапазона дат"
 }

package/dist/esm/components/RelativeRangeDatePicker/utils.js

@@ -39,7 +39,7 @@ export function getDefaultTitle({ value, timeZone, alwaysShowAsAbsolute, format
     if (!alwaysShowAsAbsolute &&
         ((_e = value.start) === null || _e === void 0 ? void 0 : _e.type) === 'relative' &&
         ((_f = value.end) === null || _f === void 0 ? void 0 : _f.type) === 'relative') {
-        return `${getPresetTitle(value.start.value, value.end.value, presets)}${tz}`;
+        return `${getPresetTitle(value.start.value, value.end.value, presets)}`;
     }
     const delimiter = ' — ';
     return `${from}${delimiter}${to}${tz}`;

package/dist/esm/components/types/events.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface KeyboardEvents {
     /** Handler that is called when a key is pressed. */
     onKeyDown?(e: React.KeyboardEvent): void;

package/dist/esm/components/types/style.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface StyleProps {
     /** Sets inline style for the element. */
     style?: React.CSSProperties;

package/package.json

@@ -1,17 +1,23 @@
 {
   "name": "@gravity-ui/date-components",
-  "version": "2.8.0",
+  "version": "2.8.2",
   "description": "",
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/esm/index.d.ts",
+  "type": "commonjs",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./dist/esm/index.d.js",
-      "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
+      "import": {
+        "types": "./dist/esm/index.d.js",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     }
   },
   "sideEffects": [
@@ -61,19 +67,19 @@
     "@gravity-ui/stylelint-config": "^4.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",
     "@gravity-ui/uikit": "^6.15.0",
-    "@storybook/addon-a11y": "^8.1.10",
-    "@storybook/addon-actions": "^8.1.10",
-    "@storybook/addon-essentials": "^8.1.10",
-    "@storybook/addon-storysource": "^8.1.10",
-    "@storybook/addon-viewport": "^8.1.10",
+    "@storybook/addon-a11y": "^8.2.9",
+    "@storybook/addon-actions": "^8.2.9",
+    "@storybook/addon-essentials": "^8.2.9",
+    "@storybook/addon-storysource": "^8.2.9",
+    "@storybook/addon-viewport": "^8.2.9",
     "@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-    "@storybook/blocks": "^8.1.10",
-    "@storybook/manager-api": "^8.1.10",
+    "@storybook/blocks": "^8.2.9",
+    "@storybook/manager-api": "^8.2.9",
     "@storybook/preset-scss": "^1.0.3",
-    "@storybook/react": "^8.1.10",
-    "@storybook/react-webpack5": "^8.1.10",
-    "@storybook/theming": "^8.1.10",
-    "@storybook/types": "^8.1.10",
+    "@storybook/react": "^8.2.9",
+    "@storybook/react-webpack5": "^8.2.9",
+    "@storybook/theming": "^8.2.9",
+    "@storybook/types": "^8.2.9",
     "@testing-library/dom": "^10.1.0",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.0",
@@ -100,12 +106,12 @@
     "react-dom": "^18.3.1",
     "rimraf": "^5.0.7",
     "sass": "^1.77.1",
-    "storybook": "^8.1.10",
+    "storybook": "^8.2.9",
     "stylelint": "^15.11.0",
     "stylelint-use-logical": "^2.1.2",
     "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "peerDependencies": {
     "@gravity-ui/uikit": "^6.0.0",