Compare commits

..

1 Commits

Author SHA1 Message Date
Philip Okugbe 965c864221 Revert "fix: prevent browser tab fallback in editor (#2123)"
This reverts commit 1d2486455f.
2026-05-19 14:06:45 +01:00
119 changed files with 194 additions and 1064 deletions
@@ -408,10 +408,6 @@
"Write...": "Write...",
"Column count": "Column count",
"{{count}} Columns": "{{count}} Columns",
"{{count}} command available_one": "1 command available",
"{{count}} command available_other": "{{count}} commands available",
"{{count}} result available_one": "1 result available",
"{{count}} result available_other": "{{count}} results available",
"Equal columns": "Equal columns",
"Left sidebar": "Left sidebar",
"Right sidebar": "Right sidebar",
@@ -877,12 +873,9 @@
"AI Chat": "AI Chat",
"Analyze for insights": "Analyze for insights",
"Ask anything...": "Ask anything...",
"Assistant said:": "Assistant said:",
"Chat history": "Chat history",
"Chat name": "Chat name",
"Chat transcript": "Chat transcript",
"Close": "Close",
"Copy assistant response": "Copy assistant response",
"Docmost AI": "Docmost AI",
"Failed to load chat. An error occurred.": "Failed to load chat. An error occurred.",
"Failed to render this message.": "Failed to render this message.",
@@ -892,8 +885,6 @@
"No chats found": "No chats found",
"No conversations yet": "No conversations yet",
"Open full page": "Open full page",
"Scroll to bottom": "Scroll to bottom",
"You said:": "You said:",
"Previous 7 days": "Previous 7 days",
"Previous 30 days": "Previous 30 days",
"Search chats...": "Search chats...",
@@ -1056,30 +1047,5 @@
"Updated {{date}}": "Updated {{date}}",
"Cell actions": "Cell actions",
"Column actions": "Column actions",
"Row actions": "Row actions",
"Filter": "Filter",
"Page title": "Page title",
"Page content": "Page content",
"Member actions": "Member actions",
"Toggle password visibility": "Toggle password visibility",
"Send comment": "Send comment",
"Token actions": "Token actions",
"Template settings": "Template settings",
"Edit diagram": "Edit diagram",
"Edit embed": "Edit embed",
"Edit drawing": "Edit drawing",
"Delete equation": "Delete equation",
"Invite actions": "Invite actions",
"Get started": "Get started",
"* indicates required fields": "* indicates required fields",
"List of spaces in this workspace": "List of spaces in this workspace",
"Active sessions": "Active sessions",
"Add {{name}} to favorites": "Add {{name}} to favorites",
"Remove {{name}} from favorites": "Remove {{name}} from favorites",
"Added to favorites": "Added to favorites",
"Removed from favorites": "Removed from favorites",
"Added {{name}} to favorites": "Added {{name}} to favorites",
"Removed {{name}} from favorites": "Removed {{name}} from favorites",
"Page menu for {{name}}": "Page menu for {{name}}",
"Create subpage of {{name}}": "Create subpage of {{name}}"
"Row actions": "Row actions"
}
@@ -80,20 +80,12 @@ export default function AvatarUploader({
}
};
const actionLabel = {
const ariaLabel = {
[AvatarIconType.AVATAR]: t("Change avatar"),
[AvatarIconType.SPACE_ICON]: t("Change space icon"),
[AvatarIconType.WORKSPACE_ICON]: t("Change workspace icon"),
}[type];
// Per WCAG 2.5.3 (Label in Name), the accessible name must include the
// visible text. When no image is set, the avatar renders the name's
// initials, so prepend the name to the action label.
const ariaLabel =
!currentImageUrl && fallbackName
? `${fallbackName} ${actionLabel}`
: actionLabel;
const handleRemove = async () => {
if (disabled) return;
+3 -7
View File
@@ -8,19 +8,15 @@ interface CopyProps {
text: string;
size?: MantineSize;
color?: MantineColor;
/** Override the accessible name (and tooltip) when not yet copied. Lets callers disambiguate adjacent copy buttons for screen readers. */
label?: string;
}
export default function CopyTextButton({ text, size, label }: CopyProps) {
export default function CopyTextButton({ text, size }: CopyProps) {
const { t } = useTranslation();
const copyLabel = label ?? t("Copy");
return (
<CopyButton value={text} timeout={2000}>
{({ copied, copy }) => (
<Tooltip
label={copied ? t("Copied") : copyLabel}
label={copied ? t("Copied") : t("Copy")}
withArrow
position="right"
>
@@ -29,7 +25,7 @@ export default function CopyTextButton({ text, size, label }: CopyProps) {
variant="subtle"
onClick={copy}
size={size}
aria-label={copied ? t("Copied") : copyLabel}
aria-label={copied ? t("Copied") : t("Copy")}
>
{copied ? <IconCheck size={16} /> : <IconCopy size={16} />}
</ActionIcon>
@@ -81,7 +81,7 @@ export default function ExportModal({
<Modal.Content style={{ overflow: "hidden" }}>
<Modal.Header py={0}>
<Modal.Title fw={500}>{t(`Export ${type}`)}</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body>
<Group justify="space-between" wrap="nowrap">
@@ -17,7 +17,6 @@ import { EmptyState } from "@/components/ui/empty-state.tsx";
import { getSpaceUrl } from "@/lib/config.ts";
import { useTranslation } from "react-i18next";
import { getInitialsColor } from "@/lib/get-initials-color.ts";
import rowClasses from "@/components/ui/clickable-table-row.module.css";
interface Props {
spaceId?: string;
@@ -42,10 +41,9 @@ export default function RecentChanges({ spaceId }: Props) {
<Table highlightOnHover verticalSpacing="sm">
<Table.Tbody>
{pages.map((page) => (
<Table.Tr key={page.id} className={rowClasses.row}>
<Table.Tr key={page.id}>
<Table.Td>
<UnstyledButton
className={rowClasses.link}
component={Link}
to={buildPageUrl(page?.space.slug, page.slugId, page.title)}
>
@@ -1,28 +1,22 @@
import { ActionIcon, Box, Group, ScrollArea, Title, Tooltip } from "@mantine/core";
import { ActionIcon, Box, Group, ScrollArea, Text, Tooltip } from "@mantine/core";
import { IconX } from "@tabler/icons-react";
import CommentListWithTabs from "@/features/comment/components/comment-list-with-tabs.tsx";
import { useAtom } from "jotai";
import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
import React, { ReactNode, useEffect } from "react";
import React, { ReactNode } from "react";
import { useTranslation } from "react-i18next";
import { TableOfContents } from "@/features/editor/components/table-of-contents/table-of-contents.tsx";
import { useAtomValue } from "jotai";
import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
import AsideChatPanel from "@/ee/ai-chat/components/aside-chat-panel";
import { PageDetailsAside } from "@/features/page-details/components/page-details-aside.tsx";
import { ASIDE_PANEL_ID } from "@/hooks/use-toggle-aside.tsx";
export default function Aside() {
const [{ tab, isAsideOpen }, setAsideState] = useAtom(asideStateAtom);
const [{ tab }, setAsideState] = useAtom(asideStateAtom);
const { t } = useTranslation();
const pageEditor = useAtomValue(pageEditorAtom);
const closeAside = () => setAsideState((s) => ({ ...s, isAsideOpen: false }));
useEffect(() => {
if (!isAsideOpen) return;
document.getElementById(ASIDE_PANEL_ID)?.focus();
}, [isAsideOpen, tab]);
let title: string;
let component: ReactNode;
@@ -54,7 +48,7 @@ export default function Aside() {
<>
{tab !== "chat" && (
<Group justify="space-between" wrap="nowrap" mb="md">
<Title order={2} size="h6" fw={500}>{t(title)}</Title>
<Text fw={500}>{t(title)}</Text>
<Tooltip label={t("Close")} withArrow>
<ActionIcon
variant="subtle"
@@ -18,8 +18,6 @@ import classes from "./app-shell.module.css";
import { useTrialEndAction } from "@/ee/hooks/use-trial-end-action.tsx";
import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
import GlobalSidebar from "@/components/layouts/global/global-sidebar.tsx";
import { ASIDE_PANEL_ID } from "@/hooks/use-toggle-aside.tsx";
import { MAIN_CONTENT_ID, SkipToMain } from "@/components/ui/skip-to-main.tsx";
export default function GlobalAppShell({
children,
@@ -83,9 +81,7 @@ export default function GlobalAppShell({
const showGlobalSidebar = !isSpaceRoute && !isSettingsRoute && !isAiRoute;
return (
<>
<SkipToMain />
<AppShell
<AppShell
header={{ height: 45 }}
navbar={{
width: isSpaceRoute ? sidebarWidth : 300,
@@ -129,7 +125,7 @@ export default function GlobalAppShell({
{isAiRoute && <AiChatSidebar />}
{showGlobalSidebar && <GlobalSidebar />}
</AppShell.Navbar>
<AppShell.Main id={MAIN_CONTENT_ID} tabIndex={-1}>
<AppShell.Main id="main-content">
{isSettingsRoute ? (
<Container size={900} pb={80}>
{children}
@@ -141,8 +137,6 @@ export default function GlobalAppShell({
{isPageRoute && (
<AppShell.Aside
id={ASIDE_PANEL_ID}
tabIndex={-1}
className={classes.aside}
p="md"
withBorder={false}
@@ -162,6 +156,5 @@ export default function GlobalAppShell({
</AppShell.Aside>
)}
</AppShell>
</>
);
}
@@ -31,11 +31,6 @@
color: light-dark(var(--mantine-color-black), var(--mantine-color-white));
}
&:focus-visible {
outline: 2px solid var(--mantine-primary-color-filled);
outline-offset: 2px;
}
&[data-active] {
&,
& :hover {
@@ -101,9 +96,4 @@
);
color: light-dark(var(--mantine-color-black), var(--mantine-color-white));
}
&:focus-visible {
outline: 2px solid var(--mantine-primary-color-filled);
outline-offset: 2px;
}
}
@@ -92,7 +92,6 @@ export default function GlobalSidebar() {
key={item.label}
className={classes.link}
data-active={active === item.path || undefined}
aria-current={active === item.path ? "page" : undefined}
to={item.path}
onClick={handleNavClick}
>
@@ -160,7 +159,6 @@ export default function GlobalSidebar() {
<Link
className={classes.link}
data-active={active.startsWith("/settings") || undefined}
aria-current={active.startsWith("/settings") ? "page" : undefined}
to="/settings/account/profile"
onClick={handleNavClick}
>
@@ -4,7 +4,7 @@ import { Divider, Title } from '@mantine/core';
export default function SettingsTitle({ title }: { title: string }) {
return (
<>
<Title order={1} size="h3">
<Title order={3}>
{title}
</Title>
<Divider my="md" />
@@ -1,29 +0,0 @@
/*
* Focus styling for list-style tables (recent changes, favorites, all
* spaces, groups, verified pages, shares).
*
* Per WAI-ARIA Authoring Practices and Adrian Roselli's guidance on table
* accessibility (https://adrianroselli.com/2020/02/block-links-cards-clickable-regions-etc.html),
* data tables should not be made fully clickable. Only the title cell is the
* link, and that link is what receives Tab focus.
*
* - `.row` adds a subtle background tint when the row contains the focused
* element, so keyboard users can see which row they're inspecting.
* - `.link` adds a visible :focus-visible outline on the title link itself.
*
* No stretched-link pseudo here on purpose: absolutely-positioned pseudos
* inside table cells cause column reflow on focus in Chromium.
*/
.row:focus-within {
background-color: light-dark(
var(--mantine-color-gray-1),
var(--mantine-color-dark-6)
);
}
.link:focus-visible {
outline: 2px solid var(--mantine-primary-color-filled);
outline-offset: 2px;
border-radius: var(--mantine-radius-sm);
}
@@ -16,18 +16,14 @@ interface CustomAvatarProps {
mt?: string | number;
}
// `color.shade` pairs whose contrast meets WCAG AA (4.5:1) in BOTH variants:
// - filled: white text on the shade as bg
// - light: shade as text on the color's light-bg (10% color.6 over white)
// Avoids lime/yellow/green/orange — even their dark shades have weak
// contrast. grape and indigo were bumped from .7 to darker shades because
// the original picks failed: grape.7 was 4.02/3.61 (both fail) and
// indigo.7 was 4.98/4.39 (light fails by a hair).
// `color.shade` pairs whose filled background meets WCAG AA (4.5:1) against
// white text. Avoids lime/yellow/green/orange — even their dark shades have
// weak white-text contrast.
const SAFE_INITIALS_COLORS: MantineColor[] = [
"blue.8",
"cyan.9",
"grape.9",
"indigo.8",
"grape.7",
"indigo.7",
"pink.8",
"red.8",
"violet.7",
@@ -41,7 +41,7 @@ export function DestinationPickerModal({
<Modal.Content>
<Modal.Header py={0}>
<Modal.Title fw={500}>{title}</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body>
<DestinationPicker
@@ -14,14 +14,7 @@ export interface SidebarToggleProps extends BoxProps, ElementProps<"button"> {
const SidebarToggle = React.forwardRef<HTMLButtonElement, SidebarToggleProps>(
({ opened, size = "sm", ...others }, ref) => {
return (
<ActionIcon
size={size}
aria-expanded={opened}
{...others}
variant="subtle"
color="gray"
ref={ref}
>
<ActionIcon size={size} {...others} variant="subtle" color="gray" ref={ref}>
{opened ? (
<IconLayoutSidebarRightExpand />
) : (
@@ -1,27 +0,0 @@
.skipLink {
position: absolute;
top: 8px;
left: 8px;
z-index: 9999;
padding: 8px 16px;
background: var(--mantine-color-body);
color: var(--mantine-color-text);
border: 2px solid var(--mantine-color-blue-6);
border-radius: 4px;
text-decoration: none;
font-weight: 500;
font-size: var(--mantine-font-size-sm);
transform: translateY(-200%);
transition: transform 0.15s ease-out;
}
.skipLink:focus {
transform: translateY(0);
outline: none;
}
@media print {
.skipLink {
display: none !important;
}
}
@@ -1,13 +0,0 @@
import { useTranslation } from "react-i18next";
import classes from "./skip-to-main.module.css";
export const MAIN_CONTENT_ID = "main-content";
export function SkipToMain() {
const { t } = useTranslation();
return (
<a href={`#${MAIN_CONTENT_ID}`} className={classes.skipLink}>
{t("Skip to main content")}
</a>
);
}
@@ -120,7 +120,7 @@ export default function AiChatSidebar() {
return (
<div className={classes.sidebar}>
<div className={classes.header}>
<h2 className={classes.title}>{t("AI Chat")}</h2>
<span className={classes.title}>{t("AI Chat")}</span>
<Tooltip label={t("New chat")} openDelay={250} withArrow>
<ActionIcon
component={Link}
@@ -176,7 +176,7 @@ export default function AiChatSidebar() {
))
: groupedChats.map((group) => (
<div key={group.key} className={classes.chatGroup}>
<h3 className={classes.chatGroupLabel}>{group.label}</h3>
<div className={classes.chatGroupLabel}>{group.label}</div>
{group.chats.map((chat) => (
<AiChatSidebarItem
key={chat.id}
@@ -56,9 +56,9 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
<div className={classes.emptyState}>
<IconSparkles size={48} stroke={1.5} className={classes.emptyStateIcon} />
<div className={classes.emptyStateBrand}>{t("Docmost AI")}</div>
<h1 className={classes.emptyStateTitle}>
<div className={classes.emptyStateTitle}>
{t("What can I help you with?")}
</h1>
</div>
<div className={classes.emptyStateInput}>
<ChatInput
@@ -71,7 +71,7 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
</div>
<div className={classes.suggestionsSection}>
<h2 className={classes.suggestionsLabel}>{t("Get started")}</h2>
<div className={classes.suggestionsLabel}>Get started</div>
<div className={classes.suggestionsGrid}>
{SUGGESTIONS.map((s) => (
<button
@@ -226,7 +226,6 @@ export default function ChatInput({
],
editorProps: {
attributes: {
role: "textbox",
"aria-label": placeholder || t("Ask anything... Use @ to mention pages"),
"aria-multiline": "true",
},
@@ -336,15 +335,7 @@ export default function ChatInput({
<EditorContent editor={editor} className={classes.editorContent} />
<div className={classes.actions}>
<Popover
opened={plusMenuOpen}
onChange={setPlusMenuOpen}
position="top-start"
width={220}
shadow="md"
trapFocus
returnFocus
>
<Popover opened={plusMenuOpen} onChange={setPlusMenuOpen} position="top-start" width={220} shadow="md">
<Popover.Target>
<button
type="button"
@@ -2,7 +2,6 @@ import { useEffect, useRef, useCallback, useState } from "react";
import { ErrorBoundary } from "react-error-boundary";
import { IconArrowDown, IconAlertTriangle } from "@tabler/icons-react";
import { useTranslation } from "react-i18next";
import { VisuallyHidden } from "@mantine/core";
import type { AiChatMessage, AiChatToolCall } from "../types/ai-chat.types";
import ChatMessage from "./chat-message";
import classes from "../styles/ai-chat.module.css";
@@ -34,7 +33,6 @@ export default function ChatMessageList({
streamingContent,
streamingToolCalls,
}: Props) {
const { t } = useTranslation();
const containerRef = useRef<HTMLDivElement>(null);
const bottomRef = useRef<HTMLDivElement>(null);
const isAtBottomRef = useRef(true);
@@ -42,38 +40,6 @@ export default function ChatMessageList({
const prevScrollTopRef = useRef(0);
const [showScrollButton, setShowScrollButton] = useState(false);
// Dedicated status-region announcement for screen readers. Rather than
// putting aria-live on the whole transcript (which re-fires for every
// streamed token), announce "AI is thinking…" when streaming starts and
// the full assistant reply once streaming completes — a single, clean read.
const [statusAnnouncement, setStatusAnnouncement] = useState("");
const wasStreamingRef = useRef(false);
useEffect(() => {
const justStartedStreaming = isStreaming && !wasStreamingRef.current;
const justFinishedStreaming = !isStreaming && wasStreamingRef.current;
if (justStartedStreaming) {
setStatusAnnouncement(t("AI is thinking..."));
} else if (justFinishedStreaming) {
const lastMessage = messages[messages.length - 1];
if (lastMessage?.role === "assistant" && lastMessage.content) {
// Strip markdown punctuation so screen readers don't read symbols
// like # * _ ` ~ aloud. A plain-text version is fine — the styled
// version stays in the DOM for visual users.
const plainText = lastMessage.content
.replace(/[#*_`~]/g, "")
.replace(/\s+/g, " ")
.trim();
setStatusAnnouncement(plainText);
} else {
setStatusAnnouncement("");
}
}
wasStreamingRef.current = isStreaming;
}, [isStreaming, messages, t]);
const scrollToBottom = useCallback((behavior: ScrollBehavior = "smooth") => {
const container = containerRef.current;
if (!container) return;
@@ -161,18 +127,7 @@ export default function ChatMessageList({
return (
<div className={classes.messageListWrapper}>
{/* Single status region for chat announcements. Kept outside the
scrolling transcript so changes here trigger one polite read per
state change instead of re-announcing every streamed token. */}
<VisuallyHidden role="status" aria-live="polite">
{statusAnnouncement}
</VisuallyHidden>
<div
ref={containerRef}
className={classes.messageList}
aria-label={t("Chat transcript")}
>
<div ref={containerRef} className={classes.messageList}>
{messages.map((msg) => (
<ErrorBoundary
key={msg.id}
@@ -207,7 +162,7 @@ export default function ChatMessageList({
{showScrollButton && (
<button
type="button"
aria-label={t("Scroll to bottom")}
aria-label="Scroll to bottom"
className={classes.scrollToBottomButton}
onClick={() => scrollToBottom("smooth")}
>
@@ -1,6 +1,5 @@
import { useCallback } from "react";
import { useNavigate } from "react-router";
import { useTranslation } from "react-i18next";
import DOMPurify from "dompurify";
import { ActionIcon, Tooltip } from "@mantine/core";
import {
@@ -44,7 +43,6 @@ export default function ChatMessage({
streamingToolCalls,
}: Props) {
const navigate = useNavigate();
const { t } = useTranslation();
const handleContentClick = useCallback(
(e: React.MouseEvent<HTMLDivElement>) => {
@@ -80,11 +78,7 @@ export default function ChatMessage({
}[]) || [];
return (
<div
className={classes.userMessage}
role="article"
aria-label={t("You said:")}
>
<div className={classes.userMessage}>
<div className={classes.userBubble}>
{attachments.length > 0 && (
<div className={classes.messageAttachments}>
@@ -106,16 +100,8 @@ export default function ChatMessage({
);
}
// Only label the article when there's something meaningful to announce.
// Tool-only assistant turns (no text) shouldn't announce "Assistant said:" with empty content.
const hasAnnouncableContent = Boolean(content);
return (
<div
className={classes.assistantMessage}
role="article"
aria-label={hasAnnouncableContent ? t("Assistant said:") : undefined}
>
<div className={classes.assistantMessage}>
<div className={classes.messageContent}>
{toolCalls && toolCalls.length > 0 && (
<ChatToolGroup toolCalls={toolCalls} isStreaming={isStreaming} />
@@ -145,10 +131,7 @@ export default function ChatMessage({
</div>
{!isStreaming && message.content && (
<div className={classes.messageActions}>
<CopyTextButton
text={message?.content}
label={t("Copy assistant response")}
/>
<CopyTextButton text={message?.content} />
</div>
)}
</div>
@@ -106,7 +106,6 @@
font-size: 1.5rem;
font-weight: 600;
color: light-dark(var(--mantine-color-gray-8), var(--mantine-color-dark-0));
margin-top: 0;
margin-bottom: var(--mantine-spacing-xl);
text-align: center;
}
@@ -129,7 +128,6 @@
color: var(--mantine-color-dimmed);
text-transform: uppercase;
letter-spacing: 0.5px;
margin-top: 0;
margin-bottom: var(--mantine-spacing-sm);
}
@@ -114,7 +114,7 @@
}
:global(.ProseMirror p.is-editor-empty:first-child::before) {
color: var(--mantine-color-placeholder);
color: light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-3));
content: attr(data-placeholder);
float: left;
height: 0;
@@ -183,7 +183,7 @@
border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
background: none;
cursor: pointer;
color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-3));
color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
transition: color 150ms, background-color 150ms;
@mixin hover {
@@ -15,7 +15,6 @@
}
.title {
margin: 0;
font-weight: 600;
font-size: var(--mantine-font-size-sm);
}
@@ -34,7 +33,6 @@
}
.chatGroupLabel {
margin: 0;
padding: 4px var(--mantine-spacing-xs);
font-size: var(--mantine-font-size-xs);
font-weight: 600;
@@ -120,8 +118,7 @@
color: inherit;
}
.chatItem:hover .chatItemDate,
.chatItem:focus-within .chatItemDate {
.chatItem:hover .chatItemDate {
opacity: 0;
}
@@ -136,12 +133,6 @@
position: relative;
}
.chatItem:hover .chatItemActions,
.chatItem:focus-within .chatItemActions {
.chatItem:hover .chatItemActions {
opacity: 1;
}
.chatItemActions :global(.mantine-ActionIcon-root):focus-visible {
outline: 2px solid var(--mantine-primary-color-filled);
outline-offset: 2px;
}
@@ -33,7 +33,6 @@ export function ApiKeyCreatedModal({
onClose={onClose}
title={t("{{credential}} created", { credential: t("API key") })}
size="lg"
closeButtonProps={{ "aria-label": t("Close") }}
>
<Stack gap="md">
<Alert
@@ -107,7 +107,6 @@ export function CreateApiKeyModal({
onClose={handleClose}
title={t("Create {{credential}}", { credential: t("API key") })}
size="md"
closeButtonProps={{ "aria-label": t("Close") }}
>
<form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
<Stack gap="md">
@@ -32,7 +32,6 @@ export function RevokeApiKeyModal({
onClose={onClose}
title={t("Revoke {{credential}}", { credential: t("API key") })}
size="md"
closeButtonProps={{ "aria-label": t("Close") }}
>
<Stack gap="md">
<Text>
@@ -55,7 +55,6 @@ export function UpdateApiKeyModal({
onClose={onClose}
title={t("Update {{credential}}", { credential: t("API key") })}
size="md"
closeButtonProps={{ "aria-label": t("Close") }}
>
<form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
<Stack gap="md">
@@ -111,11 +111,6 @@ export function LdapLoginModal({
placeholder={t("Enter your LDAP password")}
variant="filled"
disabled={isLoading}
visibilityToggleButtonProps={{
"aria-label": t("Toggle password visibility"),
"aria-hidden": false,
tabIndex: 0,
}}
{...form.getInputProps("password")}
/>
@@ -130,11 +130,6 @@ export function MfaBackupCodesModal({
label={t("Confirm password")}
placeholder={t("Enter your password")}
variant="filled"
visibilityToggleButtonProps={{
"aria-label": t("Toggle password visibility"),
"aria-hidden": false,
tabIndex: 0,
}}
{...form.getInputProps("confirmPassword")}
autoFocus
data-autofocus
@@ -107,11 +107,6 @@ export function MfaDisableModal({
<PasswordInput
label={t("Password")}
placeholder={t("Enter your password")}
visibilityToggleButtonProps={{
"aria-label": t("Toggle password visibility"),
"aria-hidden": false,
tabIndex: 0,
}}
{...form.getInputProps("confirmPassword")}
autoFocus
data-autofocus
@@ -79,13 +79,7 @@ export function PageShareModal({ readOnly }: PageShareModalProps) {
{t("Share")}
</Button>
<Modal
opened={opened}
onClose={close}
title={t("Share")}
size={600}
closeButtonProps={{ "aria-label": t("Close") }}
>
<Modal opened={opened} onClose={close} title={t("Share")} size={600}>
<Tabs value={activeTab} color="dark" onChange={setActiveTab}>
<Tabs.List mb="md">
<Tabs.Tab value="access">{t("Access")}</Tabs.Tab>
@@ -4,8 +4,8 @@ import {
Menu,
Modal,
Text,
ThemeIcon,
Tooltip,
UnstyledButton,
} from "@mantine/core";
import { useDisclosure } from "@mantine/hooks";
import {
@@ -100,20 +100,15 @@ export function PageVerificationBadge({
if (!pageId) return null;
if (!hasVerificationFeature) {
if (readOnly) return null;
const lockedLabel = `${t("Add verification")}${upgradeLabel}`;
// Use ActionIcon (a real <button>) instead of a ThemeIcon so the tooltip
// is reachable on keyboard focus, and screen readers announce the upgrade
// hint via the accessible name. Click is a no-op since the feature is
// gated; the tooltip explains why.
return (
<Tooltip label={lockedLabel} withArrow openDelay={250}>
<ActionIcon
variant="subtle"
color="gray"
aria-label={lockedLabel}
>
<Tooltip
label={`${t("Add verification")}${upgradeLabel}`}
withArrow
openDelay={250}
>
<ThemeIcon variant="subtle" color="gray">
<IconShieldCheck size={20} stroke={1.5} />
</ActionIcon>
</ThemeIcon>
</Tooltip>
);
}
@@ -137,25 +132,20 @@ export function PageVerificationBadge({
<>
{status !== "none" ? (
<Tooltip label={tooltipLabel} withArrow openDelay={250}>
<UnstyledButton
<Group
gap={4}
onClick={open}
aria-label={tooltipLabel}
style={{
display: "inline-flex",
alignItems: "center",
gap: 4,
cursor: "pointer",
}}
style={{ cursor: "pointer" }}
wrap="nowrap"
>
<IconRosetteDiscountCheckFilled
size={18}
color={`var(--mantine-color-${getStatusColor(status).replace(".", "-")})`}
aria-hidden="true"
/>
<Text size="sm" c={getStatusColor(status)}>
{getStatusLabel(status, t)}
</Text>
</UnstyledButton>
</Group>
</Tooltip>
) : !readOnly ? (
<Tooltip label={t("Set up verification")} withArrow openDelay={250}>
@@ -18,7 +18,6 @@ import { CustomAvatar } from "@/components/ui/custom-avatar";
import { buildPageUrl } from "@/features/page/page.utils";
import { format } from "date-fns";
import NoTableResults from "@/components/common/no-table-results";
import rowClasses from "@/components/ui/clickable-table-row.module.css";
const MAX_VISIBLE_VERIFIERS = 5;
@@ -125,13 +124,12 @@ export default function VerificationListTable({
);
return (
<Table.Tr key={item.id} className={rowClasses.row}>
<Table.Tr key={item.id}>
<Table.Td>
<Anchor
size="sm"
underline="never"
style={{ color: "var(--mantine-color-text)" }}
className={rowClasses.link}
component={Link}
to={pageUrl}
>
@@ -52,7 +52,6 @@ export function CreateScimTokenModal({
onClose={handleClose}
title={t("Create {{credential}}", { credential: t("SCIM token") })}
size="md"
closeButtonProps={{ "aria-label": t("Close") }}
>
<form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
<Stack gap="md">
@@ -29,7 +29,6 @@ export function RevokeScimTokenModal({
onClose={onClose}
title={t("Revoke {{credential}}", { credential: t("SCIM token") })}
size="md"
closeButtonProps={{ "aria-label": t("Close") }}
>
<Stack gap="md">
<Text>
@@ -32,7 +32,6 @@ export function ScimTokenCreatedModal({
onClose={onClose}
title={t("{{credential}} created", { credential: t("SCIM token") })}
size="lg"
closeButtonProps={{ "aria-label": t("Close") }}
>
<Stack gap="md">
<Alert
@@ -93,11 +93,7 @@ export function ScimTokenTable({
<Table.Td>
<Menu position="bottom-end" withinPortal>
<Menu.Target>
<ActionIcon
variant="subtle"
color="gray"
aria-label={t("Token actions")}
>
<ActionIcon variant="subtle" color="gray">
<IconDots size={16} />
</ActionIcon>
</Menu.Target>
@@ -52,7 +52,6 @@ export function UpdateScimTokenModal({
onClose={onClose}
title={t("Update {{credential}}", { credential: t("SCIM token") })}
size="md"
closeButtonProps={{ "aria-label": t("Close") }}
>
<form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
<Stack gap="md">
@@ -32,7 +32,6 @@ export default function SsoProviderModal({
ssoProviderType: provider.type.toUpperCase(),
})}
onClose={onClose}
closeButtonProps={{ "aria-label": t("Close") }}
>
{provider.type === SSO_PROVIDER.SAML && (
<SsoSamlForm provider={provider} onClose={onClose} />
@@ -52,7 +52,7 @@ export default function TemplatePreviewModal({
{t("Edit")}
</Button>
)}
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Group>
</Modal.Header>
<Modal.Body p={0}>
@@ -283,7 +283,6 @@ export default function TemplateEditor() {
variant="subtle"
color="gray"
size="md"
aria-label={t("Template settings")}
onClick={() => {
setDraftSpaceId(spaceId);
openSettings();
@@ -20,7 +20,7 @@ export function AuthLayout({ children }: AuthLayoutProps) {
Docmost
</Text>
</Group>
<main>{children}</main>
{children}
</>
);
}
@@ -103,11 +103,6 @@ export function InviteSignUpForm() {
placeholder={t("Your password")}
variant="filled"
mt="md"
visibilityToggleButtonProps={{
"aria-label": t("Toggle password visibility"),
"aria-hidden": false,
tabIndex: 0,
}}
{...form.getInputProps("password")}
/>
<Button type="submit" fullWidth mt="xl" loading={isLoading}>
@@ -54,13 +54,6 @@ export function LoginForm() {
await signIn(data);
}
function handleValidationFailure(errors: Record<string, unknown>) {
const firstInvalidId = Object.keys(errors)[0];
if (firstInvalidId) {
document.getElementById(firstInvalidId)?.focus();
}
}
if (isDataLoading) {
return null;
}
@@ -73,7 +66,7 @@ export function LoginForm() {
<AuthLayout>
<Container size={420} className={classes.container}>
<Box p="xl" className={classes.containerBox}>
<Title order={1} size="h2" ta="center" fw={500} mb="md">
<Title order={2} ta="center" fw={500} mb="md">
{t("Login")}
</Title>
@@ -81,31 +74,21 @@ export function LoginForm() {
{!data?.enforceSso && (
<>
<form onSubmit={form.onSubmit(onSubmit, handleValidationFailure)}>
<form onSubmit={form.onSubmit(onSubmit)}>
<TextInput
id="email"
type="email"
label={t("Email")}
placeholder="email@example.com"
variant="filled"
autoComplete="email"
errorProps={{ role: "alert" }}
{...form.getInputProps("email")}
/>
<PasswordInput
id="password"
label={t("Password")}
placeholder={t("Your password")}
variant="filled"
mt="md"
autoComplete="current-password"
errorProps={{ role: "alert" }}
visibilityToggleButtonProps={{
"aria-label": t("Toggle password visibility"),
"aria-hidden": false,
tabIndex: 0,
}}
{...form.getInputProps("password")}
/>
@@ -52,11 +52,6 @@ export function PasswordResetForm({ resetToken }: PasswordResetFormProps) {
placeholder={t("Your new password")}
variant="filled"
mt="md"
visibilityToggleButtonProps={{
"aria-label": t("Toggle password visibility"),
"aria-hidden": false,
tabIndex: 0,
}}
{...form.getInputProps("newPassword")}
/>
@@ -98,11 +98,6 @@ export function SetupWorkspaceForm() {
placeholder={t("Enter a strong password")}
variant="filled"
mt="md"
visibilityToggleButtonProps={{
"aria-label": t("Toggle password visibility"),
"aria-hidden": false,
tabIndex: 0,
}}
{...form.getInputProps("password")}
/>
<Button type="submit" fullWidth mt="xl" loading={isLoading}>
@@ -19,7 +19,6 @@ interface CommentEditorProps {
editable: boolean;
placeholder?: string;
autofocus?: boolean;
surface?: "default" | "muted";
}
const CommentEditor = forwardRef(
@@ -31,7 +30,6 @@ const CommentEditor = forwardRef(
editable,
placeholder,
autofocus,
surface,
}: CommentEditorProps,
ref,
) => {
@@ -68,9 +66,6 @@ const CommentEditor = forwardRef(
}),
],
editorProps: {
attributes: {
"aria-label": placeholder || t("Comment"),
},
handleDOMEvents: {
keydown: (_view, event) => {
if (
@@ -136,7 +131,6 @@ const CommentEditor = forwardRef(
ref={focusRef}
className={classes.commentEditor}
data-editable={editable || undefined}
data-surface={surface}
>
<EditorContent
editor={commentEditor}
@@ -383,7 +383,6 @@ const PageCommentInput = ({ onSave, isLoading }) => {
onSave={handleSave}
editable={true}
placeholder={t("Add a comment...")}
surface="muted"
/>
</div>
</Group>
@@ -392,7 +391,6 @@ const PageCommentInput = ({ onSave, isLoading }) => {
variant="filled"
radius="xl"
size="sm"
aria-label={t("Send comment")}
onClick={handleSave}
onMouseDown={(e) => e.preventDefault()}
loading={isLoading}
@@ -22,11 +22,6 @@
.commentEditor {
&[data-editable][data-surface="muted"] .ProseMirror:not(.focused) {
border-radius: var(--mantine-radius-sm);
box-shadow: 0 0 0 1px light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-4));
}
.focused {
border-radius: var(--mantine-radius-sm);
box-shadow: 0 0 0 2px var(--mantine-color-blue-3);
@@ -198,11 +198,7 @@ export default function DrawioView(props: NodeViewProps) {
className={clsx(selected ? "ProseMirror-selectednode" : "")}
>
<div style={{ display: "flex", alignItems: "center" }}>
<ActionIcon
variant="transparent"
color="gray"
aria-label={t("Edit diagram")}
>
<ActionIcon variant="transparent" color="gray">
<IconEdit size={18} />
</ActionIcon>
@@ -131,11 +131,7 @@ export default function EmbedView(props: NodeViewProps) {
className={clsx(selected ? "ProseMirror-selectednode" : "")}
>
<div style={{ display: "flex", alignItems: "center" }}>
<ActionIcon
variant="transparent"
color="gray"
aria-label={t("Edit embed")}
>
<ActionIcon variant="transparent" color="gray">
<IconEdit size={18} />
</ActionIcon>
@@ -44,11 +44,9 @@ function EmojiList({
const [cats, setCats] = useState<EmojiCategory[]>([]);
const [activeCat, setActiveCat] = useState("");
const [focusZone, setFocusZone] = useState<"grid" | "tabs">("grid");
const [announce, setAnnounce] = useState("");
const listViewport = useRef<HTMLDivElement>(null);
const gridViewport = useRef<HTMLDivElement>(null);
const catBar = useRef<HTMLDivElement>(null);
const userInteractedRef = useRef(false);
const searching = query.length > 0;
const browseLoading = !searching && cats.length === 0;
@@ -76,53 +74,6 @@ function EmojiList({
vp?.querySelector<HTMLElement>(`[data-i="${idx}"]`)?.scrollIntoView({ block: "nearest" });
}, [idx, searching, focusZone]);
// Announce picker open and selection changes via a live region. Focus
// stays in the editor, so without this the screen reader has no way to
// know the picker exists or that arrow keys are changing the selection.
// The setTimeout defers the open message past the initial render so the
// live region is in the DOM before its content changes (screen readers
// ignore content that's present at mount time).
useEffect(() => {
const timer = setTimeout(() => {
setAnnounce(
t("Emoji picker open. Use arrow keys to navigate, Enter to select."),
);
}, 100);
return () => clearTimeout(timer);
}, [t]);
useEffect(() => {
// Skip data-driven updates (idx reset, async cat load); only announce
// selection changes that come from real user navigation.
if (!userInteractedRef.current) return;
if (focusZone === "tabs") {
if (activeCat) setAnnounce(t("{{name}} category", { name: activeCat }));
return;
}
if (searching) {
const item = items[idx];
if (item)
setAnnounce(
t("{{name}}, {{n}} of {{total}}", {
name: item.id,
n: idx + 1,
total: items.length,
}),
);
return;
}
const entry = gridItems[idx];
if (entry)
setAnnounce(
t("{{name}}, {{n}} of {{total}}", {
name: entry.id,
n: idx + 1,
total: gridItems.length,
}),
);
}, [idx, activeCat, focusZone, searching, items, gridItems, t]);
const pickSearchItem = useCallback(
(i: number) => {
const item = items[i];
@@ -143,13 +94,6 @@ function EmojiList({
useEffect(() => {
function onKey(e: KeyboardEvent) {
if (
["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"].includes(
e.key,
)
) {
userInteractedRef.current = true;
}
if (searching) {
if (e.key === "ArrowDown") { e.preventDefault(); setIdx((i) => Math.min(i + 1, items.length - 1)); }
else if (e.key === "ArrowUp") { e.preventDefault(); setIdx((i) => Math.max(i - 1, 0)); }
@@ -187,24 +131,6 @@ function EmojiList({
role="listbox"
aria-label={t("Emoji picker")}
>
<div
role="status"
aria-live="polite"
aria-atomic="true"
style={{
position: "absolute",
width: 1,
height: 1,
padding: 0,
margin: -1,
overflow: "hidden",
clip: "rect(0,0,0,0)",
whiteSpace: "nowrap",
border: 0,
}}
>
{announce}
</div>
{searching ? (
<>
{isLoading && <Loader m="xs" size="xs" color="blue" type="dots" />}
@@ -245,7 +171,6 @@ function EmojiList({
title={c.id}
role="tab"
aria-selected={isActive}
aria-label={t("{{name}} category", { name: c.id })}
className={clsx(classes.catTab, {
[classes.catTabActive]: isActive,
[classes.catTabFocused]: isFocused,
@@ -265,9 +190,6 @@ function EmojiList({
key={entry.id}
data-i={i}
title={`:${entry.id}:`}
role="option"
aria-selected={i === idx}
aria-label={entry.id}
className={clsx(classes.emojiBtn, { [classes.active]: i === idx })}
onClick={() => pickGridItem(entry)}
onMouseEnter={() => setIdx(i)}
@@ -240,11 +240,7 @@ export default function ExcalidrawView(props: NodeViewProps) {
className={clsx(selected ? "ProseMirror-selectednode" : "")}
>
<div style={{ display: "flex", alignItems: "center" }}>
<ActionIcon
variant="transparent"
color="gray"
aria-label={t("Edit drawing")}
>
<ActionIcon variant="transparent" color="gray">
<IconEdit size={18} />
</ActionIcon>
@@ -149,13 +149,8 @@ export default function MathBlockView(props: NodeViewProps) {
></Textarea>
<Flex justify="flex-end" align="flex-end">
<ActionIcon
variant="light"
color="red"
aria-label={t("Delete equation")}
onClick={() => props.deleteNode()}
>
<IconTrashX size={18} />
<ActionIcon variant="light" color="red">
<IconTrashX size={18} onClick={() => props.deleteNode()} />
</ActionIcon>
</Flex>
</Stack>
@@ -3,7 +3,6 @@ import React, {
useCallback,
useEffect,
useImperativeHandle,
useMemo,
useRef,
useState,
} from "react";
@@ -16,7 +15,6 @@ import {
ScrollArea,
Text,
UnstyledButton,
VisuallyHidden,
} from "@mantine/core";
import clsx from "clsx";
import classes from "./mention.module.css";
@@ -47,8 +45,6 @@ import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
const [selectedIndex, setSelectedIndex] = useState(1);
const viewportRef = useRef<HTMLDivElement>(null);
const [countAnnouncement, setCountAnnouncement] = useState("");
const [selectionAnnouncement, setSelectionAnnouncement] = useState("");
const { pageSlug, spaceSlug } = useParams();
const { data: page } = usePageQuery({ pageId: extractPageSlugId(pageSlug) });
const { data: space } = useSpaceQuery(spaceSlug);
@@ -186,45 +182,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
setSelectedIndex(1);
}, [suggestion]);
const selectableCount = useMemo(
() => renderItems.filter((item) => item.entityType !== "header").length,
[renderItems],
);
useEffect(() => {
if (renderItems.length === 0) {
setCountAnnouncement(t("No results"));
return;
}
setCountAnnouncement(
t("{{count}} result available", { count: selectableCount }),
);
}, [renderItems.length, selectableCount, t]);
useEffect(() => {
const item = renderItems[selectedIndex];
if (!item || item.entityType === "header") {
setSelectionAnnouncement("");
return;
}
if (item.entityType === "user") {
setSelectionAnnouncement(`${t("People")}: ${item.label}`);
return;
}
if (item.entityType === "page") {
if (item.id === null) {
setSelectionAnnouncement(`${t("Create page")}: ${item.label}`);
return;
}
const pageLabel = item.label || t("Untitled");
setSelectionAnnouncement(
item.spaceName
? `${t("Pages")}: ${pageLabel}, ${item.spaceName}`
: `${t("Pages")}: ${pageLabel}`,
);
}
}, [selectedIndex, renderItems, t]);
useImperativeHandle(ref, () => ({
onKeyDown: ({ event }) => {
if (event.key === "ArrowUp") {
@@ -312,9 +269,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
if (renderItems.length === 0) {
return (
<Paper id="mention" shadow="md" py="xs" withBorder radius="md">
<VisuallyHidden role="status" aria-live="polite" aria-atomic="true">
{countAnnouncement}
</VisuallyHidden>
<Text c="dimmed" size="sm" px="sm">
{t("No results")}
</Text>
@@ -341,12 +295,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
aria-label={t("Mention suggestions")}
aria-activedescendant={`mention-option-${selectedIndex}`}
>
<VisuallyHidden role="status" aria-live="polite" aria-atomic="true">
{countAnnouncement}
</VisuallyHidden>
<VisuallyHidden role="status" aria-live="polite" aria-atomic="true">
{selectionAnnouncement}
</VisuallyHidden>
<ScrollArea.Autosize
viewportRef={viewportRef}
mah={350}
@@ -10,7 +10,6 @@ import {
ScrollArea,
Text,
UnstyledButton,
VisuallyHidden,
} from "@mantine/core";
import classes from "./slash-menu.module.css";
import clsx from "clsx";
@@ -30,8 +29,6 @@ const CommandList = ({
const { t } = useTranslation();
const [selectedIndex, setSelectedIndex] = useState(0);
const viewportRef = useRef<HTMLDivElement>(null);
const [countAnnouncement, setCountAnnouncement] = useState("");
const [selectionAnnouncement, setSelectionAnnouncement] = useState("");
const flatItems = useMemo(() => {
return Object.values(items).flat();
@@ -82,25 +79,6 @@ const CommandList = ({
setSelectedIndex(0);
}, [flatItems]);
useEffect(() => {
if (flatItems.length === 0) {
setCountAnnouncement("");
return;
}
setCountAnnouncement(
t("{{count}} command available", { count: flatItems.length }),
);
}, [flatItems.length, t]);
useEffect(() => {
const item = flatItems[selectedIndex];
if (!item) {
setSelectionAnnouncement("");
return;
}
setSelectionAnnouncement(`${t(item.title)}, ${t(item.description)}`);
}, [selectedIndex, flatItems, t]);
useEffect(() => {
viewportRef.current
?.querySelector(`[data-item-index="${selectedIndex}"]`)
@@ -117,12 +95,6 @@ const CommandList = ({
aria-label={t("Slash commands")}
aria-activedescendant={`slash-command-option-${selectedIndex}`}
>
<VisuallyHidden role="status" aria-live="polite" aria-atomic="true">
{countAnnouncement}
</VisuallyHidden>
<VisuallyHidden role="status" aria-live="polite" aria-atomic="true">
{selectionAnnouncement}
</VisuallyHidden>
<ScrollArea
viewportRef={viewportRef}
h={350}
@@ -3,7 +3,7 @@ import { TextSelection } from "@tiptap/pm/state";
import React, { FC, useEffect, useRef, useState } from "react";
import classes from "./table-of-contents.module.css";
import clsx from "clsx";
import { Box, Text, Title } from "@mantine/core";
import { Box, Text } from "@mantine/core";
import { useTranslation } from "react-i18next";
type TableOfContentsProps = {
@@ -156,9 +156,9 @@ export const TableOfContents: FC<TableOfContentsProps> = (props) => {
return (
<>
{props.isShare && (
<Title order={2} size="h6" mb="md" fw={500}>
<Text mb="md" fw={500}>
{t("Table of contents")}
</Title>
</Text>
)}
<div className={props.isShare ? classes.leftBorder : ""}>
{links.map((item, idx) => (
@@ -22,7 +22,7 @@ import { useTranslation } from "react-i18next";
import { IContributor } from "@/features/page/types/page.types.ts";
import { FixedToolbar } from "@/features/editor/components/fixed-toolbar/fixed-toolbar";
import { PageEditMode } from "@/features/user/types/user.types.ts";
import { useAsideTriggerProps } from "@/hooks/use-toggle-aside.tsx";
import useToggleAside from "@/hooks/use-toggle-aside.tsx";
import { DeletedPageBanner } from "@/features/page/trash/components/deleted-page-banner.tsx";
import clsx from "clsx";
import { currentPageEditModeAtom } from "@/features/editor/atoms/editor-atoms.ts";
@@ -125,7 +125,7 @@ type PageBylineProps = {
function PageByline({ creator, contributors, readOnly }: PageBylineProps) {
const { t } = useTranslation();
const detailsTriggerProps = useAsideTriggerProps("details");
const toggleAside = useToggleAside();
const otherContributors = (contributors ?? []).filter(
(c) => c.id !== creator?.id,
@@ -141,9 +141,7 @@ function PageByline({ creator, contributors, readOnly }: PageBylineProps) {
{creator && (
<Popover position="bottom-start" shadow="md" width={280} withArrow>
<Popover.Target>
<UnstyledButton
aria-label={t("Created by {{name}}", { name: creator.name })}
>
<UnstyledButton>
<Group gap={6}>
<CustomAvatar
avatarUrl={creator.avatarUrl}
@@ -205,7 +203,7 @@ function PageByline({ creator, contributors, readOnly }: PageBylineProps) {
variant="subtle"
color="gray"
aria-label={t("Details")}
{...detailsTriggerProps}
onClick={() => toggleAside("details")}
>
<IconInfoCircle size={20} stroke={1.5} />
</ActionIcon>
@@ -43,6 +43,7 @@ import {
import CommentDialog from "@/features/comment/components/comment-dialog";
import { EditorBubbleMenu } from "@/features/editor/components/bubble-menu/bubble-menu";
import { ReadonlyBubbleMenu } from "@/features/editor/components/bubble-menu/readonly-bubble-menu";
import TableCellMenu from "@/features/editor/components/table/table-cell-menu.tsx";
import TableMenu from "@/features/editor/components/table/table-menu.tsx";
import { TableHandlesLayer } from "@/features/editor/components/table/handle/table-handles-layer";
import ImageMenu from "@/features/editor/components/image/image-menu.tsx";
@@ -73,7 +74,6 @@ import { EditorAiMenu } from "@/ee/ai/components/editor/ai-menu/ai-menu";
import { EditorLinkMenu } from "@/features/editor/components/link/link-menu";
import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
import { useTranslation } from "react-i18next";
interface PageEditorProps {
pageId: string;
@@ -88,7 +88,6 @@ export default function PageEditor({
content,
canComment,
}: PageEditorProps) {
const { t } = useTranslation();
const collaborationURL = useCollaborationUrl();
const isComponentMounted = useRef(false);
const editorRef = useRef<Editor | null>(null);
@@ -233,9 +232,6 @@ export default function PageEditor({
editorProps: {
scrollThreshold: 80,
scrollMargin: 80,
attributes: {
"aria-label": t("Page content"),
},
handleDOMEvents: {
keydown: (_view, event) => {
if (platformModifierKey(event) && event.code === "KeyS") {
@@ -395,11 +391,6 @@ export default function PageEditor({
immediatelyRender={true}
extensions={mainExtensions}
content={content}
editorProps={{
attributes: {
"aria-label": t("Page content"),
},
}}
/>
) : (
<div className="editor-container" style={{ position: "relative" }}>
@@ -430,7 +421,9 @@ export default function PageEditor({
{editor &&
!editorIsEditable &&
(editable || canComment) &&
providersRef.current && <ReadonlyBubbleMenu editor={editor} />}
providersRef.current && (
<ReadonlyBubbleMenu editor={editor} />
)}
{showCommentPopup && (
<CommentDialog editor={editor} pageId={pageId} />
)}
@@ -1,7 +1,7 @@
.ProseMirror .is-editor-empty:first-child::before {
content: attr(data-placeholder);
float: left;
color: var(--mantine-color-placeholder);
color: #adb5bd;
pointer-events: none;
height: 0;
@@ -13,7 +13,7 @@
.ProseMirror .is-empty::before {
content: attr(data-placeholder);
float: left;
color: var(--mantine-color-placeholder);
color: #adb5bd;
pointer-events: none;
height: 0;
@@ -87,9 +87,6 @@ export function TitleEditor({
immediatelyRender: true,
shouldRerenderOnTransaction: false,
editorProps: {
attributes: {
"aria-label": t("Page title"),
},
handleDOMEvents: {
keydown: (_view, event) => {
if (platformModifierKey(event) && event.code === "KeyS") {
@@ -1,5 +1,4 @@
import { ActionIcon, Tooltip } from "@mantine/core";
import { notifications } from "@mantine/notifications";
import { IconStar, IconStarFilled } from "@tabler/icons-react";
import {
useFavoriteIds,
@@ -15,8 +14,6 @@ type StarButtonProps = {
pageId?: string;
spaceId?: string;
templateId?: string;
/** Name of the item being favorited, used to make the button's accessible name descriptive. */
name?: string;
size?: number;
};
@@ -28,7 +25,7 @@ function getEntityId(props: StarButtonProps): string | undefined {
}
export default function StarButton(props: StarButtonProps) {
const { type, name, size = 18 } = props;
const { type, size = 18 } = props;
const { t } = useTranslation();
const favoriteIds = useFavoriteIds(type);
const addMutation = useAddFavoriteMutation();
@@ -50,46 +47,22 @@ export default function StarButton(props: StarButtonProps) {
};
if (isFavorited) {
removeMutation.mutate(params, {
onSuccess: () => {
notifications.show({
message: name
? t("Removed {{name}} from favorites", { name })
: t("Removed from favorites"),
});
},
});
removeMutation.mutate(params);
} else {
addMutation.mutate(params, {
onSuccess: () => {
notifications.show({
message: name
? t("Added {{name}} to favorites", { name })
: t("Added to favorites"),
});
},
});
addMutation.mutate(params);
}
};
// Tooltip label stays short. Accessible name expands to include the item
// so screen reader users can distinguish stars on different rows.
const tooltipLabel = isFavorited
const label = isFavorited
? t("Remove from favorites")
: t("Add to favorites");
const ariaLabel = name
? isFavorited
? t("Remove {{name}} from favorites", { name })
: t("Add {{name}} to favorites", { name })
: tooltipLabel;
return (
<Tooltip label={tooltipLabel} openDelay={250} withArrow>
<Tooltip label={label} openDelay={250} withArrow>
<ActionIcon
variant="subtle"
color={isFavorited ? "yellow" : "gray"}
aria-label={ariaLabel}
aria-label={label}
aria-pressed={isFavorited}
onClick={handleToggle}
loading={isPending}
@@ -31,12 +31,7 @@ export default function AddGroupMemberModal() {
<>
<Button onClick={open}>{t("Add group members")}</Button>
<Modal
opened={opened}
onClose={close}
title={t("Add group members")}
closeButtonProps={{ "aria-label": t("Close") }}
>
<Modal opened={opened} onClose={close} title={t("Add group members")}>
<Divider size="xs" mb="xs" />
<MultiUserSelect
@@ -58,7 +58,6 @@ export function CreateGroupForm() {
label={t("Group name")}
placeholder={t("e.g Developers")}
variant="filled"
data-autofocus
{...form.getInputProps("name")}
/>
@@ -11,12 +11,7 @@ export default function CreateGroupModal() {
<>
<Button onClick={open}>{t("Create group")}</Button>
<Modal
opened={opened}
onClose={close}
title={t("Create group")}
closeButtonProps={{ "aria-label": t("Close") }}
>
<Modal opened={opened} onClose={close} title={t("Create group")}>
<Divider size="xs" mb="xs" />
<CreateGroupForm />
</Modal>
@@ -9,7 +9,6 @@ import { z } from "zod/v4";
import { useParams } from "react-router-dom";
import { useTranslation } from "react-i18next";
import { zod4Resolver } from "mantine-form-zod-resolver";
import { IGroup } from "@/features/group/types/group.types.ts";
const formSchema = z.object({
name: z.string().min(2).max(100),
@@ -19,16 +18,13 @@ const formSchema = z.object({
type FormValues = z.infer<typeof formSchema>;
interface EditGroupFormProps {
onClose?: () => void;
group?: IGroup;
}
export function EditGroupForm({ onClose, group: groupProp }: EditGroupFormProps) {
export function EditGroupForm({ onClose }: EditGroupFormProps) {
const { t } = useTranslation();
const updateGroupMutation = useUpdateGroupMutation();
const { isSuccess } = updateGroupMutation;
const { groupId: routeGroupId } = useParams();
const groupId = groupProp?.id ?? routeGroupId;
const { data: queriedGroup } = useGroupQuery(groupProp ? undefined : groupId);
const group = groupProp ?? queriedGroup;
const { groupId } = useParams();
const { data: group } = useGroupQuery(groupId);
useEffect(() => {
if (isSuccess) {
@@ -70,7 +66,6 @@ export function EditGroupForm({ onClose, group: groupProp }: EditGroupFormProps)
label={t("Group name")}
placeholder={t("e.g Developers")}
variant="filled"
data-autofocus
{...form.getInputProps("name")}
/>
@@ -1,31 +1,23 @@
import { Divider, Modal } from "@mantine/core";
import { EditGroupForm } from "@/features/group/components/edit-group-form.tsx";
import { useTranslation } from "react-i18next";
import { IGroup } from "@/features/group/types/group.types.ts";
interface EditGroupModalProps {
opened: boolean;
onClose: () => void;
group?: IGroup;
}
export default function EditGroupModal({
opened,
onClose,
group,
}: EditGroupModalProps) {
const { t } = useTranslation();
return (
<>
<Modal
opened={opened}
onClose={onClose}
title={t("Edit group")}
closeButtonProps={{ "aria-label": t("Close") }}
>
<Modal opened={opened} onClose={onClose} title={t("Edit group")}>
<Divider size="xs" mb="xs" />
<EditGroupForm onClose={onClose} group={group} />
<EditGroupForm onClose={onClose} />
</Modal>
</>
);
@@ -10,28 +10,18 @@ import { useDisclosure } from "@mantine/hooks";
import EditGroupModal from "@/features/group/components/edit-group-modal.tsx";
import { modals } from "@mantine/modals";
import { useTranslation } from "react-i18next";
import { IGroup } from "@/features/group/types/group.types.ts";
interface GroupActionMenuProps {
group?: IGroup;
}
export default function GroupActionMenu(props: GroupActionMenuProps = {}) {
export default function GroupActionMenu() {
const { t } = useTranslation();
const { groupId: routeGroupId } = useParams();
const groupId = props.group?.id ?? routeGroupId;
const { data: queriedGroup } = useGroupQuery(props.group ? undefined : groupId);
const group = props.group ?? queriedGroup;
const { groupId } = useParams();
const { data: group, isLoading } = useGroupQuery(groupId);
const deleteGroupMutation = useDeleteGroupMutation();
const navigate = useNavigate();
const [opened, { open, close }] = useDisclosure(false);
const onDelete = async () => {
await deleteGroupMutation.mutateAsync(groupId);
// Only navigate away if we're currently viewing this group's detail page.
if (routeGroupId === groupId) {
navigate("/settings/groups");
}
navigate("/settings/groups");
};
const openDeleteModal = () =>
@@ -63,11 +53,7 @@ export default function GroupActionMenu(props: GroupActionMenuProps = {}) {
arrowPosition="center"
>
<Menu.Target>
<ActionIcon
variant="subtle"
color="gray"
aria-label={t("Group actions for {{name}}", { name: group.name })}
>
<ActionIcon variant="light" aria-label={t("Group menu")}>
<IconDots size={20} stroke={2} />
</ActionIcon>
</Menu.Target>
@@ -90,7 +76,7 @@ export default function GroupActionMenu(props: GroupActionMenuProps = {}) {
</>
)}
<EditGroupModal opened={opened} onClose={close} group={group} />
<EditGroupModal opened={opened} onClose={close} />
</>
);
}
@@ -1,4 +1,4 @@
import { Table, Group, Text, Anchor, VisuallyHidden } from "@mantine/core";
import { Table, Group, Text, Anchor } from "@mantine/core";
import { useGetGroupsQuery } from "@/features/group/queries/group-query";
import { Link } from "react-router-dom";
import { IconGroupCircle } from "@/components/icons/icon-people-circle.tsx";
@@ -12,8 +12,6 @@ import { AutoTooltipText } from "@/components/ui/auto-tooltip-text.tsx";
import { SearchInput } from "@/components/common/search-input.tsx";
import NoTableResults from "@/components/common/no-table-results.tsx";
import { usePaginateAndSearch } from "@/hooks/use-paginate-and-search.tsx";
import rowClasses from "@/components/ui/clickable-table-row.module.css";
import GroupActionMenu from "@/features/group/components/group-action-menu.tsx";
export default function GroupList() {
const { t } = useTranslation();
@@ -36,16 +34,13 @@ export default function GroupList() {
<Table.Tr>
<Table.Th>{t("Group")}</Table.Th>
<Table.Th>{t("Members")}</Table.Th>
<Table.Th w={60}>
<VisuallyHidden>{t("Actions")}</VisuallyHidden>
</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{data?.items.length > 0 ? (
data?.items.map((group: IGroup, index: number) => (
<Table.Tr key={index} className={rowClasses.row}>
<Table.Tr key={index}>
<Table.Td onMouseEnter={() => prefetchGroupMembers(group.id)}>
<Anchor
size="sm"
@@ -54,7 +49,6 @@ export default function GroupList() {
cursor: "pointer",
color: "var(--mantine-color-text)",
}}
className={rowClasses.link}
component={Link}
to={`/settings/groups/${group.id}`}
>
@@ -86,13 +80,10 @@ export default function GroupList() {
{formatMemberCount(group.memberCount, t)}
</Anchor>
</Table.Td>
<Table.Td>
<GroupActionMenu group={group} />
</Table.Td>
</Table.Tr>
))
) : (
<NoTableResults colSpan={3} />
<NoTableResults colSpan={2} />
)}
</Table.Tbody>
</Table>
@@ -88,11 +88,7 @@ export default function GroupMembersList() {
arrowPosition="center"
>
<Menu.Target>
<ActionIcon
variant="subtle"
c="gray"
aria-label={t("Member actions")}
>
<ActionIcon variant="subtle" c="gray">
<IconDots size={20} stroke={2} />
</ActionIcon>
</Menu.Target>
@@ -17,7 +17,6 @@ import { EmptyState } from "@/components/ui/empty-state";
import { getSpaceUrl } from "@/lib/config";
import { useTranslation } from "react-i18next";
import { getInitialsColor } from "@/lib/get-initials-color";
import rowClasses from "@/components/ui/clickable-table-row.module.css";
type Props = {
spaceId?: string;
@@ -50,10 +49,9 @@ export default function CreatedByMe({ spaceId }: Props) {
<Table highlightOnHover verticalSpacing="sm">
<Table.Tbody>
{pages.map((page) => (
<Table.Tr key={page.id} className={rowClasses.row}>
<Table.Tr key={page.id}>
<Table.Td>
<UnstyledButton
className={rowClasses.link}
component={Link}
to={buildPageUrl(
page?.space.slug,
@@ -17,7 +17,6 @@ import { EmptyState } from "@/components/ui/empty-state";
import { getSpaceUrl } from "@/lib/config";
import { useTranslation } from "react-i18next";
import { getInitialsColor } from "@/lib/get-initials-color";
import rowClasses from "@/components/ui/clickable-table-row.module.css";
interface Props {
spaceId?: string;
@@ -51,10 +50,9 @@ export default function FavoritesPages({ spaceId }: Props) {
<Table.Tbody>
{favorites.map((fav) =>
fav.page ? (
<Table.Tr key={fav.id} className={rowClasses.row}>
<Table.Tr key={fav.id}>
<Table.Td>
<UnstyledButton
className={rowClasses.link}
component={Link}
to={buildPageUrl(
fav.space?.slug,
@@ -7,7 +7,7 @@ import {
Popover,
ScrollArea,
Tabs,
Title,
Text,
Tooltip,
} from "@mantine/core";
import {
@@ -34,14 +34,11 @@ export function NotificationPopover() {
const [opened, setOpened] = useState(false);
const [tab, setTab] = useState<NotificationTab>("direct");
const [filter, setFilter] = useState<NotificationFilter>("all");
const [filterMenuOpened, setFilterMenuOpened] = useState(false);
const [moreMenuOpened, setMoreMenuOpened] = useState(false);
const { data: unreadData } = useUnreadCountQuery();
const markAllRead = useMarkAllReadMutation();
const unreadCount = unreadData?.count ?? 0;
const isSubMenuOpen = filterMenuOpened || moreMenuOpened;
const handleMarkAllRead = () => {
markAllRead.mutate();
@@ -54,9 +51,6 @@ export function NotificationPopover() {
opened={opened}
onChange={setOpened}
withArrow
trapFocus
returnFocus
closeOnEscape={!isSubMenuOpen}
>
<Popover.Target>
<Tooltip label={t("Notifications")} withArrow>
@@ -86,25 +80,14 @@ export function NotificationPopover() {
style={{ width: "min(420px, calc(100vw - 24px))" }}
>
<Group justify="space-between" px="md" py="sm">
<Title order={2} fz="sm" fw={600}>
<Text fw={600} size="sm">
{t("Notifications")}
</Title>
</Text>
<Group gap={4}>
<Menu
position="bottom-end"
withArrow
withinPortal={false}
opened={filterMenuOpened}
onChange={setFilterMenuOpened}
>
<Menu position="bottom-end" withArrow withinPortal={false}>
<Menu.Target>
<Tooltip label={t("Filter")} withArrow>
<ActionIcon
variant="subtle"
color="dark"
size="sm"
aria-label={t("Filter")}
>
<ActionIcon variant="subtle" color="dark" size="sm">
<IconFilter size={16} />
</ActionIcon>
</Tooltip>
@@ -130,21 +113,10 @@ export function NotificationPopover() {
</Menu.Dropdown>
</Menu>
<Menu
position="bottom-end"
withArrow
withinPortal={false}
opened={moreMenuOpened}
onChange={setMoreMenuOpened}
>
<Menu position="bottom-end" withArrow withinPortal={false}>
<Menu.Target>
<Tooltip label={t("More options")} withArrow>
<ActionIcon
variant="subtle"
color="dark"
size="sm"
aria-label={t("More options")}
>
<ActionIcon variant="subtle" color="dark" size="sm">
<IconDots size={16} />
</ActionIcon>
</Tooltip>
@@ -23,7 +23,7 @@ export function BacklinksModal({
<Modal.Content>
<Modal.Header>
<Modal.Title fw={500}>{t("Backlinks")}</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body>
<Stack gap="lg">
@@ -32,7 +32,7 @@ export default function HistoryModal({ pageId, pageTitle }: Props) {
{t("Page history")}
</Text>
</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body
p={0}
@@ -60,7 +60,7 @@ export default function HistoryModal({ pageId, pageTitle }: Props) {
{t("Page history")}
</Text>
</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body>
<HistoryModalBody pageId={pageId} />
@@ -80,7 +80,7 @@ export default function CopyPageModal({
<Modal.Content style={{ overflow: "hidden" }}>
<Modal.Header py={0}>
<Modal.Title fw={500}>{t("Copy page")}</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body>
<Text mb="xs" c="dimmed" size="sm">
@@ -18,7 +18,7 @@ import {
IconWifiOff,
} from "@tabler/icons-react";
import React, { useEffect, useRef, useState } from "react";
import { useAsideTriggerProps } from "@/hooks/use-toggle-aside.tsx";
import useToggleAside from "@/hooks/use-toggle-aside.tsx";
import { useAtom, useAtomValue } from "jotai";
import { historyAtoms } from "@/features/page-history/atoms/history-atoms.ts";
import { useDisclosure, useHotkeys } from "@mantine/hooks";
@@ -64,8 +64,7 @@ interface PageHeaderMenuProps {
}
export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
const { t } = useTranslation();
const commentsTriggerProps = useAsideTriggerProps("comments");
const tocTriggerProps = useAsideTriggerProps("toc");
const toggleAside = useToggleAside();
const { pageSlug } = useParams();
const { data: page } = usePageQuery({
pageId: extractPageSlugId(pageSlug),
@@ -110,7 +109,7 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
variant="subtle"
color="dark"
aria-label={t("Comments")}
{...commentsTriggerProps}
onClick={() => toggleAside("comments")}
>
<IconMessage size={20} stroke={2} />
</ActionIcon>
@@ -121,7 +120,7 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
variant="subtle"
color="dark"
aria-label={t("Table of contents")}
{...tocTriggerProps}
onClick={() => toggleAside("toc")}
>
<IconList size={20} stroke={2} />
</ActionIcon>
@@ -75,7 +75,7 @@ export default function MovePageModal({
<Modal.Content style={{ overflow: "hidden" }}>
<Modal.Header py={0}>
<Modal.Title fw={500}>{t("Move page")}</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body>
<Text mb="xs" c="dimmed" size="sm">
@@ -28,7 +28,7 @@ export default function TrashPageContentModal({
{t("Preview")}
</Text>
</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body p={0}>
<ScrollArea h="650" w="100%" scrollbarSize={5}>
@@ -150,11 +150,7 @@ export default function Trash() {
<Table.Td>
<Menu>
<Menu.Target>
<ActionIcon
variant="subtle"
color="gray"
aria-label={t("Page actions")}
>
<ActionIcon variant="subtle" color="gray">
<IconDots size={20} stroke={1.5} />
</ActionIcon>
</Menu.Target>
@@ -125,7 +125,7 @@ export function NodeMenu({ node, canEdit }: NodeMenuProps) {
<ActionIcon
variant="transparent"
c="gray"
aria-label={t("Page menu for {{name}}", { name: node.name || t("untitled") })}
aria-label={t("Page menu")}
tabIndex={-1}
onClick={(e) => {
e.preventDefault();
@@ -274,7 +274,7 @@ function CreateNode({
<ActionIcon
variant="transparent"
c="gray"
aria-label={t("Create subpage of {{name}}", { name: node.name || t("untitled") })}
aria-label={t("Create page")}
tabIndex={-1}
onClick={(e) => {
e.preventDefault();
@@ -175,8 +175,6 @@ export function SearchSpotlightFilters({
{contentTypeOptions.map((option) => (
<Menu.Item
key={option.value}
role="menuitemradio"
aria-checked={contentType === option.value}
onClick={() =>
!option.disabled &&
contentType !== option.value &&
@@ -202,7 +200,7 @@ export function SearchSpotlightFilters({
</Text>
)}
</div>
{contentType === option.value && <IconCheck size={20} aria-hidden />}
{contentType === option.value && <IconCheck size={20} />}
</Group>
</Menu.Item>
))}
@@ -1,6 +1,6 @@
import { Spotlight } from "@mantine/spotlight";
import { IconSearch, IconSparkles } from "@tabler/icons-react";
import { Group, Button, VisuallyHidden } from "@mantine/core";
import { Group, Button } from "@mantine/core";
import React, { useState, useMemo, useEffect } from "react";
import { useDebouncedValue } from "@mantine/hooks";
import { useTranslation } from "react-i18next";
@@ -126,7 +126,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
<Group gap="xs" px="sm" pt="sm" pb="xs">
<Spotlight.Search
placeholder={isAiMode ? t("Ask a question...") : t("Search...")}
aria-label={isAiMode ? t("Ask a question...") : t("Search")}
leftSection={<IconSearch size={20} stroke={1.5} />}
style={{ flex: 1 }}
onKeyDown={(e) => {
@@ -162,18 +161,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
/>
</div>
<VisuallyHidden role="status" aria-live="polite">
{isAiMode
? query.length > 0 && !isAiLoading && !aiSearchResult
? t("No answer available")
: ""
: query.length > 0 && !isLoading
? resultItems.length === 0
? t("No results found")
: t("{{count}} results found", { count: resultItems.length })
: ""}
</VisuallyHidden>
<Spotlight.ActionsList>
{isAiMode ? (
<>
@@ -74,7 +74,6 @@ export function ShareSearchSpotlight({ shareId }: ShareSearchSpotlightProps) {
>
<Spotlight.Search
placeholder={t("Search...")}
aria-label={t("Search")}
leftSection={<IconSearch size={20} stroke={1.5} />}
/>
<Spotlight.ActionsList>
@@ -7,7 +7,6 @@ import {
Stack,
Table,
Text,
VisuallyHidden,
} from "@mantine/core";
import { IconDevices } from "@tabler/icons-react";
import { useTranslation } from "react-i18next";
@@ -34,16 +33,11 @@ export default function SessionList() {
if (isLoading) {
return (
<Table verticalSpacing="md">
<Table.Caption>
<VisuallyHidden>{t("Active sessions")}</VisuallyHidden>
</Table.Caption>
<Table.Thead>
<Table.Tr>
<Table.Th>{t("Device Name")}</Table.Th>
<Table.Th>{t("Last Active")}</Table.Th>
<Table.Th>
<VisuallyHidden>{t("Action")}</VisuallyHidden>
</Table.Th>
<Table.Th aria-label={t("Action")} />
</Table.Tr>
</Table.Thead>
<Table.Tbody>
@@ -96,18 +90,11 @@ export default function SessionList() {
)}
<Table verticalSpacing="md">
<Table.Caption>
<VisuallyHidden>{t("Active sessions")}</VisuallyHidden>
</Table.Caption>
<Table.Thead>
<Table.Tr>
<Table.Th>{t("Device Name")}</Table.Th>
<Table.Th>{t("Last Active")}</Table.Th>
{otherSessions.length > 0 && (
<Table.Th>
<VisuallyHidden>{t("Action")}</VisuallyHidden>
</Table.Th>
)}
{otherSessions.length > 0 && <Table.Th aria-label={t("Action")} />}
</Table.Tr>
</Table.Thead>
<Table.Tbody>
@@ -14,7 +14,6 @@ import { getPageIcon } from "@/lib";
import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
import { EmptyState } from "@/components/ui/empty-state.tsx";
import classes from "./share.module.css";
import rowClasses from "@/components/ui/clickable-table-row.module.css";
export default function ShareList() {
const { t } = useTranslation();
@@ -39,7 +38,7 @@ export default function ShareList() {
<Table.Tbody>
{data?.items.map((share: ISharedItem, index: number) => (
<Table.Tr key={index} className={rowClasses.row}>
<Table.Tr key={index}>
<Table.Td>
<Anchor
size="sm"
@@ -48,7 +47,6 @@ export default function ShareList() {
cursor: "pointer",
color: "var(--mantine-color-text)",
}}
className={rowClasses.link}
component={Link}
target="_blank"
to={buildSharedPageUrl({
@@ -42,7 +42,6 @@ import {
import { ShareSearchSpotlight } from "@/features/search/components/share-search-spotlight.tsx";
import { shareSearchSpotlight } from "@/features/search/constants";
import ShareBranding from '@/features/share/components/share-branding.tsx';
import { MAIN_CONTENT_ID, SkipToMain } from "@/components/ui/skip-to-main.tsx";
const MemoizedSharedTree = React.memo(SharedTree);
@@ -123,9 +122,7 @@ export default function ShareShell({
}, [data, treeData, setSharedPageTree, setSharedTreeData]);
return (
<>
<SkipToMain />
<AppShell
<AppShell
header={{ height: 50 }}
{...(data?.pageTree?.length > 1 && {
navbar: {
@@ -245,7 +242,7 @@ export default function ShareShell({
</AppShell.Navbar>
)}
<AppShell.Main id={MAIN_CONTENT_ID} tabIndex={-1}>
<AppShell.Main>
{children}
{data && shareId && !(data.features?.length > 0) && <ShareBranding />}
@@ -267,6 +264,5 @@ export default function ShareShell({
<ShareSearchSpotlight shareId={shareId} />
</AppShell>
</>
);
}
@@ -1,6 +1,6 @@
import { Button, Divider, Group, Modal, Stack } from "@mantine/core";
import { useDisclosure } from "@mantine/hooks";
import React, { useId, useState } from "react";
import React, { useState } from "react";
import { useAddSpaceMemberMutation } from "@/features/space/queries/space-query.ts";
import { MultiMemberSelect } from "@/features/space/components/multi-member-select.tsx";
import { SpaceMemberRole } from "@/features/space/components/space-member-role.tsx";
@@ -14,7 +14,6 @@ export default function AddSpaceMembersModal({
spaceId,
}: AddSpaceMemberModalProps) {
const { t } = useTranslation();
const titleId = useId();
const [opened, { open, close }] = useDisclosure(false);
const [memberIds, setMemberIds] = useState<string[]>([]);
const [role, setRole] = useState<string>(SpaceRole.WRITER);
@@ -52,33 +51,24 @@ export default function AddSpaceMembersModal({
return (
<>
<Button onClick={open}>{t("Add space members")}</Button>
<Modal.Root opened={opened} onClose={close}>
<Modal.Overlay />
<Modal.Content aria-labelledby={titleId}>
<Modal.Header>
<Modal.Title id={titleId}>{t("Add space members")}</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
</Modal.Header>
<Modal.Body>
<Divider size="xs" mb="xs" />
<Modal opened={opened} onClose={close} title={t("Add space members")}>
<Divider size="xs" mb="xs" />
<Stack>
<MultiMemberSelect onChange={handleMultiSelectChange} />
<SpaceMemberRole
onSelect={handleRoleSelection}
defaultRole={role}
label={t("Select role")}
/>
</Stack>
<Stack>
<MultiMemberSelect onChange={handleMultiSelectChange} />
<SpaceMemberRole
onSelect={handleRoleSelection}
defaultRole={role}
label={t("Select role")}
/>
</Stack>
<Group justify="flex-end" mt="md">
<Button onClick={handleSubmit} type="submit">
{t("Add")}
</Button>
</Group>
</Modal.Body>
</Modal.Content>
</Modal.Root>
<Group justify="flex-end" mt="md">
<Button onClick={handleSubmit} type="submit">
{t("Add")}
</Button>
</Group>
</Modal>
</>
);
}
@@ -1,4 +1,4 @@
import { Group, Box, Button, TextInput, Stack, Textarea, Text } from "@mantine/core";
import { Group, Box, Button, TextInput, Stack, Textarea } from "@mantine/core";
import React, { useEffect } from "react";
import { useForm } from "@mantine/form";
import { zod4Resolver } from "mantine-form-zod-resolver";
@@ -69,25 +69,10 @@ export function CreateSpaceForm() {
navigate(getSpaceUrl(createdSpace.slug));
};
function handleValidationFailure(errors: Record<string, unknown>) {
const firstInvalidId = Object.keys(errors)[0];
if (firstInvalidId) {
document.getElementById(firstInvalidId)?.focus();
}
}
return (
<>
<Box maw="500" mx="auto">
<form
onSubmit={form.onSubmit(
(values) => handleSubmit(values),
handleValidationFailure,
)}
>
<Text size="sm" c="dimmed" mb="sm">
{t("* indicates required fields")}
</Text>
<form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
<Stack>
<TextInput
withAsterisk
@@ -95,8 +80,6 @@ export function CreateSpaceForm() {
label={t("Space name")}
placeholder={t("e.g Product Team")}
variant="filled"
data-autofocus
errorProps={{ role: "alert" }}
{...form.getInputProps("name")}
/>
@@ -106,7 +89,6 @@ export function CreateSpaceForm() {
label={t("Space slug")}
placeholder={t("e.g product")}
variant="filled"
errorProps={{ role: "alert" }}
{...form.getInputProps("slug")}
/>
@@ -118,7 +100,6 @@ export function CreateSpaceForm() {
autosize
minRows={2}
maxRows={8}
errorProps={{ role: "alert" }}
{...form.getInputProps("description")}
/>
</Stack>
@@ -11,12 +11,7 @@ export default function CreateSpaceModal() {
<>
<Button onClick={open}>{t("Create space")}</Button>
<Modal
opened={opened}
onClose={close}
title={t("Create space")}
closeButtonProps={{ "aria-label": t("Close") }}
>
<Modal opened={opened} onClose={close} title={t("Create space")}>
<Divider size="xs" mb="xs" />
<CreateSpaceForm />
</Modal>
@@ -48,7 +48,7 @@ export default function SpaceSettingsModal({
{space?.name}
</Text>
</Modal.Title>
<Modal.CloseButton aria-label={t("Close")} />
<Modal.CloseButton />
</Modal.Header>
<Modal.Body>
<div style={{ height: rem(600) }}>
@@ -38,8 +38,6 @@ export function SwitchSpace({
shadow="md"
opened={opened}
onChange={toggle}
trapFocus
returnFocus
>
<Popover.Target>
<Button
@@ -6,11 +6,6 @@
box-shadow: var(--mantine-shadow-xs);
transform: scale(1.02);
}
&:focus-visible {
outline: 2px solid var(--mantine-primary-color-filled);
outline-offset: 2px;
}
}
.cardSection {
@@ -1,4 +1,4 @@
import { Text, Card, rem, Group, Button, Skeleton, Title } from "@mantine/core";
import { Text, Card, rem, Group, Button, Skeleton } from "@mantine/core";
import {
prefetchSpace,
useGetSpacesQuery,
@@ -32,9 +32,9 @@ export default function SpaceCarousel() {
return (
<>
<Group justify="space-between" align="center" mb="md">
<Title order={2} size="h6" fw={500}>
<Text fz="sm" fw={500}>
{t("Spaces you belong to")}
</Title>
</Text>
</Group>
<CardCarousel ariaLabel={t("Spaces you belong to")}>
{Array.from({ length: 4 }, (_, i) => (
@@ -80,9 +80,9 @@ export default function SpaceCarousel() {
return (
<>
<Group justify="space-between" align="center" mb="md">
<Title order={2} size="h6" fw={500}>
<Text fz="sm" fw={500}>
{t("Spaces you belong to")}
</Title>
</Text>
</Group>
<CardCarousel ariaLabel={t("Spaces you belong to")}>{cards}</CardCarousel>
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { useSpaceQuery } from "@/features/space/queries/space-query.ts";
import { EditSpaceForm } from "@/features/space/components/edit-space-form.tsx";
import { Button, Divider, Text, Title } from "@mantine/core";
import { Button, Divider, Text } from "@mantine/core";
import DeleteSpaceModal from "./delete-space-modal";
import { useDisclosure } from "@mantine/hooks";
import ExportModal from "@/components/common/export-modal.tsx";
@@ -65,9 +65,9 @@ export default function SpaceDetails({ spaceId, readOnly }: SpaceDetailsProps) {
<>
{space && (
<div>
<Title order={3} my="md" size="h6" fw={600}>
<Text my="md" fw={600}>
{t("Details")}
</Title>
</Text>
<div style={{ marginBottom: "20px" }}>
<Text size="sm" fw={500} mb="xs">
@@ -74,11 +74,7 @@ export function SpaceFilterMenu({
/>
<ScrollArea.Autosize mah={280}>
<Menu.Item
role="menuitemradio"
aria-checked={!value}
onClick={() => onChange(null)}
>
<Menu.Item onClick={() => onChange(null)}>
<Group flex="1" gap="xs">
<Avatar
color="initials"
@@ -94,19 +90,14 @@ export function SpaceFilterMenu({
{t("Search in all your spaces")}
</Text>
</div>
{!value && <IconCheck size={20} aria-hidden />}
{!value && <IconCheck size={20} />}
</Group>
</Menu.Item>
<Divider my="xs" />
{orderedSpaces.map((space) => (
<Menu.Item
key={space.id}
role="menuitemradio"
aria-checked={value === space.id}
onClick={() => onChange(space.id)}
>
<Menu.Item key={space.id} onClick={() => onChange(space.id)}>
<Group flex="1" gap="xs">
<Avatar
color="initials"
@@ -117,7 +108,7 @@ export function SpaceFilterMenu({
<Text size="sm" fw={500} style={{ flex: 1 }} truncate>
{space.name}
</Text>
{value === space.id && <IconCheck size={20} aria-hidden />}
{value === space.id && <IconCheck size={20} />}
</Group>
</Menu.Item>
))}
@@ -4,11 +4,6 @@
box-shadow: var(--mantine-shadow-xs);
transform: scale(1.02);
}
&:focus-visible {
outline: 2px solid var(--mantine-primary-color-filled);
outline-offset: 2px;
}
}
.cardSection {
@@ -1,4 +1,4 @@
import { Text, SimpleGrid, Card, rem, Group, Button, Title } from "@mantine/core";
import { Text, SimpleGrid, Card, rem, Group, Button } from "@mantine/core";
import React from "react";
import {
prefetchSpace,
@@ -33,7 +33,7 @@ export default function SpaceGrid() {
>
<Card.Section className={classes.cardSection} h={40}>
<div className={classes.starButton} data-favorited={spaceFavoriteIds.has(space.id)}>
<StarButton type="space" spaceId={space.id} name={space.name} size={16} />
<StarButton type="space" spaceId={space.id} size={16} />
</div>
</Card.Section>
<CustomAvatar
@@ -59,9 +59,9 @@ export default function SpaceGrid() {
return (
<>
<Group justify="space-between" align="center" mb="md">
<Title order={2} size="h6" fw={500}>
<Text fz="sm" fw={500}>
{t("Spaces you belong to")}
</Title>
</Text>
</Group>
<SimpleGrid cols={{ base: 1, xs: 2, sm: 3 }}>{cards}</SimpleGrid>

Some files were not shown because too many files have changed in this diff Show More