@snack-uikit/calendar 0.6.5 → 0.7.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 0.7.0 (2024-02-06)
+
+
+### Features
+
+* **FF-4166:** add locale usage in calendar ([03ff7a6](https://github.com/cloud-ru-tech/snack-uikit/commit/03ff7a6983fef794665828434e1faa8b61bd102d))
+
+
+
+
+
 ## 0.6.5 (2024-02-05)
 
 ### Only dependencies have been changed
@@ -14,7 +25,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## 0.6.4 (2024-02-02)
 
-**Note:** Version bump only for package @snack-uikit/calendar
+### Only dependencies have been changed
+* [@snack-uikit/locale@0.1.0](https://github.com/cloud-ru-tech/snack-uikit/blob/master/packages/locale/CHANGELOG.md)
 
 
 

package/dist/helperComponents/CalendarBase/CalendarBase.js

@@ -13,6 +13,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import cn from 'classnames';
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { useUncontrolledProp } from 'uncontrollable';
+import { useLocale } from '@snack-uikit/locale';
 import { extractSupportProps } from '@snack-uikit/utils';
 import { AUTOFOCUS, SIZE, VIEW_MODE } from '../../constants';
 import { getEndOfTheDay, getLocale, getTestIdBuilder, sortDates } from '../../utils';
@@ -57,7 +58,8 @@ export function CalendarBase(_a) {
         }
     }, [preselectedRange, setValue]);
     const getTestId = useMemo(() => getTestIdBuilder(testId), [testId]);
-    const locale = useMemo(() => getLocale(localeProp), [localeProp]);
+    const [, ctxLocale] = useLocale();
+    const locale = useMemo(() => getLocale({ localeProp, ctxLocale }), [ctxLocale, localeProp]);
     const firstNotDisableCell = useRef([0, 0]);
     return (_jsx("div", Object.assign({}, extractSupportProps(rest), { className: cn(styles.calendar, className, CONTAINER_SIZE_MAP[size]), style: style, "data-size": size, "data-fit-to-container": fitToContainer || undefined, "data-test-id": testId, children: _jsxs(CalendarContext.Provider, { value: {
                 locale,

package/dist/utils.d.ts

@@ -1,3 +1,4 @@
+import { LocaleLang } from '@snack-uikit/locale';
 import { InRangePosition, Range, ViewMode } from './types';
 export declare const isTheSameDecade: (date1: Date, date2: Date) => boolean;
 export declare const isTheSameYear: (date1: Date, date2: Date) => boolean;
@@ -15,6 +16,9 @@ export declare const sortDates: (dates: Date[]) => Date[];
 export declare const getInRangePosition: (date: Date, viewMode: ViewMode, range?: Range) => InRangePosition;
 export declare const getEndOfTheDay: (date: Date) => Date;
 export declare const getTestIdBuilder: (testId?: string) => (prefix: string) => string | undefined;
-export declare const getLocale: (localeProp?: Intl.Locale) => Intl.Locale;
+export declare const getLocale: ({ localeProp, ctxLocale }?: {
+    localeProp?: Intl.Locale | undefined;
+    ctxLocale?: `${string}_${string}` | undefined;
+}) => Intl.Locale;
 export declare const getStartOfWeek: (locale: Intl.Locale) => import("weekstart").DayOfWeek;
 export declare const isWeekend: (date: Date, viewMode: ViewMode) => boolean;

package/dist/utils.js

@@ -51,8 +51,8 @@ export const getInRangePosition = (date, viewMode, range) => {
     return date.valueOf() >= start && date.valueOf() <= end ? IN_RANGE_POSITION.In : IN_RANGE_POSITION.Out;
 };
 export const getEndOfTheDay = (date) => new Date(new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1).valueOf() - 1);
-export const getTestIdBuilder = (testId) => (prefix) => testId ? `${prefix}-${testId}` : undefined;
-export const getLocale = (localeProp) => localeProp || new Intl.Locale((navigator === null || navigator === void 0 ? void 0 : navigator.language) || 'ru-RU');
+export const getTestIdBuilder = (testId) => (prefix) => (testId ? `${prefix}-${testId}` : undefined);
+export const getLocale = ({ localeProp, ctxLocale } = {}) => { var _a; return localeProp || new Intl.Locale(ctxLocale ? ctxLocale.replace('_', '-') : (_a = navigator === null || navigator === void 0 ? void 0 : navigator.language) !== null && _a !== void 0 ? _a : 'ru-RU'); };
 export const getStartOfWeek = (locale) => getWeekStartByLocale(locale.language);
 export const isWeekend = (date, viewMode) => {
     if (viewMode === 'month') {

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Calendar",
-  "version": "0.6.5",
+  "version": "0.7.0",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -33,10 +33,11 @@
   "scripts": {},
   "dependencies": {
     "@snack-uikit/icons": "0.20.1",
+    "@snack-uikit/locale": "0.1.0",
     "@snack-uikit/utils": "3.2.0",
     "classnames": "2.3.2",
     "uncontrollable": "8.0.2",
     "weekstart": "2.0.0"
   },
-  "gitHead": "b1acc8128bdab6f23b534d7c464208069e59ed8c"
+  "gitHead": "e38849932e4595cfeaf19733fcd296ffcfc7322e"
 }

package/src/helperComponents/CalendarBase/CalendarBase.tsx

@@ -2,6 +2,7 @@ import cn from 'classnames';
 import { CSSProperties, RefCallback, useCallback, useMemo, useRef, useState } from 'react';
 import { useUncontrolledProp } from 'uncontrollable';
 
+import { useLocale } from '@snack-uikit/locale';
 import { extractSupportProps, WithSupportProps } from '@snack-uikit/utils';
 
 import { AUTOFOCUS, SIZE, VIEW_MODE } from '../../constants';
@@ -98,7 +99,9 @@ export function CalendarBase({
 
   const getTestId = useMemo(() => getTestIdBuilder(testId), [testId]);
 
-  const locale = useMemo(() => getLocale(localeProp), [localeProp]);
+  const [, ctxLocale] = useLocale();
+
+  const locale = useMemo(() => getLocale({ localeProp, ctxLocale }), [ctxLocale, localeProp]);
 
   const firstNotDisableCell = useRef<[number, number]>([0, 0]);
 

package/src/utils.ts

@@ -1,5 +1,7 @@
 import { getWeekStartByLocale } from 'weekstart';
 
+import { LocaleLang } from '@snack-uikit/locale';
+
 import { IN_RANGE_POSITION, VIEW_MODE } from './constants';
 import { InRangePosition, Range, ViewMode } from './types';
 
@@ -81,9 +83,10 @@ export const getInRangePosition = (date: Date, viewMode: ViewMode, range?: Range
 export const getEndOfTheDay = (date: Date) =>
   new Date(new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1).valueOf() - 1);
 
-export const getTestIdBuilder = (testId?: string) => (prefix: string) => testId ? `${prefix}-${testId}` : undefined;
+export const getTestIdBuilder = (testId?: string) => (prefix: string) => (testId ? `${prefix}-${testId}` : undefined);
 
-export const getLocale = (localeProp?: Intl.Locale) => localeProp || new Intl.Locale(navigator?.language || 'ru-RU');
+export const getLocale = ({ localeProp, ctxLocale }: { localeProp?: Intl.Locale; ctxLocale?: LocaleLang } = {}) =>
+  localeProp || new Intl.Locale(ctxLocale ? ctxLocale.replace('_', '-') : navigator?.language ?? 'ru-RU');
 
 export const getStartOfWeek = (locale: Intl.Locale) => getWeekStartByLocale(locale.language);