-
+
{
return (
@@ -78,7 +78,7 @@ const HowToUseDisclosure = () => {
aria-expanded={open}
onClick={() => setOpen((v) => !v)}
>
-
+
{t("setting.access-token.how-to-use")}
{open && (
diff --git a/web/src/components/StatisticsView/MonthNavigator.tsx b/web/src/components/StatisticsView/MonthNavigator.tsx
index 455be6e9..83ad4c67 100644
--- a/web/src/components/StatisticsView/MonthNavigator.tsx
+++ b/web/src/components/StatisticsView/MonthNavigator.tsx
@@ -26,7 +26,7 @@ export const MonthNavigator = memo(({ visibleMonth, onMonthChange }: MonthNaviga
aria-label={t("common.previous-month")}
className="size-6 rounded text-muted-foreground/65 hover:bg-muted/50 hover:text-foreground/90"
>
-
+
diff --git a/web/src/components/TagTree.tsx b/web/src/components/TagTree.tsx
index d88f6966..7319ef85 100644
--- a/web/src/components/TagTree.tsx
+++ b/web/src/components/TagTree.tsx
@@ -82,7 +82,7 @@ const TagMark = () =>
(
);
diff --git a/web/src/components/ui/dialog.tsx b/web/src/components/ui/dialog.tsx
index 169f800c..5e2dd506 100644
--- a/web/src/components/ui/dialog.tsx
+++ b/web/src/components/ui/dialog.tsx
@@ -64,7 +64,7 @@ const DialogContent = React.forwardRef<
>
{children}
{showCloseButton && (
-
+
Close
@@ -75,7 +75,7 @@ const DialogContent = React.forwardRef<
DialogContent.displayName = "DialogContent";
const DialogHeader = React.forwardRef, React.ComponentPropsWithoutRef<"div">>(({ className, ...props }, ref) => (
-
+
));
DialogHeader.displayName = "DialogHeader";
diff --git a/web/src/components/ui/dropdown-menu.tsx b/web/src/components/ui/dropdown-menu.tsx
index 8b686e29..1d3be49e 100644
--- a/web/src/components/ui/dropdown-menu.tsx
+++ b/web/src/components/ui/dropdown-menu.tsx
@@ -79,8 +79,8 @@ function DropdownMenuItem({
className={cn(
"data-highlighted:bg-accent data-highlighted:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:data-highlighted:bg-destructive/10 data-[variant=destructive]:data-highlighted:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center rounded-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
size === "sm"
- ? "min-h-7 gap-1.5 px-2 py-1 text-ui data-[inset]:pl-7 [&_svg:not([class*='size-'])]:size-3.5"
- : "gap-2 px-2 py-1.5 text-sm data-[inset]:pl-8 [&_svg:not([class*='size-'])]:size-4",
+ ? "min-h-7 gap-1.5 px-2 py-1 text-ui data-[inset]:ps-7 [&_svg:not([class*='size-'])]:size-3.5"
+ : "gap-2 px-2 py-1.5 text-sm data-[inset]:ps-8 [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
@@ -97,14 +97,14 @@ function DropdownMenuCheckboxItem({ className, children, checked, ...props }: Dr
className={cn(
"data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default items-center rounded-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
size === "sm"
- ? "min-h-7 gap-1.5 py-1 pr-2 pl-7 text-ui [&_svg:not([class*='size-'])]:size-3.5"
- : "gap-2 py-1.5 pr-2 pl-8 text-sm [&_svg:not([class*='size-'])]:size-4",
+ ? "min-h-7 gap-1.5 py-1 pe-2 ps-7 text-ui [&_svg:not([class*='size-'])]:size-3.5"
+ : "gap-2 py-1.5 pe-2 ps-8 text-sm [&_svg:not([class*='size-'])]:size-4",
className,
)}
checked={checked}
{...props}
>
-
+
@@ -127,13 +127,13 @@ function DropdownMenuRadioItem({ className, children, ...props }: DropdownMenuPr
className={cn(
"data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default items-center rounded-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
size === "sm"
- ? "min-h-7 gap-1.5 py-1 pr-2 pl-7 text-ui [&_svg:not([class*='size-'])]:size-3.5"
- : "gap-2 py-1.5 pr-2 pl-8 text-sm [&_svg:not([class*='size-'])]:size-4",
+ ? "min-h-7 gap-1.5 py-1 pe-2 ps-7 text-ui [&_svg:not([class*='size-'])]:size-3.5"
+ : "gap-2 py-1.5 pe-2 ps-8 text-sm [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
>
-
+
@@ -156,7 +156,7 @@ function DropdownMenuLabel({
);
@@ -180,7 +180,7 @@ function DropdownMenuShortcut({ className, ...props }: React.ComponentProps<"spa
return (
);
@@ -207,14 +207,14 @@ function DropdownMenuSubTrigger({
className={cn(
"data-highlighted:bg-accent data-highlighted:text-accent-foreground data-popup-open:bg-accent data-popup-open:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center rounded-sm outline-hidden select-none [&_svg]:pointer-events-none [&_svg]:shrink-0",
size === "sm"
- ? "min-h-7 gap-1.5 px-2 py-1 text-ui data-[inset]:pl-7 [&_svg:not([class*='size-'])]:size-3.5"
- : "gap-2 px-2 py-1.5 text-sm data-[inset]:pl-8 [&_svg:not([class*='size-'])]:size-4",
+ ? "min-h-7 gap-1.5 px-2 py-1 text-ui data-[inset]:ps-7 [&_svg:not([class*='size-'])]:size-3.5"
+ : "gap-2 px-2 py-1.5 text-sm data-[inset]:ps-8 [&_svg:not([class*='size-'])]:size-4",
className,
)}
{...props}
>
{children}
-
+
);
}
@@ -226,7 +226,7 @@ function DropdownMenuSubContent({ className, size, ...props }: DropdownMenuConte
{children}
- }>
+ }
+ >
diff --git a/web/src/components/ui/sheet.tsx b/web/src/components/ui/sheet.tsx
index 1e1178bc..1eb67007 100644
--- a/web/src/components/ui/sheet.tsx
+++ b/web/src/components/ui/sheet.tsx
@@ -63,7 +63,7 @@ const SheetContent = React.forwardRef<
{...props}
>
{children}
-
+
Close
diff --git a/web/src/components/ui/switch.tsx b/web/src/components/ui/switch.tsx
index d57ca34a..25413fbf 100644
--- a/web/src/components/ui/switch.tsx
+++ b/web/src/components/ui/switch.tsx
@@ -14,7 +14,7 @@ function Switch({ className, ...props }: SwitchPrimitive.Root.Props) {
diff --git a/web/src/hooks/useUserLocale.ts b/web/src/hooks/useUserLocale.ts
index cd3946c3..eae576ef 100644
--- a/web/src/hooks/useUserLocale.ts
+++ b/web/src/hooks/useUserLocale.ts
@@ -1,15 +1,14 @@
-import { useEffect } from "react";
-import { useTranslation } from "react-i18next";
+import { useEffect, useSyncExternalStore } from "react";
import { useAuth } from "@/contexts/AuthContext";
-import { getLocaleWithFallback, loadLocale } from "@/utils/i18n";
+import { getLocaleDirection, getLocaleWithFallback, type LocaleDirection, loadLocale, subscribeToLocaleDirection } from "@/utils/i18n";
/**
* Hook that reactively applies user locale preference.
* Priority: User setting → localStorage → browser language
*/
export const useUserLocale = () => {
- const { i18n } = useTranslation();
const { userGeneralSetting } = useAuth();
+ const direction = useSyncExternalStore(subscribeToLocaleDirection, getLocaleDirection, () => "ltr");
// Apply locale when user setting changes or user logs in
useEffect(() => {
@@ -20,16 +19,5 @@ export const useUserLocale = () => {
loadLocale(locale);
}, [userGeneralSetting?.locale]);
- // Update HTML lang and dir attributes based on current locale
- useEffect(() => {
- const currentLocale = i18n.language;
- document.documentElement.setAttribute("lang", currentLocale);
-
- // RTL languages
- if (["ar", "fa", "he"].includes(currentLocale)) {
- document.documentElement.setAttribute("dir", "rtl");
- } else {
- document.documentElement.setAttribute("dir", "ltr");
- }
- }, [i18n.language]);
+ return direction;
};
diff --git a/web/src/layouts/RootLayout.tsx b/web/src/layouts/RootLayout.tsx
index f3666e42..f8908bf6 100644
--- a/web/src/layouts/RootLayout.tsx
+++ b/web/src/layouts/RootLayout.tsx
@@ -70,7 +70,7 @@ const RootLayoutContent = () => {
{md && (
-
+
)}
-
+
{profile.demo && }
diff --git a/web/src/lib/markdownStyles.ts b/web/src/lib/markdownStyles.ts
index 3edef3b2..e838b2fd 100644
--- a/web/src/lib/markdownStyles.ts
+++ b/web/src/lib/markdownStyles.ts
@@ -40,9 +40,9 @@ const headingClasses: Record = {
*/
export const markdownStyles = {
paragraph: "my-0 mb-2 leading-6",
- blockquote: "my-0 mb-2 border-l-4 border-primary/30 pl-3 text-muted-foreground italic",
- bulletList: "my-0 mb-2 list-outside pl-6 list-disc",
- orderedList: "my-0 mb-2 list-outside pl-6 list-decimal",
+ blockquote: "my-0 mb-2 border-s-4 border-primary/30 ps-3 text-muted-foreground italic",
+ bulletList: "my-0 mb-2 list-outside ps-6 list-disc",
+ orderedList: "my-0 mb-2 list-outside ps-6 list-decimal",
listItem: "mt-0.5 leading-6",
// Shared by the read-only task item (MemoContent/markdown/List.tsx) and the
// editor so the checkbox + text grid stays identical in both.
diff --git a/web/src/pages/AdminSignIn.tsx b/web/src/pages/AdminSignIn.tsx
index 56ee5599..1b4520c4 100644
--- a/web/src/pages/AdminSignIn.tsx
+++ b/web/src/pages/AdminSignIn.tsx
@@ -22,7 +22,7 @@ const AdminSignIn = () => {
-
+
{t("auth.back-to-sign-in")}
diff --git a/web/src/pages/SignIn.tsx b/web/src/pages/SignIn.tsx
index c0e377b8..678cdf5b 100644
--- a/web/src/pages/SignIn.tsx
+++ b/web/src/pages/SignIn.tsx
@@ -55,7 +55,7 @@ const SignIn = () => {
>
{t("auth.admin-sign-in")}
-
+
)}
diff --git a/web/src/utils/i18n.ts b/web/src/utils/i18n.ts
index 4b1090e3..5b26c120 100644
--- a/web/src/utils/i18n.ts
+++ b/web/src/utils/i18n.ts
@@ -4,6 +4,31 @@ import i18n, { locales, TLocale } from "@/i18n";
import enTranslation from "@/locales/en.json";
const LOCALE_STORAGE_KEY = "memos-locale";
+const LOCALE_DIRECTION_CHANGE_EVENT = "memos:locale-direction-change";
+
+export type LocaleDirection = "ltr" | "rtl";
+
+export const getLocaleDirection = (): LocaleDirection =>
+ typeof document !== "undefined" && document.documentElement.dir === "rtl" ? "rtl" : "ltr";
+
+export const subscribeToLocaleDirection = (listener: () => void): (() => void) => {
+ if (typeof window === "undefined") return () => {};
+ window.addEventListener(LOCALE_DIRECTION_CHANGE_EVENT, listener);
+ return () => window.removeEventListener(LOCALE_DIRECTION_CHANGE_EVENT, listener);
+};
+
+export const applyDocumentLocale = (locale: string): LocaleDirection => {
+ const direction = i18n.dir(locale);
+ if (typeof document === "undefined") return direction;
+
+ const previousDirection = document.documentElement.getAttribute("dir");
+ document.documentElement.lang = locale;
+ document.documentElement.dir = direction;
+ if (previousDirection !== direction && typeof window !== "undefined") {
+ window.dispatchEvent(new Event(LOCALE_DIRECTION_CHANGE_EVENT));
+ }
+ return direction;
+};
const getStoredLocale = (): Locale | null => {
try {
@@ -95,8 +120,8 @@ export const getLocaleWithFallback = (userLocale?: string): Locale => {
export const loadLocale = (locale: string): Locale => {
const validLocale = isValidLocale(locale) ? (locale as Locale) : findNearestMatchedLanguage(navigator.language);
setStoredLocale(validLocale);
+ applyDocumentLocale(validLocale);
i18n.changeLanguage(validLocale);
- document.documentElement.lang = validLocale;
return validLocale;
};
diff --git a/web/tests/column-grid.test.tsx b/web/tests/column-grid.test.tsx
index 629ee04f..d0bd0e49 100644
--- a/web/tests/column-grid.test.tsx
+++ b/web/tests/column-grid.test.tsx
@@ -1,5 +1,6 @@
+import { DirectionProvider } from "@base-ui/react/direction-provider";
import { render } from "@testing-library/react";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
import ColumnGrid from "@/components/ColumnGrid";
// jsdom has no layout engine (offsetHeight/clientWidth are 0) and no ResizeObserver,
@@ -41,4 +42,21 @@ describe("", () => {
expect(container.querySelectorAll('[data-testid="card"]')).toHaveLength(0);
});
+
+ it("places the first packed column at inline start in RTL", () => {
+ const clientWidth = vi.spyOn(HTMLElement.prototype, "clientWidth", "get").mockReturnValue(532);
+ const offsetHeight = vi.spyOn(HTMLElement.prototype, "offsetHeight", "get").mockReturnValue(100);
+
+ const { getByTestId } = render(
+
+ {i.id}
} />
+ ,
+ );
+
+ expect(getByTestId("card-a").parentElement?.style.transform).toContain("translate3d(272px");
+ expect(getByTestId("card-b").parentElement?.style.transform).toContain("translate3d(0px");
+
+ clientWidth.mockRestore();
+ offsetHeight.mockRestore();
+ });
});
diff --git a/web/tests/dropdown-menu-size.test.tsx b/web/tests/dropdown-menu-size.test.tsx
index 49ff4291..1c2369b5 100644
--- a/web/tests/dropdown-menu-size.test.tsx
+++ b/web/tests/dropdown-menu-size.test.tsx
@@ -1,6 +1,15 @@
+import { DirectionProvider } from "@base-ui/react/direction-provider";
import { fireEvent, render, screen } from "@testing-library/react";
import { describe, expect, it } from "vitest";
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSub,
+ DropdownMenuSubContent,
+ DropdownMenuSubTrigger,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
describe("DropdownMenu sizing", () => {
it("applies compact content and item density through the sm size", async () => {
@@ -25,4 +34,37 @@ describe("DropdownMenu sizing", () => {
}
expect(screen.getByRole("menuitem", { name: "Delete" })).toHaveAttribute("data-variant", "destructive");
});
+
+ it("opens submenus toward the inline end in RTL", async () => {
+ render(
+
+
+ Actions
+
+
+ More
+
+ Nested action
+
+
+
+
+ ,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "Actions" }));
+ const trigger = await screen.findByRole("menuitem", { name: "More" });
+ expect(trigger.querySelector("svg")).toHaveClass("ms-auto", "rtl:rotate-180");
+
+ trigger.focus();
+ fireEvent.keyDown(trigger, { key: "ArrowLeft" });
+
+ const nestedAction = await screen.findByRole("menuitem", { name: "Nested action" });
+ const submenu = nestedAction.closest('[data-slot="dropdown-menu-content"]');
+ expect(submenu).toHaveAttribute("data-side", "inline-end");
+ expect(submenu).toHaveClass(
+ "data-[side=inline-end]:data-starting-style:-translate-x-2",
+ "rtl:data-[side=inline-end]:data-starting-style:translate-x-2",
+ );
+ });
});
diff --git a/web/tests/i18n-document-direction.test.ts b/web/tests/i18n-document-direction.test.ts
new file mode 100644
index 00000000..b465ff70
--- /dev/null
+++ b/web/tests/i18n-document-direction.test.ts
@@ -0,0 +1,47 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import i18n from "@/i18n";
+import { getLocaleDirection, loadLocale, subscribeToLocaleDirection } from "@/utils/i18n";
+
+const originalLanguage = i18n.language;
+const originalLangAttribute = document.documentElement.getAttribute("lang");
+const originalDirAttribute = document.documentElement.getAttribute("dir");
+
+const restoreAttribute = (name: "lang" | "dir", value: string | null) => {
+ if (value === null) {
+ document.documentElement.removeAttribute(name);
+ } else {
+ document.documentElement.setAttribute(name, value);
+ }
+};
+
+describe("document locale direction", () => {
+ afterEach(async () => {
+ localStorage.clear();
+ restoreAttribute("lang", originalLangAttribute);
+ restoreAttribute("dir", originalDirAttribute);
+ await i18n.changeLanguage(originalLanguage);
+ });
+
+ it.each([
+ ["ar", "rtl"],
+ ["fa", "rtl"],
+ ["he", "rtl"],
+ ["en", "ltr"],
+ ] as const)("sets %s as a %s document", (locale, direction) => {
+ loadLocale(locale);
+
+ expect(document.documentElement).toHaveAttribute("lang", locale);
+ expect(document.documentElement).toHaveAttribute("dir", direction);
+ });
+
+ it("notifies direction consumers before translations finish loading", () => {
+ const listener = vi.fn();
+ const unsubscribe = subscribeToLocaleDirection(listener);
+
+ loadLocale("ar");
+
+ expect(getLocaleDirection()).toBe("rtl");
+ expect(listener).toHaveBeenCalledOnce();
+ unsubscribe();
+ });
+});
diff --git a/web/tests/memo-content-list.test.tsx b/web/tests/memo-content-list.test.tsx
index cb5addad..86d6fdc7 100644
--- a/web/tests/memo-content-list.test.tsx
+++ b/web/tests/memo-content-list.test.tsx
@@ -1,10 +1,10 @@
import { renderToStaticMarkup } from "react-dom/server";
import ReactMarkdown from "react-markdown";
import remarkGfm from "remark-gfm";
-import { List, ListItem } from "@/components/MemoContent/markdown";
-import { TASK_LIST_CLASS, TASK_LIST_ITEM_CLASS } from "@/components/MemoContent/constants";
-import { remarkSplitMixedTaskLists } from "@/utils/remark-plugins/remark-split-mixed-task-lists";
import { describe, expect, it } from "vitest";
+import { TASK_LIST_CLASS, TASK_LIST_ITEM_CLASS } from "@/components/MemoContent/constants";
+import { List, ListItem } from "@/components/MemoContent/markdown";
+import { remarkSplitMixedTaskLists } from "@/utils/remark-plugins/remark-split-mixed-task-lists";
const renderListContent = (content: string): string =>
renderToStaticMarkup(
@@ -27,9 +27,9 @@ describe("memo content lists", () => {
expect(listOpenTags).toHaveLength(2);
expect(listOpenTags[0]).toContain(TASK_LIST_CLASS);
expect(listOpenTags[0]).toContain("list-none");
- expect(listOpenTags[0]).not.toContain("pl-6");
+ expect(listOpenTags[0]).not.toContain("ps-6");
expect(listOpenTags[1]).not.toContain(TASK_LIST_CLASS);
- expect(listOpenTags[1]).toContain("pl-6");
+ expect(listOpenTags[1]).toContain("ps-6");
expect(listOpenTags[1]).toContain("list-disc");
expect(html).toContain('milk');
expect(html).not.toContain('\nmilk
');
diff --git a/web/tests/memo-display-setting-menu.test.tsx b/web/tests/memo-display-setting-menu.test.tsx
index 4e70d19b..643c5969 100644
--- a/web/tests/memo-display-setting-menu.test.tsx
+++ b/web/tests/memo-display-setting-menu.test.tsx
@@ -1,3 +1,4 @@
+import { DirectionProvider } from "@base-ui/react/direction-provider";
import { fireEvent, render, screen } from "@testing-library/react";
import { beforeEach, describe, expect, it, vi } from "vitest";
import { SIDEBAR_SECTION_ACTION_BUTTON_CLASSES, SIDEBAR_SECTION_ACTION_ICON_CLASSES } from "@/components/AppSidebar/SidebarSection";
@@ -58,4 +59,19 @@ describe("MemoDisplaySettingMenu", () => {
expect(compactMode).toHaveAttribute("aria-disabled", "true");
expect(screen.getByText("Grid layouts always use compact cards.")).toBeInTheDocument();
});
+
+ it("moves horizontally in the visual direction for RTL layouts", () => {
+ render(
+
+
+
+
+ ,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "View options" }));
+ fireEvent.keyDown(screen.getByRole("radiogroup", { name: "Layout" }), { key: "ArrowLeft" });
+
+ expect(screen.getByRole("radio", { name: "2 columns" })).toBeChecked();
+ });
});
diff --git a/web/tests/scroll-restoration.test.tsx b/web/tests/scroll-restoration.test.tsx
index 04636c35..436a7c19 100644
--- a/web/tests/scroll-restoration.test.tsx
+++ b/web/tests/scroll-restoration.test.tsx
@@ -1,7 +1,9 @@
+import { useDirection } from "@base-ui/react/direction-provider";
import { act, render, screen, waitFor } from "@testing-library/react";
import { createMemoryRouter, RouterProvider } from "react-router-dom";
import { beforeEach, describe, expect, it, vi } from "vitest";
import App from "@/App";
+import { useUserLocale } from "@/hooks/useUserLocale";
vi.mock("@/contexts/InstanceContext", () => ({
useInstance: () => ({
@@ -20,6 +22,7 @@ describe("scroll restoration", () => {
let scrollY = 0;
beforeEach(() => {
+ vi.mocked(useUserLocale).mockReturnValue("ltr");
scrollY = 0;
Object.defineProperty(window, "scrollY", {
configurable: true,
@@ -27,6 +30,25 @@ describe("scroll restoration", () => {
});
});
+ it("provides the active locale direction to routed content", async () => {
+ vi.mocked(useUserLocale).mockReturnValue("rtl");
+ const DirectionProbe = () => Direction: {useDirection()}
;
+ const router = createMemoryRouter(
+ [
+ {
+ path: "/",
+ element: ,
+ children: [{ index: true, element: }],
+ },
+ ],
+ { initialEntries: ["/"] },
+ );
+
+ render();
+
+ expect(await screen.findByText("Direction: rtl")).toBeInTheDocument();
+ });
+
it("resets new routes and restores history entries", async () => {
const scrollTo = vi.spyOn(window, "scrollTo").mockImplementation((xOrOptions, y) => {
scrollY = typeof xOrOptions === "number" ? (y ?? 0) : (xOrOptions.top ?? 0);
diff --git a/web/tests/select.test.tsx b/web/tests/select.test.tsx
index ab991beb..1937ccff 100644
--- a/web/tests/select.test.tsx
+++ b/web/tests/select.test.tsx
@@ -28,5 +28,9 @@ describe("Select", () => {
const popup = document.querySelector('[data-slot="select-content"]');
expect(popup).not.toBeNull();
expect(popup?.parentElement).toHaveClass("isolate", "z-dropdown");
+
+ const selectedOption = screen.getByRole("option", { name: "Last updated" });
+ expect(selectedOption).toHaveClass("pe-8", "ps-2");
+ expect(selectedOption.querySelector('[data-slot="select-item-indicator"]')).toHaveClass("end-2");
});
});
diff --git a/web/tests/sidebar-resize-handle.test.tsx b/web/tests/sidebar-resize-handle.test.tsx
index 1705cc05..099158e1 100644
--- a/web/tests/sidebar-resize-handle.test.tsx
+++ b/web/tests/sidebar-resize-handle.test.tsx
@@ -1,3 +1,4 @@
+import { DirectionProvider } from "@base-ui/react/direction-provider";
import { fireEvent, render, screen } from "@testing-library/react";
import { type CSSProperties, useRef, useState } from "react";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
@@ -18,25 +19,35 @@ vi.mock("@/utils/i18n", () => ({
// handle writes to it. `railMounted` stands in for RootLayout's `md &&` gate, which unmounts the
// rail — and with it the handle — when the window drops below the desktop breakpoint, while the
// shell itself stays mounted.
-const Harness = ({ onWidthChange = vi.fn(), railMounted = true }: { onWidthChange?: (width: number) => void; railMounted?: boolean }) => {
+const Harness = ({
+ onWidthChange = vi.fn(),
+ railMounted = true,
+ direction = "ltr",
+}: {
+ onWidthChange?: (width: number) => void;
+ railMounted?: boolean;
+ direction?: "ltr" | "rtl";
+}) => {
const targetRef = useRef(null);
const [width, setWidth] = useState(SIDEBAR_DEFAULT_WIDTH);
return (
-
- {railMounted && (
- {
- setWidth(next);
- onWidthChange(next);
- }}
- targetRef={targetRef}
- />
- )}
-
+
+
+ {railMounted && (
+ {
+ setWidth(next);
+ onWidthChange(next);
+ }}
+ targetRef={targetRef}
+ />
+ )}
+
+
);
};
@@ -111,6 +122,21 @@ describe("", () => {
expect(onWidthChange).toHaveBeenLastCalledWith(SIDEBAR_DEFAULT_WIDTH);
});
+ it("mirrors keyboard and pointer resizing for a right-hand RTL sidebar", () => {
+ const onWidthChange = vi.fn();
+ render();
+ const handle = screen.getByRole("separator");
+
+ expect(handle).toHaveClass("-end-1");
+ fireEvent.keyDown(handle, { key: "ArrowLeft" });
+ expect(onWidthChange).toHaveBeenLastCalledWith(SIDEBAR_DEFAULT_WIDTH + 16);
+ fireEvent.keyDown(handle, { key: "ArrowRight" });
+ expect(onWidthChange).toHaveBeenLastCalledWith(SIDEBAR_DEFAULT_WIDTH);
+
+ drag(SIDEBAR_DEFAULT_WIDTH, SIDEBAR_DEFAULT_WIDTH - 40);
+ expect(shellWidthVar()).toBe(`${SIDEBAR_DEFAULT_WIDTH + 40}px`);
+ });
+
it("jumps to each bound with Home and End", () => {
const onWidthChange = vi.fn();
render();
diff --git a/web/tests/switch.test.tsx b/web/tests/switch.test.tsx
new file mode 100644
index 00000000..4f32e019
--- /dev/null
+++ b/web/tests/switch.test.tsx
@@ -0,0 +1,16 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { Switch } from "@/components/ui/switch";
+
+describe("Switch", () => {
+ it("moves the checked thumb toward the inline end in both text directions", () => {
+ render();
+
+ const root = screen.getByRole("switch", { name: "Example setting" });
+ const thumb = root.querySelector('[data-slot="switch-thumb"]');
+
+ expect(root).toHaveAttribute("aria-checked", "true");
+ expect(thumb).toHaveAttribute("data-checked");
+ expect(thumb).toHaveClass("data-checked:translate-x-[calc(100%-2px)]", "rtl:data-checked:-translate-x-[calc(100%-2px)]");
+ });
+});
diff --git a/web/tests/user-locale-direction.test.tsx b/web/tests/user-locale-direction.test.tsx
new file mode 100644
index 00000000..c4fc09a8
--- /dev/null
+++ b/web/tests/user-locale-direction.test.tsx
@@ -0,0 +1,39 @@
+import { renderHook, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { useUserLocale } from "@/hooks/useUserLocale";
+import i18n from "@/i18n";
+
+vi.mock("@/contexts/AuthContext", () => ({
+ useAuth: () => ({ userGeneralSetting: { locale: "ar" } }),
+}));
+
+const originalLanguage = i18n.language;
+const originalLangAttribute = document.documentElement.getAttribute("lang");
+const originalDirAttribute = document.documentElement.getAttribute("dir");
+
+describe("useUserLocale", () => {
+ beforeEach(async () => {
+ localStorage.clear();
+ localStorage.setItem("memos-locale", "en");
+ document.documentElement.lang = "en";
+ document.documentElement.dir = "ltr";
+ await i18n.changeLanguage("en");
+ });
+
+ afterEach(async () => {
+ localStorage.clear();
+ if (originalLangAttribute === null) document.documentElement.removeAttribute("lang");
+ else document.documentElement.lang = originalLangAttribute;
+ if (originalDirAttribute === null) document.documentElement.removeAttribute("dir");
+ else document.documentElement.dir = originalDirAttribute;
+ await i18n.changeLanguage(originalLanguage);
+ });
+
+ it("keeps the user setting direction while its translations load", async () => {
+ const { result } = renderHook(() => useUserLocale());
+
+ await waitFor(() => expect(result.current).toBe("rtl"));
+ expect(document.documentElement).toHaveAttribute("lang", "ar");
+ expect(document.documentElement).toHaveAttribute("dir", "rtl");
+ });
+});