diff --git a/AGENTS.md b/AGENTS.md index 96f607481..4cbd29b49 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -132,7 +132,8 @@ Black-box service tests live in `server/api/test/`, unit tests next to the code. components). Controls come from the package; build a part it lacks on Base UI as its `custom-components.md` describes. - Use a package component when one fits (`Button`, `Link`, `Spinner`, `Badge`). Its class functions (`buttonClasses()`, `menuClasses()`, `badgeClasses()`) are for elements it can't render, such as a router link or a Base UI trigger. -- Action menus use `md`, including custom rows styled with `menuClasses()`. Compact three-dot trigger buttons keep `sm`. +- Menus have fixed density; do not pass `size` to `Menu.Root` or `menuClasses()`, or use `mu-compact` to size menu rows. + Compact three-dot trigger buttons keep `sm`. - Field text follows its component size on every device; do not add touch-specific font sizing. - Style with Tailwind CSS v4 and the package's `mu-` utilities (`bg-mu-surface`, `text-mu-text-secondary`, `rounded-mu-md`), text with its type classes (`mu-caption`, `mu-body`, `mu-label`, `mu-title`), and `cn()` for class merging. No Tailwind diff --git a/web/package.json b/web/package.json index f35c4d8db..0bc72a0ce 100644 --- a/web/package.json +++ b/web/package.json @@ -29,7 +29,7 @@ "@tanstack/react-query-devtools": "^5.100.9", "@usememos/canvas": "26.11.3", "@usememos/editor": "26.11.5", - "@usememos/ui": "26.11.23", + "@usememos/ui": "26.11.25", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "copy-to-clipboard": "^4.0.2", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index aeff90035..2e11dfde9 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -45,8 +45,8 @@ importers: specifier: 26.11.5 version: 26.11.5(react-dom@19.2.6(react@19.2.6))(react@19.2.6) '@usememos/ui': - specifier: 26.11.23 - version: 26.11.23(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6) + specifier: 26.11.25 + version: 26.11.25(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6) class-variance-authority: specifier: ^0.7.1 version: 0.7.1 @@ -981,8 +981,8 @@ packages: react-dom: optional: true - '@usememos/ui@26.11.23': - resolution: {integrity: sha512-fC3dyMDAASe407AcTHZ5kXM1U35Y+WvrXWHryQveSyMupaMeun3qUjE5HGPV56fGnYhydqYGApeQ/WvTrAQQVA==} + '@usememos/ui@26.11.25': + resolution: {integrity: sha512-kD0v47wcZVRrOdDHvTN5EanGiOi7Vlo9i+TcjVirFBA4whUgPt14H38r9Q0cXCThngVwfWoYfeDWiMqg4PpkSA==} peerDependencies: '@base-ui/react': 1.9.0 lucide-react: '>=1.0.0' @@ -2414,7 +2414,7 @@ snapshots: react: 19.2.6 react-dom: 19.2.6(react@19.2.6) - '@usememos/ui@26.11.23(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)': + '@usememos/ui@26.11.25(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)': dependencies: '@base-ui/react': 1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6) lucide-react: 1.34.0(react@19.2.6) diff --git a/web/src/components/AppSidebar/TagsSection.tsx b/web/src/components/AppSidebar/TagsSection.tsx index 8566b29b2..8b400e353 100644 --- a/web/src/components/AppSidebar/TagsSection.tsx +++ b/web/src/components/AppSidebar/TagsSection.tsx @@ -96,7 +96,7 @@ const TagsSection = ({ tagCount, onSelect, scope }: Props) => { + { {memoView.title} - + - {item.kind === "motion" && {t("attachment-library.labels.live")}} + {item.kind === "motion" && ( + + {t("attachment-library.labels.live")} + + )} - + { const { memo, parentPage, readonly } = props; @@ -163,7 +163,7 @@ const MemoActionMenu = (props: MemoActionMenuProps) => { }; return ( - + } />} />} diff --git a/web/src/components/MemoEditor/edit/Toolbar/AudienceMenu.tsx b/web/src/components/MemoEditor/edit/Toolbar/AudienceMenu.tsx index 2b3ac6479..7762e55d8 100644 --- a/web/src/components/MemoEditor/edit/Toolbar/AudienceMenu.tsx +++ b/web/src/components/MemoEditor/edit/Toolbar/AudienceMenu.tsx @@ -42,7 +42,7 @@ const AudienceMenu = ({ value, onChange, space, onSpaceChange, disabled }: Audie ]; return ( - + {/* The trigger starts with an icon (a space mark or the lock) inside a span, so it takes the package's icon-side padding itself; its gaps are the md icon gap, like a Button's. */} { return ( <> - +
- + } aria-label={t("common.more")} onClick={stop} />} /> diff --git a/web/src/components/MemoView/components/MemoHeader.tsx b/web/src/components/MemoView/components/MemoHeader.tsx index 4582296e3..4d9b80e91 100644 --- a/web/src/components/MemoView/components/MemoHeader.tsx +++ b/web/src/components/MemoView/components/MemoHeader.tsx @@ -121,7 +121,7 @@ const MemoHeader: React.FC = ({ timeDisplay = "relative", showC const NewBadge = () => { const t = useTranslate(); return ( - + {t("memo.new-badge")} ); diff --git a/web/src/components/Settings/AISection.tsx b/web/src/components/Settings/AISection.tsx index 0e3f4511d..d95f828d2 100644 --- a/web/src/components/Settings/AISection.tsx +++ b/web/src/components/Settings/AISection.tsx @@ -225,7 +225,9 @@ const AISection = () => {
- {t("setting.ai.byok-label")} + + {t("setting.ai.byok-label")} +

{t("setting.ai.byok-title")}

{t("setting.ai.byok-description")}

diff --git a/web/src/components/Settings/LinkedIdentitySection.tsx b/web/src/components/Settings/LinkedIdentitySection.tsx index e7794b801..1e1feca76 100644 --- a/web/src/components/Settings/LinkedIdentitySection.tsx +++ b/web/src/components/Settings/LinkedIdentitySection.tsx @@ -153,7 +153,7 @@ const LinkedIdentitySection = () => {
{row.title} - {row.typeLabel} + {row.typeLabel}
diff --git a/web/src/components/Settings/SSOSection.tsx b/web/src/components/Settings/SSOSection.tsx index 50962382d..0ebb69fbe 100644 --- a/web/src/components/Settings/SSOSection.tsx +++ b/web/src/components/Settings/SSOSection.tsx @@ -130,7 +130,7 @@ const SSOSection = () => {
{row.title} - {row.typeLabel} + {row.typeLabel}
diff --git a/web/src/components/Settings/StorageSection.tsx b/web/src/components/Settings/StorageSection.tsx index a310d4f5b..d00b3b7d4 100644 --- a/web/src/components/Settings/StorageSection.tsx +++ b/web/src/components/Settings/StorageSection.tsx @@ -297,7 +297,7 @@ const StorageSection = () => { {option.badges && ( {option.badges.map((badge) => ( - + {t(badge)} ))} diff --git a/web/src/components/Settings/TagsSection.tsx b/web/src/components/Settings/TagsSection.tsx index a33bd69a3..0eecf96da 100644 --- a/web/src/components/Settings/TagsSection.tsx +++ b/web/src/components/Settings/TagsSection.tsx @@ -222,7 +222,9 @@ const TagsSection = () => {

{t("setting.tags.configured-rules")}

- {configuredEntries.length} + + {configuredEntries.length} +
{configuredEntries.length === 0 ? ( diff --git a/web/src/components/UserMenu.tsx b/web/src/components/UserMenu.tsx index f80de3567..26226f6cd 100644 --- a/web/src/components/UserMenu.tsx +++ b/web/src/components/UserMenu.tsx @@ -49,14 +49,14 @@ const PreferenceSubmenu = ({ icon: Icon, label, value, options, onChange, classN
)}
diff --git a/web/src/pages/MemoViews.tsx b/web/src/pages/MemoViews.tsx index fde24b043..6931d83af 100644 --- a/web/src/pages/MemoViews.tsx +++ b/web/src/pages/MemoViews.tsx @@ -596,7 +596,11 @@ const MemoViews = () => {

{t("setting.memo-view.all")}

- {!isPending && !isError && {memoViews.length}} + {!isPending && !isError && ( + + {memoViews.length} + + )}
{isPending ? ( diff --git a/web/tests/app-sidebar-logo.test.tsx b/web/tests/app-sidebar-logo.test.tsx index 1062e8202..b92280026 100644 --- a/web/tests/app-sidebar-logo.test.tsx +++ b/web/tests/app-sidebar-logo.test.tsx @@ -601,7 +601,7 @@ describe("App sidebar logo", () => { expect(sidebarState.setMobileOpen).toHaveBeenCalledWith(false); }); - it("uses md text-only actions for a saved view", async () => { + it("uses fixed-density text-only actions for a saved view", async () => { authState.memoViews = [{ name: "memoViews/1", title: "testgp" }]; render( @@ -612,7 +612,7 @@ describe("App sidebar logo", () => { fireEvent.click(screen.getByRole("button", { name: "common.edit testgp" })); const menu = await screen.findByRole("menu"); - expect(menu.closest(".mu-s-md") ?? menu.querySelector(".mu-s-md")).not.toBeNull(); + expect(menu).toHaveClass("mu-s-sm"); const editItem = screen.getByRole("menuitem", { name: "common.edit" }); const deleteItem = screen.getByRole("menuitem", { name: "common.delete" }); expect(editItem.querySelector("svg")).toBeNull();