@kaizen/components 1.77.4 → 1.78.1

package/dist/types/Calendar/CalendarRange/CalendarRange.d.ts

@@ -1,11 +1,11 @@
-import { type DayPickerRangeProps } from 'react-day-picker';
+import { type PropsBase, type PropsRange } from 'react-day-picker';
 import { type OverrideClassName } from "../../types/OverrideClassName";
 export type CalendarRangeElement = HTMLDivElement;
 export type CalendarRangeProps = {
     id?: string;
     onMount?: (calendarElement: CalendarRangeElement) => void;
     hasDivider?: boolean;
-} & OverrideClassName<Omit<DayPickerRangeProps, 'mode'>>;
+} & OverrideClassName<Omit<PropsRange & Omit<PropsBase, 'mode'>, 'mode'>>;
 export declare const CalendarRange: {
     ({ id, onMount, hasDivider, classNameOverride, selected, defaultMonth, numberOfMonths, locale, ...restProps }: CalendarRangeProps): JSX.Element;
     displayName: string;

package/dist/types/Calendar/CalendarSingle/CalendarSingle.d.ts

@@ -1,10 +1,10 @@
-import { type DayPickerSingleProps } from 'react-day-picker';
+import { type PropsBase, type PropsSingle } from 'react-day-picker';
 import { type OverrideClassName } from "../../types/OverrideClassName";
 export type CalendarSingleElement = HTMLDivElement;
 export type CalendarSingleProps = {
     id?: string;
     onMount?: (calendarElement: CalendarSingleElement) => void;
-} & OverrideClassName<Omit<DayPickerSingleProps, 'mode'>>;
+} & OverrideClassName<Omit<PropsSingle & Omit<PropsBase, 'mode'>, 'mode'>>;
 export declare const CalendarSingle: {
     ({ id, onMount, classNameOverride, selected, defaultMonth, weekStartsOn, locale, ...restProps }: CalendarSingleProps): JSX.Element;
     displayName: string;

package/dist/types/Calendar/LegacyCalendarRange/LegacyCalendarRange.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 import type { Locale } from 'date-fns';
-import { type DateRange, type DayClickEventHandler, type Matcher } from 'react-day-picker';
+import { type DateRange, type DayEventHandler, type Matcher } from 'react-day-picker';
 import { DayOfWeek } from '../enums';
 export type LegacyCalendarRangeElement = HTMLDivElement;
 export type LegacyCalendarRangeProps = {
@@ -9,7 +10,7 @@ export type LegacyCalendarRangeProps = {
     disabledDays?: Matcher[];
     selectedRange?: DateRange;
     locale: Locale;
-    onDayChange: DayClickEventHandler;
+    onDayChange: DayEventHandler<React.MouseEvent>;
 };
 export declare const LegacyCalendarRange: {
     ({ classNameOverride, defaultMonth, weekStartsOn, disabledDays, selectedRange, locale, onDayChange, }: LegacyCalendarRangeProps): JSX.Element;

package/dist/types/Calendar/baseCalendarClassNames.d.ts

@@ -1,2 +1,2 @@
-import { type ClassNames } from 'react-day-picker';
-export declare const baseCalendarClassNames: ClassNames;
+import { type PropsBase } from 'react-day-picker';
+export declare const baseCalendarClassNames: PropsBase['classNames'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaizen/components",
-  "version": "1.77.4",
+  "version": "1.78.1",
   "description": "Kaizen component library",
   "author": "Geoffrey Chong <geoff.chong@cultureamp.com>",
   "homepage": "https://cultureamp.design",
@@ -103,25 +103,25 @@
   },
   "dependencies": {
     "@floating-ui/react-dom": "^2.1.2",
-    "@headlessui/react": "^2.2.2",
-    "@internationalized/date": "^3.8.0",
+    "@headlessui/react": "^2.2.4",
+    "@internationalized/date": "^3.8.1",
     "@popperjs/core": "^2.11.8",
     "@reach/tabs": "^0.18.0",
-    "@react-aria/button": "^3.13.0",
-    "@react-aria/datepicker": "^3.14.2",
-    "@react-aria/focus": "^3.20.2",
-    "@react-aria/i18n": "^3.12.8",
-    "@react-aria/listbox": "^3.14.3",
-    "@react-aria/menu": "^3.18.2",
-    "@react-aria/overlays": "^3.27.0",
-    "@react-aria/select": "^3.15.4",
-    "@react-aria/utils": "^3.28.2",
-    "@react-stately/collections": "^3.12.3",
-    "@react-stately/datepicker": "^3.14.0",
-    "@react-stately/list": "^3.12.1",
-    "@react-stately/menu": "^3.9.3",
-    "@react-stately/select": "^3.6.12",
-    "@react-types/shared": "^3.29.0",
+    "@react-aria/button": "^3.13.1",
+    "@react-aria/datepicker": "^3.14.3",
+    "@react-aria/focus": "^3.20.3",
+    "@react-aria/i18n": "^3.12.9",
+    "@react-aria/listbox": "^3.14.4",
+    "@react-aria/menu": "^3.18.3",
+    "@react-aria/overlays": "^3.27.1",
+    "@react-aria/select": "^3.15.5",
+    "@react-aria/utils": "^3.29.0",
+    "@react-stately/collections": "^3.12.4",
+    "@react-stately/datepicker": "^3.14.1",
+    "@react-stately/list": "^3.12.2",
+    "@react-stately/menu": "^3.9.4",
+    "@react-stately/select": "^3.6.13",
+    "@react-types/shared": "^3.29.1",
     "classnames": "^2.5.1",
     "date-fns": "^4.1.0",
     "lodash.debounce": "^4.0.8",
@@ -136,11 +136,11 @@
     "prosemirror-state": "^1.4.3",
     "prosemirror-transform": "^1.10.4",
     "prosemirror-utils": "^1.2.2",
-    "prosemirror-view": "^1.39.2",
+    "prosemirror-view": "^1.39.3",
     "react-animate-height": "^3.2.3",
-    "react-aria": "^3.39.0",
-    "react-aria-components": "^1.8.0",
-    "react-day-picker": "8.10.1",
+    "react-aria": "^3.40.0",
+    "react-aria-components": "^1.9.0",
+    "react-day-picker": "9.6.7",
     "react-focus-lock": "^2.13.6",
     "react-focus-on": "^3.9.4",
     "react-popper": "^2.3.0",
@@ -154,9 +154,9 @@
     "react-day-picker": "Version locked until a11y gets fixed (https://github.com/gpbl/react-day-picker/pull/1708)"
   },
   "devDependencies": {
-    "@cultureamp/frontend-apis": "^13.3.0",
-    "@cultureamp/i18n-react-intl": "^2.8.0",
-    "@cultureamp/package-bundler": "^2.3.1",
+    "@cultureamp/frontend-apis": "13.3.0",
+    "@cultureamp/i18n-react-intl": "^2.9.1",
+    "@cultureamp/package-bundler": "^2.3.2",
     "@testing-library/dom": "^10.4.0",
     "@types/jest-axe": "^3.5.9",
     "@types/lodash.debounce": "^4.0.9",
@@ -174,9 +174,9 @@
     "postcss-import": "^16.1.0",
     "postcss-preset-env": "^10.1.6",
     "postcss-scss": "^4.0.9",
-    "query-string": "^9.1.2",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "query-string": "^9.2.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-highlight": "^0.15.0",
     "react-intl": "^7.1.11",
     "rollup": "^4.40.2",
@@ -186,16 +186,17 @@
     "tslib": "^2.8.1",
     "ts-patch": "^3.3.0",
     "tsx": "^4.19.4",
-    "@kaizen/design-tokens": "10.9.1"
+    "@kaizen/design-tokens": "10.10.0"
   },
   "devDependenciesComments": {
     "sass": "Prevent deprecation warnings introduced in 1.80 as we plan to move away from sass",
-    "typescript": "Installed in root"
+    "typescript": "Installed in root",
+    "frontend-apis": "There's an unresolved dep with 13.4.0 and onwards with node/msw, so we are locking to 13.3.0 for this update."
   },
   "peerDependencies": {
     "@cultureamp/i18n-react-intl": "^2.5.9",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^18.3.1 || ^19.0.0",
+    "react-dom": "^18.3.1 || ^19.0.0",
     "react-intl": "^6.6.8 || ^7.0.0",
     "typescript": "5.x"
   },

package/src/Avatar/Avatar.module.css

@@ -74,7 +74,7 @@
 }
 
 .fallbackIcon {
-  color: rgba(var(--color-purple-800-rgb), 0.7);
+  color: rgb(var(--color-purple-800-rgb), 0.7);
   font-size: calc(var(--avatar-x-y) * 0.7);
 }
 

package/src/Badge/Badge.module.css

@@ -15,7 +15,7 @@
 }
 
 .reversed {
-  --badge-background-color: rgba(var(--color-white-rgb), 0.1);
+  --badge-background-color: rgb(var(--color-white-rgb), 0.1);
 
   color: var(--color-white);
 }
@@ -50,7 +50,7 @@
 }
 
 .dark {
-  --badge-background-color: rgba(var(--color-purple-700-rgb), 0.1);
+  --badge-background-color: rgb(var(--color-purple-700-rgb), 0.1);
 
   color: var(--color-purple-800);
 }
