diff --git a/src/widgets/CalendarWidget/index.ts b/src/widgets/CalendarWidget/index.ts
index 548da58..1113844 100644
--- a/src/widgets/CalendarWidget/index.ts
+++ b/src/widgets/CalendarWidget/index.ts
@@ -1 +1,2 @@
+export type { CalendarWidgetProps } from './ui/CalendarWidget.ui';
 export { default as CalendarWidget } from './ui/CalendarWidget.ui';
diff --git a/src/widgets/CalendarWidget/ui/CalendarWidget.ui.tsx b/src/widgets/CalendarWidget/ui/CalendarWidget.ui.tsx
index 3ad844d..234e846 100644
--- a/src/widgets/CalendarWidget/ui/CalendarWidget.ui.tsx
+++ b/src/widgets/CalendarWidget/ui/CalendarWidget.ui.tsx
@@ -1,10 +1,15 @@
+import type { DataDateString } from 'shared/types/date';
+
 import classes from './CalendarWidget.module.css';
 import { CalendarWidgetProvider } from './CalendarWidgetContext';
 import { DateWrapper } from './components/DateWrapper';
 import { DayOfWeekRow } from './components/DayOfWeekRow';
 import { HeaderRow } from './components/HeaderRow';
 
-import type { FC } from 'react';
+import type { FC, HTMLAttributes } from 'react';
+
+type DateCellPropsType = HTMLAttributes<HTMLDivElement>;
+type DateCellPropsFuncType = (params: { date: Date; dataDate: DataDateString }) => DateCellPropsType;
 
 export type CalendarWidgetProps = {
   maxDate?: Date;
@@ -13,6 +18,8 @@ export type CalendarWidgetProps = {
   locale?: 'en' | 'ru';
   highlightToday?: boolean;
   highlightValue?: boolean;
+
+  DateCellProps?: DateCellPropsFuncType | DateCellPropsType;
 };
 const CalendarWidget: FC<CalendarWidgetProps> = (props) => (
   <CalendarWidgetProvider {...props}>
diff --git a/src/widgets/CalendarWidget/ui/CalendarWidgetContext.tsx b/src/widgets/CalendarWidget/ui/CalendarWidgetContext.tsx
index ae28fad..3811ae3 100644
--- a/src/widgets/CalendarWidget/ui/CalendarWidgetContext.tsx
+++ b/src/widgets/CalendarWidget/ui/CalendarWidgetContext.tsx
@@ -4,11 +4,16 @@ import React, { createContext, useMemo, useState } from 'react';
 import type { CalendarWidgetProps } from './CalendarWidget.ui';
 import type { FC, PropsWithChildren } from 'react';
 
-type CalendarWidgetContextValue = Required<CalendarWidgetProps> & {
+type CalendarWidgetContextValue = Omit<CalendarWidgetProps, 'locale' | 'maxDate' | 'minDate' | 'value'> & {
   targetYear: number;
   targetMonthIndex: number;
   targetDate: Date;
   setTargetDate: React.Dispatch<React.SetStateAction<Date>>;
+
+  maxDate: NonNullable<CalendarWidgetProps['maxDate']>;
+  minDate: NonNullable<CalendarWidgetProps['minDate']>;
+  locale: NonNullable<CalendarWidgetProps['locale']>;
+  value: NonNullable<CalendarWidgetProps['value']>;
 };
 export const CalendarWidgetContext = createContext({} as CalendarWidgetContextValue);
 
@@ -21,8 +26,6 @@ export const CalendarWidgetProvider: FC<CalendarWidgetProviderProps> = (props) =
     minDate = new Date(1990, 0, 1),
     locale = 'ru',
     value = new Date(),
-    highlightToday = false,
-    highlightValue = false,
     ...restProps
   } = props;
 
@@ -37,10 +40,8 @@ export const CalendarWidgetProvider: FC<CalendarWidgetProviderProps> = (props) =
     maxDate,
     locale,
     value,
-    highlightToday,
-    highlightValue,
     ...restProps,
-  }), [highlightValue, targetDate, minDate, maxDate, locale, value, highlightToday, restProps]);
+  }), [targetDate, minDate, maxDate, locale, value, restProps]);
 
   return (
     <CalendarWidgetContext.Provider value={contextValue}>
diff --git a/src/widgets/CalendarWidget/ui/components/DateCell/ui/DateCell.spec.tsx b/src/widgets/CalendarWidget/ui/components/DateCell/ui/DateCell.spec.tsx
index 8819c30..20cd412 100644
--- a/src/widgets/CalendarWidget/ui/components/DateCell/ui/DateCell.spec.tsx
+++ b/src/widgets/CalendarWidget/ui/components/DateCell/ui/DateCell.spec.tsx
@@ -32,6 +32,6 @@ describe('Base Render', () => {
     setup(new Date(2024, 3, 15));
 
     const dateCellElem = screen.getByTestId('date-cell');
-    expect(dateCellElem).toHaveAttribute('data-date', '4/15/2024');
+    expect(dateCellElem).toHaveAttribute('data-date', '04/15/2024');
   });
 });
diff --git a/src/widgets/CalendarWidget/ui/components/DateCell/ui/DateCell.ui.tsx b/src/widgets/CalendarWidget/ui/components/DateCell/ui/DateCell.ui.tsx
index 7fb829d..a12aaaa 100644
--- a/src/widgets/CalendarWidget/ui/components/DateCell/ui/DateCell.ui.tsx
+++ b/src/widgets/CalendarWidget/ui/components/DateCell/ui/DateCell.ui.tsx
@@ -1,47 +1,77 @@
 import classnames from 'classnames';
