@kaizen/components 1.77.3 → 1.78.0

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()
   })
 })

package/src/Calendar/utils/setFocusInCalendar.ts

@@ -3,21 +3,21 @@ import { type CalendarSingleElement } from '../CalendarSingle'
 import calendarStyles from '../baseCalendarClassNames.module.scss'
 import { isInvalidDate } from './isInvalidDate'
 
-const isHTMLElement = (element: Element | undefined): element is HTMLElement =>
-  element instanceof HTMLElement
-
 export const setFocusInCalendar = (
   calendarElement: CalendarSingleElement | CalendarRangeElement,
   selectedDay: Date | undefined,
 ): void => {
-  const daySelectedOrToday = calendarElement.getElementsByClassName(
+  const dayClass =
     selectedDay && !isInvalidDate(selectedDay)
-      ? calendarStyles.daySelected
-      : calendarStyles.dayToday,
-  )[0]
+      ? `.${calendarStyles.daySelected}`
+      : `.${calendarStyles.dayToday}`
+
+  let dayToFocus = calendarElement.querySelector(`${dayClass} button`)
 
-  const dayToFocus =
-    daySelectedOrToday ?? calendarElement.getElementsByClassName(calendarStyles.day)[0]
+  // RDP v9 puts the day class on the button inside the table cell whereas today and selected appear on the table cell
+  dayToFocus ??= calendarElement.querySelector(`.${calendarStyles.day}`)
 
-  if (isHTMLElement(dayToFocus)) dayToFocus.focus()
+  if (dayToFocus instanceof HTMLElement) {
+    dayToFocus.focus()
+  }
 }

package/src/DatePicker/DatePicker.spec.tsx

@@ -91,11 +91,8 @@ describe('<DatePicker />', () => {
       expect(screen.getByRole('dialog')).toBeVisible()
     })
 
+    // TODO: For some reason a single tab no longer jumps out of input to the button
     await user.tab()
