Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(calendar): arrows changing order when html has dir="rtl" #3656

Merged
merged 3 commits into from
Aug 30, 2024
Merged

fix(calendar): arrows changing order when html has dir="rtl" #3656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eccacec
fix(calendar): #3641,#3642 add order and row-reverse to arrows for rt…
ameybh Aug 13, 2024
8162066
chore(changeset): patch @nextui-org/calendar
ameybh Aug 13, 2024
4b34d6c
chore(changeset): add missing package and revise changeset message
wingkwong Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/slow-forks-nail.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/calendar": patch
"@nextui-org/theme": patch
---

fixed arrow keys order when html has dir="rtl" (#3641, #3642)
7 changes: 2 additions & 5 deletions packages/components/calendar/src/calendar-base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import type {HTMLAttributes, ReactNode, RefObject} from "react";

import {Fragment} from "react";
import {useState} from "react";
import {useLocale} from "@react-aria/i18n";
import {VisuallyHidden} from "@react-aria/visually-hidden";
import {Button} from "@nextui-org/button";
import {chain, mergeProps} from "@react-aria/utils";
Expand Down Expand Up @@ -55,8 +54,6 @@ export function CalendarBase(props: CalendarBaseProps) {

const [direction, setDirection] = useState<number>(0);

const {direction: rtlDirection} = useLocale();

const currentMonth = state.visibleRange.start;

const headers: React.ReactNode[] = [];
Expand All @@ -72,7 +69,7 @@ export function CalendarBase(props: CalendarBaseProps) {
{...prevButtonProps}
onPress={chain(prevButtonProps.onPress, () => setDirection(-1))}
>
{rtlDirection === "rtl" ? <ChevronRightIcon /> : <ChevronLeftIcon />}
<ChevronLeftIcon />
</Button>
)}
<CalendarHeader
Expand All @@ -86,7 +83,7 @@ export function CalendarBase(props: CalendarBaseProps) {
{...nextButtonProps}
onPress={chain(nextButtonProps.onPress, () => setDirection(1))}
>
{rtlDirection === "rtl" ? <ChevronLeftIcon /> : <ChevronRightIcon />}
<ChevronRightIcon />
</Button>
)}
</Fragment>,
Expand Down
8 changes: 4 additions & 4 deletions packages/core/theme/src/components/calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ const calendar = tv({
"rounded-large overflow-x-auto bg-default-50 dark:bg-background",
"w-[calc(var(--visible-months)_*_var(--calendar-width))]",
],
prevButton: [],
nextButton: [],
prevButton: ["order-1"],
nextButton: ["order-3"],
headerWrapper: [
"px-4 py-2 flex items-center justify-between gap-2 bg-content1 overflow-hidden",
"px-4 py-2 flex items-center justify-between gap-2 bg-content1 overflow-hidden rtl:flex-row-reverse",
"[&_.chevron-icon]:flex-none",
// month/year picker wrapper
"after:content-['']",
"after:bg-content1 origin-top",
"after:w-full after:h-0",
"after:absolute after:top-0 after:left-0",
],
header: "flex w-full items-center justify-center gap-2 z-10",
header: "flex w-full items-center justify-center gap-2 z-10 order-2",
title: "text-default-500 text-small font-medium",
content: "w-[calc(var(--visible-months)_*_var(--calendar-width))]",
gridWrapper: "flex max-w-full overflow-hidden pb-2 h-auto relative",
Expand Down