diff --git a/.changeset/stale-dogs-deliver.md b/.changeset/stale-dogs-deliver.md new file mode 100644 index 00000000000..01c4d381f96 --- /dev/null +++ b/.changeset/stale-dogs-deliver.md @@ -0,0 +1,5 @@ +--- +"@navikt/ds-react": patch +--- + +DatePicker: Knapper fikk ikke riktig aria-label diff --git a/@navikt/core/react/src/date/datepicker/DatePicker.tsx b/@navikt/core/react/src/date/datepicker/DatePicker.tsx index 834bbfdf8d8..99b3d24cbd3 100644 --- a/@navikt/core/react/src/date/datepicker/DatePicker.tsx +++ b/@navikt/core/react/src/date/datepicker/DatePicker.tsx @@ -11,7 +11,6 @@ import { DateWrapper } from "../parts/DateWrapper"; import { getLocaleFromString, labels } from "../utils"; import DatePickerStandalone from "./DatePickerStandalone"; import Caption from "./parts/Caption"; -import DayButton from "./parts/DayButton"; import DropdownCaption from "./parts/DropdownCaption"; import { HeadRow } from "./parts/HeadRow"; import Row from "./parts/Row"; @@ -124,7 +123,6 @@ export const DatePicker = forwardRef( HeadRow, WeekNumber, Row, - Day: DayButton, }} className={cl("navds-date", className)} classNames={{ diff --git a/@navikt/core/react/src/date/datepicker/DatePickerStandalone.tsx b/@navikt/core/react/src/date/datepicker/DatePickerStandalone.tsx index 2c22b228dfa..c849c1fb323 100644 --- a/@navikt/core/react/src/date/datepicker/DatePickerStandalone.tsx +++ b/@navikt/core/react/src/date/datepicker/DatePickerStandalone.tsx @@ -5,7 +5,6 @@ import { DateRange, DayPicker, isMatch } from "react-day-picker"; import { omit } from "../../util"; import { getLocaleFromString, labels } from "../utils"; import Caption from "./parts/Caption"; -import DayButton from "./parts/DayButton"; import DropdownCaption from "./parts/DropdownCaption"; import { HeadRow } from "./parts/HeadRow"; import Row from "./parts/Row"; @@ -94,7 +93,6 @@ export const DatePickerStandalone: DatePickerStandaloneType = forwardRef< HeadRow, WeekNumber, Row, - Day: DayButton, }} className="navds-date" classNames={{ vhidden: "navds-sr-only" }} diff --git a/@navikt/core/react/src/date/datepicker/datepicker.stories.tsx b/@navikt/core/react/src/date/datepicker/datepicker.stories.tsx index a04ed2dffae..76f88ffef32 100644 --- a/@navikt/core/react/src/date/datepicker/datepicker.stories.tsx +++ b/@navikt/core/react/src/date/datepicker/datepicker.stories.tsx @@ -27,13 +27,13 @@ export const Default: StoryObj = { const [open, setOpen] = useState(false); const rangeCtx = useRangeDatepicker({ - fromDate: new Date("Aug 23 2020"), - toDate: new Date("Aug 23 2023"), + fromDate: new Date("Aug 23 2023"), + toDate: new Date("Aug 23 2029"), }); const singleCtx = useDatepicker({ fromDate: new Date("Aug 23 2020"), - toDate: new Date("Aug 23 2023"), + toDate: new Date("Aug 23 2029"), }); const newProps = { @@ -42,7 +42,7 @@ export const Default: StoryObj = { open, onClose: () => setOpen(false), fromDate: new Date("Aug 23 2020"), - toDate: new Date("Aug 23 2023"), + toDate: new Date("Aug 23 2029"), } : {}), }; diff --git a/@navikt/core/react/src/date/datepicker/parts/Row.tsx b/@navikt/core/react/src/date/datepicker/parts/Row.tsx index 9cd594ec205..14526769fb8 100644 --- a/@navikt/core/react/src/date/datepicker/parts/Row.tsx +++ b/@navikt/core/react/src/date/datepicker/parts/Row.tsx @@ -1,7 +1,8 @@ import { getUnixTime } from "date-fns"; import React from "react"; -import { Day, useDayPicker } from "react-day-picker"; +import { useDayPicker } from "react-day-picker"; import { Hide } from "../../../layout/responsive"; +import DayButton from "./DayButton"; import WeekNumber from "./WeekNumber"; /** @@ -37,7 +38,7 @@ function Row(props: RowProps): JSX.Element { style={styles.cell} key={getUnixTime(date)} > - + ))}