-import { useContext } from 'react';
+import React, { useContext, useMemo, useRef } from 'react';
+
+import { getDataDateString } from 'shared/utils/date';
 
 import { CalendarWidgetContext } from '../../../CalendarWidgetContext';
 
 import classes from './DateCell.style.module.css';
 
-import type { FC } from 'react';
+import type { FC, MouseEventHandler, KeyboardEventHandler } from 'react';
 
-type DateCellProps = {
+type DateCellProps = React.HTMLAttributes<HTMLDivElement> & {
   date: Date;
 };
 const DateCell: FC<DateCellProps> = (props) => {
   const {
     date,
   } = props;
-  const format = 'en-En';
-
+  const rootDateCellRef = useRef<HTMLDivElement>(null);
   const {
     targetMonthIndex,
     value,
     highlightToday,
     highlightValue,
+    DateCellProps = {},
   } = useContext(CalendarWidgetContext);
 
   const todayDate = new Date();
-  const dataDate = new Intl.DateTimeFormat(format).format(date);
-  const dataToday = new Intl.DateTimeFormat(format).format(todayDate);
-  const dataValue = new Intl.DateTimeFormat(format).format(value);
+  const dataDate = getDataDateString(date);
+  const dataToday = getDataDateString(todayDate);
+  const dataValue = getDataDateString(value);
   const isOutMonthRange = date.getMonth() !== targetMonthIndex;
 
+  const {
+    className,
+    onClick,
+    onKeyPress,
+    ...restProps
+  } = useMemo(() => {
+    if (typeof DateCellProps === 'function') {
+      return DateCellProps({ date, dataDate });
+    }
+
+    return DateCellProps;
+    // @ts-ignore
+  }, [DateCellProps, dataDate, date]);
+
+  const onClickHandler: MouseEventHandler<HTMLDivElement> = (event) => {
+    onClick?.({ ...event, target: rootDateCellRef.current as EventTarget });
+  };
+
+  const onKeyPressHandler: KeyboardEventHandler<HTMLDivElement> = (event) => {
+    onKeyPress?.(event);
+  };
+
   return (
     <div
       key={dataDate}
-      className={classes.dateCell}
+      ref={rootDateCellRef}
+      className={classnames(classes.dateCell, className)}
       data-date={dataDate}
       data-testid="date-cell"
+      role="button"
+      tabIndex={0}
+      onClick={onClickHandler}
+      onKeyPress={onKeyPressHandler}
+      {...restProps}
     >
       <span
         className={classnames(
           {
-            [classes.today as string]: highlightToday && dataDate === dataToday,
+            [classes.today as string]: Boolean(highlightToday) && dataDate === dataToday,
             [classes.outMothRange as string]: isOutMonthRange,
-            [classes.valueDate as string]: highlightValue && dataDate === dataValue,
+            [classes.valueDate as string]: Boolean(highlightValue) && dataDate === dataValue,
           },
         )}
       >
diff --git a/src/widgets/CalendarWidget/ui/components/DateRow/ui/DateRow.spec.tsx b/src/widgets/CalendarWidget/ui/components/DateRow/ui/DateRow.spec.tsx
index ef8d83a..a372aad 100644
--- a/src/widgets/CalendarWidget/ui/components/DateRow/ui/DateRow.spec.tsx
+++ b/src/widgets/CalendarWidget/ui/components/DateRow/ui/DateRow.spec.tsx
@@ -33,7 +33,7 @@ describe('Test Date Row', () => {
     setupWeek();
 
     const dateRowElem = screen.getByTestId('date-row');
-    expect(dateRowElem).toHaveAttribute('data-row', '4/15/2024-4/21/2024');
+    expect(dateRowElem).toHaveAttribute('data-row', '04/15/2024-04/21/2024');
   });
 
   test('Correct style class', () => {
diff --git a/src/widgets/CalendarWidget/ui/components/DateRow/ui/DateRow.ui.tsx b/src/widgets/CalendarWidget/ui/components/DateRow/ui/DateRow.ui.tsx
index 9f44e98..f51ed80 100644
--- a/src/widgets/CalendarWidget/ui/components/DateRow/ui/DateRow.ui.tsx
+++ b/src/widgets/CalendarWidget/ui/components/DateRow/ui/DateRow.ui.tsx
@@ -1,3 +1,5 @@
+import { getDataDateString } from 'shared/utils/date';
+
 import { DateCell } from '../../DateCell';
 
 import classes from './DateRow.style.module.css';
@@ -12,16 +14,21 @@ const DateRow: FC<DateRowType> = (props) => {
     cells,
   } = props;
 
-  const format = 'en-En';
+  const firstDate = cells[0];
+  const lastDate = cells[cells.length - 1];
 
-  const firstDate = new Intl.DateTimeFormat(format).format(cells[0]);
-  const lastDate = new Intl.DateTimeFormat(format).format(cells[cells.length - 1]);
+  if (!firstDate || !lastDate) {
+    return null;
+  }
+
+  const firstDataDate = getDataDateString(firstDate);
+  const lastDataDate = getDataDateString(lastDate);
 
   return (
     <div
-      key={`${firstDate}-${lastDate}`}
+      key={`${firstDataDate}-${lastDataDate}`}
       className={classes.dateRow}
-      data-row={`${firstDate}-${lastDate}`}
+      data-row={`${firstDataDate}-${lastDataDate}`}
       data-testid="date-row"
     >
       {cells.map((item) => (