@@ -87,7 +87,7 @@
 }
 
 .animationOn .badge.dark {
-  --badge-background-color: rgba(var(--color-purple-700-rgb), 0.2);
+  --badge-background-color: rgb(var(--color-purple-700-rgb), 0.2);
 }
 
 .animationOn .badge.active {

package/src/Calendar/CalendarRange/CalendarRange.module.scss

@@ -6,7 +6,7 @@ $cell-border-radius: 3px;
 .month {
   padding: 0 $spacing-sm;
 
-  &:first-child {
+  &:nth-of-type(1) {
     padding-inline-start: 0;
   }
 
@@ -19,7 +19,7 @@ $cell-border-radius: 3px;
   position: relative;
   padding: 0 $spacing-md;
 
-  &:not(:first-child) {
+  &:not(:nth-of-type(1)) {
     &::before {
       position: absolute;
       content: '';
@@ -28,7 +28,7 @@ $cell-border-radius: 3px;
     }
   }
 
-  &:first-child {
+  &:nth-of-type(1) {
     padding-inline-start: 0;
   }
 
@@ -40,18 +40,10 @@ $cell-border-radius: 3px;
 .nav {
   position: absolute;
   display: flex;
-  justify-content: flex-start;
+  justify-content: space-between;
   width: 100%;
   color: $color-purple-800;
-
-  .captionEnd & {
-    flex-direction: row-reverse;
-  }
-
-  .captionStart.captionEnd & {
-    justify-content: space-between;
-    flex-direction: row;
-  }
+  top: -0.25rem;
 }
 
 .dayRangeStart,
@@ -63,4 +55,12 @@ $cell-border-radius: 3px;
 .dayRangeMiddle {
   background-color: $color-blue-100;
   color: $color-blue-500;
+
+  & [class*='_button_'] {
+    color: $color-blue-500;
+  }
+}
+
+.hidden {
+  background-color: transparent;
 }

package/src/Calendar/CalendarRange/CalendarRange.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react'
 import { enAU } from 'date-fns/locale'
-import { DayPicker, type DayPickerRangeProps } from 'react-day-picker'
+import { DayPicker, type PropsBase, type PropsRange } from 'react-day-picker'
 import { Icon } from '~components/__next__/Icon'
 import { type OverrideClassName } from '~components/types/OverrideClassName'
 import { baseCalendarClassNames } from '../baseCalendarClassNames'
@@ -13,7 +13,7 @@ export type CalendarRangeProps = {
   id?: string
   onMount?: (calendarElement: CalendarRangeElement) => void
   hasDivider?: boolean
-} & OverrideClassName<Omit<DayPickerRangeProps, 'mode'>>
+} & OverrideClassName<Omit<PropsRange & Omit<PropsBase, 'mode'>, 'mode'>>
 
 export const CalendarRange = ({
   id,
@@ -36,16 +36,15 @@ export const CalendarRange = ({
   const selectedMonth = monthToShow && isInvalidDate(monthToShow) ? undefined : monthToShow
 
   /* eslint-disable camelcase */
-  const classNames = {
+  const classNames: PropsBase['classNames'] = {
     ...baseCalendarClassNames,
     month: hasDivider ? styles.monthWithDivider : styles.month,
-    caption_end: styles.captionEnd,
-    caption_start: styles.captionStart,
     nav: styles.nav,
-    day_range_start: styles.dayRangeStart,
-    day_range_end: styles.dayRangeEnd,
-    day_range_middle: styles.dayRangeMiddle,
-  } satisfies DayPickerRangeProps['classNames']
+    range_start: styles.dayRangeStart,
+    range_end: styles.dayRangeEnd,
+    range_middle: styles.dayRangeMiddle,
+    hidden: styles.hidden,
+  }
   /* eslint-enable camelcase */
 
   return (
@@ -56,8 +55,13 @@ export const CalendarRange = ({
         defaultMonth={selectedMonth}
         classNames={classNames}
         components={{
-          IconRight: () => <Icon name="arrow_forward" isPresentational shouldMirrorInRTL />,
-          IconLeft: () => <Icon name="arrow_back" isPresentational shouldMirrorInRTL />,
+          Chevron: (props) => {
+            if (props.orientation === 'left') {
+              return <Icon name="arrow_back" isPresentational shouldMirrorInRTL />
+            }
+
+            return <Icon name="arrow_forward" isPresentational shouldMirrorInRTL />
+          },
         }}
         numberOfMonths={numberOfMonths}
         locale={locale}

package/src/Calendar/CalendarRange/_docs/CalendarRange.stickersheet.stories.tsx

@@ -89,7 +89,8 @@ const applyStickerSheetStyles = (canvasElement: HTMLElement): void => {
   ): HTMLElement => {
     const calendar = canvas.getByTestId(id)
     const month = within(calendar).getByRole('grid', { name: monthName })
-    return within(month).getByRole('gridcell', { name: dayName })
+    const day = within(month).getByRole('gridcell', { name: dayName })
+    return within(day).getByRole('button')
   }
 
   const calendarsPseudoStates = [

package/src/Calendar/CalendarSingle/CalendarSingle.module.scss

@@ -6,6 +6,7 @@
   justify-content: space-between;
   width: 100%;
   color: $color-purple-800;
+  top: -0.25rem;
 }
 
 .navButtonNext {

package/src/Calendar/CalendarSingle/CalendarSingle.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react'
 import { enAU } from 'date-fns/locale'
-import { DayPicker, type DayPickerSingleProps } from 'react-day-picker'
+import { DayPicker, type PropsBase, type PropsSingle } from 'react-day-picker'
 import { Icon } from '~components/__next__/Icon'
 import { type OverrideClassName } from '~components/types/OverrideClassName'
 import { baseCalendarClassNames } from '../baseCalendarClassNames'
@@ -12,7 +12,7 @@ export type CalendarSingleElement = HTMLDivElement
 export type CalendarSingleProps = {
   id?: string
   onMount?: (calendarElement: CalendarSingleElement) => void
-} & OverrideClassName<Omit<DayPickerSingleProps, 'mode'>>
+} & OverrideClassName<Omit<PropsSingle & Omit<PropsBase, 'mode'>, 'mode'>>
 
 export const CalendarSingle = ({
   id,
@@ -34,11 +34,11 @@ export const CalendarSingle = ({
   const selectedMonth = monthToShow && isInvalidDate(monthToShow) ? undefined : monthToShow
 
   /* eslint-disable camelcase */
-  const classNames = {
+  const classNames: PropsBase['classNames'] = {
     ...baseCalendarClassNames,
     nav: styles.nav,
     nav_button_next: styles.navButtonNext,
-  } satisfies DayPickerSingleProps['classNames']
+  }
   /* eslint-enable camelcase */
 
   return (
@@ -50,8 +50,13 @@ export const CalendarSingle = ({
         weekStartsOn={isValidWeekStartsOn(weekStartsOn) ? weekStartsOn : undefined}
         classNames={classNames}
         components={{
-          IconRight: () => <Icon name="arrow_forward" isPresentational shouldMirrorInRTL />,
-          IconLeft: () => <Icon name="arrow_back" isPresentational shouldMirrorInRTL />,
+          Chevron: (props) => {
+            if (props.orientation === 'left') {
+              return <Icon name="arrow_back" isPresentational shouldMirrorInRTL />
+            }
+
+            return <Icon name="arrow_forward" isPresentational shouldMirrorInRTL />
+          },
         }}
         locale={locale}
         {...restProps}

package/src/Calendar/CalendarSingle/_docs/CalendarSingle.stickersheet.stories.tsx

@@ -89,9 +89,14 @@ const StickerSheetTemplate: StickerSheetStory = {
 const applyStickerSheetStyles = (canvasElement: HTMLElement): void => {
   const canvas = within(canvasElement)
 
-  const getElementWithinCalendar = (id: string, role: string, name: string): HTMLElement => {
+  const getElementWithinCalendar = (
+    id: string,
+    role: string,
+    name: string | RegExp,
+  ): HTMLElement => {
     const calendar = canvas.getByTestId(id)
-    return within(calendar).getByRole(role, { name })
+    const day = within(calendar).getByRole(role, { name })
+    return role === 'button' ? day : within(day).getByRole('button')
   }
 
   const todayCalendarIds = [
@@ -118,7 +123,7 @@ const applyStickerSheetStyles = (canvasElement: HTMLElement): void => {
     {
       id: 'id--calendar-navigation',
       role: 'button',
-      name: 'Go to previous month',
+      name: /Go to the previous month/i,
     },
   ]
 

package/src/Calendar/LegacyCalendarRange/LegacyCalendarRange.module.scss

@@ -6,10 +6,7 @@
   justify-content: space-between;
   width: 100%;
   color: $color-purple-800;
-}
-
-.navButtonNext {
-  inset-inline-end: 0;
+  top: -0.25rem;
 }
 
 .dayRangeStart,
@@ -21,4 +18,8 @@
 .dayRangeMiddle {
   background-color: $color-blue-100;
   color: $color-blue-500;
+
+  & [class*='_button_'] {
+    color: $color-blue-500;
+  }
 }

package/src/Calendar/LegacyCalendarRange/LegacyCalendarRange.tsx

@@ -3,9 +3,9 @@ import type { Locale } from 'date-fns'
 import {
   DayPicker,
   type DateRange,
-  type DayClickEventHandler,
-  type DayPickerRangeProps,
+  type DayEventHandler,
   type Matcher,
+  type PropsBase,
 } from 'react-day-picker'
 import { Icon } from '~components/__next__/Icon'
 import { baseCalendarClassNames } from '../baseCalendarClassNames'
@@ -22,7 +22,7 @@ export type LegacyCalendarRangeProps = {
   disabledDays?: Matcher[]
   selectedRange?: DateRange
   locale: Locale
-  onDayChange: DayClickEventHandler
+  onDayChange: DayEventHandler<React.MouseEvent>
 }
 
 export const LegacyCalendarRange = ({
@@ -38,14 +38,13 @@ export const LegacyCalendarRange = ({
   const selectedMonth = monthToShow && isInvalidDate(monthToShow) ? undefined : monthToShow
 
   /* eslint-disable camelcase */
-  const classNames = {
+  const classNames: PropsBase['classNames'] = {
     ...baseCalendarClassNames,
     nav: styles.nav,
-    nav_button_next: styles.navButtonNext,
-    day_range_start: styles.dayRangeStart,
-    day_range_end: styles.dayRangeEnd,
-    day_range_middle: styles.dayRangeMiddle,
-  } satisfies DayPickerRangeProps['classNames']
+    range_start: styles.dayRangeStart,
+    range_end: styles.dayRangeEnd,
+    range_middle: styles.dayRangeMiddle,
+  }
   /* eslint-enable camelcase */
 
   return (
@@ -59,8 +58,13 @@ export const LegacyCalendarRange = ({
         onDayClick={onDayChange}
         classNames={classNames}
         components={{
-          IconRight: () => <Icon name="arrow_forward" isPresentational shouldMirrorInRTL />,
-          IconLeft: () => <Icon name="arrow_back" isPresentational shouldMirrorInRTL />,
+          Chevron: (props) => {
+            if (props.orientation === 'left') {
+              return <Icon name="arrow_back" isPresentational shouldMirrorInRTL />
+            }
+
+            return <Icon name="arrow_forward" isPresentational shouldMirrorInRTL />
+          },
         }}
         locale={locale}
       />

package/src/Calendar/baseCalendarClassNames.module.scss

@@ -41,6 +41,7 @@ $rdp-cell-size: 40px;
 
 .root {
   display: inline-flex;
+  position: relative;
 }
 
 .months {
@@ -56,7 +57,6 @@ $rdp-cell-size: 40px;
 }
 
 .caption {
-  position: relative;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -166,12 +166,17 @@ $rdp-cell-size: 40px;
 
 .daySelected {
   background-color: $color-blue-500;
+  border-radius: $button-border-radius;
   color: $color-white;
 
-  &:hover,
-  &:focus-visible {
-    background-color: $color-blue-400;
+  & .button {
     color: $color-white;
+
+    &:hover,
+    &:focus-visible {
+      background-color: $color-blue-400;
+      color: $color-white;
+    }
   }
 }
 
@@ -182,20 +187,8 @@ $rdp-cell-size: 40px;
   // https://github.com/gpbl/react-day-picker/issues/1449#issuecomment-1149942033
   background: none;
   pointer-events: none;
-  color: rgba($color-purple-800-rgb, 0.3);
-}
 
-// We can't use <VisuallyHidden />, so copied the styles here.
-%visually-hidden {
-  clip: rect(0 0 0 0);
-  clip-path: inset(50%);
-  height: 1px;
-  overflow: hidden;
-  position: absolute;
-  white-space: nowrap;
-  width: 1px;
-}
-
-.vHidden {
-  @extend %visually-hidden;
+  & [class*='_button_'] {
+    color: rgba($color-purple-800-rgb, 0.3);
+  }
 }

package/src/Calendar/baseCalendarClassNames.ts

@@ -1,22 +1,20 @@
 /* eslint-disable camelcase */
-import { type ClassNames } from 'react-day-picker'
+import { type PropsBase } from 'react-day-picker'
 import styles from './baseCalendarClassNames.module.scss'
 
-export const baseCalendarClassNames: ClassNames = {
-  vhidden: styles.vHidden,
+export const baseCalendarClassNames: PropsBase['classNames'] = {
   root: styles.root,
   months: styles.months,
-  button_reset: styles.buttonReset,
-  button: styles.button,
-  caption: styles.caption,
+  day_button: `${styles.buttonReset} ${styles.button} ${styles.day}`,
+  button_next: `${styles.buttonReset} ${styles.button} ${styles.navButton}`,
+  button_previous: `${styles.buttonReset} ${styles.button} ${styles.navButton}`,
+  day: styles.cell,
+  month_caption: styles.caption,
   caption_label: styles.captionLabel,
-  nav_button: styles.navButton,
-  table: styles.table,
-  head_cell: styles.weekday,
-  cell: styles.cell,
-  day: styles.day,
-  tbody: styles.tbody,
-  day_selected: styles.daySelected,
-  day_today: styles.dayToday,
-  day_disabled: styles.dayDisabled,
+  month_grid: styles.table,
+  weekday: styles.weekday,
+  weeks: styles.tbody,
+  selected: styles.daySelected,
+  today: styles.dayToday,
+  disabled: styles.dayDisabled,
 }

package/src/Calendar/utils/isSelectingDayInCalendar.spec.tsx

@@ -8,7 +8,8 @@ describe('isSelectingDayInCalendar', () => {
     render(<CalendarSingle defaultMonth={new Date('2022-02-01')} />)
     const targetMonth = screen.getByRole('grid', { name: 'February 2022' })
     const targetDay = within(targetMonth).getByRole('gridcell', { name: '1' })
-    expect(isSelectingDayInCalendar(targetDay)).toBe(true)
+    const targetBtn = within(targetDay).getByRole('button')
+    expect(isSelectingDayInCalendar(targetBtn)).toBe(true)
   })
 
   it('returns false when target is not a Calendar day', () => {

package/src/Calendar/utils/setFocusInCalendar.spec.tsx

@@ -27,7 +27,8 @@ describe('setFocusInCalendar', () => {
     const targetDay = within(targetMonth).getByRole('gridcell', {
       name: todayDay,
     })
-    expect(targetDay).toHaveFocus()
+    const targetBtn = within(targetDay).getByRole('button')
+    expect(targetBtn).toHaveFocus()
   })
 
   it('should focus on the selected day', () => {
@@ -35,7 +36,8 @@ describe('setFocusInCalendar', () => {
 
     const targetMonth = screen.getByRole('grid', { name: 'August 2022' })
     const targetDay = within(targetMonth).getByRole('gridcell', { name: '15' })
-    expect(targetDay).toHaveFocus()
+    const targetBtn = within(targetDay).getByRole('button')
+    expect(targetBtn).toHaveFocus()
   })
 
   it('should focus on today when selected date is invalid', () => {
@@ -45,7 +47,8 @@ describe('setFocusInCalendar', () => {
     const targetDay = within(targetMonth).getByRole('gridcell', {
       name: todayDay,
     })
-    expect(targetDay).toHaveFocus()
+    const targetBtn = within(targetDay).getByRole('button')
+    expect(targetBtn).toHaveFocus()
   })
 
   it('should focus on the first of the month when there is no selected day nor in the current month', () => {
@@ -53,6 +56,7 @@ describe('setFocusInCalendar', () => {
 
     const targetMonth = screen.getByRole('grid', { name: 'May 2022' })
     const targetDay = within(targetMonth).getByRole('gridcell', { name: '1' })
-    expect(targetDay).toHaveFocus()
+    const targetBtn = within(targetDay).getByRole('button')
+    expect(targetBtn).toHaveFocus()
   })
 })