-    await waitFor(() => {
-      expect(input).toHaveFocus()
-    })
-
     await user.tab()
     await waitFor(() => {
       const calendarButton = screen.getByRole('button', { name: 'Choose date' })
@@ -105,7 +102,7 @@ describe('<DatePicker />', () => {
     await user.tab()
     await waitFor(() => {
       const arrowButton = screen.getByRole('button', {
-        name: 'Go to previous month',
+        name: /Go to the previous month/i,
       })
       expect(arrowButton).toHaveFocus()
     })
@@ -168,7 +165,8 @@ describe('<DatePicker /> - Focus element', () => {
 
       const month = screen.getByRole('grid', { name: 'March 2022' })
       const dateToSelect = within(month).getByRole('gridcell', { name: '6' })
-      await user.click(dateToSelect)
+      const dateToSelectButton = within(dateToSelect).getByRole('button')
+      await user.click(dateToSelectButton)
 
       const input = screen.getByLabelText('Input label', { selector: 'input' })
       expect(input).toHaveFocus()
@@ -192,7 +190,8 @@ describe('<DatePicker /> - Focus element', () => {
 
       const month = screen.getByRole('grid', { name: 'March 2022' })
       const selectedDate = within(month).getByRole('gridcell', { name: '1' })
-      expect(selectedDate).toHaveFocus()
+      const selectedDateButton = within(selectedDate).getByRole('button')
+      expect(selectedDateButton).toHaveFocus()
     })
 
     it('returns focus to the input when the user escapes from the calendar', async () => {
@@ -233,7 +232,8 @@ describe('<DatePicker /> - Focus element', () => {
 
       const month = screen.getByRole('grid', { name: 'March 2022' })
       const selectedDate = within(month).getByRole('gridcell', { name: '1' })
-      expect(selectedDate).toHaveFocus()
+      const selectedDateButton = within(selectedDate).getByRole('button')
+      expect(selectedDateButton).toHaveFocus()
     })
 
     it('returns focus to the calendar button when the user escapes from the calendar', async () => {
@@ -277,7 +277,8 @@ describe('<DatePicker /> - Focus element', () => {
 
       const month = screen.getByRole('grid', { name: 'March 2022' })
       const selectedDate = within(month).getByRole('gridcell', { name: '1' })
-      expect(selectedDate).toHaveFocus()
+      const selectedDateButton = within(selectedDate).getByRole('button')
+      expect(selectedDateButton).toHaveFocus()
     })
 
     it('returns focus to the input when the user escapes from the calendar', async () => {

package/src/DatePicker/DatePicker.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useId, useRef, useState, type RefObject } from 'react'
 import { useIntl } from '@cultureamp/i18n-react-intl'
-import { type DayClickEventHandler } from 'react-day-picker'
+import { type DayEventHandler } from 'react-day-picker'
 import { FocusOn } from 'react-focus-on'
 import {
   CalendarSingle,
@@ -161,7 +161,7 @@ export const DatePicker = ({
     onDayChange(newDate)
   }
 
-  const handleCalendarDayChange: DayClickEventHandler = (date) => {
+  const handleCalendarDayChange: DayEventHandler<React.MouseEvent> = (date) => {
     if (!isDisabledDate(date, disabledDays)) {
       const newInputValue =
         lastTrigger === 'calendarButton'

package/src/Filter/FilterBar/subcomponents/FilterBarDatePicker/FilterBarDatePicker.spec.tsx

@@ -127,8 +127,9 @@ describe('<FilterBarDatePicker />', () => {
 
     const targetMonth = screen.getByRole('grid', { name: 'June 2023' })
     const targetDay = within(targetMonth).getByRole('gridcell', { name: '7' })
+    const targetBtn = within(targetDay).getByRole('button')
 
-    await user.click(targetDay)
+    await user.click(targetBtn)
 
     await waitFor(() => {
       expect(screen.getByRole('button', { name: 'Drank : 7 Jun 2023' })).toBeInTheDocument()
@@ -148,7 +149,8 @@ describe('<FilterBarDatePicker />', () => {
 
     const targetMonth = screen.getByRole('grid', { name: 'June 2023' })
     const targetDay = within(targetMonth).getByRole('gridcell', { name: '7' })
-    await user.click(targetDay)
+    const targetBtn = within(targetDay).getByRole('button')
+    await user.click(targetBtn)
 
     await waitFor(() => {
       expect(onChange.mock.calls).toEqual([[new Date('2023-06-07')]])

package/src/Filter/FilterBar/subcomponents/FilterBarDateRangePicker/FilterBarDateRangePicker.spec.tsx

@@ -138,7 +138,9 @@ describe('<FilterBarDateRangePicker />', () => {
 
     const targetMonth = screen.getByRole('grid', { name: 'June 2022' })
     const targetDay = within(targetMonth).getByRole('gridcell', { name: '23' })
-    await user.click(targetDay)
+    const targetBtn = within(targetDay).getByRole('button')
+
+    await user.click(targetBtn)
     await user.click(document.body) // Exit the focus lock
 
     await waitFor(() => {
@@ -170,7 +172,9 @@ describe('<FilterBarDateRangePicker />', () => {
 
     const targetMonth = screen.getByRole('grid', { name: 'June 2022' })
     const targetDay = within(targetMonth).getByRole('gridcell', { name: '23' })
-    await user.click(targetDay)
+    const targetBtn = within(targetDay).getByRole('button')
+
+    await user.click(targetBtn)
 
     await waitFor(() => {
       expect(onChange).toHaveBeenCalledWith({

package/src/Filter/FilterDatePicker/FilterDatePicker.spec.tsx

@@ -75,7 +75,8 @@ describe('<FilterDatePicker />', () => {
 
     const targetMonth = screen.getByRole('grid', { name: 'May 2022' })
     const targetDay = within(targetMonth).getByRole('gridcell', { name: '2' })
-    await user.click(targetDay)
+    const targetBtn = within(targetDay).getByRole('button')
+    await user.click(targetBtn)
 
     await waitFor(() => {
       expect(dialog).not.toBeInTheDocument()
@@ -196,7 +197,7 @@ describe('<FilterDatePicker />', () => {
     })
 
     const navigateMonthsButton = getByRole('button', {
-      name: 'Go to next month',
+      name: /Go to the next month/i,
     })
 
     await user.click(navigateMonthsButton)

package/src/Filter/FilterDatePicker/subcomponents/FilterDatePickerField/FilterDatePickerField.spec.tsx

@@ -191,7 +191,8 @@ describe('<FilterDatePickerField />', () => {
       const targetDay = within(targetMonth).getByRole('gridcell', {
         name: '15',
       })
-      await user.click(targetDay)
+      const targetBtn = within(targetDay).getByRole('button')
+      await user.click(targetBtn)
 
       await waitFor(() => {
         expect(inputDateOnSubmit).toHaveBeenCalled()
@@ -210,7 +211,8 @@ describe('<FilterDatePickerField />', () => {
         name: '12',
       })
       expect(targetDay).not.toHaveAttribute('aria-selected')
-      await user.click(targetDay)
+      const targetBtn = within(targetDay).getByRole('button')
+      await user.click(targetBtn)
 
       await waitFor(() => {
         expect(targetDay).toHaveAttribute('aria-selected', 'true')
@@ -229,7 +231,8 @@ describe('<FilterDatePickerField />', () => {
       const firstSelectedDay = within(targetMonth).getByRole('gridcell', {
         name: '15',
       })
-      await user.click(firstSelectedDay)
+      const targetBtn = within(firstSelectedDay).getByRole('button')
+      await user.click(targetBtn)
 
       await waitFor(() => {
         expect(inputDate).toHaveValue('')
@@ -323,7 +326,8 @@ describe('<FilterDatePickerField />', () => {
       const targetDay = within(targetMonth).getByRole('gridcell', {
         name: '12',
       })
-      await user.click(targetDay)
+      const targetBtn = within(targetDay).getByRole('button')
+      await user.click(targetBtn)
 
       await waitFor(() => {
         expect(dateErrorContainer).not.toBeInTheDocument()

package/src/Filter/FilterDateRangePicker/_docs/FilterDateRangePicker.stories.tsx

@@ -454,8 +454,8 @@ export const OnSmallViewport: Story = {
 
     await step('Back and Forward arrow and both visible', async () => {
       await waitFor(() => {
-        const prevMonth = canvas.getByLabelText('Go to previous month')
-        const nextMonth = canvas.getByLabelText('Go to next month')
+        const prevMonth = canvas.getByLabelText(/Go to the previous month/i)
+        const nextMonth = canvas.getByLabelText(/Go to the next month/i)
 
         expect(prevMonth).toBeVisible()
         expect(nextMonth).toBeVisible()

package/src/Filter/FilterDateRangePicker/subcomponents/FilterDateRangePickerField/FilterDateRangePickerField.spec.tsx

@@ -254,7 +254,9 @@ describe('<FilterDateRangePickerField />', () => {
         name: '12',
       })
       expect(targetDay).not.toHaveAttribute('aria-selected')
-      await user.click(targetDay)
+
+      const targetBtn = within(targetDay).getByRole('button')
+      await user.click(targetBtn)
 
       await waitFor(() => {
         expect(targetDay).toHaveAttribute('aria-selected', 'true')
@@ -281,7 +283,8 @@ describe('<FilterDateRangePickerField />', () => {
         name: '23',
       })
       expect(targetDay).not.toHaveAttribute('aria-selected')
-      await user.click(targetDay)
+      const targetBtn = within(targetDay).getByRole('button')
+      await user.click(targetBtn)
 
       await waitFor(() => {
         expect(targetDay).toHaveAttribute('aria-selected', 'true')
@@ -289,7 +292,7 @@ describe('<FilterDateRangePickerField />', () => {
       })
     })
 
-    it('clears the inputs when clearing the calendar value', async () => {
+    it('sets the range end date to match the start date when clicking on the start date with an active range', async () => {
       render(
         <FilterDateRangePickerFieldWrapper
           selectedRange={{
@@ -302,18 +305,20 @@ describe('<FilterDateRangePickerField />', () => {
 
       const inputStartDate = screen.getByLabelText('Date from')
       const inputEndDate = screen.getByLabelText('Date to')
-      expect(inputStartDate).toHaveValue('15 May 2022')
+      const startDate = '15 May 2022'
+      expect(inputStartDate).toHaveValue(startDate)
       expect(inputEndDate).toHaveValue('22 May 2022')
 
       const targetMonth = screen.getByRole('grid', { name: 'May 2022' })
       const firstSelectedDay = within(targetMonth).getByRole('gridcell', {
         name: '15',
       })
-      await user.click(firstSelectedDay)
+      const firstSelectedDayBtn = within(firstSelectedDay).getByRole('button')
+      await user.click(firstSelectedDayBtn)
 
       await waitFor(() => {
-        expect(inputStartDate).toHaveValue('')
-        expect(inputEndDate).toHaveValue('')
+        expect(inputStartDate).toHaveValue(startDate)
+        expect(inputEndDate).toHaveValue(startDate)
       })
     })
   })
@@ -634,7 +639,8 @@ describe('<FilterDateRangePickerField />', () => {
       const targetDay = within(targetMonth).getByRole('gridcell', {
         name: '12',
       })
-      await user.click(targetDay)
+      const targetBtn = within(targetDay).getByRole('button')
+      await user.click(targetBtn)
 
       await waitFor(() => {
         expect(dateEndErrorContainer).not.toBeInTheDocument()

package/src/RichTextEditor/utils/schema/marks.ts

@@ -1,8 +1,8 @@
-import type { MarkSpec, Node } from 'prosemirror-model'
+import type { Mark, MarkSpec } from 'prosemirror-model'
 import { marks as proseMarks } from 'prosemirror-schema-basic'
 import { validateLink } from '../plugins/LinkManager/validation'
 
-export const getMarks = (): MarkSpec => ({
+export const getMarks = (): Record<string, MarkSpec> => ({
   ...proseMarks,
 
   // An underline mark. Rendered as a `<u>` element. Has parse rules that also
@@ -26,18 +26,19 @@ export const getMarks = (): MarkSpec => ({
     parseDOM: [
       {
         tag: 'a[href]',
-        getAttrs(dom: HTMLAnchorElement) {
+        getAttrs(dom: HTMLElement) {
+          const anchor = dom as HTMLAnchorElement
           return {
-            href: getAttributeWithDefault(dom, 'href'),
-            target: getAttributeWithDefault(dom, 'target'),
-            rel: getAttributeWithDefault(dom, 'rel'),
+            href: getAttributeWithDefault(anchor, 'href'),
+            target: getAttributeWithDefault(anchor, 'target'),
+            rel: getAttributeWithDefault(anchor, 'rel'),
             _metadata: null,
           }
         },
       },
     ],
-    toDOM(node: Node) {
-      const { href, target, rel } = node.attrs
+    toDOM(mark: Mark) {
+      const { href, target, rel } = mark.attrs
       const validationStatus = validateLink(href)
 
       if (validationStatus.status === 'error') {