mirror of
https://github.com/docmost/docmost.git
synced 2026-05-09 07:43:06 +08:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2d8b470495 | |||
| c66c08fa78 | |||
| 6046d04375 | |||
| 5d8c11e741 | |||
| de60aa7e61 | |||
| c9fa6e20b3 | |||
| ec51ca7815 | |||
| 2b63137217 | |||
| 3227bc6059 | |||
| 73dc62bca3 | |||
| 3c74bb3dee | |||
| dbe6c2d6ba | |||
| fe18f22dc6 | |||
| fcef0c6b96 | |||
| 17f3158a3b | |||
| b74ca00bfd | |||
| c247d4c1e3 | |||
| 641ce142df | |||
| 1d2486455f |
@@ -54,7 +54,6 @@
|
|||||||
"react-router-dom": "^7.13.1",
|
"react-router-dom": "^7.13.1",
|
||||||
"semver": "^7.7.4",
|
"semver": "^7.7.4",
|
||||||
"socket.io-client": "^4.8.3",
|
"socket.io-client": "^4.8.3",
|
||||||
"tiptap-extension-global-drag-handle": "^0.1.18",
|
|
||||||
"zod": "^4.3.6"
|
"zod": "^4.3.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -416,6 +416,7 @@
|
|||||||
"{{latestVersion}} is available": "{{latestVersion}} is available",
|
"{{latestVersion}} is available": "{{latestVersion}} is available",
|
||||||
"Default page edit mode": "Default page edit mode",
|
"Default page edit mode": "Default page edit mode",
|
||||||
"Choose your preferred page edit mode. Avoid accidental edits.": "Choose your preferred page edit mode. Avoid accidental edits.",
|
"Choose your preferred page edit mode. Avoid accidental edits.": "Choose your preferred page edit mode. Avoid accidental edits.",
|
||||||
|
"Choose {{format}} file": "Choose {{format}} file",
|
||||||
"Reading": "Reading",
|
"Reading": "Reading",
|
||||||
"Delete member": "Delete member",
|
"Delete member": "Delete member",
|
||||||
"Member deleted successfully": "Member deleted successfully",
|
"Member deleted successfully": "Member deleted successfully",
|
||||||
@@ -869,6 +870,12 @@
|
|||||||
"Previous 7 days": "Previous 7 days",
|
"Previous 7 days": "Previous 7 days",
|
||||||
"Previous 30 days": "Previous 30 days",
|
"Previous 30 days": "Previous 30 days",
|
||||||
"Search chats...": "Search chats...",
|
"Search chats...": "Search chats...",
|
||||||
|
"Search chats": "Search chats",
|
||||||
|
"Ask anything... Use @ to mention pages": "Ask anything... Use @ to mention pages",
|
||||||
|
"Ask anything or search your workspace": "Ask anything or search your workspace",
|
||||||
|
"Welcome to {{name}}": "Welcome to {{name}}",
|
||||||
|
"Add files": "Add files",
|
||||||
|
"Mention a page": "Mention a page",
|
||||||
"Start a new chat to see it here.": "Start a new chat to see it here.",
|
"Start a new chat to see it here.": "Start a new chat to see it here.",
|
||||||
"Summarize this page": "Summarize this page",
|
"Summarize this page": "Summarize this page",
|
||||||
"Toggle AI Chat": "Toggle AI Chat",
|
"Toggle AI Chat": "Toggle AI Chat",
|
||||||
@@ -900,5 +907,44 @@
|
|||||||
"SCIM tokens": "SCIM tokens",
|
"SCIM tokens": "SCIM tokens",
|
||||||
"This action cannot be undone. Your identity provider will stop syncing immediately.": "This action cannot be undone. Your identity provider will stop syncing immediately.",
|
"This action cannot be undone. Your identity provider will stop syncing immediately.": "This action cannot be undone. Your identity provider will stop syncing immediately.",
|
||||||
"Toggle SCIM provisioning": "Toggle SCIM provisioning",
|
"Toggle SCIM provisioning": "Toggle SCIM provisioning",
|
||||||
"Token": "Token"
|
"Token": "Token",
|
||||||
|
"Page menu": "Page menu",
|
||||||
|
"Expand": "Expand",
|
||||||
|
"Collapse": "Collapse",
|
||||||
|
"Comment menu": "Comment menu",
|
||||||
|
"Group menu": "Group menu",
|
||||||
|
"Show hidden breadcrumbs": "Show hidden breadcrumbs",
|
||||||
|
"Breadcrumbs": "Breadcrumbs",
|
||||||
|
"Page actions": "Page actions",
|
||||||
|
"Pick emoji": "Pick emoji",
|
||||||
|
"Template menu": "Template menu",
|
||||||
|
"Chat menu": "Chat menu",
|
||||||
|
"API key menu": "API key menu",
|
||||||
|
"Jump to comment selection": "Jump to comment selection",
|
||||||
|
"Slash commands": "Slash commands",
|
||||||
|
"Mention suggestions": "Mention suggestions",
|
||||||
|
"Link suggestions": "Link suggestions",
|
||||||
|
"Diagram editor": "Diagram editor",
|
||||||
|
"Add comment": "Add comment",
|
||||||
|
"Find and replace": "Find and replace",
|
||||||
|
"Main navigation": "Main navigation",
|
||||||
|
"Space navigation": "Space navigation",
|
||||||
|
"Settings navigation": "Settings navigation",
|
||||||
|
"AI navigation": "AI navigation",
|
||||||
|
"Breadcrumb": "Breadcrumb",
|
||||||
|
"Skip to main content": "Skip to main content"
|
||||||
|
"Synced block": "Synced block",
|
||||||
|
"Create a block that stays in sync across pages.": "Create a block that stays in sync across pages.",
|
||||||
|
"Editing original": "Editing original",
|
||||||
|
"Copy synced block": "Copy synced block",
|
||||||
|
"Unsync": "Unsync",
|
||||||
|
"Delete synced block": "Delete synced block",
|
||||||
|
"Synced to {{count}} other page_one": "Synced to {{count}} other page",
|
||||||
|
"Synced to {{count}} other page_other": "Synced to {{count}} other pages",
|
||||||
|
"ORIGINAL": "ORIGINAL",
|
||||||
|
"THIS PAGE": "THIS PAGE",
|
||||||
|
"No pages": "No pages",
|
||||||
|
"The original synced block no longer exists": "The original synced block no longer exists",
|
||||||
|
"You don't have access to this synced block": "You don't have access to this synced block",
|
||||||
|
"Failed to load this synced block": "Failed to load this synced block"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,6 +80,12 @@ export default function AvatarUploader({
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const ariaLabel = {
|
||||||
|
[AvatarIconType.AVATAR]: t("Change avatar"),
|
||||||
|
[AvatarIconType.SPACE_ICON]: t("Change space icon"),
|
||||||
|
[AvatarIconType.WORKSPACE_ICON]: t("Change workspace icon"),
|
||||||
|
}[type];
|
||||||
|
|
||||||
const handleRemove = async () => {
|
const handleRemove = async () => {
|
||||||
if (disabled) return;
|
if (disabled) return;
|
||||||
|
|
||||||
@@ -104,6 +110,8 @@ export default function AvatarUploader({
|
|||||||
ref={fileInputRef}
|
ref={fileInputRef}
|
||||||
onChange={handleFileInputChange}
|
onChange={handleFileInputChange}
|
||||||
accept="image/png,image/jpeg,image/jpg"
|
accept="image/png,image/jpeg,image/jpg"
|
||||||
|
aria-label={ariaLabel}
|
||||||
|
tabIndex={-1}
|
||||||
style={{ display: "none" }}
|
style={{ display: "none" }}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -115,6 +123,8 @@ export default function AvatarUploader({
|
|||||||
size={size}
|
size={size}
|
||||||
avatarUrl={currentImageUrl}
|
avatarUrl={currentImageUrl}
|
||||||
name={fallbackName}
|
name={fallbackName}
|
||||||
|
aria-label={ariaLabel}
|
||||||
|
aria-haspopup="menu"
|
||||||
style={{
|
style={{
|
||||||
cursor: disabled || isLoading ? "default" : "pointer",
|
cursor: disabled || isLoading ? "default" : "pointer",
|
||||||
opacity: isLoading ? 0.6 : 1,
|
opacity: isLoading ? 0.6 : 1,
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ export default function CopyTextButton({ text, size }: CopyProps) {
|
|||||||
variant="subtle"
|
variant="subtle"
|
||||||
onClick={copy}
|
onClick={copy}
|
||||||
size={size}
|
size={size}
|
||||||
|
aria-label={copied ? t("Copied") : t("Copy")}
|
||||||
>
|
>
|
||||||
{copied ? <IconCheck size={16} /> : <IconCopy size={16} />}
|
{copied ? <IconCheck size={16} /> : <IconCopy size={16} />}
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import {
|
|||||||
UnstyledButton,
|
UnstyledButton,
|
||||||
Badge,
|
Badge,
|
||||||
Table,
|
Table,
|
||||||
ActionIcon,
|
ThemeIcon,
|
||||||
Button,
|
Button,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
@@ -49,9 +49,9 @@ export default function RecentChanges({ spaceId }: Props) {
|
|||||||
>
|
>
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
{page.icon || (
|
{page.icon || (
|
||||||
<ActionIcon variant="transparent" color="gray" size={18}>
|
<ThemeIcon variant="transparent" color="gray" size={18}>
|
||||||
<IconFileDescription size={18} />
|
<IconFileDescription size={18} />
|
||||||
</ActionIcon>
|
</ThemeIcon>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Text fw={500} size="md" lineClamp={1}>
|
<Text fw={500} size="md" lineClamp={1}>
|
||||||
|
|||||||
@@ -6,12 +6,14 @@ import { useTranslation } from "react-i18next";
|
|||||||
|
|
||||||
export interface SearchInputProps {
|
export interface SearchInputProps {
|
||||||
placeholder?: string;
|
placeholder?: string;
|
||||||
|
ariaLabel?: string;
|
||||||
debounceDelay?: number;
|
debounceDelay?: number;
|
||||||
onSearch: (value: string) => void;
|
onSearch: (value: string) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SearchInput({
|
export function SearchInput({
|
||||||
placeholder,
|
placeholder,
|
||||||
|
ariaLabel,
|
||||||
debounceDelay = 500,
|
debounceDelay = 500,
|
||||||
onSearch,
|
onSearch,
|
||||||
}: SearchInputProps) {
|
}: SearchInputProps) {
|
||||||
@@ -28,6 +30,7 @@ export function SearchInput({
|
|||||||
<TextInput
|
<TextInput
|
||||||
size="sm"
|
size="sm"
|
||||||
placeholder={placeholder || t("Search...")}
|
placeholder={placeholder || t("Search...")}
|
||||||
|
aria-label={ariaLabel || placeholder || t("Search")}
|
||||||
leftSection={<IconSearch size={16} />}
|
leftSection={<IconSearch size={16} />}
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(e) => setValue(e.currentTarget.value)}
|
onChange={(e) => setValue(e.currentTarget.value)}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import { ActionIcon, rem } from "@mantine/core";
|
import { ThemeIcon } from "@mantine/core";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { IconUsersGroup } from "@tabler/icons-react";
|
import { IconUsersGroup } from "@tabler/icons-react";
|
||||||
|
|
||||||
export function IconGroupCircle() {
|
export function IconGroupCircle() {
|
||||||
return (
|
return (
|
||||||
<ActionIcon variant="light" size="lg" color="gray" radius="xl">
|
<ThemeIcon variant="light" size="lg" color="gray" radius="xl">
|
||||||
<IconUsersGroup stroke={1.5} />
|
<IconUsersGroup stroke={1.5} />
|
||||||
</ActionIcon>
|
</ThemeIcon>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,4 +28,22 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.skipLink {
|
||||||
|
position: fixed;
|
||||||
|
left: 8px;
|
||||||
|
top: 8px;
|
||||||
|
padding: 8px 12px;
|
||||||
|
background: var(--mantine-color-blue-6);
|
||||||
|
color: #fff;
|
||||||
|
border-radius: 4px;
|
||||||
|
text-decoration: none;
|
||||||
|
z-index: 1000;
|
||||||
|
transform: translateY(-150%);
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
transform: translateY(0);
|
||||||
|
outline: 2px solid var(--mantine-color-blue-3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { AppShell, Container } from "@mantine/core";
|
import { AppShell, Container } from "@mantine/core";
|
||||||
import React, { useEffect, useRef, useState } from "react";
|
import React, { useEffect, useRef, useState } from "react";
|
||||||
import { useLocation } from "react-router-dom";
|
import { useLocation } from "react-router-dom";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import SettingsSidebar from "@/components/settings/settings-sidebar.tsx";
|
import SettingsSidebar from "@/components/settings/settings-sidebar.tsx";
|
||||||
import { useAtom } from "jotai";
|
import { useAtom } from "jotai";
|
||||||
import {
|
import {
|
||||||
@@ -23,11 +24,12 @@ export default function GlobalAppShell({
|
|||||||
}: {
|
}: {
|
||||||
children: React.ReactNode;
|
children: React.ReactNode;
|
||||||
}) {
|
}) {
|
||||||
|
const { t } = useTranslation();
|
||||||
useTrialEndAction();
|
useTrialEndAction();
|
||||||
const [mobileOpened] = useAtom(mobileSidebarAtom);
|
const [mobileOpened] = useAtom(mobileSidebarAtom);
|
||||||
const toggleMobile = useToggleSidebar(mobileSidebarAtom);
|
const toggleMobile = useToggleSidebar(mobileSidebarAtom);
|
||||||
const [desktopOpened] = useAtom(desktopSidebarAtom);
|
const [desktopOpened] = useAtom(desktopSidebarAtom);
|
||||||
const [{ isAsideOpen }] = useAtom(asideStateAtom);
|
const [{ isAsideOpen, tab: asideTab }] = useAtom(asideStateAtom);
|
||||||
const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
|
const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
|
||||||
const [isResizing, setIsResizing] = useState(false);
|
const [isResizing, setIsResizing] = useState(false);
|
||||||
const sidebarRef = useRef(null);
|
const sidebarRef = useRef(null);
|
||||||
@@ -79,7 +81,11 @@ export default function GlobalAppShell({
|
|||||||
const showGlobalSidebar = !isSpaceRoute && !isSettingsRoute && !isAiRoute;
|
const showGlobalSidebar = !isSpaceRoute && !isSettingsRoute && !isAiRoute;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AppShell
|
<>
|
||||||
|
<a href="#main-content" className={classes.skipLink}>
|
||||||
|
{t("Skip to main content")}
|
||||||
|
</a>
|
||||||
|
<AppShell
|
||||||
header={{ height: 45 }}
|
header={{ height: 45 }}
|
||||||
navbar={{
|
navbar={{
|
||||||
width: isSpaceRoute ? sidebarWidth : 300,
|
width: isSpaceRoute ? sidebarWidth : 300,
|
||||||
@@ -105,6 +111,15 @@ export default function GlobalAppShell({
|
|||||||
className={classes.navbar}
|
className={classes.navbar}
|
||||||
withBorder={false}
|
withBorder={false}
|
||||||
ref={sidebarRef}
|
ref={sidebarRef}
|
||||||
|
aria-label={
|
||||||
|
isSpaceRoute
|
||||||
|
? t("Space navigation")
|
||||||
|
: isSettingsRoute
|
||||||
|
? t("Settings navigation")
|
||||||
|
: isAiRoute
|
||||||
|
? t("AI navigation")
|
||||||
|
: t("Main navigation")
|
||||||
|
}
|
||||||
>
|
>
|
||||||
{isSpaceRoute && (
|
{isSpaceRoute && (
|
||||||
<div className={classes.resizeHandle} onMouseDown={startResizing} />
|
<div className={classes.resizeHandle} onMouseDown={startResizing} />
|
||||||
@@ -114,7 +129,7 @@ export default function GlobalAppShell({
|
|||||||
{isAiRoute && <AiChatSidebar />}
|
{isAiRoute && <AiChatSidebar />}
|
||||||
{showGlobalSidebar && <GlobalSidebar />}
|
{showGlobalSidebar && <GlobalSidebar />}
|
||||||
</AppShell.Navbar>
|
</AppShell.Navbar>
|
||||||
<AppShell.Main>
|
<AppShell.Main id="main-content">
|
||||||
{isSettingsRoute ? (
|
{isSettingsRoute ? (
|
||||||
<Container size={900} pb={80}>
|
<Container size={900} pb={80}>
|
||||||
{children}
|
{children}
|
||||||
@@ -125,10 +140,24 @@ export default function GlobalAppShell({
|
|||||||
</AppShell.Main>
|
</AppShell.Main>
|
||||||
|
|
||||||
{isPageRoute && (
|
{isPageRoute && (
|
||||||
<AppShell.Aside className={classes.aside} p="md" withBorder={false}>
|
<AppShell.Aside
|
||||||
|
className={classes.aside}
|
||||||
|
p="md"
|
||||||
|
withBorder={false}
|
||||||
|
aria-label={
|
||||||
|
asideTab === "comments"
|
||||||
|
? t("Comments")
|
||||||
|
: asideTab === "toc"
|
||||||
|
? t("Table of contents")
|
||||||
|
: asideTab === "chat"
|
||||||
|
? t("AI Chat")
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
|
>
|
||||||
<Aside />
|
<Aside />
|
||||||
</AppShell.Aside>
|
</AppShell.Aside>
|
||||||
)}
|
)}
|
||||||
</AppShell>
|
</AppShell>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
.sectionHeader {
|
.sectionHeader {
|
||||||
padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
|
padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
|
||||||
font-size: var(--mantine-font-size-xs);
|
font-size: var(--mantine-font-size-xs);
|
||||||
color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-3));
|
color: var(--mantine-color-dimmed);
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
letter-spacing: 0.5px;
|
letter-spacing: 0.5px;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { ScrollArea, Text, Divider, Modal } from "@mantine/core";
|
import { ScrollArea, Text, Divider, Modal, UnstyledButton } from "@mantine/core";
|
||||||
import {
|
import {
|
||||||
IconHome,
|
IconHome,
|
||||||
IconClock,
|
IconClock,
|
||||||
@@ -119,17 +119,13 @@ export default function GlobalSidebar() {
|
|||||||
</ScrollArea>
|
</ScrollArea>
|
||||||
|
|
||||||
<div className={classes.bottomSection}>
|
<div className={classes.bottomSection}>
|
||||||
<a
|
<UnstyledButton
|
||||||
className={classes.link}
|
className={classes.link}
|
||||||
onClick={(e) => {
|
onClick={openInvite}
|
||||||
e.preventDefault();
|
|
||||||
openInvite();
|
|
||||||
}}
|
|
||||||
href="#"
|
|
||||||
>
|
>
|
||||||
<IconUserPlus className={classes.linkIcon} stroke={2} />
|
<IconUserPlus className={classes.linkIcon} stroke={2} />
|
||||||
<span>{t("Invite People")}</span>
|
<span>{t("Invite People")}</span>
|
||||||
</a>
|
</UnstyledButton>
|
||||||
<Link
|
<Link
|
||||||
className={classes.link}
|
className={classes.link}
|
||||||
data-active={active.startsWith("/settings") || undefined}
|
data-active={active.startsWith("/settings") || undefined}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export default function AppVersion() {
|
|||||||
>
|
>
|
||||||
<Indicator
|
<Indicator
|
||||||
label={t("New update")}
|
label={t("New update")}
|
||||||
color="gray"
|
color="dark"
|
||||||
inline
|
inline
|
||||||
size={16}
|
size={16}
|
||||||
position="middle-end"
|
position="middle-end"
|
||||||
|
|||||||
@@ -230,32 +230,6 @@ export default function SettingsSidebar() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const isDisabled = isItemDisabled(item);
|
const isDisabled = isItemDisabled(item);
|
||||||
const linkElement = (
|
|
||||||
<Link
|
|
||||||
onMouseEnter={!isDisabled ? prefetchHandler : undefined}
|
|
||||||
className={classes.link}
|
|
||||||
data-active={active.startsWith(item.path) || undefined}
|
|
||||||
data-disabled={isDisabled || undefined}
|
|
||||||
key={item.label}
|
|
||||||
to={isDisabled ? "#" : item.path}
|
|
||||||
onClick={(e) => {
|
|
||||||
if (isDisabled) {
|
|
||||||
e.preventDefault();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (mobileSidebarOpened) {
|
|
||||||
toggleMobileSidebar();
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
style={{
|
|
||||||
opacity: isDisabled ? 0.5 : 1,
|
|
||||||
cursor: isDisabled ? "not-allowed" : "pointer",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<item.icon className={classes.linkIcon} stroke={2} />
|
|
||||||
<span>{t(item.label)}</span>
|
|
||||||
</Link>
|
|
||||||
);
|
|
||||||
|
|
||||||
if (isDisabled) {
|
if (isDisabled) {
|
||||||
return (
|
return (
|
||||||
@@ -265,12 +239,41 @@ export default function SettingsSidebar() {
|
|||||||
position="right"
|
position="right"
|
||||||
withArrow
|
withArrow
|
||||||
>
|
>
|
||||||
{linkElement}
|
<span
|
||||||
|
className={classes.link}
|
||||||
|
data-disabled
|
||||||
|
role="link"
|
||||||
|
aria-disabled="true"
|
||||||
|
tabIndex={0}
|
||||||
|
style={{
|
||||||
|
opacity: 0.5,
|
||||||
|
cursor: "not-allowed",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<item.icon className={classes.linkIcon} stroke={2} />
|
||||||
|
<span>{t(item.label)}</span>
|
||||||
|
</span>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return linkElement;
|
return (
|
||||||
|
<Link
|
||||||
|
onMouseEnter={prefetchHandler}
|
||||||
|
className={classes.link}
|
||||||
|
data-active={active.startsWith(item.path) || undefined}
|
||||||
|
key={item.label}
|
||||||
|
to={item.path}
|
||||||
|
onClick={() => {
|
||||||
|
if (mobileSidebarOpened) {
|
||||||
|
toggleMobileSidebar();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<item.icon className={classes.linkIcon} stroke={2} />
|
||||||
|
<span>{t(item.label)}</span>
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -288,7 +291,7 @@ export default function SettingsSidebar() {
|
|||||||
}}
|
}}
|
||||||
variant="transparent"
|
variant="transparent"
|
||||||
c="gray"
|
c="gray"
|
||||||
aria-label="Back"
|
aria-label={t("Back")}
|
||||||
>
|
>
|
||||||
<IconArrowLeft stroke={2} />
|
<IconArrowLeft stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { Avatar } from "@mantine/core";
|
import { Avatar, MantineColor } from "@mantine/core";
|
||||||
import { getAvatarUrl } from "@/lib/config.ts";
|
import { getAvatarUrl } from "@/lib/config.ts";
|
||||||
import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
|
import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
|
||||||
|
|
||||||
@@ -16,19 +16,53 @@ interface CustomAvatarProps {
|
|||||||
mt?: string | number;
|
mt?: string | number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// `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.7",
|
||||||
|
"indigo.7",
|
||||||
|
"pink.8",
|
||||||
|
"red.8",
|
||||||
|
"violet.7",
|
||||||
|
];
|
||||||
|
|
||||||
|
function hashName(input: string) {
|
||||||
|
let hash = 0;
|
||||||
|
for (let i = 0; i < input.length; i += 1) {
|
||||||
|
hash = (hash << 5) - hash + input.charCodeAt(i);
|
||||||
|
hash |= 0;
|
||||||
|
}
|
||||||
|
return Math.abs(hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
function pickInitialsColor(name: string) {
|
||||||
|
return SAFE_INITIALS_COLORS[hashName(name) % SAFE_INITIALS_COLORS.length];
|
||||||
|
}
|
||||||
|
|
||||||
|
function sanitizeInitialsSource(name: string) {
|
||||||
|
const sanitized = name.replace(/[^\p{L}\p{N}\s]/gu, " ").trim();
|
||||||
|
return sanitized || name;
|
||||||
|
}
|
||||||
|
|
||||||
export const CustomAvatar = React.forwardRef<
|
export const CustomAvatar = React.forwardRef<
|
||||||
HTMLInputElement,
|
HTMLInputElement,
|
||||||
CustomAvatarProps
|
CustomAvatarProps
|
||||||
>(({ avatarUrl, name, type, ...props }: CustomAvatarProps, ref) => {
|
>(({ avatarUrl, name, type, color, ...props }: CustomAvatarProps, ref) => {
|
||||||
const avatarLink = getAvatarUrl(avatarUrl, type);
|
const avatarLink = getAvatarUrl(avatarUrl, type);
|
||||||
|
const resolvedColor =
|
||||||
|
!color || color === "initials" ? pickInitialsColor(name ?? "") : color;
|
||||||
|
const initialsSource = sanitizeInitialsSource(name ?? "");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Avatar
|
<Avatar
|
||||||
ref={ref}
|
ref={ref}
|
||||||
src={avatarLink}
|
src={avatarLink}
|
||||||
name={name}
|
name={initialsSource}
|
||||||
alt={name}
|
alt={name}
|
||||||
color="initials"
|
color={resolvedColor}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -74,7 +74,18 @@ export function PageChildren({
|
|||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
{hasNextPage && (
|
{hasNextPage && (
|
||||||
<div className={classes.loadMore} onClick={() => fetchNextPage()}>
|
<div
|
||||||
|
className={classes.loadMore}
|
||||||
|
onClick={() => fetchNextPage()}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === "Enter" || e.key === " ") {
|
||||||
|
e.preventDefault();
|
||||||
|
fetchNextPage();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
>
|
||||||
{t("Load more")}
|
{t("Load more")}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -75,6 +75,9 @@ function EmojiPicker({
|
|||||||
variant={actionIconProps?.variant || "transparent"}
|
variant={actionIconProps?.variant || "transparent"}
|
||||||
size={actionIconProps?.size}
|
size={actionIconProps?.size}
|
||||||
onClick={handlers.toggle}
|
onClick={handlers.toggle}
|
||||||
|
aria-label={t("Pick emoji")}
|
||||||
|
aria-haspopup="dialog"
|
||||||
|
aria-expanded={opened}
|
||||||
>
|
>
|
||||||
{icon}
|
{icon}
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
@@ -132,6 +132,7 @@ export default function AiChatSidebarItem({
|
|||||||
size="xs"
|
size="xs"
|
||||||
color="gray"
|
color="gray"
|
||||||
onClick={(e) => e.preventDefault()}
|
onClick={(e) => e.preventDefault()}
|
||||||
|
aria-label={t("Chat menu")}
|
||||||
>
|
>
|
||||||
<IconDots size={14} />
|
<IconDots size={14} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
@@ -137,7 +137,8 @@ export default function AiChatSidebar() {
|
|||||||
|
|
||||||
<TextInput
|
<TextInput
|
||||||
className={classes.searchInput}
|
className={classes.searchInput}
|
||||||
placeholder="Search chats..."
|
placeholder={t("Search chats...")}
|
||||||
|
aria-label={t("Search chats")}
|
||||||
leftSection={<IconSearch size={14} />}
|
leftSection={<IconSearch size={14} />}
|
||||||
size="xs"
|
size="xs"
|
||||||
value={search}
|
value={search}
|
||||||
|
|||||||
@@ -178,6 +178,7 @@ export default function AsideChatPanel() {
|
|||||||
href="/ai"
|
href="/ai"
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
color="dark"
|
color="dark"
|
||||||
|
aria-label={t("New chat")}
|
||||||
onClick={handleNewChat}
|
onClick={handleNewChat}
|
||||||
>
|
>
|
||||||
<IconPlus size={20} stroke={1.75} />
|
<IconPlus size={20} stroke={1.75} />
|
||||||
@@ -185,13 +186,23 @@ export default function AsideChatPanel() {
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|
||||||
<Tooltip label={t("Open full page")} openDelay={250}>
|
<Tooltip label={t("Open full page")} openDelay={250}>
|
||||||
<ActionIcon variant="subtle" color="dark" onClick={handleExpand}>
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="dark"
|
||||||
|
aria-label={t("Open full page")}
|
||||||
|
onClick={handleExpand}
|
||||||
|
>
|
||||||
<IconArrowsDiagonal size={18} stroke={1.5} />
|
<IconArrowsDiagonal size={18} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|
||||||
<Tooltip label={t("Close")} openDelay={250}>
|
<Tooltip label={t("Close")} openDelay={250}>
|
||||||
<ActionIcon variant="subtle" color="dark" onClick={handleClose}>
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="dark"
|
||||||
|
aria-label={t("Close")}
|
||||||
|
onClick={handleClose}
|
||||||
|
>
|
||||||
<IconX size={20} stroke={1.75} />
|
<IconX size={20} stroke={1.75} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
|
|||||||
isStreaming={isStreaming}
|
isStreaming={isStreaming}
|
||||||
onSend={onSend}
|
onSend={onSend}
|
||||||
onStop={onStop}
|
onStop={onStop}
|
||||||
placeholder="Ask anything... Use @ to mention pages"
|
placeholder={t("Ask anything... Use @ to mention pages")}
|
||||||
autofocus
|
autofocus
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ export default function ChatInput({
|
|||||||
link: false,
|
link: false,
|
||||||
}),
|
}),
|
||||||
Placeholder.configure({
|
Placeholder.configure({
|
||||||
placeholder: placeholder || "Ask anything... Use @ to mention pages",
|
placeholder: placeholder || t("Ask anything... Use @ to mention pages"),
|
||||||
}),
|
}),
|
||||||
CharacterCount.configure({
|
CharacterCount.configure({
|
||||||
limit: 50000,
|
limit: 50000,
|
||||||
@@ -225,6 +225,10 @@ export default function ChatInput({
|
|||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
editorProps: {
|
editorProps: {
|
||||||
|
attributes: {
|
||||||
|
"aria-label": placeholder || t("Ask anything... Use @ to mention pages"),
|
||||||
|
"aria-multiline": "true",
|
||||||
|
},
|
||||||
handleDOMEvents: {
|
handleDOMEvents: {
|
||||||
keydown: (_view, event) => {
|
keydown: (_view, event) => {
|
||||||
if (
|
if (
|
||||||
@@ -275,6 +279,8 @@ export default function ChatInput({
|
|||||||
type="file"
|
type="file"
|
||||||
accept={ACCEPTED_FILE_TYPES}
|
accept={ACCEPTED_FILE_TYPES}
|
||||||
multiple
|
multiple
|
||||||
|
aria-label={t("Add files")}
|
||||||
|
tabIndex={-1}
|
||||||
style={{ display: "none" }}
|
style={{ display: "none" }}
|
||||||
onChange={(e) => handleFileSelect(e.target.files)}
|
onChange={(e) => handleFileSelect(e.target.files)}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -31,7 +31,16 @@ export default function ChatToolGroup({ toolCalls, isStreaming }: Props) {
|
|||||||
<div className={classes.toolGroup}>
|
<div className={classes.toolGroup}>
|
||||||
<div
|
<div
|
||||||
className={classes.toolGroupHeader}
|
className={classes.toolGroupHeader}
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-expanded={expanded}
|
||||||
onClick={() => setExpanded((prev) => !prev)}
|
onClick={() => setExpanded((prev) => !prev)}
|
||||||
|
onKeyDown={(event) => {
|
||||||
|
if (event.key === "Enter" || event.key === " ") {
|
||||||
|
event.preventDefault();
|
||||||
|
setExpanded((prev) => !prev);
|
||||||
|
}
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{activeLabel ? (
|
{activeLabel ? (
|
||||||
<IconLoader2 size={12} className={classes.processingSpinner} />
|
<IconLoader2 size={12} className={classes.processingSpinner} />
|
||||||
|
|||||||
@@ -98,7 +98,7 @@
|
|||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
letter-spacing: 0.08em;
|
letter-spacing: 0.08em;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
|
color: var(--mantine-color-dimmed);
|
||||||
margin-bottom: var(--mantine-spacing-xs);
|
margin-bottom: var(--mantine-spacing-xs);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
.suggestionsLabel {
|
.suggestionsLabel {
|
||||||
font-size: var(--mantine-font-size-xs);
|
font-size: var(--mantine-font-size-xs);
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
|
color: var(--mantine-color-dimmed);
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
letter-spacing: 0.5px;
|
letter-spacing: 0.5px;
|
||||||
margin-bottom: var(--mantine-spacing-sm);
|
margin-bottom: var(--mantine-spacing-sm);
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: var(--mantine-font-size-xs);
|
font-size: var(--mantine-font-size-xs);
|
||||||
color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
|
color: var(--mantine-color-dimmed);
|
||||||
}
|
}
|
||||||
|
|
||||||
.attachmentChips {
|
.attachmentChips {
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
padding: 4px var(--mantine-spacing-xs);
|
padding: 4px var(--mantine-spacing-xs);
|
||||||
font-size: var(--mantine-font-size-xs);
|
font-size: var(--mantine-font-size-xs);
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
|
color: var(--mantine-color-dimmed);
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,7 +104,7 @@
|
|||||||
|
|
||||||
.chatItemDate {
|
.chatItemDate {
|
||||||
font-size: var(--mantine-font-size-xs);
|
font-size: var(--mantine-font-size-xs);
|
||||||
color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
|
color: var(--mantine-color-dimmed);
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
transition: opacity 150ms;
|
transition: opacity 150ms;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export function ApiKeyTable({
|
|||||||
<Table.Th>{t("Last used")}</Table.Th>
|
<Table.Th>{t("Last used")}</Table.Th>
|
||||||
<Table.Th>{t("Expires")}</Table.Th>
|
<Table.Th>{t("Expires")}</Table.Th>
|
||||||
<Table.Th>{t("Created")}</Table.Th>
|
<Table.Th>{t("Created")}</Table.Th>
|
||||||
<Table.Th></Table.Th>
|
<Table.Th aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
|
|
||||||
@@ -106,7 +106,11 @@ export function ApiKeyTable({
|
|||||||
<Table.Td>
|
<Table.Td>
|
||||||
<Menu position="bottom-end" withinPortal>
|
<Menu position="bottom-end" withinPortal>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="subtle" color="gray">
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
aria-label={t("API key menu")}
|
||||||
|
>
|
||||||
<IconDots size={16} />
|
<IconDots size={16} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ export const Feature = {
|
|||||||
AI: 'ai',
|
AI: 'ai',
|
||||||
CONFLUENCE_IMPORT: 'import:confluence',
|
CONFLUENCE_IMPORT: 'import:confluence',
|
||||||
DOCX_IMPORT: 'import:docx',
|
DOCX_IMPORT: 'import:docx',
|
||||||
|
PDF_IMPORT: 'import:pdf',
|
||||||
ATTACHMENT_INDEXING: 'attachment:indexing',
|
ATTACHMENT_INDEXING: 'attachment:indexing',
|
||||||
SECURITY_SETTINGS: 'security:settings',
|
SECURITY_SETTINGS: 'security:settings',
|
||||||
MCP: 'mcp',
|
MCP: 'mcp',
|
||||||
|
|||||||
@@ -1,4 +1,12 @@
|
|||||||
import { ActionIcon, Group, Menu, Modal, Text, Tooltip } from "@mantine/core";
|
import {
|
||||||
|
ActionIcon,
|
||||||
|
Group,
|
||||||
|
Menu,
|
||||||
|
Modal,
|
||||||
|
Text,
|
||||||
|
ThemeIcon,
|
||||||
|
Tooltip,
|
||||||
|
} from "@mantine/core";
|
||||||
import { useDisclosure } from "@mantine/hooks";
|
import { useDisclosure } from "@mantine/hooks";
|
||||||
import {
|
import {
|
||||||
IconRosetteDiscountCheckFilled,
|
IconRosetteDiscountCheckFilled,
|
||||||
@@ -38,6 +46,7 @@ export function PageVerificationModal({
|
|||||||
<Modal
|
<Modal
|
||||||
opened={opened}
|
opened={opened}
|
||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
|
aria-label={status === "none" ? t("Set up verification") : t("Verify page")}
|
||||||
title={
|
title={
|
||||||
<Group gap="xs">
|
<Group gap="xs">
|
||||||
<IconShieldCheck
|
<IconShieldCheck
|
||||||
@@ -97,9 +106,9 @@ export function PageVerificationBadge({
|
|||||||
withArrow
|
withArrow
|
||||||
openDelay={250}
|
openDelay={250}
|
||||||
>
|
>
|
||||||
<ActionIcon variant="subtle" color="gray">
|
<ThemeIcon variant="subtle" color="gray">
|
||||||
<IconShieldCheck size={20} stroke={1.5} />
|
<IconShieldCheck size={20} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ThemeIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -130,7 +139,12 @@ export function PageVerificationBadge({
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
) : !readOnly ? (
|
) : !readOnly ? (
|
||||||
<Tooltip label={t("Set up verification")} withArrow openDelay={250}>
|
<Tooltip label={t("Set up verification")} withArrow openDelay={250}>
|
||||||
<ActionIcon variant="subtle" color="gray" onClick={open}>
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
aria-label={t("Set up verification")}
|
||||||
|
onClick={open}
|
||||||
|
>
|
||||||
<IconShieldCheck size={20} stroke={1.5} />
|
<IconShieldCheck size={20} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export function ScimTokenTable({
|
|||||||
<Table.Th>{t("Created by")}</Table.Th>
|
<Table.Th>{t("Created by")}</Table.Th>
|
||||||
<Table.Th>{t("Last used")}</Table.Th>
|
<Table.Th>{t("Last used")}</Table.Th>
|
||||||
<Table.Th>{t("Created")}</Table.Th>
|
<Table.Th>{t("Created")}</Table.Th>
|
||||||
<Table.Th></Table.Th>
|
<Table.Th aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
|
|
||||||
|
|||||||
@@ -141,6 +141,7 @@ export default function SsoProviderList() {
|
|||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
color="gray"
|
color="gray"
|
||||||
|
aria-label={t("Edit {{name}}", { name: provider.name })}
|
||||||
onClick={() => handleEdit(provider)}
|
onClick={() => handleEdit(provider)}
|
||||||
>
|
>
|
||||||
<IconPencil size={16} />
|
<IconPencil size={16} />
|
||||||
@@ -152,7 +153,13 @@ export default function SsoProviderList() {
|
|||||||
withinPortal
|
withinPortal
|
||||||
>
|
>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="subtle" color="gray">
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
aria-label={t("More actions for {{name}}", {
|
||||||
|
name: provider.name,
|
||||||
|
})}
|
||||||
|
>
|
||||||
<IconDots size={16} />
|
<IconDots size={16} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ export default function TemplateCard({
|
|||||||
color="gray"
|
color="gray"
|
||||||
className={classes.menuTarget}
|
className={classes.menuTarget}
|
||||||
onClick={(e) => e.stopPropagation()}
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
aria-label={t("Template menu")}
|
||||||
>
|
>
|
||||||
<IconDots size={16} />
|
<IconDots size={16} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export default function TemplatePreviewModal({
|
|||||||
const title = template?.title || t("Untitled");
|
const title = template?.title || t("Untitled");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal.Root size={1200} opened={opened} onClose={onClose}>
|
<Modal.Root size={1200} opened={opened} onClose={onClose} aria-label={title}>
|
||||||
<Modal.Overlay />
|
<Modal.Overlay />
|
||||||
<Modal.Content style={{ overflow: "hidden" }}>
|
<Modal.Content style={{ overflow: "hidden" }}>
|
||||||
<Modal.Header>
|
<Modal.Header>
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) {
|
|||||||
withCloseButton
|
withCloseButton
|
||||||
withBorder
|
withBorder
|
||||||
data-comment-dialog
|
data-comment-dialog
|
||||||
|
aria-label={t("Add comment")}
|
||||||
>
|
>
|
||||||
<Stack gap={2}>
|
<Stack gap={2}>
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -173,6 +173,15 @@ function CommentListItem({
|
|||||||
<Box
|
<Box
|
||||||
className={classes.textSelection}
|
className={classes.textSelection}
|
||||||
onClick={() => handleCommentClick(comment)}
|
onClick={() => handleCommentClick(comment)}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === "Enter" || e.key === " ") {
|
||||||
|
e.preventDefault();
|
||||||
|
handleCommentClick(comment);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-label={t("Jump to comment selection")}
|
||||||
>
|
>
|
||||||
<Text size="sm">{comment?.selection}</Text>
|
<Text size="sm">{comment?.selection}</Text>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -46,7 +46,11 @@ function CommentMenu({
|
|||||||
return (
|
return (
|
||||||
<Menu shadow="md" width={200}>
|
<Menu shadow="md" width={200}>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="default" style={{ border: "none" }}>
|
<ActionIcon
|
||||||
|
variant="default"
|
||||||
|
style={{ border: "none" }}
|
||||||
|
aria-label={t("Comment menu")}
|
||||||
|
>
|
||||||
<IconDots size={20} stroke={2} />
|
<IconDots size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ export default function AudioView(props: NodeViewProps) {
|
|||||||
preload="metadata"
|
preload="metadata"
|
||||||
controls
|
controls
|
||||||
src={safeSrc}
|
src={safeSrc}
|
||||||
|
aria-label={placeholder?.name || t("Audio")}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{!safeSrc && previewSrc && (
|
{!safeSrc && previewSrc && (
|
||||||
@@ -45,6 +46,7 @@ export default function AudioView(props: NodeViewProps) {
|
|||||||
preload="metadata"
|
preload="metadata"
|
||||||
controls
|
controls
|
||||||
src={previewSrc}
|
src={previewSrc}
|
||||||
|
aria-label={placeholder?.name || t("Audio")}
|
||||||
/>
|
/>
|
||||||
<Loader size={20} pos="absolute" top={6} right={6} />
|
<Loader size={20} pos="absolute" top={6} right={6} />
|
||||||
</Group>
|
</Group>
|
||||||
@@ -60,7 +62,7 @@ export default function AudioView(props: NodeViewProps) {
|
|||||||
</Group>
|
</Group>
|
||||||
)}
|
)}
|
||||||
{!safeSrc && !previewSrc && !placeholder && (
|
{!safeSrc && !previewSrc && !placeholder && (
|
||||||
<audio className={classes.audio} controls />
|
<audio className={classes.audio} controls aria-label={t("Audio")} />
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</NodeViewWrapper>
|
</NodeViewWrapper>
|
||||||
|
|||||||
@@ -172,6 +172,9 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
|
|||||||
fontWeight: 500,
|
fontWeight: 500,
|
||||||
fontSize: rem(16),
|
fontSize: rem(16),
|
||||||
}}
|
}}
|
||||||
|
aria-label={t("Text color")}
|
||||||
|
aria-haspopup="dialog"
|
||||||
|
aria-expanded={isOpen}
|
||||||
>
|
>
|
||||||
A
|
A
|
||||||
</Button>
|
</Button>
|
||||||
@@ -186,20 +189,32 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
|
|||||||
{t("Text color")}
|
{t("Text color")}
|
||||||
</Text>
|
</Text>
|
||||||
<SimpleGrid cols={5} spacing="xs">
|
<SimpleGrid cols={5} spacing="xs">
|
||||||
{TEXT_COLORS.map(({ name, color }, index) => (
|
{TEXT_COLORS.map(({ name, color }, index) => {
|
||||||
|
const applyTextColor = () => {
|
||||||
|
if (name === "Default") {
|
||||||
|
editor.commands.unsetColor();
|
||||||
|
} else {
|
||||||
|
editor
|
||||||
|
.chain()
|
||||||
|
.focus()
|
||||||
|
.setColor(color || "")
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
setIsOpen(false);
|
||||||
|
};
|
||||||
|
return (
|
||||||
<Tooltip key={index} label={t(name)} withArrow>
|
<Tooltip key={index} label={t(name)} withArrow>
|
||||||
<Box
|
<Box
|
||||||
onClick={() => {
|
role="button"
|
||||||
if (name === "Default") {
|
tabIndex={0}
|
||||||
editor.commands.unsetColor();
|
aria-label={t(name)}
|
||||||
} else {
|
aria-pressed={!!editorState[`text_${color}`]}
|
||||||
editor
|
onClick={applyTextColor}
|
||||||
.chain()
|
onKeyDown={(e) => {
|
||||||
.focus()
|
if (e.key === "Enter" || e.key === " ") {
|
||||||
.setColor(color || "")
|
e.preventDefault();
|
||||||
.run();
|
applyTextColor();
|
||||||
}
|
}
|
||||||
setIsOpen(false);
|
|
||||||
}}
|
}}
|
||||||
style={{
|
style={{
|
||||||
width: rem(28),
|
width: rem(28),
|
||||||
@@ -221,7 +236,8 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
|
|||||||
A
|
A
|
||||||
</Box>
|
</Box>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
</SimpleGrid>
|
</SimpleGrid>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
@@ -230,23 +246,35 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
|
|||||||
{t("Highlight color")}
|
{t("Highlight color")}
|
||||||
</Text>
|
</Text>
|
||||||
<SimpleGrid cols={5} spacing="xs">
|
<SimpleGrid cols={5} spacing="xs">
|
||||||
{HIGHLIGHT_COLORS.map(({ name, color }, index) => (
|
{HIGHLIGHT_COLORS.map(({ name, color }, index) => {
|
||||||
|
const applyHighlight = () => {
|
||||||
|
if (name === "Default") {
|
||||||
|
editor.commands.unsetHighlight();
|
||||||
|
} else {
|
||||||
|
editor
|
||||||
|
.chain()
|
||||||
|
.focus()
|
||||||
|
.toggleMark("highlight", {
|
||||||
|
color: color || "",
|
||||||
|
colorName: name.toLowerCase() || "",
|
||||||
|
})
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
setIsOpen(false);
|
||||||
|
};
|
||||||
|
return (
|
||||||
<Tooltip key={index} label={t(name)} withArrow>
|
<Tooltip key={index} label={t(name)} withArrow>
|
||||||
<Box
|
<Box
|
||||||
onClick={() => {
|
role="button"
|
||||||
if (name === "Default") {
|
tabIndex={0}
|
||||||
editor.commands.unsetHighlight();
|
aria-label={t(name)}
|
||||||
} else {
|
aria-pressed={!!editorState[`highlight_${color}`]}
|
||||||
editor
|
onClick={applyHighlight}
|
||||||
.chain()
|
onKeyDown={(e) => {
|
||||||
.focus()
|
if (e.key === "Enter" || e.key === " ") {
|
||||||
.toggleMark("highlight", {
|
e.preventDefault();
|
||||||
color: color || "",
|
applyHighlight();
|
||||||
colorName: name.toLowerCase() || "",
|
|
||||||
})
|
|
||||||
.run();
|
|
||||||
}
|
}
|
||||||
setIsOpen(false);
|
|
||||||
}}
|
}}
|
||||||
style={{
|
style={{
|
||||||
width: rem(28),
|
width: rem(28),
|
||||||
@@ -274,7 +302,8 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
|
|||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
</SimpleGrid>
|
</SimpleGrid>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import {
|
|||||||
IconInfoCircle,
|
IconInfoCircle,
|
||||||
IconList,
|
IconList,
|
||||||
IconListNumbers,
|
IconListNumbers,
|
||||||
|
IconQuote,
|
||||||
IconTypography,
|
IconTypography,
|
||||||
} from "@tabler/icons-react";
|
} from "@tabler/icons-react";
|
||||||
import { Popover, Button, ScrollArea, Tooltip } from "@mantine/core";
|
import { Popover, Button, ScrollArea, Tooltip } from "@mantine/core";
|
||||||
@@ -59,6 +60,7 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
|
|||||||
isCodeBlock: ctx.editor.isActive("codeBlock"),
|
isCodeBlock: ctx.editor.isActive("codeBlock"),
|
||||||
isCallout: ctx.editor.isActive("callout"),
|
isCallout: ctx.editor.isActive("callout"),
|
||||||
isDetails: ctx.editor.isActive("details"),
|
isDetails: ctx.editor.isActive("details"),
|
||||||
|
isTransclusionSource: ctx.editor.isActive("transclusionSource"),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -122,6 +124,12 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
|
|||||||
.run(),
|
.run(),
|
||||||
isActive: () => editorState?.isBlockquote,
|
isActive: () => editorState?.isBlockquote,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "Synced block",
|
||||||
|
icon: IconQuote,
|
||||||
|
command: () => editor.chain().focus().toggleTransclusionSource().run(),
|
||||||
|
isActive: () => editorState?.isTransclusionSource,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "Code",
|
name: "Code",
|
||||||
icon: IconCode,
|
icon: IconCode,
|
||||||
@@ -149,7 +157,12 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
|
|||||||
return (
|
return (
|
||||||
<Popover opened={isOpen} withArrow>
|
<Popover opened={isOpen} withArrow>
|
||||||
<Popover.Target>
|
<Popover.Target>
|
||||||
<Tooltip label={t("Turn into")} withArrow withinPortal={false} disabled={isOpen}>
|
<Tooltip
|
||||||
|
label={t("Turn into")}
|
||||||
|
withArrow
|
||||||
|
withinPortal={false}
|
||||||
|
disabled={isOpen}
|
||||||
|
>
|
||||||
<Button
|
<Button
|
||||||
className={classes.buttonRoot}
|
className={classes.buttonRoot}
|
||||||
variant="default"
|
variant="default"
|
||||||
@@ -157,6 +170,9 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
|
|||||||
radius="0"
|
radius="0"
|
||||||
rightSection={<IconChevronDown size={16} />}
|
rightSection={<IconChevronDown size={16} />}
|
||||||
onClick={() => setIsOpen(!isOpen)}
|
onClick={() => setIsOpen(!isOpen)}
|
||||||
|
aria-label={t("Turn into")}
|
||||||
|
aria-haspopup="menu"
|
||||||
|
aria-expanded={isOpen}
|
||||||
>
|
>
|
||||||
{t(activeItem?.name)}
|
{t(activeItem?.name)}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -92,6 +92,9 @@ export const TextAlignmentSelector: FC<TextAlignmentProps> = ({
|
|||||||
radius="0"
|
radius="0"
|
||||||
rightSection={<IconChevronDown size={16} />}
|
rightSection={<IconChevronDown size={16} />}
|
||||||
onClick={() => setIsOpen(!isOpen)}
|
onClick={() => setIsOpen(!isOpen)}
|
||||||
|
aria-label={t("Text align")}
|
||||||
|
aria-haspopup="menu"
|
||||||
|
aria-expanded={isOpen}
|
||||||
>
|
>
|
||||||
<activeItem.icon style={{ width: rem(16) }} stroke={2} />
|
<activeItem.icon style={{ width: rem(16) }} stroke={2} />
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -137,7 +137,13 @@ export default function DrawioView(props: NodeViewProps) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<NodeViewWrapper data-drag-handle>
|
<NodeViewWrapper data-drag-handle>
|
||||||
<Modal.Root opened={opened} onClose={handleClose} fullScreen closeOnEscape={false}>
|
<Modal.Root
|
||||||
|
opened={opened}
|
||||||
|
onClose={handleClose}
|
||||||
|
fullScreen
|
||||||
|
closeOnEscape={false}
|
||||||
|
aria-label={t("Diagram editor")}
|
||||||
|
>
|
||||||
<Modal.Overlay />
|
<Modal.Overlay />
|
||||||
<Modal.Content style={{ overflow: "hidden" }}>
|
<Modal.Content style={{ overflow: "hidden" }}>
|
||||||
<Modal.Body pos="relative">
|
<Modal.Body pos="relative">
|
||||||
|
|||||||
@@ -1,30 +1,26 @@
|
|||||||
import { CommandProps, EmojiMenuItemType } from "./types";
|
import { CommandProps, EmojiMenuItemType } from "./types";
|
||||||
import { SearchIndex } from "emoji-mart";
|
import { buildEmojiIndex, getFrequentlyUsedEmoji, sortFrequentlyUsedEmoji } from "./utils";
|
||||||
import { getFrequentlyUsedEmoji, sortFrequentlyUsedEmoji } from "./utils";
|
|
||||||
|
|
||||||
const searchEmoji = async (value: string): Promise<EmojiMenuItemType[]> => {
|
const MAX_RESULTS = 5;
|
||||||
if (value === "") {
|
|
||||||
const frequentlyUsedEmoji = getFrequentlyUsedEmoji();
|
const searchEmoji = async (query: string): Promise<EmojiMenuItemType[]> => {
|
||||||
return sortFrequentlyUsedEmoji(frequentlyUsedEmoji);
|
if (query === "") {
|
||||||
|
return sortFrequentlyUsedEmoji(getFrequentlyUsedEmoji());
|
||||||
}
|
}
|
||||||
|
|
||||||
const emojis = await SearchIndex.search(value);
|
const q = query.toLowerCase();
|
||||||
const results = emojis.map((emoji: any) => {
|
const index = await buildEmojiIndex();
|
||||||
return {
|
|
||||||
id: emoji.id,
|
|
||||||
emoji: emoji.skins[0].native,
|
|
||||||
command: ({ editor, range }: CommandProps) => {
|
|
||||||
editor
|
|
||||||
.chain()
|
|
||||||
.focus()
|
|
||||||
.deleteRange(range)
|
|
||||||
.insertContent(emoji.skins[0].native + " ")
|
|
||||||
.run();
|
|
||||||
},
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
return results;
|
return index
|
||||||
|
.filter((e) => e.name.includes(q) || e.id.includes(q))
|
||||||
|
.slice(0, MAX_RESULTS)
|
||||||
|
.map((entry) => ({
|
||||||
|
id: entry.id,
|
||||||
|
emoji: entry.native,
|
||||||
|
command: ({ editor, range }: CommandProps) => {
|
||||||
|
editor.chain().focus().deleteRange(range).insertContent(entry.native + " ").run();
|
||||||
|
},
|
||||||
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getEmojiItems = async ({
|
export const getEmojiItems = async ({
|
||||||
|
|||||||
@@ -1,140 +1,208 @@
|
|||||||
import {
|
import { Loader, Paper, ScrollArea, Text, UnstyledButton } from "@mantine/core";
|
||||||
ActionIcon,
|
|
||||||
Loader,
|
|
||||||
Paper,
|
|
||||||
ScrollArea,
|
|
||||||
SimpleGrid,
|
|
||||||
Text,
|
|
||||||
} from "@mantine/core";
|
|
||||||
import { EmojiMenuItemType } from "./types";
|
|
||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import classes from "./emoji-menu.module.css";
|
|
||||||
import { useCallback, useEffect, useRef, useState } from "react";
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
import { GRID_COLUMNS, incrementEmojiUsage } from "./utils";
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { EmojiMenuItemType } from "./types";
|
||||||
|
import {
|
||||||
|
EmojiCategory,
|
||||||
|
EmojiIndexEntry,
|
||||||
|
getEmojiCategories,
|
||||||
|
incrementEmojiUsage,
|
||||||
|
} from "./utils";
|
||||||
|
import classes from "./emoji-menu.module.css";
|
||||||
|
|
||||||
const EmojiList = ({
|
const COLS = 8;
|
||||||
|
|
||||||
|
const CAT_ICONS: Record<string, string> = {
|
||||||
|
people: "😀",
|
||||||
|
nature: "🌿",
|
||||||
|
foods: "🍕",
|
||||||
|
activity: "🎮",
|
||||||
|
places: "🗺️",
|
||||||
|
objects: "🔧",
|
||||||
|
symbols: "💯",
|
||||||
|
flags: "🚩",
|
||||||
|
};
|
||||||
|
|
||||||
|
function EmojiList({
|
||||||
items,
|
items,
|
||||||
isLoading,
|
isLoading,
|
||||||
command,
|
command,
|
||||||
editor,
|
editor,
|
||||||
range,
|
range,
|
||||||
|
query = "",
|
||||||
}: {
|
}: {
|
||||||
items: EmojiMenuItemType[];
|
items: EmojiMenuItemType[];
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
command: any;
|
command: (item: EmojiMenuItemType) => void;
|
||||||
editor: any;
|
editor: any;
|
||||||
range: any;
|
range: any;
|
||||||
}) => {
|
query?: string;
|
||||||
const [selectedIndex, setSelectedIndex] = useState(0);
|
}) {
|
||||||
const viewportRef = useRef<HTMLDivElement>(null);
|
const { t } = useTranslation();
|
||||||
|
const [idx, setIdx] = useState(0);
|
||||||
|
const [cats, setCats] = useState<EmojiCategory[]>([]);
|
||||||
|
const [activeCat, setActiveCat] = useState("");
|
||||||
|
const [focusZone, setFocusZone] = useState<"grid" | "tabs">("grid");
|
||||||
|
const listViewport = useRef<HTMLDivElement>(null);
|
||||||
|
const gridViewport = useRef<HTMLDivElement>(null);
|
||||||
|
const catBar = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
const selectItem = useCallback(
|
const searching = query.length > 0;
|
||||||
(index: number) => {
|
const browseLoading = !searching && cats.length === 0;
|
||||||
const item = items[index];
|
const gridItems = cats.find((c) => c.id === activeCat)?.emojis ?? [];
|
||||||
if (item) {
|
|
||||||
command(item);
|
useEffect(() => {
|
||||||
incrementEmojiUsage(item.id);
|
getEmojiCategories().then((data) => {
|
||||||
}
|
setCats(data);
|
||||||
|
setActiveCat((prev) => prev || data[0]?.id || "");
|
||||||
|
});
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => { setIdx(0); }, [query, activeCat]);
|
||||||
|
|
||||||
|
useEffect(() => { if (searching) setFocusZone("grid"); }, [searching]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (focusZone !== "tabs") return;
|
||||||
|
catBar.current?.querySelector<HTMLElement>(`[data-cat="${activeCat}"]`)?.scrollIntoView({ block: "nearest", inline: "nearest" });
|
||||||
|
}, [activeCat, focusZone]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (focusZone === "tabs") return;
|
||||||
|
const vp = searching ? listViewport.current : gridViewport.current;
|
||||||
|
vp?.querySelector<HTMLElement>(`[data-i="${idx}"]`)?.scrollIntoView({ block: "nearest" });
|
||||||
|
}, [idx, searching, focusZone]);
|
||||||
|
|
||||||
|
const pickSearchItem = useCallback(
|
||||||
|
(i: number) => {
|
||||||
|
const item = items[i];
|
||||||
|
if (!item) return;
|
||||||
|
command(item);
|
||||||
|
incrementEmojiUsage(item.id);
|
||||||
},
|
},
|
||||||
[command, items]
|
[command, items],
|
||||||
|
);
|
||||||
|
|
||||||
|
const pickGridItem = useCallback(
|
||||||
|
(entry: EmojiIndexEntry) => {
|
||||||
|
editor.chain().focus().deleteRange(range).insertContent(entry.native + " ").run();
|
||||||
|
incrementEmojiUsage(entry.id);
|
||||||
|
},
|
||||||
|
[editor, range],
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const navigationKeys = [
|
function onKey(e: KeyboardEvent) {
|
||||||
"ArrowRight",
|
if (searching) {
|
||||||
"ArrowLeft",
|
if (e.key === "ArrowDown") { e.preventDefault(); setIdx((i) => Math.min(i + 1, items.length - 1)); }
|
||||||
"ArrowUp",
|
else if (e.key === "ArrowUp") { e.preventDefault(); setIdx((i) => Math.max(i - 1, 0)); }
|
||||||
"ArrowDown",
|
else if (e.key === "Enter") { e.preventDefault(); pickSearchItem(idx); }
|
||||||
"Enter",
|
} else if (focusZone === "tabs") {
|
||||||
];
|
const catIdx = cats.findIndex((c) => c.id === activeCat);
|
||||||
const onKeyDown = (e: KeyboardEvent) => {
|
if (e.key === "ArrowRight") { e.preventDefault(); const next = cats[Math.min(catIdx + 1, cats.length - 1)]; if (next) setActiveCat(next.id); }
|
||||||
if (navigationKeys.includes(e.key)) {
|
else if (e.key === "ArrowLeft") { e.preventDefault(); const prev = cats[Math.max(catIdx - 1, 0)]; if (prev) setActiveCat(prev.id); }
|
||||||
e.preventDefault();
|
else if (e.key === "ArrowDown" || e.key === "Enter") { e.preventDefault(); setFocusZone("grid"); }
|
||||||
|
else if (e.key === "ArrowUp") { e.preventDefault(); }
|
||||||
if (e.key === "ArrowRight") {
|
} else {
|
||||||
setSelectedIndex(
|
const total = gridItems.length;
|
||||||
selectedIndex + 1 < items.length ? selectedIndex + 1 : selectedIndex
|
if (e.key === "ArrowRight") { e.preventDefault(); setIdx((i) => Math.min(i + 1, total - 1)); }
|
||||||
);
|
else if (e.key === "ArrowLeft") { e.preventDefault(); setIdx((i) => Math.max(i - 1, 0)); }
|
||||||
return true;
|
else if (e.key === "ArrowDown") { e.preventDefault(); setIdx((i) => Math.min(i + COLS, total - 1)); }
|
||||||
|
else if (e.key === "ArrowUp") {
|
||||||
|
e.preventDefault();
|
||||||
|
if (idx < COLS) setFocusZone("tabs");
|
||||||
|
else setIdx((i) => Math.max(i - COLS, 0));
|
||||||
}
|
}
|
||||||
|
else if (e.key === "Enter") { e.preventDefault(); if (gridItems[idx]) pickGridItem(gridItems[idx]); }
|
||||||
if (e.key === "ArrowLeft") {
|
|
||||||
setSelectedIndex(
|
|
||||||
selectedIndex - 1 >= 0 ? selectedIndex - 1 : selectedIndex
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e.key === "ArrowUp") {
|
|
||||||
setSelectedIndex(
|
|
||||||
selectedIndex - GRID_COLUMNS >= 0
|
|
||||||
? selectedIndex - GRID_COLUMNS
|
|
||||||
: selectedIndex
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e.key === "ArrowDown") {
|
|
||||||
setSelectedIndex(
|
|
||||||
selectedIndex + GRID_COLUMNS < items.length
|
|
||||||
? selectedIndex + GRID_COLUMNS
|
|
||||||
: selectedIndex
|
|
||||||
);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e.key === "Enter") {
|
|
||||||
selectItem(selectedIndex);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
document.addEventListener("keydown", onKeyDown);
|
document.addEventListener("keydown", onKey);
|
||||||
return () => {
|
return () => document.removeEventListener("keydown", onKey);
|
||||||
document.removeEventListener("keydown", onKeyDown);
|
}, [searching, items, idx, gridItems, pickSearchItem, pickGridItem, focusZone, cats, activeCat]);
|
||||||
};
|
|
||||||
}, [items, selectedIndex, setSelectedIndex]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
return (
|
||||||
setSelectedIndex(0);
|
<Paper
|
||||||
}, [items]);
|
id="emoji-command"
|
||||||
|
p={0}
|
||||||
useEffect(() => {
|
shadow="md"
|
||||||
viewportRef.current
|
withBorder
|
||||||
?.querySelector(`[data-item-index="${selectedIndex}"]`)
|
style={{ width: 280 }}
|
||||||
?.scrollIntoView({ block: "nearest" });
|
role="listbox"
|
||||||
}, [selectedIndex]);
|
aria-label={t("Emoji picker")}
|
||||||
|
>
|
||||||
return items.length > 0 || isLoading ? (
|
{searching ? (
|
||||||
<Paper id="emoji-command" p="0" shadow="md" withBorder>
|
<>
|
||||||
{isLoading && <Loader m="xs" color="blue" type="dots" />}
|
{isLoading && <Loader m="xs" size="xs" color="blue" type="dots" />}
|
||||||
{items.length > 0 && (
|
<ScrollArea.Autosize mah={260} scrollbarSize={6} viewportRef={listViewport}>
|
||||||
<ScrollArea.Autosize
|
<div style={{ padding: 4 }}>
|
||||||
viewportRef={viewportRef}
|
{items.length === 0 && !isLoading ? (
|
||||||
mah={250}
|
<Text size="sm" c="dimmed" p="xs">{t("No results")}</Text>
|
||||||
scrollbarSize={8}
|
) : items.map((item, i) => (
|
||||||
pr="5"
|
<UnstyledButton
|
||||||
>
|
key={item.id}
|
||||||
<SimpleGrid cols={GRID_COLUMNS} p="xs" spacing="xs">
|
data-i={i}
|
||||||
{items.map((item, index: number) => (
|
w="100%"
|
||||||
<ActionIcon
|
className={clsx(classes.row, { [classes.active]: i === idx })}
|
||||||
data-item-index={index}
|
onClick={() => pickSearchItem(i)}
|
||||||
variant="transparent"
|
onMouseEnter={() => setIdx(i)}
|
||||||
key={item.id}
|
role="option"
|
||||||
className={clsx(classes.menuBtn, {
|
aria-selected={i === idx}
|
||||||
[classes.selectedItem]: index === selectedIndex,
|
>
|
||||||
})}
|
<span style={{ fontSize: 20, lineHeight: 1, minWidth: 26 }}>{item.emoji}</span>
|
||||||
onClick={() => selectItem(index)}
|
<Text size="sm" c="dimmed" ff="monospace" span>:{item.id}:</Text>
|
||||||
>
|
</UnstyledButton>
|
||||||
<Text size="xl">{item.emoji}</Text>
|
))}
|
||||||
</ActionIcon>
|
</div>
|
||||||
))}
|
</ScrollArea.Autosize>
|
||||||
</SimpleGrid>
|
</>
|
||||||
</ScrollArea.Autosize>
|
) : browseLoading ? (
|
||||||
|
<Loader m="xs" size="xs" color="blue" type="dots" />
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<div className={classes.catBar} role="tablist" ref={catBar}>
|
||||||
|
{cats.map((c) => {
|
||||||
|
const isActive = c.id === activeCat;
|
||||||
|
const isFocused = isActive && focusZone === "tabs";
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
key={c.id}
|
||||||
|
data-cat={c.id}
|
||||||
|
title={c.id}
|
||||||
|
role="tab"
|
||||||
|
aria-selected={isActive}
|
||||||
|
className={clsx(classes.catTab, {
|
||||||
|
[classes.catTabActive]: isActive,
|
||||||
|
[classes.catTabFocused]: isFocused,
|
||||||
|
})}
|
||||||
|
onClick={() => { setActiveCat(c.id); setFocusZone("grid"); }}
|
||||||
|
onMouseEnter={() => setFocusZone("grid")}
|
||||||
|
>
|
||||||
|
{CAT_ICONS[c.id] ?? "🔣"}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
<ScrollArea.Autosize mah={220} scrollbarSize={6} viewportRef={gridViewport}>
|
||||||
|
<div className={classes.grid} style={{ gridTemplateColumns: `repeat(${COLS}, 1fr)` }}>
|
||||||
|
{gridItems.map((entry, i) => (
|
||||||
|
<button
|
||||||
|
key={entry.id}
|
||||||
|
data-i={i}
|
||||||
|
title={`:${entry.id}:`}
|
||||||
|
className={clsx(classes.emojiBtn, { [classes.active]: i === idx })}
|
||||||
|
onClick={() => pickGridItem(entry)}
|
||||||
|
onMouseEnter={() => setIdx(i)}
|
||||||
|
>
|
||||||
|
{entry.native}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</ScrollArea.Autosize>
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</Paper>
|
</Paper>
|
||||||
) : null;
|
);
|
||||||
};
|
}
|
||||||
|
|
||||||
export default EmojiList;
|
export default EmojiList;
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
.menuBtn {
|
.row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 6px 10px;
|
||||||
border-radius: var(--mantine-radius-sm);
|
border-radius: var(--mantine-radius-sm);
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
@mixin light {
|
@mixin light {
|
||||||
background: var(--mantine-color-gray-2);
|
background: var(--mantine-color-gray-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin dark {
|
@mixin dark {
|
||||||
@@ -12,7 +16,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.selectedItem {
|
.active {
|
||||||
@mixin light {
|
@mixin light {
|
||||||
background: var(--mantine-color-gray-2);
|
background: var(--mantine-color-gray-2);
|
||||||
}
|
}
|
||||||
@@ -21,3 +25,83 @@
|
|||||||
background: var(--mantine-color-gray-light);
|
background: var(--mantine-color-gray-light);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.catBar {
|
||||||
|
display: flex;
|
||||||
|
gap: 2px;
|
||||||
|
padding: 4px 6px;
|
||||||
|
overflow-x: auto;
|
||||||
|
scrollbar-width: none;
|
||||||
|
|
||||||
|
@mixin light {
|
||||||
|
border-bottom: 1px solid var(--mantine-color-gray-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin dark {
|
||||||
|
border-bottom: 1px solid var(--mantine-color-dark-4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.catTab {
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 16px;
|
||||||
|
line-height: 1;
|
||||||
|
padding: 4px 5px;
|
||||||
|
border-radius: var(--mantine-radius-sm);
|
||||||
|
flex-shrink: 0;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
@mixin light {
|
||||||
|
background: var(--mantine-color-gray-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin dark {
|
||||||
|
background: var(--mantine-color-gray-light);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.catTabActive {
|
||||||
|
@mixin light {
|
||||||
|
background: var(--mantine-color-gray-2);
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin dark {
|
||||||
|
background: var(--mantine-color-gray-light);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.catTabFocused {
|
||||||
|
outline: 1px solid var(--mantine-color-blue-filled);
|
||||||
|
outline-offset: -1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grid {
|
||||||
|
display: grid;
|
||||||
|
gap: 1px;
|
||||||
|
padding: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.emojiBtn {
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 20px;
|
||||||
|
line-height: 1;
|
||||||
|
padding: 3px;
|
||||||
|
border-radius: var(--mantine-radius-sm);
|
||||||
|
aspect-ratio: 1 / 1;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
@mixin light {
|
||||||
|
background: var(--mantine-color-gray-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin dark {
|
||||||
|
background: var(--mantine-color-gray-light);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { ReactRenderer, useEditor } from "@tiptap/react";
|
import { ReactRenderer, useEditor } from "@tiptap/react";
|
||||||
import EmojiList from "./emoji-list";
|
import EmojiList from "./emoji-list";
|
||||||
import { init } from "emoji-mart";
|
|
||||||
import {
|
import {
|
||||||
autoUpdate,
|
autoUpdate,
|
||||||
computePosition,
|
computePosition,
|
||||||
@@ -37,10 +36,6 @@ const renderEmojiItems = () => {
|
|||||||
editor: ReturnType<typeof useEditor>;
|
editor: ReturnType<typeof useEditor>;
|
||||||
clientRect: () => DOMRect;
|
clientRect: () => DOMRect;
|
||||||
}) => {
|
}) => {
|
||||||
init({
|
|
||||||
data: async () => (await import("@emoji-mart/data")).default,
|
|
||||||
});
|
|
||||||
|
|
||||||
component = new ReactRenderer(EmojiList, {
|
component = new ReactRenderer(EmojiList, {
|
||||||
props: { isLoading: true, items: [] },
|
props: { isLoading: true, items: [] },
|
||||||
editor: props.editor,
|
editor: props.editor,
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
import { CommandProps } from "./types";
|
import { CommandProps, EmojiMartFrequentlyType, EmojiMenuItemType } from "./types";
|
||||||
import { getEmojiDataFromNative } from "emoji-mart";
|
|
||||||
import { EmojiMartFrequentlyType, EmojiMenuItemType } from "./types";
|
|
||||||
|
|
||||||
export const GRID_COLUMNS = 10;
|
|
||||||
|
|
||||||
export const LOCAL_STORAGE_FREQUENT_KEY = "emoji-mart.frequently";
|
export const LOCAL_STORAGE_FREQUENT_KEY = "emoji-mart.frequently";
|
||||||
|
|
||||||
@@ -19,41 +15,76 @@ export const DEFAULT_FREQUENTLY_USED_EMOJI_MART = `{
|
|||||||
"rocket": 1
|
"rocket": 1
|
||||||
}`;
|
}`;
|
||||||
|
|
||||||
|
export type EmojiIndexEntry = { id: string; name: string; native: string };
|
||||||
|
|
||||||
|
let _emojiIndex: EmojiIndexEntry[] | null = null;
|
||||||
|
|
||||||
|
export const buildEmojiIndex = async (): Promise<EmojiIndexEntry[]> => {
|
||||||
|
if (_emojiIndex) return _emojiIndex;
|
||||||
|
const { default: data } = await import("@emoji-mart/data");
|
||||||
|
_emojiIndex = (Object.values((data as any).emojis) as any[])
|
||||||
|
.filter((e) => e.id && e.name && e.skins?.[0]?.native)
|
||||||
|
.map((e) => ({
|
||||||
|
id: e.id as string,
|
||||||
|
name: (e.name as string).toLowerCase(),
|
||||||
|
native: e.skins[0].native as string,
|
||||||
|
}));
|
||||||
|
return _emojiIndex;
|
||||||
|
};
|
||||||
|
|
||||||
export const incrementEmojiUsage = (emojiId: string) => {
|
export const incrementEmojiUsage = (emojiId: string) => {
|
||||||
const frequentlyUsedEmoji =
|
const stored = JSON.parse(
|
||||||
JSON.parse(localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART);
|
localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART,
|
||||||
frequentlyUsedEmoji[emojiId]
|
|
||||||
? (frequentlyUsedEmoji[emojiId] += 1)
|
|
||||||
: (frequentlyUsedEmoji[emojiId] = 1);
|
|
||||||
localStorage.setItem(
|
|
||||||
LOCAL_STORAGE_FREQUENT_KEY,
|
|
||||||
JSON.stringify(frequentlyUsedEmoji)
|
|
||||||
);
|
);
|
||||||
|
stored[emojiId] = (stored[emojiId] ?? 0) + 1;
|
||||||
|
localStorage.setItem(LOCAL_STORAGE_FREQUENT_KEY, JSON.stringify(stored));
|
||||||
};
|
};
|
||||||
|
|
||||||
export const sortFrequentlyUsedEmoji = async (
|
export const sortFrequentlyUsedEmoji = async (
|
||||||
frequentlyUsedEmoji: EmojiMartFrequentlyType
|
frequentlyUsedEmoji: EmojiMartFrequentlyType,
|
||||||
): Promise<EmojiMenuItemType[]> => {
|
): Promise<EmojiMenuItemType[]> => {
|
||||||
const data = await Promise.all(
|
const index = await buildEmojiIndex();
|
||||||
Object.entries(frequentlyUsedEmoji).map(
|
const results: EmojiMenuItemType[] = Object.entries(frequentlyUsedEmoji)
|
||||||
async ([id, count]): Promise<EmojiMenuItemType> => ({
|
.map(([id, count]): EmojiMenuItemType | null => {
|
||||||
|
const entry = index.find((e) => e.id === id);
|
||||||
|
if (!entry) return null;
|
||||||
|
return {
|
||||||
id,
|
id,
|
||||||
count,
|
count,
|
||||||
emoji: (await getEmojiDataFromNative(id))?.native,
|
emoji: entry.native,
|
||||||
command: async ({ editor, range }: CommandProps) => {
|
command: ({ editor, range }: CommandProps) => {
|
||||||
editor
|
editor.chain().focus().deleteRange(range).insertContent(entry.native + " ").run();
|
||||||
.chain()
|
|
||||||
.focus()
|
|
||||||
.deleteRange(range)
|
|
||||||
.insertContent((await getEmojiDataFromNative(id))?.native + " ")
|
|
||||||
.run();
|
|
||||||
},
|
},
|
||||||
})
|
};
|
||||||
)
|
})
|
||||||
);
|
.filter((e): e is EmojiMenuItemType => e !== null);
|
||||||
return data.sort((a, b) => b.count - a.count);
|
return results.sort((a, b) => (b.count ?? 0) - (a.count ?? 0)).slice(0, 5);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getFrequentlyUsedEmoji = () => {
|
export const getFrequentlyUsedEmoji = (): EmojiMartFrequentlyType => {
|
||||||
return JSON.parse(localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART);
|
return JSON.parse(
|
||||||
}
|
localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export type EmojiCategory = { id: string; emojis: EmojiIndexEntry[] };
|
||||||
|
|
||||||
|
let _cats: EmojiCategory[] | null = null;
|
||||||
|
|
||||||
|
export const getEmojiCategories = async (): Promise<EmojiCategory[]> => {
|
||||||
|
if (_cats) return _cats;
|
||||||
|
const [{ default: data }, index] = await Promise.all([
|
||||||
|
import("@emoji-mart/data"),
|
||||||
|
buildEmojiIndex(),
|
||||||
|
]);
|
||||||
|
const byId = new Map(index.map((e) => [e.id, e]));
|
||||||
|
_cats = ((data as any).categories as { id: string; emojis: string[] }[])
|
||||||
|
.map((cat) => ({
|
||||||
|
id: cat.id,
|
||||||
|
emojis: cat.emojis
|
||||||
|
.map((id) => byId.get(id))
|
||||||
|
.filter((e): e is EmojiIndexEntry => !!e),
|
||||||
|
}))
|
||||||
|
.filter((c) => c.emojis.length > 0);
|
||||||
|
return _cats;
|
||||||
|
};
|
||||||
|
|||||||
@@ -102,6 +102,14 @@ export const LinkEditorPanel = ({
|
|||||||
leftSection={<IconLink size={16} stroke={1.5} color="var(--mantine-color-dimmed)" />}
|
leftSection={<IconLink size={16} stroke={1.5} color="var(--mantine-color-dimmed)" />}
|
||||||
classNames={{ input: classes.linkInput }}
|
classNames={{ input: classes.linkInput }}
|
||||||
placeholder={t("Paste link or search pages")}
|
placeholder={t("Paste link or search pages")}
|
||||||
|
aria-label={t("Paste link or search pages")}
|
||||||
|
role="combobox"
|
||||||
|
aria-expanded={showDropdown}
|
||||||
|
aria-controls="link-editor-results"
|
||||||
|
aria-autocomplete="list"
|
||||||
|
aria-activedescendant={
|
||||||
|
showDropdown ? `link-editor-option-${selectedIndex}` : undefined
|
||||||
|
}
|
||||||
value={state.url}
|
value={state.url}
|
||||||
onChange={state.onChange}
|
onChange={state.onChange}
|
||||||
onKeyDown={handleKeyDown}
|
onKeyDown={handleKeyDown}
|
||||||
@@ -125,10 +133,16 @@ export const LinkEditorPanel = ({
|
|||||||
scrollbarSize={6}
|
scrollbarSize={6}
|
||||||
mt={state.url.length > 0 ? 8 : 0}
|
mt={state.url.length > 0 ? 8 : 0}
|
||||||
styles={{ content: { minWidth: 0 } }}
|
styles={{ content: { minWidth: 0 } }}
|
||||||
|
id="link-editor-results"
|
||||||
|
role="listbox"
|
||||||
|
aria-label={t("Link suggestions")}
|
||||||
>
|
>
|
||||||
{showUrlItem && (
|
{showUrlItem && (
|
||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
data-item-index={0}
|
data-item-index={0}
|
||||||
|
id="link-editor-option-0"
|
||||||
|
role="option"
|
||||||
|
aria-selected={selectedIndex === 0}
|
||||||
onClick={() => onSetLink(state.url, false)}
|
onClick={() => onSetLink(state.url, false)}
|
||||||
className={clsx(classes.searchItem, {
|
className={clsx(classes.searchItem, {
|
||||||
[classes.selectedSearchItem]: selectedIndex === 0,
|
[classes.selectedSearchItem]: selectedIndex === 0,
|
||||||
@@ -156,6 +170,9 @@ export const LinkEditorPanel = ({
|
|||||||
return (
|
return (
|
||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
data-item-index={itemIndex}
|
data-item-index={itemIndex}
|
||||||
|
id={`link-editor-option-${itemIndex}`}
|
||||||
|
role="option"
|
||||||
|
aria-selected={itemIndex === selectedIndex}
|
||||||
key={page.id || index}
|
key={page.id || index}
|
||||||
onClick={() => selectPage(page)}
|
onClick={() => selectPage(page)}
|
||||||
className={clsx(classes.searchItem, {
|
className={clsx(classes.searchItem, {
|
||||||
|
|||||||
@@ -287,7 +287,16 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Paper id="mention" shadow="md" withBorder radius="md" py={6}>
|
<Paper
|
||||||
|
id="mention"
|
||||||
|
shadow="md"
|
||||||
|
withBorder
|
||||||
|
radius="md"
|
||||||
|
py={6}
|
||||||
|
role="listbox"
|
||||||
|
aria-label={t("Mention suggestions")}
|
||||||
|
aria-activedescendant={`mention-option-${selectedIndex}`}
|
||||||
|
>
|
||||||
<ScrollArea.Autosize
|
<ScrollArea.Autosize
|
||||||
viewportRef={viewportRef}
|
viewportRef={viewportRef}
|
||||||
mah={350}
|
mah={350}
|
||||||
@@ -301,7 +310,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
|
|||||||
if (item.entityType === "header") {
|
if (item.entityType === "header") {
|
||||||
const isFirst = index === 0;
|
const isFirst = index === 0;
|
||||||
return (
|
return (
|
||||||
<div key={`${item.label}-${index}`}>
|
<div key={`${item.label}-${index}`} role="presentation">
|
||||||
{!isFirst && <Divider my={6} />}
|
{!isFirst && <Divider my={6} />}
|
||||||
<Text
|
<Text
|
||||||
c="dimmed"
|
c="dimmed"
|
||||||
@@ -322,6 +331,9 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
|
|||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
data-item-index={index}
|
data-item-index={index}
|
||||||
key={index}
|
key={index}
|
||||||
|
id={`mention-option-${index}`}
|
||||||
|
role="option"
|
||||||
|
aria-selected={index === selectedIndex}
|
||||||
onClick={() => selectItem(index)}
|
onClick={() => selectItem(index)}
|
||||||
className={clsx(classes.menuBtn, {
|
className={clsx(classes.menuBtn, {
|
||||||
[classes.selectedItem]: index === selectedIndex,
|
[classes.selectedItem]: index === selectedIndex,
|
||||||
@@ -348,6 +360,9 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
|
|||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
data-item-index={index}
|
data-item-index={index}
|
||||||
key={index}
|
key={index}
|
||||||
|
id={`mention-option-${index}`}
|
||||||
|
role="option"
|
||||||
|
aria-selected={index === selectedIndex}
|
||||||
onClick={() => selectItem(index)}
|
onClick={() => selectItem(index)}
|
||||||
className={clsx(classes.menuBtn, {
|
className={clsx(classes.menuBtn, {
|
||||||
[classes.selectedItem]: index === selectedIndex,
|
[classes.selectedItem]: index === selectedIndex,
|
||||||
@@ -358,7 +373,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
|
|||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
component="div"
|
component="div"
|
||||||
aria-label={item.label}
|
aria-hidden="true"
|
||||||
color="gray"
|
color="gray"
|
||||||
size="sm"
|
size="sm"
|
||||||
>
|
>
|
||||||
@@ -390,6 +405,11 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
|
|||||||
{(hasUsers || hasPages) && <Divider my={6} />}
|
{(hasUsers || hasPages) && <Divider my={6} />}
|
||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
data-item-index={renderItems.indexOf(createPageItemData)}
|
data-item-index={renderItems.indexOf(createPageItemData)}
|
||||||
|
id={`mention-option-${renderItems.indexOf(createPageItemData)}`}
|
||||||
|
role="option"
|
||||||
|
aria-selected={
|
||||||
|
renderItems.indexOf(createPageItemData) === selectedIndex
|
||||||
|
}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
selectItem(renderItems.indexOf(createPageItemData))
|
selectItem(renderItems.indexOf(createPageItemData))
|
||||||
}
|
}
|
||||||
@@ -405,6 +425,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
|
|||||||
component="div"
|
component="div"
|
||||||
color="gray"
|
color="gray"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
aria-hidden="true"
|
||||||
>
|
>
|
||||||
<IconPlus size={16} stroke={1.5} />
|
<IconPlus size={16} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|||||||
@@ -92,7 +92,20 @@ export default function PdfView(props: NodeViewProps) {
|
|||||||
if (hasError) {
|
if (hasError) {
|
||||||
return (
|
return (
|
||||||
<NodeViewWrapper data-drag-handle>
|
<NodeViewWrapper data-drag-handle>
|
||||||
<div data-pdf-error className={clsx(classes.pdfError, { "ProseMirror-selectednode": selected })} onClick={handleSelect}>
|
<div
|
||||||
|
data-pdf-error
|
||||||
|
className={clsx(classes.pdfError, { "ProseMirror-selectednode": selected })}
|
||||||
|
onClick={handleSelect}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === "Enter" || e.key === " ") {
|
||||||
|
e.preventDefault();
|
||||||
|
handleSelect();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-label={t("Failed to load PDF")}
|
||||||
|
>
|
||||||
<IconFileTypePdf size={32} stroke={1.5} />
|
<IconFileTypePdf size={32} stroke={1.5} />
|
||||||
<Text size="sm" c="dimmed">
|
<Text size="sm" c="dimmed">
|
||||||
{t("Failed to load PDF")}
|
{t("Failed to load PDF")}
|
||||||
|
|||||||
+25
-3
@@ -187,12 +187,14 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
|
|||||||
position={{ top: 90, right: 50 }}
|
position={{ top: 90, right: 50 }}
|
||||||
withBorder
|
withBorder
|
||||||
transitionProps={{ transition: "slide-down" }}
|
transitionProps={{ transition: "slide-down" }}
|
||||||
|
aria-label={t("Find and replace")}
|
||||||
>
|
>
|
||||||
<Stack gap="xs">
|
<Stack gap="xs">
|
||||||
<Flex align="center" gap="xs">
|
<Flex align="center" gap="xs">
|
||||||
<Input
|
<Input
|
||||||
ref={inputRef}
|
ref={inputRef}
|
||||||
placeholder={t("Find")}
|
placeholder={t("Find")}
|
||||||
|
aria-label={t("Find")}
|
||||||
leftSection={<IconSearch size={16} />}
|
leftSection={<IconSearch size={16} />}
|
||||||
rightSection={
|
rightSection={
|
||||||
<Text size="xs" ta="right">
|
<Text size="xs" ta="right">
|
||||||
@@ -217,7 +219,12 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
|
|||||||
|
|
||||||
<ActionIcon.Group>
|
<ActionIcon.Group>
|
||||||
<Tooltip label={t("Previous match (Shift+Enter)")}>
|
<Tooltip label={t("Previous match (Shift+Enter)")}>
|
||||||
<ActionIcon variant="subtle" color="gray" onClick={previous}>
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
onClick={previous}
|
||||||
|
aria-label={t("Previous match (Shift+Enter)")}
|
||||||
|
>
|
||||||
<IconArrowNarrowUp
|
<IconArrowNarrowUp
|
||||||
style={{ width: "70%", height: "70%" }}
|
style={{ width: "70%", height: "70%" }}
|
||||||
stroke={1.5}
|
stroke={1.5}
|
||||||
@@ -225,7 +232,12 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
|
|||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip label={t("Next match (Enter)")}>
|
<Tooltip label={t("Next match (Enter)")}>
|
||||||
<ActionIcon variant="subtle" color="gray" onClick={next}>
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
onClick={next}
|
||||||
|
aria-label={t("Next match (Enter)")}
|
||||||
|
>
|
||||||
<IconArrowNarrowDown
|
<IconArrowNarrowDown
|
||||||
style={{ width: "70%", height: "70%" }}
|
style={{ width: "70%", height: "70%" }}
|
||||||
stroke={1.5}
|
stroke={1.5}
|
||||||
@@ -237,6 +249,8 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
|
|||||||
variant="subtle"
|
variant="subtle"
|
||||||
color={caseSensitive.color}
|
color={caseSensitive.color}
|
||||||
onClick={() => caseSensitiveToggle()}
|
onClick={() => caseSensitiveToggle()}
|
||||||
|
aria-label={t("Match case (Alt+C)")}
|
||||||
|
aria-pressed={caseSensitive.isCaseSensitive}
|
||||||
>
|
>
|
||||||
<IconLetterCase
|
<IconLetterCase
|
||||||
style={{ width: "70%", height: "70%" }}
|
style={{ width: "70%", height: "70%" }}
|
||||||
@@ -250,6 +264,8 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
|
|||||||
variant="subtle"
|
variant="subtle"
|
||||||
color={replaceButton.color}
|
color={replaceButton.color}
|
||||||
onClick={() => replaceButtonToggle()}
|
onClick={() => replaceButtonToggle()}
|
||||||
|
aria-label={t("Replace")}
|
||||||
|
aria-pressed={replaceButton.isReplaceShow}
|
||||||
>
|
>
|
||||||
<IconReplace
|
<IconReplace
|
||||||
style={{ width: "70%", height: "70%" }}
|
style={{ width: "70%", height: "70%" }}
|
||||||
@@ -259,7 +275,12 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
<Tooltip label={t("Close (Escape)")}>
|
<Tooltip label={t("Close (Escape)")}>
|
||||||
<ActionIcon variant="subtle" color="gray" onClick={closeDialog}>
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
onClick={closeDialog}
|
||||||
|
aria-label={t("Close (Escape)")}
|
||||||
|
>
|
||||||
<IconX style={{ width: "70%", height: "70%" }} stroke={1.5} />
|
<IconX style={{ width: "70%", height: "70%" }} stroke={1.5} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
@@ -269,6 +290,7 @@ function SearchAndReplaceDialog({ editor, editable = true }: PageFindDialogDialo
|
|||||||
<Flex align="center" gap="xs">
|
<Flex align="center" gap="xs">
|
||||||
<Input
|
<Input
|
||||||
placeholder={t("Replace")}
|
placeholder={t("Replace")}
|
||||||
|
aria-label={t("Replace")}
|
||||||
leftSection={<IconReplace size={16} />}
|
leftSection={<IconReplace size={16} />}
|
||||||
rightSection={<div></div>}
|
rightSection={<div></div>}
|
||||||
rightSectionPointerEvents="all"
|
rightSectionPointerEvents="all"
|
||||||
|
|||||||
@@ -86,7 +86,15 @@ const CommandList = ({
|
|||||||
}, [selectedIndex]);
|
}, [selectedIndex]);
|
||||||
|
|
||||||
return flatItems.length > 0 ? (
|
return flatItems.length > 0 ? (
|
||||||
<Paper id="slash-command" shadow="md" p="xs" withBorder>
|
<Paper
|
||||||
|
id="slash-command"
|
||||||
|
shadow="md"
|
||||||
|
p="xs"
|
||||||
|
withBorder
|
||||||
|
role="listbox"
|
||||||
|
aria-label={t("Slash commands")}
|
||||||
|
aria-activedescendant={`slash-command-option-${selectedIndex}`}
|
||||||
|
>
|
||||||
<ScrollArea
|
<ScrollArea
|
||||||
viewportRef={viewportRef}
|
viewportRef={viewportRef}
|
||||||
h={350}
|
h={350}
|
||||||
@@ -94,22 +102,30 @@ const CommandList = ({
|
|||||||
scrollbarSize={8}
|
scrollbarSize={8}
|
||||||
overscrollBehavior="contain"
|
overscrollBehavior="contain"
|
||||||
>
|
>
|
||||||
{Object.entries(items).map(([category, categoryItems]) => (
|
{(() => {
|
||||||
<div key={category}>
|
let flatIndex = -1;
|
||||||
|
return Object.entries(items).map(([category, categoryItems]) => (
|
||||||
|
<div key={category} role="group" aria-label={category}>
|
||||||
<Text c="dimmed" mb={4} fw={500} tt="capitalize">
|
<Text c="dimmed" mb={4} fw={500} tt="capitalize">
|
||||||
{category}
|
{category}
|
||||||
</Text>
|
</Text>
|
||||||
{categoryItems.map((item: SlashMenuItemType, index: number) => (
|
{categoryItems.map((item: SlashMenuItemType) => {
|
||||||
|
flatIndex += 1;
|
||||||
|
const itemIndex = flatIndex;
|
||||||
|
return (
|
||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
data-item-index={index}
|
data-item-index={itemIndex}
|
||||||
key={index}
|
key={itemIndex}
|
||||||
onClick={() => selectItem(index)}
|
id={`slash-command-option-${itemIndex}`}
|
||||||
|
role="option"
|
||||||
|
aria-selected={itemIndex === selectedIndex}
|
||||||
|
onClick={() => selectItem(itemIndex)}
|
||||||
className={clsx(classes.menuBtn, {
|
className={clsx(classes.menuBtn, {
|
||||||
[classes.selectedItem]: index === selectedIndex,
|
[classes.selectedItem]: itemIndex === selectedIndex,
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<Group>
|
<Group>
|
||||||
<ActionIcon variant="default" component="div">
|
<ActionIcon variant="default" component="div" aria-hidden="true">
|
||||||
<item.icon size={18} />
|
<item.icon size={18} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
|
|
||||||
@@ -124,9 +140,11 @@ const CommandList = ({
|
|||||||
</div>
|
</div>
|
||||||
</Group>
|
</Group>
|
||||||
</UnstyledButton>
|
</UnstyledButton>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
</div>
|
</div>
|
||||||
))}
|
));
|
||||||
|
})()}
|
||||||
</ScrollArea>
|
</ScrollArea>
|
||||||
</Paper>
|
</Paper>
|
||||||
) : null;
|
) : null;
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ import {
|
|||||||
IconColumns3,
|
IconColumns3,
|
||||||
IconColumns2,
|
IconColumns2,
|
||||||
IconTag,
|
IconTag,
|
||||||
|
IconMoodSmile,
|
||||||
|
IconRotate2,
|
||||||
} from "@tabler/icons-react";
|
} from "@tabler/icons-react";
|
||||||
import {
|
import {
|
||||||
CommandProps,
|
CommandProps,
|
||||||
@@ -132,7 +134,7 @@ const CommandGroups: SlashMenuGroupedItemsType = {
|
|||||||
{
|
{
|
||||||
title: "Numbered list",
|
title: "Numbered list",
|
||||||
description: "Create a list with numbering.",
|
description: "Create a list with numbering.",
|
||||||
searchTerms: ["numbered", "ordered", "list"],
|
searchTerms: ["numbered", "ordered", "list", "ol"],
|
||||||
icon: IconListNumbers,
|
icon: IconListNumbers,
|
||||||
command: ({ editor, range }: CommandProps) => {
|
command: ({ editor, range }: CommandProps) => {
|
||||||
editor.chain().focus().deleteRange(range).toggleOrderedList().run();
|
editor.chain().focus().deleteRange(range).toggleOrderedList().run();
|
||||||
@@ -231,7 +233,15 @@ const CommandGroups: SlashMenuGroupedItemsType = {
|
|||||||
{
|
{
|
||||||
title: "Audio",
|
title: "Audio",
|
||||||
description: "Upload any audio from your device.",
|
description: "Upload any audio from your device.",
|
||||||
searchTerms: ["audio", "music", "sound", "mp3", "media", "file", "attachment"],
|
searchTerms: [
|
||||||
|
"audio",
|
||||||
|
"music",
|
||||||
|
"sound",
|
||||||
|
"mp3",
|
||||||
|
"media",
|
||||||
|
"file",
|
||||||
|
"attachment",
|
||||||
|
],
|
||||||
icon: IconMusic,
|
icon: IconMusic,
|
||||||
command: ({ editor, range }) => {
|
command: ({ editor, range }) => {
|
||||||
editor.chain().focus().deleteRange(range).run();
|
editor.chain().focus().deleteRange(range).run();
|
||||||
@@ -468,15 +478,53 @@ const CommandGroups: SlashMenuGroupedItemsType = {
|
|||||||
.run();
|
.run();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: "Emoji",
|
||||||
|
description: "Insert emoji.",
|
||||||
|
searchTerms: ["emoji", "icon", "smiley", "emoticon", "symbol", "reaction"],
|
||||||
|
icon: IconMoodSmile,
|
||||||
|
command: ({ editor, range }: CommandProps) => {
|
||||||
|
editor.chain().focus().deleteRange(range).insertContent(":").run();
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: "Subpages (Child pages)",
|
title: "Subpages (Child pages)",
|
||||||
description: "List all subpages of the current page",
|
description: "List all subpages of the current page",
|
||||||
searchTerms: ["subpages", "child", "children", "nested", "hierarchy"],
|
searchTerms: [
|
||||||
|
"subpages",
|
||||||
|
"child",
|
||||||
|
"children",
|
||||||
|
"nested",
|
||||||
|
"hierarchy",
|
||||||
|
"toc",
|
||||||
|
],
|
||||||
icon: IconSitemap,
|
icon: IconSitemap,
|
||||||
command: ({ editor, range }: CommandProps) => {
|
command: ({ editor, range }: CommandProps) => {
|
||||||
editor.chain().focus().deleteRange(range).insertSubpages().run();
|
editor.chain().focus().deleteRange(range).insertSubpages().run();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: "Synced block",
|
||||||
|
description: "Create a block that stays in sync across pages.",
|
||||||
|
searchTerms: [
|
||||||
|
"sync",
|
||||||
|
"synced",
|
||||||
|
"synced block",
|
||||||
|
"excerpt",
|
||||||
|
"transclusion",
|
||||||
|
"reusable",
|
||||||
|
"snippet",
|
||||||
|
],
|
||||||
|
icon: IconRotate2,
|
||||||
|
command: ({ editor, range }: CommandProps) => {
|
||||||
|
editor
|
||||||
|
.chain()
|
||||||
|
.focus()
|
||||||
|
.deleteRange(range)
|
||||||
|
.insertTransclusionSource()
|
||||||
|
.run();
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: "2 Columns",
|
title: "2 Columns",
|
||||||
description: "Split content into two columns.",
|
description: "Split content into two columns.",
|
||||||
|
|||||||
@@ -92,8 +92,17 @@ export default function StatusView(props: NodeViewProps) {
|
|||||||
colorClassMap[color],
|
colorClassMap[color],
|
||||||
)}
|
)}
|
||||||
onClick={() => isEditable && setOpened(true)}
|
onClick={() => isEditable && setOpened(true)}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (isEditable && (e.key === "Enter" || e.key === " ")) {
|
||||||
|
e.preventDefault();
|
||||||
|
setOpened(true);
|
||||||
|
}
|
||||||
|
}}
|
||||||
role="button"
|
role="button"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
|
aria-label={text || "SET STATUS"}
|
||||||
|
aria-haspopup="dialog"
|
||||||
|
aria-expanded={opened}
|
||||||
>
|
>
|
||||||
{text || "SET STATUS"}
|
{text || "SET STATUS"}
|
||||||
</span>
|
</span>
|
||||||
@@ -127,6 +136,16 @@ export default function StatusView(props: NodeViewProps) {
|
|||||||
)}
|
)}
|
||||||
style={{ backgroundColor: bg }}
|
style={{ backgroundColor: bg }}
|
||||||
onClick={() => handleColorChange(name)}
|
onClick={() => handleColorChange(name)}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === "Enter" || e.key === " ") {
|
||||||
|
e.preventDefault();
|
||||||
|
handleColorChange(name);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
aria-label={name}
|
||||||
|
aria-pressed={color === name}
|
||||||
>
|
>
|
||||||
{color === name && <IconCheck size={14} />}
|
{color === name && <IconCheck size={14} />}
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { IconAlertTriangle } from "@tabler/icons-react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import classes from "./transclusion.module.css";
|
||||||
|
|
||||||
|
export default function ErrorPlaceholder() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
return (
|
||||||
|
<div className={classes.placeholder}>
|
||||||
|
<IconAlertTriangle
|
||||||
|
size={18}
|
||||||
|
stroke={1.6}
|
||||||
|
className={classes.placeholderIcon}
|
||||||
|
/>
|
||||||
|
<span>{t("Failed to load this synced block")}</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
import { IconEyeOff } from "@tabler/icons-react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import classes from "./transclusion.module.css";
|
||||||
|
|
||||||
|
export default function NoAccessPlaceholder() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
return (
|
||||||
|
<div className={classes.placeholder}>
|
||||||
|
<IconEyeOff size={18} stroke={1.6} className={classes.placeholderIcon} />
|
||||||
|
<span>{t("You don't have access to this synced block")}</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { IconInfoCircle } from "@tabler/icons-react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import classes from "./transclusion.module.css";
|
||||||
|
|
||||||
|
export default function NotFoundPlaceholder() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
return (
|
||||||
|
<div className={classes.placeholder}>
|
||||||
|
<IconInfoCircle
|
||||||
|
size={18}
|
||||||
|
stroke={1.6}
|
||||||
|
className={classes.placeholderIcon}
|
||||||
|
/>
|
||||||
|
<span>{t("The original synced block no longer exists")}</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
import { EditorProvider } from "@tiptap/react";
|
||||||
|
import { useMemo } from "react";
|
||||||
|
import { mainExtensions } from "@/features/editor/extensions/extensions";
|
||||||
|
import { UniqueID } from "@docmost/editor-ext";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
content: unknown;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function TransclusionContent({ content }: Props) {
|
||||||
|
const extensions = useMemo(() => {
|
||||||
|
const filtered = mainExtensions.filter(
|
||||||
|
(e: any) => e.name !== "uniqueID" && e.name !== "globalDragHandle",
|
||||||
|
);
|
||||||
|
return [
|
||||||
|
...filtered,
|
||||||
|
UniqueID.configure({
|
||||||
|
types: ["heading", "paragraph", "transclusionSource"],
|
||||||
|
updateDocument: false,
|
||||||
|
}),
|
||||||
|
];
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Isolate the nested read-only editor's events from the host editor:
|
||||||
|
// - mousedown/click would otherwise make the host node-select the atom
|
||||||
|
// wrapper, blocking native text selection inside.
|
||||||
|
// - dragstart/dragover/drop would otherwise let the host treat events
|
||||||
|
// inside the nested view as drops on the host, duplicating dropped
|
||||||
|
// files at the transclusion's position.
|
||||||
|
const stop = (e: React.SyntheticEvent) => e.stopPropagation();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
onMouseDown={stop}
|
||||||
|
onClick={stop}
|
||||||
|
onDragStart={stop}
|
||||||
|
onDragOver={stop}
|
||||||
|
onDrop={stop}
|
||||||
|
>
|
||||||
|
<EditorProvider
|
||||||
|
editable={false}
|
||||||
|
immediatelyRender={true}
|
||||||
|
extensions={extensions}
|
||||||
|
content={content as any}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
+213
@@ -0,0 +1,213 @@
|
|||||||
|
import React, {
|
||||||
|
createContext,
|
||||||
|
useCallback,
|
||||||
|
useContext,
|
||||||
|
useEffect,
|
||||||
|
useMemo,
|
||||||
|
useRef,
|
||||||
|
useState,
|
||||||
|
} from "react";
|
||||||
|
import {
|
||||||
|
lookupTransclusion,
|
||||||
|
lookupTransclusionForShare,
|
||||||
|
} from "@/features/transclusion/services/transclusion-api";
|
||||||
|
import type { TransclusionLookup } from "@/features/transclusion/types/transclusion.types";
|
||||||
|
|
||||||
|
type LookupKey = string; // `${sourcePageId}::${transclusionId}`
|
||||||
|
|
||||||
|
type Subscriber = {
|
||||||
|
key: LookupKey;
|
||||||
|
sourcePageId: string;
|
||||||
|
transclusionId: string;
|
||||||
|
setResult: (r: TransclusionLookup) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
type ContextValue = {
|
||||||
|
/** Register a subscriber. Returns an unsubscribe function. */
|
||||||
|
subscribe: (s: Subscriber) => () => void;
|
||||||
|
/**
|
||||||
|
* Force a re-fetch of `key` and resolve when the response arrives (or the
|
||||||
|
* request fails). Bypasses the cache and any in-flight de-dup so the user
|
||||||
|
* always sees a fresh server read.
|
||||||
|
*/
|
||||||
|
refresh: (key: LookupKey) => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
const TransclusionLookupContext = createContext<ContextValue | null>(null);
|
||||||
|
|
||||||
|
export function TransclusionLookupProvider({
|
||||||
|
children,
|
||||||
|
shareId,
|
||||||
|
}: {
|
||||||
|
children: React.ReactNode;
|
||||||
|
/**
|
||||||
|
* When set, lookups go through the share-scoped public endpoint and are
|
||||||
|
* gated by the share graph (source page must have its own share or inherit
|
||||||
|
* one). Used by the public share viewer; left undefined in the authenticated
|
||||||
|
* app, where personal permissions gate access.
|
||||||
|
*/
|
||||||
|
shareId?: string;
|
||||||
|
}) {
|
||||||
|
const subscribersRef = useRef(new Map<LookupKey, Subscriber[]>());
|
||||||
|
const queueRef = useRef(new Set<LookupKey>());
|
||||||
|
const tickRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||||
|
// Read inside flush() via ref so changing share context doesn't churn the
|
||||||
|
// memoized callbacks (and thus doesn't re-render every consumer).
|
||||||
|
const shareIdRef = useRef<string | undefined>(shareId);
|
||||||
|
shareIdRef.current = shareId;
|
||||||
|
// Last looked-up value for each key. Re-subscribers (e.g. when the editor
|
||||||
|
// remounts after switching from static to live) get this immediately
|
||||||
|
// instead of triggering a duplicate fetch.
|
||||||
|
const resultCacheRef = useRef(new Map<LookupKey, TransclusionLookup>());
|
||||||
|
// Keys that are currently in flight in a batch request. A second subscribe
|
||||||
|
// for the same key while the first request is pending is a no-op; the
|
||||||
|
// subscriber is added to subscribersRef and will be notified when the
|
||||||
|
// pending request completes.
|
||||||
|
const inFlightRef = useRef(new Set<LookupKey>());
|
||||||
|
// Resolvers waiting on the next response for a key. Populated by refresh()
|
||||||
|
// so callers can await the fetch round-trip; resolved on success and on
|
||||||
|
// network error so the UI never hangs in a loading state.
|
||||||
|
const pendingRef = useRef(new Map<LookupKey, Array<() => void>>());
|
||||||
|
|
||||||
|
const flush = useCallback(async () => {
|
||||||
|
tickRef.current = null;
|
||||||
|
const keys = Array.from(queueRef.current);
|
||||||
|
queueRef.current.clear();
|
||||||
|
if (keys.length === 0) return;
|
||||||
|
|
||||||
|
for (const k of keys) inFlightRef.current.add(k);
|
||||||
|
|
||||||
|
const references = keys.map((k) => {
|
||||||
|
const [sourcePageId, transclusionId] = k.split("::");
|
||||||
|
return { sourcePageId, transclusionId };
|
||||||
|
});
|
||||||
|
|
||||||
|
const resolveWaiters = (key: LookupKey) => {
|
||||||
|
const waiters = pendingRef.current.get(key);
|
||||||
|
if (!waiters) return;
|
||||||
|
pendingRef.current.delete(key);
|
||||||
|
for (const w of waiters) w();
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const activeShareId = shareIdRef.current;
|
||||||
|
const { items } = activeShareId
|
||||||
|
? await lookupTransclusionForShare({
|
||||||
|
shareId: activeShareId,
|
||||||
|
references,
|
||||||
|
})
|
||||||
|
: await lookupTransclusion({ references });
|
||||||
|
for (const r of items) {
|
||||||
|
const key = `${r.sourcePageId}::${r.transclusionId}`;
|
||||||
|
resultCacheRef.current.set(key, r);
|
||||||
|
inFlightRef.current.delete(key);
|
||||||
|
const subs = subscribersRef.current.get(key);
|
||||||
|
if (subs) {
|
||||||
|
for (const s of subs) s.setResult(r);
|
||||||
|
}
|
||||||
|
resolveWaiters(key);
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Network error — leave subscribers in pending state and clear the
|
||||||
|
// in-flight flag so a future subscribe can retry.
|
||||||
|
for (const k of keys) {
|
||||||
|
inFlightRef.current.delete(k);
|
||||||
|
resolveWaiters(k);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const enqueue = useCallback(
|
||||||
|
(key: LookupKey) => {
|
||||||
|
queueRef.current.add(key);
|
||||||
|
if (tickRef.current === null) {
|
||||||
|
tickRef.current = setTimeout(flush, 10);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[flush],
|
||||||
|
);
|
||||||
|
|
||||||
|
const subscribe = useCallback<ContextValue["subscribe"]>(
|
||||||
|
(s) => {
|
||||||
|
const list = subscribersRef.current.get(s.key) ?? [];
|
||||||
|
list.push(s);
|
||||||
|
subscribersRef.current.set(s.key, list);
|
||||||
|
|
||||||
|
const cached = resultCacheRef.current.get(s.key);
|
||||||
|
if (cached) {
|
||||||
|
s.setResult(cached);
|
||||||
|
} else if (!inFlightRef.current.has(s.key)) {
|
||||||
|
enqueue(s.key);
|
||||||
|
}
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
const cur = subscribersRef.current.get(s.key) ?? [];
|
||||||
|
const next = cur.filter((x) => x !== s);
|
||||||
|
if (next.length === 0) subscribersRef.current.delete(s.key);
|
||||||
|
else subscribersRef.current.set(s.key, next);
|
||||||
|
};
|
||||||
|
},
|
||||||
|
[enqueue],
|
||||||
|
);
|
||||||
|
|
||||||
|
const refresh = useCallback<ContextValue["refresh"]>(
|
||||||
|
(key) =>
|
||||||
|
new Promise<void>((resolve) => {
|
||||||
|
resultCacheRef.current.delete(key);
|
||||||
|
inFlightRef.current.delete(key);
|
||||||
|
const waiters = pendingRef.current.get(key) ?? [];
|
||||||
|
waiters.push(resolve);
|
||||||
|
pendingRef.current.set(key, waiters);
|
||||||
|
enqueue(key);
|
||||||
|
}),
|
||||||
|
[enqueue],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(
|
||||||
|
() => () => {
|
||||||
|
if (tickRef.current) clearTimeout(tickRef.current);
|
||||||
|
},
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
|
||||||
|
const value = useMemo<ContextValue>(
|
||||||
|
() => ({ subscribe, refresh }),
|
||||||
|
[subscribe, refresh],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TransclusionLookupContext.Provider value={value}>
|
||||||
|
{children}
|
||||||
|
</TransclusionLookupContext.Provider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useTransclusionLookup(
|
||||||
|
sourcePageId: string | null | undefined,
|
||||||
|
transclusionId: string | null | undefined,
|
||||||
|
): {
|
||||||
|
result: TransclusionLookup | null;
|
||||||
|
refresh: () => Promise<void>;
|
||||||
|
} {
|
||||||
|
const ctx = useContext(TransclusionLookupContext);
|
||||||
|
const [result, setResult] = useState<TransclusionLookup | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!ctx || !sourcePageId || !transclusionId) return;
|
||||||
|
const key = `${sourcePageId}::${transclusionId}`;
|
||||||
|
const unsubscribe = ctx.subscribe({
|
||||||
|
key,
|
||||||
|
sourcePageId,
|
||||||
|
transclusionId,
|
||||||
|
setResult,
|
||||||
|
});
|
||||||
|
return unsubscribe;
|
||||||
|
}, [ctx, sourcePageId, transclusionId]);
|
||||||
|
|
||||||
|
const refresh = useCallback(async () => {
|
||||||
|
if (!ctx || !sourcePageId || !transclusionId) return;
|
||||||
|
await ctx.refresh(`${sourcePageId}::${transclusionId}`);
|
||||||
|
}, [ctx, sourcePageId, transclusionId]);
|
||||||
|
|
||||||
|
return { result, refresh };
|
||||||
|
}
|
||||||
+212
@@ -0,0 +1,212 @@
|
|||||||
|
import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
|
||||||
|
import { ActionIcon, Menu, Tooltip } from "@mantine/core";
|
||||||
|
import {
|
||||||
|
IconDots,
|
||||||
|
IconLinkOff,
|
||||||
|
IconPencil,
|
||||||
|
IconRefresh,
|
||||||
|
IconTrash,
|
||||||
|
} from "@tabler/icons-react";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { Link } from "react-router-dom";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { ErrorBoundary } from "react-error-boundary";
|
||||||
|
import { useTransclusionLookup } from "./transclusion-lookup-context";
|
||||||
|
import TransclusionContent from "./transclusion-content";
|
||||||
|
import NoAccessPlaceholder from "./no-access-placeholder";
|
||||||
|
import NotFoundPlaceholder from "./not-found-placeholder";
|
||||||
|
import ErrorPlaceholder from "./error-placeholder";
|
||||||
|
import classes from "./transclusion.module.css";
|
||||||
|
import SyncBlockReferencesDropdown from "@/features/transclusion/components/sync-block-references-dropdown";
|
||||||
|
import {
|
||||||
|
useReferencesQuery,
|
||||||
|
useUnsyncReferenceMutation,
|
||||||
|
} from "@/features/transclusion/queries/transclusion-query";
|
||||||
|
import { buildPageUrl } from "@/features/page/page.utils";
|
||||||
|
|
||||||
|
export default function TransclusionReferenceView(props: NodeViewProps) {
|
||||||
|
const isEditable = props.editor.isEditable;
|
||||||
|
const sourcePageId: string | null = props.node.attrs.sourcePageId ?? null;
|
||||||
|
const transclusionId: string | null = props.node.attrs.transclusionId ?? null;
|
||||||
|
const [openMenus, setOpenMenus] = useState(0);
|
||||||
|
const trackOpen = (open: boolean) =>
|
||||||
|
setOpenMenus((n) => Math.max(0, n + (open ? 1 : -1)));
|
||||||
|
|
||||||
|
return (
|
||||||
|
<NodeViewWrapper
|
||||||
|
className={classes.includeWrap}
|
||||||
|
data-focused={isEditable && props.selected ? "true" : "false"}
|
||||||
|
data-menu-open={openMenus > 0 ? "true" : "false"}
|
||||||
|
contentEditable={false}
|
||||||
|
>
|
||||||
|
<ErrorBoundary
|
||||||
|
resetKeys={[sourcePageId, transclusionId]}
|
||||||
|
fallback={<ErrorPlaceholder />}
|
||||||
|
>
|
||||||
|
<TransclusionReferenceBody {...props} trackOpen={trackOpen} />
|
||||||
|
</ErrorBoundary>
|
||||||
|
</NodeViewWrapper>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function TransclusionReferenceBody({
|
||||||
|
editor,
|
||||||
|
node,
|
||||||
|
deleteNode,
|
||||||
|
getPos,
|
||||||
|
trackOpen,
|
||||||
|
}: NodeViewProps & { trackOpen: (open: boolean) => void }) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const sourcePageId: string | null = node.attrs.sourcePageId ?? null;
|
||||||
|
const transclusionId: string | null = node.attrs.transclusionId ?? null;
|
||||||
|
const isEditable = editor.isEditable;
|
||||||
|
|
||||||
|
const { result, refresh } = useTransclusionLookup(
|
||||||
|
sourcePageId,
|
||||||
|
transclusionId,
|
||||||
|
);
|
||||||
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
|
const handleRefresh = async () => {
|
||||||
|
setRefreshing(true);
|
||||||
|
try {
|
||||||
|
await refresh();
|
||||||
|
} finally {
|
||||||
|
setRefreshing(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
// @ts-ignore - editor.storage.pageId is set by the host editor
|
||||||
|
const hostPageId: string | undefined = editor.storage?.pageId;
|
||||||
|
const unsyncMutation = useUnsyncReferenceMutation();
|
||||||
|
// Cached against the dropdown's identical query so the source link target
|
||||||
|
// is ready as soon as the controls fade in on hover, without a second
|
||||||
|
// fetch.
|
||||||
|
const referencesQuery = useReferencesQuery(
|
||||||
|
sourcePageId,
|
||||||
|
transclusionId,
|
||||||
|
isEditable,
|
||||||
|
);
|
||||||
|
const sourcePageHref = (() => {
|
||||||
|
const source = referencesQuery.data?.source;
|
||||||
|
const base = source?.spaceSlug
|
||||||
|
? buildPageUrl(source.spaceSlug, source.slugId, source.title)
|
||||||
|
: sourcePageId
|
||||||
|
? `/p/${sourcePageId}`
|
||||||
|
: null;
|
||||||
|
if (!base) return null;
|
||||||
|
return transclusionId ? `${base}#${transclusionId}` : base;
|
||||||
|
})();
|
||||||
|
|
||||||
|
const handleUnsync = async () => {
|
||||||
|
if (!hostPageId || !sourcePageId || !transclusionId) return;
|
||||||
|
try {
|
||||||
|
const { content } = await unsyncMutation.mutateAsync({
|
||||||
|
referencePageId: hostPageId,
|
||||||
|
sourcePageId,
|
||||||
|
transclusionId,
|
||||||
|
});
|
||||||
|
const pos = getPos();
|
||||||
|
if (typeof pos !== "number") return;
|
||||||
|
const from = pos;
|
||||||
|
const to = pos + node.nodeSize;
|
||||||
|
editor
|
||||||
|
.chain()
|
||||||
|
.focus()
|
||||||
|
.insertContentAt({ from, to }, content as any)
|
||||||
|
.run();
|
||||||
|
} catch {
|
||||||
|
// mutation surfaces errors via React Query; node stays as-is
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{isEditable && (
|
||||||
|
<div
|
||||||
|
className={classes.includeControls}
|
||||||
|
contentEditable={false}
|
||||||
|
onMouseDown={(e) => e.preventDefault()}
|
||||||
|
>
|
||||||
|
{sourcePageId && transclusionId && hostPageId && (
|
||||||
|
<SyncBlockReferencesDropdown
|
||||||
|
sourcePageId={sourcePageId}
|
||||||
|
transclusionId={transclusionId}
|
||||||
|
currentPageId={hostPageId}
|
||||||
|
mode="reference"
|
||||||
|
onOpenChange={trackOpen}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<span className={classes.controlsDivider} />
|
||||||
|
<Tooltip label={t("Refresh")}>
|
||||||
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
size="sm"
|
||||||
|
onClick={handleRefresh}
|
||||||
|
loading={refreshing}
|
||||||
|
disabled={!sourcePageId || !transclusionId}
|
||||||
|
>
|
||||||
|
<IconRefresh size={14} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Tooltip>
|
||||||
|
{sourcePageHref && (
|
||||||
|
<Tooltip label={t("Edit source")}>
|
||||||
|
<ActionIcon
|
||||||
|
component={Link}
|
||||||
|
to={sourcePageHref}
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
size="sm"
|
||||||
|
style={{
|
||||||
|
textDecoration: "none",
|
||||||
|
borderBottom: "none",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<IconPencil size={14} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
<Menu position="bottom-end" withinPortal onChange={trackOpen}>
|
||||||
|
<Menu.Target>
|
||||||
|
<ActionIcon variant="subtle" color="gray" size="sm">
|
||||||
|
<IconDots size={14} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Menu.Target>
|
||||||
|
<Menu.Dropdown>
|
||||||
|
<Menu.Item
|
||||||
|
leftSection={<IconLinkOff size={14} />}
|
||||||
|
onClick={handleUnsync}
|
||||||
|
disabled={
|
||||||
|
unsyncMutation.isPending ||
|
||||||
|
!hostPageId ||
|
||||||
|
!sourcePageId ||
|
||||||
|
!transclusionId
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{t("Unsync")}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
color="red"
|
||||||
|
leftSection={<IconTrash size={14} />}
|
||||||
|
onClick={() => deleteNode()}
|
||||||
|
>
|
||||||
|
{t("Remove from page")}
|
||||||
|
</Menu.Item>
|
||||||
|
</Menu.Dropdown>
|
||||||
|
</Menu>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!sourcePageId || !transclusionId ? (
|
||||||
|
<NotFoundPlaceholder />
|
||||||
|
) : !result ? (
|
||||||
|
<div style={{ minHeight: 24 }} />
|
||||||
|
) : !("status" in result) ? (
|
||||||
|
<TransclusionContent content={result.content} />
|
||||||
|
) : result.status === "no_access" ? (
|
||||||
|
<NoAccessPlaceholder />
|
||||||
|
) : (
|
||||||
|
<NotFoundPlaceholder />
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
import {
|
||||||
|
NodeViewContent,
|
||||||
|
NodeViewProps,
|
||||||
|
NodeViewWrapper,
|
||||||
|
} from "@tiptap/react";
|
||||||
|
import { ActionIcon, Menu, Tooltip } from "@mantine/core";
|
||||||
|
import { notifications } from "@mantine/notifications";
|
||||||
|
import {
|
||||||
|
IconCheck,
|
||||||
|
IconCopy,
|
||||||
|
IconDots,
|
||||||
|
IconLinkOff,
|
||||||
|
IconTrash,
|
||||||
|
} from "@tabler/icons-react";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import classes from "./transclusion.module.css";
|
||||||
|
import SyncBlockReferencesDropdown from "@/features/transclusion/components/sync-block-references-dropdown";
|
||||||
|
|
||||||
|
export default function TransclusionView(props: NodeViewProps) {
|
||||||
|
const { editor, node, deleteNode } = props;
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const [openMenus, setOpenMenus] = useState(0);
|
||||||
|
const trackOpen = (open: boolean) =>
|
||||||
|
setOpenMenus((n) => Math.max(0, n + (open ? 1 : -1)));
|
||||||
|
|
||||||
|
const isEditable = editor.isEditable;
|
||||||
|
// @ts-ignore - editor.storage.pageId is set by the host editor (page-editor.tsx onCreate)
|
||||||
|
const sourcePageId: string | undefined = editor.storage?.pageId;
|
||||||
|
const transclusionId: string | null = node.attrs.id ?? null;
|
||||||
|
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
const handleCopy = async () => {
|
||||||
|
if (!sourcePageId || !transclusionId) return;
|
||||||
|
const html = `<div data-type="transclusionReference" data-source-page-id="${sourcePageId}" data-transclusion-id="${transclusionId}"></div>`;
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.write([
|
||||||
|
new ClipboardItem({
|
||||||
|
"text/html": new Blob([html], { type: "text/html" }),
|
||||||
|
"text/plain": new Blob([html], { type: "text/plain" }),
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
} catch {
|
||||||
|
// Fallback for browsers without ClipboardItem write support
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(html);
|
||||||
|
} catch {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setCopied(true);
|
||||||
|
window.setTimeout(() => setCopied(false), 2000);
|
||||||
|
notifications.show({
|
||||||
|
message: t("Copied. Paste on any page to embed this synced block."),
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleUnsync = () => {
|
||||||
|
editor.chain().focus().unsyncTransclusionSource().run();
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<NodeViewWrapper
|
||||||
|
className={classes.transclusionWrap}
|
||||||
|
data-menu-open={openMenus > 0 ? "true" : "false"}
|
||||||
|
data-id={transclusionId ?? undefined}
|
||||||
|
>
|
||||||
|
{isEditable && (
|
||||||
|
<div
|
||||||
|
className={classes.transclusionControls}
|
||||||
|
contentEditable={false}
|
||||||
|
onMouseDown={(e) => e.preventDefault()}
|
||||||
|
>
|
||||||
|
{sourcePageId && transclusionId && (
|
||||||
|
<SyncBlockReferencesDropdown
|
||||||
|
sourcePageId={sourcePageId}
|
||||||
|
transclusionId={transclusionId}
|
||||||
|
currentPageId={sourcePageId}
|
||||||
|
mode="source"
|
||||||
|
onOpenChange={trackOpen}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<span className={classes.controlsDivider} />
|
||||||
|
|
||||||
|
<Tooltip label={copied ? t("Copied") : t("Copy synced block")}>
|
||||||
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color={copied ? "teal" : "gray"}
|
||||||
|
size="sm"
|
||||||
|
onClick={handleCopy}
|
||||||
|
disabled={!sourcePageId || !transclusionId}
|
||||||
|
>
|
||||||
|
{copied ? <IconCheck size={14} /> : <IconCopy size={14} />}
|
||||||
|
</ActionIcon>
|
||||||
|
</Tooltip>
|
||||||
|
|
||||||
|
<Menu position="bottom-end" withinPortal onChange={trackOpen}>
|
||||||
|
<Menu.Target>
|
||||||
|
<ActionIcon variant="subtle" color="gray" size="sm">
|
||||||
|
<IconDots size={14} />
|
||||||
|
</ActionIcon>
|
||||||
|
</Menu.Target>
|
||||||
|
<Menu.Dropdown>
|
||||||
|
<Menu.Item
|
||||||
|
leftSection={<IconLinkOff size={14} />}
|
||||||
|
onClick={handleUnsync}
|
||||||
|
>
|
||||||
|
{t("Unsync")}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
color="red"
|
||||||
|
leftSection={<IconTrash size={14} />}
|
||||||
|
onClick={() => deleteNode()}
|
||||||
|
>
|
||||||
|
{t("Delete synced block")}
|
||||||
|
</Menu.Item>
|
||||||
|
</Menu.Dropdown>
|
||||||
|
</Menu>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<NodeViewContent />
|
||||||
|
</NodeViewWrapper>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,209 @@
|
|||||||
|
.placeholder {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 8px 12px;
|
||||||
|
border-radius: var(--mantine-radius-md);
|
||||||
|
background: light-dark(
|
||||||
|
var(--mantine-color-gray-0),
|
||||||
|
var(--mantine-color-dark-6)
|
||||||
|
);
|
||||||
|
color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
|
||||||
|
font-size: var(--mantine-font-size-sm);
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.placeholderIcon {
|
||||||
|
flex: none;
|
||||||
|
color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
|
||||||
|
}
|
||||||
|
|
||||||
|
.transclusionBadge {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 2px 8px;
|
||||||
|
font-size: var(--mantine-font-size-xs);
|
||||||
|
font-weight: 600;
|
||||||
|
color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
|
||||||
|
background: light-dark(
|
||||||
|
var(--mantine-color-gray-1),
|
||||||
|
var(--mantine-color-dark-5)
|
||||||
|
);
|
||||||
|
border-radius: var(--mantine-radius-sm);
|
||||||
|
margin-bottom: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transclusionWrap {
|
||||||
|
position: relative;
|
||||||
|
margin-left: -3rem;
|
||||||
|
margin-right: -3rem;
|
||||||
|
width: calc(100% + 6rem);
|
||||||
|
padding: 0.5em 3rem;
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 2px solid transparent;
|
||||||
|
transition: border 0.3s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transclusionWrap:hover,
|
||||||
|
.transclusionWrap:focus-within {
|
||||||
|
border: 2px solid
|
||||||
|
light-dark(
|
||||||
|
var(--mantine-color-orange-2),
|
||||||
|
color-mix(in srgb, var(--mantine-color-orange-9), transparent 55%)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.transclusionControls {
|
||||||
|
position: absolute;
|
||||||
|
bottom: calc(100% + 8px);
|
||||||
|
right: 4px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
background: var(--mantine-color-body);
|
||||||
|
border: 1px solid var(--mantine-color-default-border);
|
||||||
|
border-radius: 6px;
|
||||||
|
padding: 4px 6px;
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
transition: opacity 0.15s ease;
|
||||||
|
z-index: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hover bridge: keeps :hover on the wrap while the cursor crosses the
|
||||||
|
8px gap between wrap and floating chrome, so the menu doesn't fade out
|
||||||
|
on the way to it. */
|
||||||
|
.transclusionControls::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
height: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transclusionWrap:hover .transclusionControls,
|
||||||
|
.transclusionWrap:focus-within .transclusionControls,
|
||||||
|
.transclusionWrap[data-menu-open="true"] .transclusionControls {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.controlsDivider {
|
||||||
|
display: inline-block;
|
||||||
|
width: 1px;
|
||||||
|
height: 16px;
|
||||||
|
background: var(--mantine-color-default-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.transclusionControls a[href],
|
||||||
|
.includeControls a[href] {
|
||||||
|
color: var(--ai-color);
|
||||||
|
border-bottom: none;
|
||||||
|
font-weight: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
.includeWrap {
|
||||||
|
position: relative;
|
||||||
|
margin-left: -3rem;
|
||||||
|
margin-right: -3rem;
|
||||||
|
width: calc(100% + 6rem);
|
||||||
|
padding: 0.5em 0;
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 2px solid transparent;
|
||||||
|
transition: border 0.3s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.includeWrap:hover,
|
||||||
|
.includeWrap[data-focused="true"],
|
||||||
|
.includeWrap[data-menu-open="true"] {
|
||||||
|
border: 2px solid
|
||||||
|
light-dark(
|
||||||
|
var(--mantine-color-orange-2),
|
||||||
|
color-mix(in srgb, var(--mantine-color-orange-9), transparent 55%)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.includeControls {
|
||||||
|
position: absolute;
|
||||||
|
bottom: calc(100% + 8px);
|
||||||
|
right: 4px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
background: var(--mantine-color-body);
|
||||||
|
border: 1px solid var(--mantine-color-default-border);
|
||||||
|
border-radius: 6px;
|
||||||
|
padding: 4px 6px;
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
transition: opacity 0.15s ease;
|
||||||
|
z-index: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hover bridge: keeps :hover on the wrap while the cursor crosses the
|
||||||
|
8px gap between wrap and floating chrome, so the menu doesn't fade out
|
||||||
|
on the way to it. */
|
||||||
|
.includeControls::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
height: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.includeWrap:hover .includeControls,
|
||||||
|
.includeWrap:focus-within .includeControls,
|
||||||
|
.includeWrap[data-focused="true"] .includeControls,
|
||||||
|
.includeWrap[data-menu-open="true"] .includeControls {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
:global(.react-renderer.node-transclusionSource.ProseMirror-selectednode),
|
||||||
|
:global(.react-renderer.node-transclusionReference.ProseMirror-selectednode) {
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 48em) {
|
||||||
|
.transclusionWrap,
|
||||||
|
.includeWrap {
|
||||||
|
margin-left: -1rem;
|
||||||
|
margin-right: -1rem;
|
||||||
|
width: calc(100% + 2rem);
|
||||||
|
}
|
||||||
|
|
||||||
|
.transclusionWrap {
|
||||||
|
padding-left: 1rem;
|
||||||
|
padding-right: 1rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media print {
|
||||||
|
.transclusionControls,
|
||||||
|
.includeControls {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
.transclusionWrap,
|
||||||
|
.includeWrap {
|
||||||
|
border: none !important;
|
||||||
|
margin-left: 0 !important;
|
||||||
|
margin-right: 0 !important;
|
||||||
|
width: 100% !important;
|
||||||
|
padding: 0 !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.editingOriginalTag {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 0 6px;
|
||||||
|
font-size: var(--mantine-font-size-xs);
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--mantine-color-blue-7);
|
||||||
|
background: light-dark(
|
||||||
|
var(--mantine-color-blue-0),
|
||||||
|
var(--mantine-color-blue-9)
|
||||||
|
);
|
||||||
|
border-radius: var(--mantine-radius-sm);
|
||||||
|
}
|
||||||
@@ -47,6 +47,7 @@ export default function VideoView(props: NodeViewProps) {
|
|||||||
preload="metadata"
|
preload="metadata"
|
||||||
controls
|
controls
|
||||||
src={getFileUrl(src)}
|
src={getFileUrl(src)}
|
||||||
|
aria-label={placeholder?.name || t("Video")}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{!src && previewSrc && (
|
{!src && previewSrc && (
|
||||||
@@ -56,6 +57,7 @@ export default function VideoView(props: NodeViewProps) {
|
|||||||
preload="metadata"
|
preload="metadata"
|
||||||
controls
|
controls
|
||||||
src={previewSrc}
|
src={previewSrc}
|
||||||
|
aria-label={placeholder?.name || t("Video")}
|
||||||
/>
|
/>
|
||||||
<Loader size={20} pos="absolute" top={6} right={6} />
|
<Loader size={20} pos="absolute" top={6} right={6} />
|
||||||
</Group>
|
</Group>
|
||||||
@@ -71,7 +73,7 @@ export default function VideoView(props: NodeViewProps) {
|
|||||||
</Group>
|
</Group>
|
||||||
)}
|
)}
|
||||||
{!src && !previewSrc && !placeholder && (
|
{!src && !previewSrc && !placeholder && (
|
||||||
<video className={classes.video} controls />
|
<video className={classes.video} controls aria-label={t("Video")} />
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</NodeViewWrapper>
|
</NodeViewWrapper>
|
||||||
|
|||||||
@@ -0,0 +1,419 @@
|
|||||||
|
import { Extension } from "@tiptap/core";
|
||||||
|
import {
|
||||||
|
NodeSelection,
|
||||||
|
Plugin,
|
||||||
|
PluginKey,
|
||||||
|
TextSelection,
|
||||||
|
} from "@tiptap/pm/state";
|
||||||
|
import { Fragment, Slice, Node } from "@tiptap/pm/model";
|
||||||
|
import { EditorView } from "@tiptap/pm/view";
|
||||||
|
|
||||||
|
export interface GlobalDragHandleOptions {
|
||||||
|
/**
|
||||||
|
* The width of the drag handle
|
||||||
|
*/
|
||||||
|
dragHandleWidth: number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The treshold for scrolling
|
||||||
|
*/
|
||||||
|
scrollThreshold: number;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The css selector to query for the drag handle. (eg: '.custom-handle').
|
||||||
|
* If handle element is found, that element will be used as drag handle. If not, a default handle will be created
|
||||||
|
*/
|
||||||
|
dragHandleSelector?: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tags to be excluded for drag handle
|
||||||
|
*/
|
||||||
|
excludedTags: string[];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom nodes to be included for drag handle
|
||||||
|
*/
|
||||||
|
customNodes: string[];
|
||||||
|
}
|
||||||
|
function absoluteRect(node: Element) {
|
||||||
|
const data = node.getBoundingClientRect();
|
||||||
|
const modal = node.closest('[role="dialog"]');
|
||||||
|
|
||||||
|
if (modal && window.getComputedStyle(modal).transform !== "none") {
|
||||||
|
const modalRect = modal.getBoundingClientRect();
|
||||||
|
|
||||||
|
return {
|
||||||
|
top: data.top - modalRect.top,
|
||||||
|
left: data.left - modalRect.left,
|
||||||
|
width: data.width,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
top: data.top,
|
||||||
|
left: data.left,
|
||||||
|
width: data.width,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function nodeDOMAtCoords(
|
||||||
|
coords: { x: number; y: number },
|
||||||
|
options: GlobalDragHandleOptions,
|
||||||
|
view: EditorView,
|
||||||
|
) {
|
||||||
|
const selectors = [
|
||||||
|
"li",
|
||||||
|
"p:not(:first-child)",
|
||||||
|
"pre",
|
||||||
|
"blockquote",
|
||||||
|
"h1",
|
||||||
|
"h2",
|
||||||
|
"h3",
|
||||||
|
"h4",
|
||||||
|
"h5",
|
||||||
|
"h6",
|
||||||
|
...options.customNodes.map((node) => `[data-type=${node}]`),
|
||||||
|
].join(", ");
|
||||||
|
return document
|
||||||
|
.elementsFromPoint(coords.x, coords.y)
|
||||||
|
.find((elem: Element) => {
|
||||||
|
// Skip elements that belong to a nested editor (e.g. transclusion
|
||||||
|
// references render their own ProseMirror instance). Only consider
|
||||||
|
// elements whose closest editor is this host view.
|
||||||
|
if (elem.closest(".ProseMirror") !== view.dom) return false;
|
||||||
|
return (
|
||||||
|
elem.parentElement?.matches?.(".ProseMirror") ||
|
||||||
|
elem.matches(selectors)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
function nodePosAtDOM(
|
||||||
|
node: Element,
|
||||||
|
view: EditorView,
|
||||||
|
options: GlobalDragHandleOptions,
|
||||||
|
) {
|
||||||
|
const boundingRect = node.getBoundingClientRect();
|
||||||
|
|
||||||
|
return view.posAtCoords({
|
||||||
|
left: boundingRect.left + 50 + options.dragHandleWidth,
|
||||||
|
top: boundingRect.top + 1,
|
||||||
|
})?.inside;
|
||||||
|
}
|
||||||
|
|
||||||
|
function calcNodePos(pos: number, view: EditorView) {
|
||||||
|
const $pos = view.state.doc.resolve(pos);
|
||||||
|
if ($pos.depth > 1) return $pos.before($pos.depth);
|
||||||
|
return pos;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DragHandlePlugin(
|
||||||
|
options: GlobalDragHandleOptions & { pluginKey: string },
|
||||||
|
) {
|
||||||
|
let listType = "";
|
||||||
|
function handleDragStart(event: DragEvent, view: EditorView) {
|
||||||
|
view.focus();
|
||||||
|
|
||||||
|
if (!event.dataTransfer) return;
|
||||||
|
|
||||||
|
const node = nodeDOMAtCoords(
|
||||||
|
{
|
||||||
|
x: event.clientX + 50 + options.dragHandleWidth,
|
||||||
|
y: event.clientY,
|
||||||
|
},
|
||||||
|
options,
|
||||||
|
view,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!(node instanceof Element)) return;
|
||||||
|
|
||||||
|
let draggedNodePos = nodePosAtDOM(node, view, options);
|
||||||
|
if (draggedNodePos == null || draggedNodePos < 0) return;
|
||||||
|
draggedNodePos = calcNodePos(draggedNodePos, view);
|
||||||
|
|
||||||
|
const { from, to } = view.state.selection;
|
||||||
|
const diff = from - to;
|
||||||
|
|
||||||
|
const fromSelectionPos = calcNodePos(from, view);
|
||||||
|
let differentNodeSelected = false;
|
||||||
|
|
||||||
|
const nodePos = view.state.doc.resolve(fromSelectionPos);
|
||||||
|
|
||||||
|
// Check if nodePos points to the top level node
|
||||||
|
if (nodePos.node().type.name === "doc") differentNodeSelected = true;
|
||||||
|
else {
|
||||||
|
const nodeSelection = NodeSelection.create(
|
||||||
|
view.state.doc,
|
||||||
|
nodePos.before(),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Check if the node where the drag event started is part of the current selection
|
||||||
|
differentNodeSelected = !(
|
||||||
|
draggedNodePos + 1 >= nodeSelection.$from.pos &&
|
||||||
|
draggedNodePos <= nodeSelection.$to.pos
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let selection = view.state.selection;
|
||||||
|
if (
|
||||||
|
!differentNodeSelected &&
|
||||||
|
diff !== 0 &&
|
||||||
|
!(view.state.selection instanceof NodeSelection)
|
||||||
|
) {
|
||||||
|
const endSelection = NodeSelection.create(view.state.doc, to - 1);
|
||||||
|
selection = TextSelection.create(
|
||||||
|
view.state.doc,
|
||||||
|
draggedNodePos,
|
||||||
|
endSelection.$to.pos,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
selection = NodeSelection.create(view.state.doc, draggedNodePos);
|
||||||
|
|
||||||
|
// if inline node is selected, e.g mention -> go to the parent node to select the whole node
|
||||||
|
// if table row is selected, go to the parent node to select the whole node
|
||||||
|
if (
|
||||||
|
(selection as NodeSelection).node.type.isInline ||
|
||||||
|
(selection as NodeSelection).node.type.name === "tableRow"
|
||||||
|
) {
|
||||||
|
let $pos = view.state.doc.resolve(selection.from);
|
||||||
|
selection = NodeSelection.create(view.state.doc, $pos.before());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
view.dispatch(view.state.tr.setSelection(selection));
|
||||||
|
|
||||||
|
// If the selected node is a list item, we need to save the type of the wrapping list e.g. OL or UL
|
||||||
|
if (
|
||||||
|
view.state.selection instanceof NodeSelection &&
|
||||||
|
view.state.selection.node.type.name === "listItem"
|
||||||
|
) {
|
||||||
|
listType = node.parentElement!.tagName;
|
||||||
|
}
|
||||||
|
|
||||||
|
const slice = view.state.selection.content();
|
||||||
|
const { dom, text } = view.serializeForClipboard(slice);
|
||||||
|
|
||||||
|
event.dataTransfer.clearData();
|
||||||
|
event.dataTransfer.setData("text/html", dom.innerHTML);
|
||||||
|
event.dataTransfer.setData("text/plain", text);
|
||||||
|
event.dataTransfer.effectAllowed = "move";
|
||||||
|
|
||||||
|
event.dataTransfer.setDragImage(node, 0, 0);
|
||||||
|
|
||||||
|
view.dragging = { slice, move: event.ctrlKey };
|
||||||
|
}
|
||||||
|
|
||||||
|
let dragHandleElement: HTMLElement | null = null;
|
||||||
|
|
||||||
|
function hideDragHandle() {
|
||||||
|
if (dragHandleElement) {
|
||||||
|
dragHandleElement.classList.add("hide");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showDragHandle() {
|
||||||
|
if (dragHandleElement) {
|
||||||
|
dragHandleElement.classList.remove("hide");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function hideHandleOnEditorOut(event: MouseEvent) {
|
||||||
|
if (event.target instanceof Element) {
|
||||||
|
// Check if the relatedTarget class is still inside the editor
|
||||||
|
const relatedTarget = event.relatedTarget as HTMLElement;
|
||||||
|
const isInsideEditor =
|
||||||
|
relatedTarget?.classList.contains("tiptap") ||
|
||||||
|
relatedTarget?.classList.contains("drag-handle");
|
||||||
|
|
||||||
|
if (isInsideEditor) return;
|
||||||
|
}
|
||||||
|
hideDragHandle();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Plugin({
|
||||||
|
key: new PluginKey(options.pluginKey),
|
||||||
|
view: (view) => {
|
||||||
|
const handleBySelector = options.dragHandleSelector
|
||||||
|
? document.querySelector<HTMLElement>(options.dragHandleSelector)
|
||||||
|
: null;
|
||||||
|
dragHandleElement = handleBySelector ?? document.createElement("div");
|
||||||
|
dragHandleElement.draggable = true;
|
||||||
|
dragHandleElement.dataset.dragHandle = "";
|
||||||
|
dragHandleElement.classList.add("drag-handle");
|
||||||
|
|
||||||
|
function onDragHandleDragStart(e: DragEvent) {
|
||||||
|
handleDragStart(e, view);
|
||||||
|
}
|
||||||
|
|
||||||
|
dragHandleElement.addEventListener("dragstart", onDragHandleDragStart);
|
||||||
|
|
||||||
|
function onDragHandleDrag(e: DragEvent) {
|
||||||
|
hideDragHandle();
|
||||||
|
let scrollY = window.scrollY;
|
||||||
|
if (e.clientY < options.scrollThreshold) {
|
||||||
|
window.scrollTo({ top: scrollY - 30, behavior: "smooth" });
|
||||||
|
} else if (window.innerHeight - e.clientY < options.scrollThreshold) {
|
||||||
|
window.scrollTo({ top: scrollY + 30, behavior: "smooth" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dragHandleElement.addEventListener("drag", onDragHandleDrag);
|
||||||
|
|
||||||
|
hideDragHandle();
|
||||||
|
|
||||||
|
if (!handleBySelector) {
|
||||||
|
view?.dom?.parentElement?.appendChild(dragHandleElement);
|
||||||
|
}
|
||||||
|
view?.dom?.parentElement?.addEventListener(
|
||||||
|
"mouseout",
|
||||||
|
hideHandleOnEditorOut,
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
destroy: () => {
|
||||||
|
if (!handleBySelector) {
|
||||||
|
dragHandleElement?.remove?.();
|
||||||
|
}
|
||||||
|
dragHandleElement?.removeEventListener("drag", onDragHandleDrag);
|
||||||
|
dragHandleElement?.removeEventListener(
|
||||||
|
"dragstart",
|
||||||
|
onDragHandleDragStart,
|
||||||
|
);
|
||||||
|
dragHandleElement = null;
|
||||||
|
view?.dom?.parentElement?.removeEventListener(
|
||||||
|
"mouseout",
|
||||||
|
hideHandleOnEditorOut,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
handleDOMEvents: {
|
||||||
|
mousemove: (view, event) => {
|
||||||
|
if (!view.editable) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const node = nodeDOMAtCoords(
|
||||||
|
{
|
||||||
|
x: event.clientX + 50 + options.dragHandleWidth,
|
||||||
|
y: event.clientY,
|
||||||
|
},
|
||||||
|
options,
|
||||||
|
view,
|
||||||
|
);
|
||||||
|
|
||||||
|
const notDragging = node?.closest(".not-draggable");
|
||||||
|
const excludedTagList = options.excludedTags
|
||||||
|
.concat(["ol", "ul"])
|
||||||
|
.join(", ");
|
||||||
|
|
||||||
|
if (
|
||||||
|
!(node instanceof Element) ||
|
||||||
|
node.matches(excludedTagList) ||
|
||||||
|
notDragging
|
||||||
|
) {
|
||||||
|
hideDragHandle();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const compStyle = window.getComputedStyle(node);
|
||||||
|
const parsedLineHeight = parseInt(compStyle.lineHeight, 10);
|
||||||
|
const lineHeight = isNaN(parsedLineHeight)
|
||||||
|
? parseInt(compStyle.fontSize) * 1.2
|
||||||
|
: parsedLineHeight;
|
||||||
|
const paddingTop = parseInt(compStyle.paddingTop, 10);
|
||||||
|
|
||||||
|
const rect = absoluteRect(node);
|
||||||
|
|
||||||
|
rect.top += (lineHeight - 24) / 2;
|
||||||
|
rect.top += paddingTop;
|
||||||
|
// Li markers
|
||||||
|
if (node.matches("ul:not([data-type=taskList]) li, ol li")) {
|
||||||
|
rect.left -= options.dragHandleWidth;
|
||||||
|
}
|
||||||
|
rect.width = options.dragHandleWidth;
|
||||||
|
|
||||||
|
if (!dragHandleElement) return;
|
||||||
|
|
||||||
|
dragHandleElement.style.left = `${rect.left - rect.width}px`;
|
||||||
|
dragHandleElement.style.top = `${rect.top}px`;
|
||||||
|
showDragHandle();
|
||||||
|
},
|
||||||
|
keydown: () => {
|
||||||
|
hideDragHandle();
|
||||||
|
},
|
||||||
|
mousewheel: () => {
|
||||||
|
hideDragHandle();
|
||||||
|
},
|
||||||
|
// dragging class is used for CSS
|
||||||
|
dragstart: (view) => {
|
||||||
|
view.dom.classList.add("dragging");
|
||||||
|
},
|
||||||
|
drop: (view, event) => {
|
||||||
|
view.dom.classList.remove("dragging");
|
||||||
|
hideDragHandle();
|
||||||
|
let droppedNode: Node | null = null;
|
||||||
|
const dropPos = view.posAtCoords({
|
||||||
|
left: event.clientX,
|
||||||
|
top: event.clientY,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!dropPos) return;
|
||||||
|
|
||||||
|
if (view.state.selection instanceof NodeSelection) {
|
||||||
|
droppedNode = view.state.selection.node;
|
||||||
|
}
|
||||||
|
if (!droppedNode) return;
|
||||||
|
|
||||||
|
const resolvedPos = view.state.doc.resolve(dropPos.pos);
|
||||||
|
|
||||||
|
const isDroppedInsideList =
|
||||||
|
resolvedPos.parent.type.name === "listItem";
|
||||||
|
|
||||||
|
// If the selected node is a list item and is not dropped inside a list, we need to wrap it inside <ol> tag otherwise ol list items will be transformed into ul list item when dropped
|
||||||
|
if (
|
||||||
|
view.state.selection instanceof NodeSelection &&
|
||||||
|
view.state.selection.node.type.name === "listItem" &&
|
||||||
|
!isDroppedInsideList &&
|
||||||
|
listType == "OL"
|
||||||
|
) {
|
||||||
|
const newList = view.state.schema.nodes.orderedList?.createAndFill(
|
||||||
|
null,
|
||||||
|
droppedNode,
|
||||||
|
);
|
||||||
|
const slice = new Slice(Fragment.from(newList), 0, 0);
|
||||||
|
view.dragging = { slice, move: event.ctrlKey };
|
||||||
|
}
|
||||||
|
},
|
||||||
|
dragend: (view) => {
|
||||||
|
view.dom.classList.remove("dragging");
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const GlobalDragHandle = Extension.create({
|
||||||
|
name: "globalDragHandle",
|
||||||
|
|
||||||
|
addOptions() {
|
||||||
|
return {
|
||||||
|
dragHandleWidth: 20,
|
||||||
|
scrollThreshold: 100,
|
||||||
|
excludedTags: [],
|
||||||
|
customNodes: [],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
addProseMirrorPlugins() {
|
||||||
|
return [
|
||||||
|
DragHandlePlugin({
|
||||||
|
pluginKey: "globalDragHandle",
|
||||||
|
dragHandleWidth: this.options.dragHandleWidth,
|
||||||
|
scrollThreshold: this.options.scrollThreshold,
|
||||||
|
dragHandleSelector: this.options.dragHandleSelector,
|
||||||
|
excludedTags: this.options.excludedTags,
|
||||||
|
customNodes: this.options.customNodes,
|
||||||
|
}),
|
||||||
|
];
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export default GlobalDragHandle;
|
||||||
@@ -9,9 +9,10 @@ import SubScript from "@tiptap/extension-subscript";
|
|||||||
import { Typography } from "@tiptap/extension-typography";
|
import { Typography } from "@tiptap/extension-typography";
|
||||||
import { TextStyle } from "@tiptap/extension-text-style";
|
import { TextStyle } from "@tiptap/extension-text-style";
|
||||||
import { Color } from "@tiptap/extension-color";
|
import { Color } from "@tiptap/extension-color";
|
||||||
import GlobalDragHandle from "tiptap-extension-global-drag-handle";
|
|
||||||
import { Youtube } from "@tiptap/extension-youtube";
|
import { Youtube } from "@tiptap/extension-youtube";
|
||||||
import SlashCommand, { SlashCommandExtension as Command } from "@/features/editor/extensions/slash-command";
|
import SlashCommand, {
|
||||||
|
SlashCommandExtension as Command,
|
||||||
|
} from "@/features/editor/extensions/slash-command";
|
||||||
import renderItems from "@/features/editor/components/slash-menu/render-items";
|
import renderItems from "@/features/editor/components/slash-menu/render-items";
|
||||||
import getSuggestionItems from "@/features/editor/components/slash-menu/menu-items";
|
import getSuggestionItems from "@/features/editor/components/slash-menu/menu-items";
|
||||||
import { Collaboration, isChangeOrigin } from "@tiptap/extension-collaboration";
|
import { Collaboration, isChangeOrigin } from "@tiptap/extension-collaboration";
|
||||||
@@ -47,11 +48,14 @@ import {
|
|||||||
Subpages,
|
Subpages,
|
||||||
Heading,
|
Heading,
|
||||||
Highlight,
|
Highlight,
|
||||||
|
Indent,
|
||||||
UniqueID,
|
UniqueID,
|
||||||
SharedStorage,
|
SharedStorage,
|
||||||
Columns,
|
Columns,
|
||||||
Column,
|
Column,
|
||||||
Status,
|
Status,
|
||||||
|
TransclusionSource,
|
||||||
|
TransclusionReference,
|
||||||
} from "@docmost/editor-ext";
|
} from "@docmost/editor-ext";
|
||||||
import {
|
import {
|
||||||
randomElement,
|
randomElement,
|
||||||
@@ -80,6 +84,8 @@ import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-v
|
|||||||
import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
|
import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
|
||||||
import PdfView from "@/features/editor/components/pdf/pdf-view.tsx";
|
import PdfView from "@/features/editor/components/pdf/pdf-view.tsx";
|
||||||
import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx";
|
import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx";
|
||||||
|
import TransclusionView from "@/features/editor/components/transclusion/transclusion-view.tsx";
|
||||||
|
import TransclusionReferenceView from "@/features/editor/components/transclusion/transclusion-reference-view.tsx";
|
||||||
import { common, createLowlight } from "lowlight";
|
import { common, createLowlight } from "lowlight";
|
||||||
import plaintext from "highlight.js/lib/languages/plaintext";
|
import plaintext from "highlight.js/lib/languages/plaintext";
|
||||||
import powershell from "highlight.js/lib/languages/powershell";
|
import powershell from "highlight.js/lib/languages/powershell";
|
||||||
@@ -100,6 +106,7 @@ import { MarkdownClipboard } from "@/features/editor/extensions/markdown-clipboa
|
|||||||
import EmojiCommand from "./emoji-command";
|
import EmojiCommand from "./emoji-command";
|
||||||
import { countWords } from "alfaaz";
|
import { countWords } from "alfaaz";
|
||||||
import AutoJoiner from "@/features/editor/extensions/autojoiner.ts";
|
import AutoJoiner from "@/features/editor/extensions/autojoiner.ts";
|
||||||
|
import GlobalDragHandle from "@/features/editor/extensions/drag-handle.ts";
|
||||||
|
|
||||||
const lowlight = createLowlight(common);
|
const lowlight = createLowlight(common);
|
||||||
lowlight.register("mermaid", plaintext);
|
lowlight.register("mermaid", plaintext);
|
||||||
@@ -167,7 +174,7 @@ export const mainExtensions = [
|
|||||||
SharedStorage,
|
SharedStorage,
|
||||||
Heading,
|
Heading,
|
||||||
UniqueID.configure({
|
UniqueID.configure({
|
||||||
types: ["heading", "paragraph"],
|
types: ["heading", "paragraph", "transclusionSource"],
|
||||||
filterTransaction: (transaction) => !isChangeOrigin(transaction),
|
filterTransaction: (transaction) => !isChangeOrigin(transaction),
|
||||||
}),
|
}),
|
||||||
Placeholder.configure({
|
Placeholder.configure({
|
||||||
@@ -197,6 +204,7 @@ export const mainExtensions = [
|
|||||||
showOnlyWhenEditable: true,
|
showOnlyWhenEditable: true,
|
||||||
}),
|
}),
|
||||||
TextAlign.configure({ types: ["heading", "paragraph"] }),
|
TextAlign.configure({ types: ["heading", "paragraph"] }),
|
||||||
|
Indent,
|
||||||
TaskList,
|
TaskList,
|
||||||
TaskItem.configure({
|
TaskItem.configure({
|
||||||
nested: true,
|
nested: true,
|
||||||
@@ -215,7 +223,9 @@ export const mainExtensions = [
|
|||||||
}),
|
}),
|
||||||
Typography,
|
Typography,
|
||||||
TrailingNode,
|
TrailingNode,
|
||||||
GlobalDragHandle,
|
GlobalDragHandle.configure({
|
||||||
|
customNodes: ["transclusionSource", "transclusionReference"],
|
||||||
|
}),
|
||||||
TextStyle,
|
TextStyle,
|
||||||
Color,
|
Color,
|
||||||
SlashCommand,
|
SlashCommand,
|
||||||
@@ -305,6 +315,8 @@ export const mainExtensions = [
|
|||||||
view: CodeBlockView,
|
view: CodeBlockView,
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
lowlight,
|
lowlight,
|
||||||
|
enableTabIndentation: true,
|
||||||
|
tabSize: 2,
|
||||||
HTMLAttributes: {
|
HTMLAttributes: {
|
||||||
spellcheck: false,
|
spellcheck: false,
|
||||||
},
|
},
|
||||||
@@ -351,6 +363,12 @@ export const mainExtensions = [
|
|||||||
Status.configure({
|
Status.configure({
|
||||||
view: StatusView,
|
view: StatusView,
|
||||||
}),
|
}),
|
||||||
|
TransclusionSource.configure({
|
||||||
|
view: TransclusionView,
|
||||||
|
}),
|
||||||
|
TransclusionReference.configure({
|
||||||
|
view: TransclusionReferenceView,
|
||||||
|
}),
|
||||||
MarkdownClipboard.configure({
|
MarkdownClipboard.configure({
|
||||||
transformPastedText: true,
|
transformPastedText: true,
|
||||||
}),
|
}),
|
||||||
@@ -393,7 +411,10 @@ const TEMPLATE_EXCLUDED_SLASH_ITEMS = new Set([
|
|||||||
const TemplateSlashCommand = Command.configure({
|
const TemplateSlashCommand = Command.configure({
|
||||||
suggestion: {
|
suggestion: {
|
||||||
items: ({ query }: { query: string }) =>
|
items: ({ query }: { query: string }) =>
|
||||||
getSuggestionItems({ query, excludeItems: TEMPLATE_EXCLUDED_SLASH_ITEMS }),
|
getSuggestionItems({
|
||||||
|
query,
|
||||||
|
excludeItems: TEMPLATE_EXCLUDED_SLASH_ITEMS,
|
||||||
|
}),
|
||||||
render: renderItems,
|
render: renderItems,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ import { useEditorScroll } from "./hooks/use-editor-scroll";
|
|||||||
import { EditorAiMenu } from "@/ee/ai/components/editor/ai-menu/ai-menu";
|
import { EditorAiMenu } from "@/ee/ai/components/editor/ai-menu/ai-menu";
|
||||||
import { EditorLinkMenu } from "@/features/editor/components/link/link-menu";
|
import { EditorLinkMenu } from "@/features/editor/components/link/link-menu";
|
||||||
import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
|
import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
|
||||||
|
import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
|
||||||
|
|
||||||
interface PageEditorProps {
|
interface PageEditorProps {
|
||||||
pageId: string;
|
pageId: string;
|
||||||
@@ -236,6 +237,14 @@ export default function PageEditor({
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
if (event.key === "Tab") {
|
||||||
|
const editor = editorRef.current;
|
||||||
|
if (!editor) return false;
|
||||||
|
event.preventDefault();
|
||||||
|
return editor.view.someProp("handleKeyDown", (f) =>
|
||||||
|
f(editor.view, event)
|
||||||
|
);
|
||||||
|
}
|
||||||
if (platformModifierKey(event) && event.code === "KeyK") {
|
if (platformModifierKey(event) && event.code === "KeyK") {
|
||||||
searchSpotlight.open();
|
searchSpotlight.open();
|
||||||
return true;
|
return true;
|
||||||
@@ -391,55 +400,60 @@ export default function PageEditor({
|
|||||||
}
|
}
|
||||||
}, [yjsConnectionStatus, isSynced]);
|
}, [yjsConnectionStatus, isSynced]);
|
||||||
|
|
||||||
if (showStatic) {
|
|
||||||
return (
|
|
||||||
<EditorProvider
|
|
||||||
editable={false}
|
|
||||||
immediatelyRender={true}
|
|
||||||
extensions={mainExtensions}
|
|
||||||
content={content}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="editor-container" style={{ position: "relative" }}>
|
<TransclusionLookupProvider>
|
||||||
<div ref={menuContainerRef}>
|
{showStatic ? (
|
||||||
<EditorContent editor={editor} />
|
<EditorProvider
|
||||||
|
editable={false}
|
||||||
|
immediatelyRender={true}
|
||||||
|
extensions={mainExtensions}
|
||||||
|
content={content}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div className="editor-container" style={{ position: "relative" }}>
|
||||||
|
<div ref={menuContainerRef}>
|
||||||
|
<EditorContent editor={editor} />
|
||||||
|
|
||||||
{editor && (
|
{editor && (
|
||||||
<SearchAndReplaceDialog editor={editor} editable={editable} />
|
<SearchAndReplaceDialog editor={editor} editable={editable} />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{editor && editorIsEditable && (
|
{editor && editorIsEditable && (
|
||||||
<div>
|
<div>
|
||||||
<EditorAiMenu editor={editor} />
|
<EditorAiMenu editor={editor} />
|
||||||
<EditorLinkMenu editor={editor} />
|
<EditorLinkMenu editor={editor} />
|
||||||
<EditorBubbleMenu editor={editor} />
|
<EditorBubbleMenu editor={editor} />
|
||||||
<TableMenu editor={editor} />
|
<TableMenu editor={editor} />
|
||||||
<TableCellMenu editor={editor} appendTo={menuContainerRef} />
|
<TableCellMenu editor={editor} appendTo={menuContainerRef} />
|
||||||
<ImageMenu editor={editor} />
|
<ImageMenu editor={editor} />
|
||||||
<VideoMenu editor={editor} />
|
<VideoMenu editor={editor} />
|
||||||
<PdfMenu editor={editor} />
|
<PdfMenu editor={editor} />
|
||||||
<CalloutMenu editor={editor} />
|
<CalloutMenu editor={editor} />
|
||||||
<SubpagesMenu editor={editor} />
|
<SubpagesMenu editor={editor} />
|
||||||
<ExcalidrawMenu editor={editor} />
|
<ExcalidrawMenu editor={editor} />
|
||||||
<DrawioMenu editor={editor} />
|
<DrawioMenu editor={editor} />
|
||||||
<ColumnsMenu editor={editor} />
|
<ColumnsMenu editor={editor} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{editor &&
|
||||||
|
!editorIsEditable &&
|
||||||
|
(editable || canComment) &&
|
||||||
|
providersRef.current && (
|
||||||
|
<ReadonlyBubbleMenu editor={editor} />
|
||||||
|
)}
|
||||||
|
{showCommentPopup && (
|
||||||
|
<CommentDialog editor={editor} pageId={pageId} />
|
||||||
|
)}
|
||||||
|
{showReadOnlyCommentPopup && (
|
||||||
|
<CommentDialog editor={editor} pageId={pageId} readOnly />
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
<div
|
||||||
{editor && !editorIsEditable && (editable || canComment) && providersRef.current && (
|
onClick={() => editor.commands.focus("end")}
|
||||||
<ReadonlyBubbleMenu editor={editor} />
|
style={{ paddingBottom: "20vh" }}
|
||||||
)}
|
></div>
|
||||||
{showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
|
</div>
|
||||||
{showReadOnlyCommentPopup && (
|
)}
|
||||||
<CommentDialog editor={editor} pageId={pageId} readOnly />
|
</TransclusionLookupProvider>
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
onClick={() => editor.commands.focus("end")}
|
|
||||||
style={{ paddingBottom: "20vh" }}
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,17 +9,26 @@ import { Placeholder } from "@tiptap/extension-placeholder";
|
|||||||
import { useAtom } from "jotai";
|
import { useAtom } from "jotai";
|
||||||
import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
|
import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
|
||||||
import { useEditorScroll } from "./hooks/use-editor-scroll";
|
import { useEditorScroll } from "./hooks/use-editor-scroll";
|
||||||
|
import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
|
||||||
|
|
||||||
interface PageEditorProps {
|
interface PageEditorProps {
|
||||||
title: string;
|
title: string;
|
||||||
content: any;
|
content: any;
|
||||||
pageId?: string;
|
pageId?: string;
|
||||||
|
/**
|
||||||
|
* When rendering inside a public share, pass the share's id (or key). Lookups
|
||||||
|
* for transclusion content then resolve against the share graph instead of
|
||||||
|
* the viewer's personal permissions, so a share never leaks source content
|
||||||
|
* that isn't itself shared.
|
||||||
|
*/
|
||||||
|
shareId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function ReadonlyPageEditor({
|
export default function ReadonlyPageEditor({
|
||||||
title,
|
title,
|
||||||
content,
|
content,
|
||||||
pageId,
|
pageId,
|
||||||
|
shareId,
|
||||||
}: PageEditorProps) {
|
}: PageEditorProps) {
|
||||||
const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
|
const [, setReadOnlyEditor] = useAtom(readOnlyEditorAtom);
|
||||||
const isComponentMounted = useRef(false);
|
const isComponentMounted = useRef(false);
|
||||||
@@ -65,7 +74,7 @@ export default function ReadonlyPageEditor({
|
|||||||
];
|
];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<TransclusionLookupProvider shareId={shareId}>
|
||||||
<div className="page-title">
|
<div className="page-title">
|
||||||
<EditorProvider
|
<EditorProvider
|
||||||
editable={false}
|
editable={false}
|
||||||
@@ -95,6 +104,6 @@ export default function ReadonlyPageEditor({
|
|||||||
}}
|
}}
|
||||||
></EditorProvider>
|
></EditorProvider>
|
||||||
<div style={{ paddingBottom: "20vh" }}></div>
|
<div style={{ paddingBottom: "20vh" }}></div>
|
||||||
</>
|
</TransclusionLookupProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
.ProseMirror {
|
||||||
|
--indent-step: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ProseMirror [data-indent="1"] { padding-inline-start: calc(var(--indent-step) * 1); }
|
||||||
|
.ProseMirror [data-indent="2"] { padding-inline-start: calc(var(--indent-step) * 2); }
|
||||||
|
.ProseMirror [data-indent="3"] { padding-inline-start: calc(var(--indent-step) * 3); }
|
||||||
|
.ProseMirror [data-indent="4"] { padding-inline-start: calc(var(--indent-step) * 4); }
|
||||||
|
.ProseMirror [data-indent="5"] { padding-inline-start: calc(var(--indent-step) * 5); }
|
||||||
|
.ProseMirror [data-indent="6"] { padding-inline-start: calc(var(--indent-step) * 6); }
|
||||||
|
.ProseMirror [data-indent="7"] { padding-inline-start: calc(var(--indent-step) * 7); }
|
||||||
|
.ProseMirror [data-indent="8"] { padding-inline-start: calc(var(--indent-step) * 8); }
|
||||||
|
.ProseMirror [data-indent="9"] { padding-inline-start: calc(var(--indent-step) * 9); }
|
||||||
|
.ProseMirror [data-indent="10"] { padding-inline-start: calc(var(--indent-step) * 10); }
|
||||||
@@ -13,5 +13,6 @@
|
|||||||
@import "./mention.css";
|
@import "./mention.css";
|
||||||
@import "./ordered-list.css";
|
@import "./ordered-list.css";
|
||||||
@import "./highlight.css";
|
@import "./highlight.css";
|
||||||
|
@import "./indent.css";
|
||||||
@import "./columns.css";
|
@import "./columns.css";
|
||||||
@import "./status.css";
|
@import "./status.css";
|
||||||
|
|||||||
@@ -53,15 +53,17 @@ export default function StarButton(props: StarButtonProps) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const label = isFavorited
|
||||||
|
? t("Remove from favorites")
|
||||||
|
: t("Add to favorites");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Tooltip
|
<Tooltip label={label} openDelay={250} withArrow>
|
||||||
label={isFavorited ? t("Remove from favorites") : t("Add to favorites")}
|
|
||||||
openDelay={250}
|
|
||||||
withArrow
|
|
||||||
>
|
|
||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
color={isFavorited ? "yellow" : "gray"}
|
color={isFavorited ? "yellow" : "gray"}
|
||||||
|
aria-label={label}
|
||||||
|
aria-pressed={isFavorited}
|
||||||
onClick={handleToggle}
|
onClick={handleToggle}
|
||||||
loading={isPending}
|
loading={isPending}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export default function GroupActionMenu() {
|
|||||||
arrowPosition="center"
|
arrowPosition="center"
|
||||||
>
|
>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="light">
|
<ActionIcon variant="light" aria-label={t("Group menu")}>
|
||||||
<IconDots size={20} stroke={2} />
|
<IconDots size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ export default function GroupMembersList() {
|
|||||||
<Table.Tr>
|
<Table.Tr>
|
||||||
<Table.Th>{t("User")}</Table.Th>
|
<Table.Th>{t("User")}</Table.Th>
|
||||||
<Table.Th>{t("Status")}</Table.Th>
|
<Table.Th>{t("Status")}</Table.Th>
|
||||||
<Table.Th></Table.Th>
|
<Table.Th aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import {
|
|||||||
UnstyledButton,
|
UnstyledButton,
|
||||||
Badge,
|
Badge,
|
||||||
Table,
|
Table,
|
||||||
ActionIcon,
|
ThemeIcon,
|
||||||
Button,
|
Button,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
@@ -61,13 +61,13 @@ export default function CreatedByMe({ spaceId }: Props) {
|
|||||||
>
|
>
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
{page.icon || (
|
{page.icon || (
|
||||||
<ActionIcon
|
<ThemeIcon
|
||||||
variant="transparent"
|
variant="transparent"
|
||||||
color="gray"
|
color="gray"
|
||||||
size={18}
|
size={18}
|
||||||
>
|
>
|
||||||
<IconFileDescription size={18} />
|
<IconFileDescription size={18} />
|
||||||
</ActionIcon>
|
</ThemeIcon>
|
||||||
)}
|
)}
|
||||||
<Text fw={500} size="md" lineClamp={1}>
|
<Text fw={500} size="md" lineClamp={1}>
|
||||||
{page.title || t("Untitled")}
|
{page.title || t("Untitled")}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import {
|
|||||||
UnstyledButton,
|
UnstyledButton,
|
||||||
Badge,
|
Badge,
|
||||||
Table,
|
Table,
|
||||||
ActionIcon,
|
ThemeIcon,
|
||||||
Button,
|
Button,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
@@ -62,13 +62,13 @@ export default function FavoritesPages({ spaceId }: Props) {
|
|||||||
>
|
>
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
{fav.page.icon || (
|
{fav.page.icon || (
|
||||||
<ActionIcon
|
<ThemeIcon
|
||||||
variant="transparent"
|
variant="transparent"
|
||||||
color="gray"
|
color="gray"
|
||||||
size={18}
|
size={18}
|
||||||
>
|
>
|
||||||
<IconFileDescription size={18} />
|
<IconFileDescription size={18} />
|
||||||
</ActionIcon>
|
</ThemeIcon>
|
||||||
)}
|
)}
|
||||||
<Text fw={500} size="md" lineClamp={1}>
|
<Text fw={500} size="md" lineClamp={1}>
|
||||||
{fav.page.title || t("Untitled")}
|
{fav.page.title || t("Untitled")}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
.subtitle {
|
.subtitle {
|
||||||
font-size: var(--mantine-font-size-sm);
|
font-size: var(--mantine-font-size-sm);
|
||||||
color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
|
color: var(--mantine-color-dimmed);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
margin-bottom: var(--mantine-spacing-lg);
|
margin-bottom: var(--mantine-spacing-lg);
|
||||||
|
|||||||
@@ -58,6 +58,9 @@ export function NotificationPopover() {
|
|||||||
variant="subtle"
|
variant="subtle"
|
||||||
color="dark"
|
color="dark"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
aria-label={t("Notifications")}
|
||||||
|
aria-haspopup="dialog"
|
||||||
|
aria-expanded={opened}
|
||||||
onClick={() => setOpened((o) => !o)}
|
onClick={() => setOpened((o) => !o)}
|
||||||
>
|
>
|
||||||
<Indicator
|
<Indicator
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export default function HistoryModal({ pageId, pageTitle }: Props) {
|
|||||||
opened={isModalOpen}
|
opened={isModalOpen}
|
||||||
onClose={() => setModalOpen(false)}
|
onClose={() => setModalOpen(false)}
|
||||||
fullScreen
|
fullScreen
|
||||||
|
aria-label={t("Page history")}
|
||||||
>
|
>
|
||||||
<Modal.Overlay />
|
<Modal.Overlay />
|
||||||
<Modal.Content style={{ overflow: "hidden" }}>
|
<Modal.Content style={{ overflow: "hidden" }}>
|
||||||
@@ -49,6 +50,7 @@ export default function HistoryModal({ pageId, pageTitle }: Props) {
|
|||||||
size={1400}
|
size={1400}
|
||||||
opened={isModalOpen}
|
opened={isModalOpen}
|
||||||
onClose={() => setModalOpen(false)}
|
onClose={() => setModalOpen(false)}
|
||||||
|
aria-label={t("Page history")}
|
||||||
>
|
>
|
||||||
<Modal.Overlay />
|
<Modal.Overlay />
|
||||||
<Modal.Content style={{ overflow: "hidden" }}>
|
<Modal.Content style={{ overflow: "hidden" }}>
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { buildPageUrl } from "@/features/page/page.utils.ts";
|
|||||||
import { usePageQuery } from "@/features/page/queries/page-query.ts";
|
import { usePageQuery } from "@/features/page/queries/page-query.ts";
|
||||||
import { extractPageSlugId } from "@/lib";
|
import { extractPageSlugId } from "@/lib";
|
||||||
import { useMediaQuery } from "@mantine/hooks";
|
import { useMediaQuery } from "@mantine/hooks";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
function getTitle(name: string, icon: string) {
|
function getTitle(name: string, icon: string) {
|
||||||
if (icon) {
|
if (icon) {
|
||||||
@@ -28,6 +29,7 @@ function getTitle(name: string, icon: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function Breadcrumb() {
|
export default function Breadcrumb() {
|
||||||
|
const { t } = useTranslation();
|
||||||
const treeData = useAtomValue(treeDataAtom);
|
const treeData = useAtomValue(treeDataAtom);
|
||||||
const [breadcrumbNodes, setBreadcrumbNodes] = useState<
|
const [breadcrumbNodes, setBreadcrumbNodes] = useState<
|
||||||
SpaceTreeNode[] | null
|
SpaceTreeNode[] | null
|
||||||
@@ -80,7 +82,7 @@ export default function Breadcrumb() {
|
|||||||
));
|
));
|
||||||
|
|
||||||
const renderAnchor = useCallback(
|
const renderAnchor = useCallback(
|
||||||
(node: SpaceTreeNode) => (
|
(node: SpaceTreeNode, isCurrent = false) => (
|
||||||
<Tooltip label={node.name} key={node.id}>
|
<Tooltip label={node.name} key={node.id}>
|
||||||
<Anchor
|
<Anchor
|
||||||
component={Link}
|
component={Link}
|
||||||
@@ -89,6 +91,7 @@ export default function Breadcrumb() {
|
|||||||
fz="sm"
|
fz="sm"
|
||||||
key={node.id}
|
key={node.id}
|
||||||
className={classes.truncatedText}
|
className={classes.truncatedText}
|
||||||
|
aria-current={isCurrent ? "page" : undefined}
|
||||||
>
|
>
|
||||||
{getTitle(node.name, node.icon)}
|
{getTitle(node.name, node.icon)}
|
||||||
</Anchor>
|
</Anchor>
|
||||||
@@ -115,7 +118,11 @@ export default function Breadcrumb() {
|
|||||||
key="hidden-nodes"
|
key="hidden-nodes"
|
||||||
>
|
>
|
||||||
<Popover.Target>
|
<Popover.Target>
|
||||||
<ActionIcon color="gray" variant="transparent">
|
<ActionIcon
|
||||||
|
color="gray"
|
||||||
|
variant="transparent"
|
||||||
|
aria-label={t("Show hidden breadcrumbs")}
|
||||||
|
>
|
||||||
<IconDots size={20} stroke={2} />
|
<IconDots size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Popover.Target>
|
</Popover.Target>
|
||||||
@@ -124,11 +131,13 @@ export default function Breadcrumb() {
|
|||||||
</Popover.Dropdown>
|
</Popover.Dropdown>
|
||||||
</Popover>,
|
</Popover>,
|
||||||
//renderAnchor(secondLastNode),
|
//renderAnchor(secondLastNode),
|
||||||
renderAnchor(lastNode),
|
renderAnchor(lastNode, true),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
return breadcrumbNodes.map(renderAnchor);
|
return breadcrumbNodes.map((node, i) =>
|
||||||
|
renderAnchor(node, i === breadcrumbNodes.length - 1),
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const getMobileBreadcrumbItems = () => {
|
const getMobileBreadcrumbItems = () => {
|
||||||
@@ -144,8 +153,12 @@ export default function Breadcrumb() {
|
|||||||
key="mobile-hidden-nodes"
|
key="mobile-hidden-nodes"
|
||||||
>
|
>
|
||||||
<Popover.Target>
|
<Popover.Target>
|
||||||
<Tooltip label="Breadcrumbs">
|
<Tooltip label={t("Breadcrumbs")}>
|
||||||
<ActionIcon color="gray" variant="transparent">
|
<ActionIcon
|
||||||
|
color="gray"
|
||||||
|
variant="transparent"
|
||||||
|
aria-label={t("Breadcrumbs")}
|
||||||
|
>
|
||||||
<IconCornerDownRightDouble size={20} stroke={2} />
|
<IconCornerDownRightDouble size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
@@ -157,16 +170,18 @@ export default function Breadcrumb() {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
return breadcrumbNodes.map(renderAnchor);
|
return breadcrumbNodes.map((node, i) =>
|
||||||
|
renderAnchor(node, i === breadcrumbNodes.length - 1),
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={classes.breadcrumbDiv}>
|
<nav aria-label={t("Breadcrumb")} className={classes.breadcrumbDiv}>
|
||||||
{breadcrumbNodes && (
|
{breadcrumbNodes && (
|
||||||
<Breadcrumbs className={classes.breadcrumbs}>
|
<Breadcrumbs className={classes.breadcrumbs}>
|
||||||
{isMobile ? getMobileBreadcrumbItems() : getBreadcrumbItems()}
|
{isMobile ? getMobileBreadcrumbItems() : getBreadcrumbItems()}
|
||||||
</Breadcrumbs>
|
</Breadcrumbs>
|
||||||
)}
|
)}
|
||||||
</div>
|
</nav>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { ActionIcon, Group, Menu, Text, Tooltip } from "@mantine/core";
|
import { ActionIcon, Group, Menu, Text, ThemeIcon, Tooltip } from "@mantine/core";
|
||||||
import {
|
import {
|
||||||
IconArrowRight,
|
IconArrowRight,
|
||||||
IconArrowsHorizontal,
|
IconArrowsHorizontal,
|
||||||
@@ -99,6 +99,7 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
|
|||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
color="dark"
|
color="dark"
|
||||||
|
aria-label={t("Comments")}
|
||||||
onClick={() => toggleAside("comments")}
|
onClick={() => toggleAside("comments")}
|
||||||
>
|
>
|
||||||
<IconMessage size={20} stroke={2} />
|
<IconMessage size={20} stroke={2} />
|
||||||
@@ -109,6 +110,7 @@ export default function PageHeaderMenu({ readOnly }: PageHeaderMenuProps) {
|
|||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
color="dark"
|
color="dark"
|
||||||
|
aria-label={t("Table of contents")}
|
||||||
onClick={() => toggleAside("toc")}
|
onClick={() => toggleAside("toc")}
|
||||||
>
|
>
|
||||||
<IconList size={20} stroke={2} />
|
<IconList size={20} stroke={2} />
|
||||||
@@ -205,7 +207,11 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
|
|||||||
arrowPosition="center"
|
arrowPosition="center"
|
||||||
>
|
>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="subtle" color="dark">
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="dark"
|
||||||
|
aria-label={t("Page actions")}
|
||||||
|
>
|
||||||
<IconDots size={20} />
|
<IconDots size={20} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
@@ -416,9 +422,15 @@ function ConnectionWarning() {
|
|||||||
openDelay={250}
|
openDelay={250}
|
||||||
withArrow
|
withArrow
|
||||||
>
|
>
|
||||||
<ActionIcon variant="default" c="red" style={{ border: "none" }}>
|
<ThemeIcon
|
||||||
|
variant="default"
|
||||||
|
c="red"
|
||||||
|
role="status"
|
||||||
|
aria-label={t("Real-time editor connection lost. Retrying...")}
|
||||||
|
style={{ border: "none" }}
|
||||||
|
>
|
||||||
<IconWifiOff size={20} stroke={2} />
|
<IconWifiOff size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ThemeIcon>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import {
|
|||||||
IconCheck,
|
IconCheck,
|
||||||
IconFileCode,
|
IconFileCode,
|
||||||
IconFileTypeDocx,
|
IconFileTypeDocx,
|
||||||
|
IconFileTypePdf,
|
||||||
IconFileTypeZip,
|
IconFileTypeZip,
|
||||||
IconMarkdown,
|
IconMarkdown,
|
||||||
IconX,
|
IconX,
|
||||||
@@ -66,7 +67,7 @@ export default function PageImportModal({
|
|||||||
<Modal.Content style={{ overflow: "hidden" }}>
|
<Modal.Content style={{ overflow: "hidden" }}>
|
||||||
<Modal.Header py={0}>
|
<Modal.Header py={0}>
|
||||||
<Modal.Title fw={500}>{t("Import pages")}</Modal.Title>
|
<Modal.Title fw={500}>{t("Import pages")}</Modal.Title>
|
||||||
<Modal.CloseButton />
|
<Modal.CloseButton aria-label={t("Close")} />
|
||||||
</Modal.Header>
|
</Modal.Header>
|
||||||
<Modal.Body>
|
<Modal.Body>
|
||||||
<ImportFormatSelection spaceId={spaceId} onClose={onClose} />
|
<ImportFormatSelection spaceId={spaceId} onClose={onClose} />
|
||||||
@@ -90,12 +91,14 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
const markdownFileRef = useRef<() => void>(null);
|
const markdownFileRef = useRef<() => void>(null);
|
||||||
const htmlFileRef = useRef<() => void>(null);
|
const htmlFileRef = useRef<() => void>(null);
|
||||||
const docxFileRef = useRef<() => void>(null);
|
const docxFileRef = useRef<() => void>(null);
|
||||||
|
const pdfFileRef = useRef<() => void>(null);
|
||||||
const notionFileRef = useRef<() => void>(null);
|
const notionFileRef = useRef<() => void>(null);
|
||||||
const confluenceFileRef = useRef<() => void>(null);
|
const confluenceFileRef = useRef<() => void>(null);
|
||||||
const zipFileRef = useRef<() => void>(null);
|
const zipFileRef = useRef<() => void>(null);
|
||||||
|
|
||||||
const canUseConfluence = useHasFeature(Feature.CONFLUENCE_IMPORT);
|
const canUseConfluence = useHasFeature(Feature.CONFLUENCE_IMPORT);
|
||||||
const canUseDocx = useHasFeature(Feature.DOCX_IMPORT);
|
const canUseDocx = useHasFeature(Feature.DOCX_IMPORT);
|
||||||
|
const canUsePdf = useHasFeature(Feature.PDF_IMPORT);
|
||||||
const upgradeLabel = useUpgradeLabel();
|
const upgradeLabel = useUpgradeLabel();
|
||||||
|
|
||||||
const handleZipUpload = async (selectedFile: File, source: string) => {
|
const handleZipUpload = async (selectedFile: File, source: string) => {
|
||||||
@@ -244,7 +247,7 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
}, 3000);
|
}, 3000);
|
||||||
}, [fileTaskId]);
|
}, [fileTaskId]);
|
||||||
|
|
||||||
const maxSingleFileSize = bytes("20mb");
|
const maxSingleFileSize = bytes("30mb");
|
||||||
|
|
||||||
const handleFileUpload = async (selectedFiles: File[]) => {
|
const handleFileUpload = async (selectedFiles: File[]) => {
|
||||||
if (!selectedFiles) {
|
if (!selectedFiles) {
|
||||||
@@ -298,6 +301,7 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
if (markdownFileRef.current) markdownFileRef.current();
|
if (markdownFileRef.current) markdownFileRef.current();
|
||||||
if (htmlFileRef.current) htmlFileRef.current();
|
if (htmlFileRef.current) htmlFileRef.current();
|
||||||
if (docxFileRef.current) docxFileRef.current();
|
if (docxFileRef.current) docxFileRef.current();
|
||||||
|
if (pdfFileRef.current) pdfFileRef.current();
|
||||||
|
|
||||||
const pageCountText =
|
const pageCountText =
|
||||||
pageCount === 1 ? `1 ${t("page")}` : `${pageCount} ${t("pages")}`;
|
pageCount === 1 ? `1 ${t("page")}` : `${pageCount} ${t("pages")}`;
|
||||||
@@ -328,7 +332,15 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<SimpleGrid cols={2}>
|
<SimpleGrid cols={2}>
|
||||||
<FileButton onChange={handleFileUpload} accept=".md" multiple resetRef={markdownFileRef}>
|
<FileButton
|
||||||
|
onChange={handleFileUpload}
|
||||||
|
accept=".md"
|
||||||
|
multiple
|
||||||
|
resetRef={markdownFileRef}
|
||||||
|
inputProps={{
|
||||||
|
"aria-label": t("Choose {{format}} file", { format: "Markdown" }),
|
||||||
|
}}
|
||||||
|
>
|
||||||
{(props) => (
|
{(props) => (
|
||||||
<Button
|
<Button
|
||||||
justify="start"
|
justify="start"
|
||||||
@@ -341,7 +353,15 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
)}
|
)}
|
||||||
</FileButton>
|
</FileButton>
|
||||||
|
|
||||||
<FileButton onChange={handleFileUpload} accept="text/html" multiple resetRef={htmlFileRef}>
|
<FileButton
|
||||||
|
onChange={handleFileUpload}
|
||||||
|
accept="text/html"
|
||||||
|
multiple
|
||||||
|
resetRef={htmlFileRef}
|
||||||
|
inputProps={{
|
||||||
|
"aria-label": t("Choose {{format}} file", { format: "HTML" }),
|
||||||
|
}}
|
||||||
|
>
|
||||||
{(props) => (
|
{(props) => (
|
||||||
<Button
|
<Button
|
||||||
justify="start"
|
justify="start"
|
||||||
@@ -359,6 +379,9 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
accept=".docx"
|
accept=".docx"
|
||||||
multiple
|
multiple
|
||||||
resetRef={docxFileRef}
|
resetRef={docxFileRef}
|
||||||
|
inputProps={{
|
||||||
|
"aria-label": t("Choose {{format}} file", { format: "Word (DOCX)" }),
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{(props) => (
|
{(props) => (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
@@ -378,10 +401,40 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
)}
|
)}
|
||||||
</FileButton>
|
</FileButton>
|
||||||
|
|
||||||
|
<FileButton
|
||||||
|
onChange={handleFileUpload}
|
||||||
|
accept=".pdf"
|
||||||
|
multiple
|
||||||
|
resetRef={pdfFileRef}
|
||||||
|
inputProps={{
|
||||||
|
"aria-label": t("Choose {{format}} file", { format: "PDF" }),
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{(props) => (
|
||||||
|
<Tooltip
|
||||||
|
label={upgradeLabel}
|
||||||
|
disabled={canUsePdf}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
disabled={!canUsePdf}
|
||||||
|
justify="start"
|
||||||
|
variant="default"
|
||||||
|
leftSection={<IconFileTypePdf size={18} />}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
PDF
|
||||||
|
</Button>
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
</FileButton>
|
||||||
|
|
||||||
<FileButton
|
<FileButton
|
||||||
onChange={(file) => handleZipUpload(file, "notion")}
|
onChange={(file) => handleZipUpload(file, "notion")}
|
||||||
accept="application/zip"
|
accept="application/zip"
|
||||||
resetRef={notionFileRef}
|
resetRef={notionFileRef}
|
||||||
|
inputProps={{
|
||||||
|
"aria-label": t("Choose {{format}} file", { format: "Notion" }),
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{(props) => (
|
{(props) => (
|
||||||
<Button
|
<Button
|
||||||
@@ -398,6 +451,9 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
onChange={(file) => handleZipUpload(file, "confluence")}
|
onChange={(file) => handleZipUpload(file, "confluence")}
|
||||||
accept="application/zip"
|
accept="application/zip"
|
||||||
resetRef={confluenceFileRef}
|
resetRef={confluenceFileRef}
|
||||||
|
inputProps={{
|
||||||
|
"aria-label": t("Choose {{format}} file", { format: "Confluence" }),
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{(props) => (
|
{(props) => (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
@@ -435,6 +491,9 @@ function ImportFormatSelection({ spaceId, onClose }: ImportFormatSelection) {
|
|||||||
onChange={(file) => handleZipUpload(file, "generic")}
|
onChange={(file) => handleZipUpload(file, "generic")}
|
||||||
accept="application/zip"
|
accept="application/zip"
|
||||||
resetRef={zipFileRef}
|
resetRef={zipFileRef}
|
||||||
|
inputProps={{
|
||||||
|
"aria-label": t("Choose {{format}} file", { format: "ZIP" }),
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{(props) => (
|
{(props) => (
|
||||||
<Group justify="center">
|
<Group justify="center">
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export default function TrashPageContentModal({
|
|||||||
const title = pageTitle || t("Untitled");
|
const title = pageTitle || t("Untitled");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal.Root size={1200} opened={opened} onClose={onClose}>
|
<Modal.Root size={1200} opened={opened} onClose={onClose} aria-label={t("Preview")}>
|
||||||
<Modal.Overlay />
|
<Modal.Overlay />
|
||||||
<Modal.Content style={{ overflow: "hidden" }}>
|
<Modal.Content style={{ overflow: "hidden" }}>
|
||||||
<Modal.Header>
|
<Modal.Header>
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ export default function Trash() {
|
|||||||
<Table.Th style={{ whiteSpace: "nowrap" }}>
|
<Table.Th style={{ whiteSpace: "nowrap" }}>
|
||||||
{t("Deleted at")}
|
{t("Deleted at")}
|
||||||
</Table.Th>
|
</Table.Th>
|
||||||
<Table.Th></Table.Th>
|
<Table.Th aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
<Table.Tbody>
|
<Table.Tbody>
|
||||||
|
|||||||
@@ -458,6 +458,8 @@ interface CreateNodeProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function CreateNode({ node, treeApi, onExpandTree }: CreateNodeProps) {
|
function CreateNode({ node, treeApi, onExpandTree }: CreateNodeProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
function handleCreate() {
|
function handleCreate() {
|
||||||
if (node.data.hasChildren && node.children.length === 0) {
|
if (node.data.hasChildren && node.children.length === 0) {
|
||||||
node.toggle();
|
node.toggle();
|
||||||
@@ -475,6 +477,7 @@ function CreateNode({ node, treeApi, onExpandTree }: CreateNodeProps) {
|
|||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="transparent"
|
variant="transparent"
|
||||||
c="gray"
|
c="gray"
|
||||||
|
aria-label={t("Create page")}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
@@ -591,6 +594,7 @@ function NodeMenu({ node, treeApi, spaceId }: NodeMenuProps) {
|
|||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="transparent"
|
variant="transparent"
|
||||||
c="gray"
|
c="gray"
|
||||||
|
aria-label={t("Page menu")}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
@@ -725,6 +729,8 @@ interface PageArrowProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function PageArrow({ node, onExpandTree }: PageArrowProps) {
|
function PageArrow({ node, onExpandTree }: PageArrowProps) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (node.isOpen) {
|
if (node.isOpen) {
|
||||||
onExpandTree();
|
onExpandTree();
|
||||||
@@ -736,6 +742,8 @@ function PageArrow({ node, onExpandTree }: PageArrowProps) {
|
|||||||
size={20}
|
size={20}
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
c="gray"
|
c="gray"
|
||||||
|
aria-label={node.isOpen ? t("Collapse") : t("Expand")}
|
||||||
|
aria-expanded={node.isInternal ? node.isOpen : undefined}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ export function SearchMobileControl({ onSearch }: SearchMobileControlProps) {
|
|||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
color="dark"
|
color="dark"
|
||||||
|
aria-label={t("Search")}
|
||||||
onClick={onSearch}
|
onClick={onSearch}
|
||||||
size="sm"
|
size="sm"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export default function SessionList() {
|
|||||||
<Table.Tr>
|
<Table.Tr>
|
||||||
<Table.Th>{t("Device Name")}</Table.Th>
|
<Table.Th>{t("Device Name")}</Table.Th>
|
||||||
<Table.Th>{t("Last Active")}</Table.Th>
|
<Table.Th>{t("Last Active")}</Table.Th>
|
||||||
<Table.Th />
|
<Table.Th aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
<Table.Tbody>
|
<Table.Tbody>
|
||||||
@@ -94,7 +94,7 @@ export default function SessionList() {
|
|||||||
<Table.Tr>
|
<Table.Tr>
|
||||||
<Table.Th>{t("Device Name")}</Table.Th>
|
<Table.Th>{t("Device Name")}</Table.Th>
|
||||||
<Table.Th>{t("Last Active")}</Table.Th>
|
<Table.Th>{t("Last Active")}</Table.Th>
|
||||||
{otherSessions.length > 0 && <Table.Th />}
|
{otherSessions.length > 0 && <Table.Th aria-label={t("Action")} />}
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
<Table.Tbody>
|
<Table.Tbody>
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ export default function ShareActionMenu({ share }: Props) {
|
|||||||
arrowPosition="center"
|
arrowPosition="center"
|
||||||
>
|
>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="subtle" c="gray">
|
<ActionIcon variant="subtle" c="gray" aria-label={t("More options")}>
|
||||||
<IconDots size={20} stroke={2} />
|
<IconDots size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
@@ -148,6 +148,7 @@ export default function ShareShell({
|
|||||||
onClick={toggleTocMobile}
|
onClick={toggleTocMobile}
|
||||||
hiddenFrom="sm"
|
hiddenFrom="sm"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
aria-label={t("Table of contents")}
|
||||||
>
|
>
|
||||||
<IconList size={20} stroke={2} />
|
<IconList size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
@@ -157,6 +158,7 @@ export default function ShareShell({
|
|||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="default"
|
variant="default"
|
||||||
style={{ border: "none" }}
|
style={{ border: "none" }}
|
||||||
|
aria-label={t("Table of contents")}
|
||||||
onClick={toggleToc}
|
onClick={toggleToc}
|
||||||
visibleFrom="sm"
|
visibleFrom="sm"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ export default function SpaceMembersList({
|
|||||||
<Table.Tr>
|
<Table.Tr>
|
||||||
<Table.Th>{t("Member")}</Table.Th>
|
<Table.Th>{t("Member")}</Table.Th>
|
||||||
<Table.Th>{t("Role")}</Table.Th>
|
<Table.Th>{t("Role")}</Table.Th>
|
||||||
<Table.Th></Table.Th>
|
<Table.Th aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
|
|
||||||
|
|||||||
@@ -49,15 +49,15 @@ function WatchButton({ spaceId, watchedIds, size = 16 }: { spaceId: string; watc
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const label = isWatching ? t("Stop watching space") : t("Watch space");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Tooltip
|
<Tooltip label={label} openDelay={250} withArrow>
|
||||||
label={isWatching ? t("Stop watching space") : t("Watch space")}
|
|
||||||
openDelay={250}
|
|
||||||
withArrow
|
|
||||||
>
|
|
||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="subtle"
|
variant="subtle"
|
||||||
color={isWatching ? "blue" : "gray"}
|
color={isWatching ? "blue" : "gray"}
|
||||||
|
aria-label={label}
|
||||||
|
aria-pressed={isWatching}
|
||||||
onClick={handleToggle}
|
onClick={handleToggle}
|
||||||
loading={isPending}
|
loading={isPending}
|
||||||
>
|
>
|
||||||
@@ -111,7 +111,7 @@ export default function AllSpacesList({
|
|||||||
<Table.Tr>
|
<Table.Tr>
|
||||||
<Table.Th>{t("Space")}</Table.Th>
|
<Table.Th>{t("Space")}</Table.Th>
|
||||||
<Table.Th>{t("Members")}</Table.Th>
|
<Table.Th>{t("Members")}</Table.Th>
|
||||||
<Table.Th w={130}></Table.Th>
|
<Table.Th w={130} aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
|
|
||||||
@@ -168,7 +168,11 @@ export default function AllSpacesList({
|
|||||||
<WatchButton spaceId={space.id} watchedIds={watchedIds} size={16} />
|
<WatchButton spaceId={space.id} watchedIds={watchedIds} size={16} />
|
||||||
<Menu position="bottom-end">
|
<Menu position="bottom-end">
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="subtle" color="gray">
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
color="gray"
|
||||||
|
aria-label={t("Space menu")}
|
||||||
|
>
|
||||||
<IconDots size={16} />
|
<IconDots size={16} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
+205
@@ -0,0 +1,205 @@
|
|||||||
|
.trigger {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 3px 6px 3px 6px;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: transparent;
|
||||||
|
border: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
font: inherit;
|
||||||
|
font-size: var(--mantine-font-size-xs);
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-7),
|
||||||
|
var(--mantine-color-dark-1)
|
||||||
|
);
|
||||||
|
transition: background 120ms ease;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trigger:hover {
|
||||||
|
background: light-dark(
|
||||||
|
var(--mantine-color-gray-1),
|
||||||
|
var(--mantine-color-dark-5)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerIcon {
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-5),
|
||||||
|
var(--mantine-color-dark-2)
|
||||||
|
);
|
||||||
|
display: inline-flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggerChev {
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-5),
|
||||||
|
var(--mantine-color-dark-2)
|
||||||
|
);
|
||||||
|
display: inline-flex;
|
||||||
|
margin-left: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.banner {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 10px 14px;
|
||||||
|
background: light-dark(
|
||||||
|
var(--mantine-color-gray-0),
|
||||||
|
var(--mantine-color-dark-6)
|
||||||
|
);
|
||||||
|
border-bottom: 1px solid
|
||||||
|
light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-7),
|
||||||
|
var(--mantine-color-dark-1)
|
||||||
|
);
|
||||||
|
font-size: var(--mantine-font-size-xs);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bannerIcon {
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-6),
|
||||||
|
var(--mantine-color-dark-2)
|
||||||
|
);
|
||||||
|
flex: none;
|
||||||
|
display: inline-flex;
|
||||||
|
margin-top: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bannerLink {
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-9),
|
||||||
|
var(--mantine-color-dark-0)
|
||||||
|
);
|
||||||
|
text-decoration: underline;
|
||||||
|
text-underline-offset: 2px;
|
||||||
|
text-decoration-thickness: 1px;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bannerLink:hover {
|
||||||
|
text-decoration-thickness: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section {
|
||||||
|
padding: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sectionLabel {
|
||||||
|
font-size: var(--mantine-font-size-xs);
|
||||||
|
font-weight: 500;
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-6),
|
||||||
|
var(--mantine-color-dark-2)
|
||||||
|
);
|
||||||
|
margin: 0 0 6px;
|
||||||
|
padding: 0 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 6px 8px;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-9),
|
||||||
|
var(--mantine-color-dark-0)
|
||||||
|
);
|
||||||
|
font-size: var(--mantine-font-size-sm);
|
||||||
|
text-decoration: none;
|
||||||
|
transition: background 100ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.row:hover {
|
||||||
|
background: light-dark(
|
||||||
|
var(--mantine-color-gray-1),
|
||||||
|
var(--mantine-color-dark-5)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.rowIcon {
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-5),
|
||||||
|
var(--mantine-color-dark-2)
|
||||||
|
);
|
||||||
|
flex: none;
|
||||||
|
display: inline-flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rowEmoji {
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1;
|
||||||
|
flex: none;
|
||||||
|
display: inline-flex;
|
||||||
|
width: 18px;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rowTitle {
|
||||||
|
font-weight: 500;
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge {
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
padding: 2px 7px;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: light-dark(
|
||||||
|
var(--mantine-color-gray-1),
|
||||||
|
var(--mantine-color-dark-5)
|
||||||
|
);
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-7),
|
||||||
|
var(--mantine-color-dark-1)
|
||||||
|
);
|
||||||
|
text-transform: uppercase;
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badgeAccent {
|
||||||
|
background: light-dark(
|
||||||
|
var(--mantine-color-blue-0),
|
||||||
|
var(--mantine-color-blue-9)
|
||||||
|
);
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-blue-7),
|
||||||
|
var(--mantine-color-blue-2)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty {
|
||||||
|
padding: 18px 14px;
|
||||||
|
text-align: center;
|
||||||
|
color: light-dark(
|
||||||
|
var(--mantine-color-gray-6),
|
||||||
|
var(--mantine-color-dark-2)
|
||||||
|
);
|
||||||
|
font-size: var(--mantine-font-size-xs);
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 18px;
|
||||||
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
import { Loader, Popover } from "@mantine/core";
|
||||||
|
import {
|
||||||
|
IconChevronDown,
|
||||||
|
IconCornerDownLeft,
|
||||||
|
IconFile,
|
||||||
|
IconInfoCircle,
|
||||||
|
} from "@tabler/icons-react";
|
||||||
|
import { Link } from "react-router-dom";
|
||||||
|
import { Trans, useTranslation } from "react-i18next";
|
||||||
|
import { useReferencesQuery } from "@/features/transclusion/queries/transclusion-query";
|
||||||
|
import type { ReferencingPage } from "@/features/transclusion/types/transclusion.types";
|
||||||
|
import { buildPageUrl } from "@/features/page/page.utils";
|
||||||
|
import classes from "./sync-block-references-dropdown.module.css";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
sourcePageId: string | null;
|
||||||
|
transclusionId: string | null;
|
||||||
|
/** The page currently being viewed - used to mark the "THIS PAGE" badge. */
|
||||||
|
currentPageId: string;
|
||||||
|
/**
|
||||||
|
* Source: trigger reads "Editing original".
|
||||||
|
* Reference: trigger reads "Synced to N other pages".
|
||||||
|
*/
|
||||||
|
mode: "source" | "reference";
|
||||||
|
/** Notified whenever the dropdown opens/closes (for keep-chrome-visible). */
|
||||||
|
onOpenChange?: (open: boolean) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function SyncBlockReferencesDropdown({
|
||||||
|
sourcePageId,
|
||||||
|
transclusionId,
|
||||||
|
currentPageId,
|
||||||
|
mode,
|
||||||
|
onOpenChange,
|
||||||
|
}: Props) {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const [opened, setOpened] = useState(false);
|
||||||
|
|
||||||
|
const handleOpenChange = (next: boolean) => {
|
||||||
|
setOpened(next);
|
||||||
|
onOpenChange?.(next);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Fetch eagerly so the "Synced to N other pages" count is correct even
|
||||||
|
// before the dropdown is opened. The cache is keyed on (sourcePageId,
|
||||||
|
// transclusionId), so two views (source + reference) share one fetch.
|
||||||
|
const enabled = !!sourcePageId && !!transclusionId;
|
||||||
|
const { data, isLoading } = useReferencesQuery(
|
||||||
|
sourcePageId,
|
||||||
|
transclusionId,
|
||||||
|
enabled,
|
||||||
|
);
|
||||||
|
|
||||||
|
const allPages: Array<{ page: ReferencingPage; isOriginal: boolean }> = [];
|
||||||
|
if (data?.source) {
|
||||||
|
allPages.push({ page: data.source, isOriginal: true });
|
||||||
|
}
|
||||||
|
for (const ref of data?.references ?? []) {
|
||||||
|
allPages.push({ page: ref, isOriginal: false });
|
||||||
|
}
|
||||||
|
|
||||||
|
const otherCount = allPages.filter((p) => p.page.id !== currentPageId).length;
|
||||||
|
const label =
|
||||||
|
mode === "source"
|
||||||
|
? t("Editing original")
|
||||||
|
: t("Synced to {{count}} other page", {
|
||||||
|
count: otherCount,
|
||||||
|
defaultValue_one: "Synced to {{count}} other page",
|
||||||
|
defaultValue_other: "Synced to {{count}} other pages",
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Popover
|
||||||
|
position="bottom-start"
|
||||||
|
shadow="lg"
|
||||||
|
opened={opened}
|
||||||
|
onChange={handleOpenChange}
|
||||||
|
width={340}
|
||||||
|
withinPortal
|
||||||
|
>
|
||||||
|
<Popover.Target>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={classes.trigger}
|
||||||
|
onClick={() => handleOpenChange(!opened)}
|
||||||
|
aria-expanded={opened}
|
||||||
|
aria-haspopup="dialog"
|
||||||
|
>
|
||||||
|
<span className={classes.triggerIcon}>
|
||||||
|
<IconCornerDownLeft size={14} stroke={1.8} />
|
||||||
|
</span>
|
||||||
|
<span>{label}</span>
|
||||||
|
<span className={classes.triggerChev}>
|
||||||
|
<IconChevronDown size={12} stroke={2} />
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</Popover.Target>
|
||||||
|
|
||||||
|
<Popover.Dropdown className={classes.dropdown}>
|
||||||
|
{mode === "reference" && data?.source && (
|
||||||
|
<div className={classes.banner}>
|
||||||
|
<span className={classes.bannerIcon}>
|
||||||
|
<IconInfoCircle size={16} stroke={1.6} />
|
||||||
|
</span>
|
||||||
|
<div>
|
||||||
|
<Trans
|
||||||
|
i18nKey="sourceReadOnlyHint"
|
||||||
|
defaults="This section is read-only here. Edit it on the <link>original source page</link>."
|
||||||
|
components={{
|
||||||
|
link: (
|
||||||
|
<Link
|
||||||
|
to={
|
||||||
|
data.source.spaceSlug
|
||||||
|
? buildPageUrl(
|
||||||
|
data.source.spaceSlug,
|
||||||
|
data.source.slugId,
|
||||||
|
data.source.title,
|
||||||
|
)
|
||||||
|
: `/p/${data.source.id}`
|
||||||
|
}
|
||||||
|
className={classes.bannerLink}
|
||||||
|
onClick={() => handleOpenChange(false)}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{isLoading ? (
|
||||||
|
<div className={classes.loading}>
|
||||||
|
<Loader size="xs" />
|
||||||
|
</div>
|
||||||
|
) : allPages.length === 0 ? (
|
||||||
|
<div className={classes.empty}>{t("No pages")}</div>
|
||||||
|
) : (
|
||||||
|
<div className={classes.section}>
|
||||||
|
<div className={classes.sectionLabel}>{t("Synced to")}</div>
|
||||||
|
<ul className={classes.list}>
|
||||||
|
{allPages.map(({ page, isOriginal }) => {
|
||||||
|
const isCurrent = page.id === currentPageId;
|
||||||
|
const href = page.spaceSlug
|
||||||
|
? buildPageUrl(page.spaceSlug, page.slugId, page.title)
|
||||||
|
: `/p/${page.id}`;
|
||||||
|
const title = page.title?.length ? page.title : t("Untitled");
|
||||||
|
return (
|
||||||
|
<li key={page.id}>
|
||||||
|
<Link
|
||||||
|
to={href}
|
||||||
|
className={classes.row}
|
||||||
|
onClick={() => handleOpenChange(false)}
|
||||||
|
>
|
||||||
|
{page.icon ? (
|
||||||
|
<span className={classes.rowEmoji}>{page.icon}</span>
|
||||||
|
) : (
|
||||||
|
<span className={classes.rowIcon}>
|
||||||
|
<IconFile size={16} stroke={1.6} />
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
<span className={classes.rowTitle} title={title}>
|
||||||
|
{title}
|
||||||
|
</span>
|
||||||
|
{isCurrent ? (
|
||||||
|
<span
|
||||||
|
className={`${classes.badge} ${classes.badgeAccent}`}
|
||||||
|
>
|
||||||
|
{t("THIS PAGE")}
|
||||||
|
</span>
|
||||||
|
) : isOriginal ? (
|
||||||
|
<span className={classes.badge}>{t("ORIGINAL")}</span>
|
||||||
|
) : null}
|
||||||
|
</Link>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Popover.Dropdown>
|
||||||
|
</Popover>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import { useMutation, useQuery } from "@tanstack/react-query";
|
||||||
|
import {
|
||||||
|
listReferences,
|
||||||
|
unsyncReference,
|
||||||
|
} from "../services/transclusion-api";
|
||||||
|
|
||||||
|
export function useReferencesQuery(
|
||||||
|
sourcePageId: string | null,
|
||||||
|
transclusionId: string | null,
|
||||||
|
enabled: boolean,
|
||||||
|
) {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ["transclusion-references", sourcePageId, transclusionId],
|
||||||
|
queryFn: () =>
|
||||||
|
listReferences({
|
||||||
|
sourcePageId: sourcePageId!,
|
||||||
|
transclusionId: transclusionId!,
|
||||||
|
}),
|
||||||
|
enabled: enabled && !!sourcePageId && !!transclusionId,
|
||||||
|
staleTime: 10 * 1000,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useUnsyncReferenceMutation() {
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: (params: {
|
||||||
|
referencePageId: string;
|
||||||
|
sourcePageId: string;
|
||||||
|
transclusionId: string;
|
||||||
|
}) => unsyncReference(params),
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import api from "@/lib/api-client";
|
||||||
|
import type {
|
||||||
|
ReferencingPagesResponse,
|
||||||
|
TransclusionLookup,
|
||||||
|
} from "../types/transclusion.types";
|
||||||
|
|
||||||
|
export async function lookupTransclusion(params: {
|
||||||
|
references: Array<{ sourcePageId: string; transclusionId: string }>;
|
||||||
|
}): Promise<{ items: TransclusionLookup[] }> {
|
||||||
|
const r = await api.post("/pages/transclusion/lookup", params);
|
||||||
|
return r.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function lookupTransclusionForShare(params: {
|
||||||
|
shareId: string;
|
||||||
|
references: Array<{ sourcePageId: string; transclusionId: string }>;
|
||||||
|
}): Promise<{ items: TransclusionLookup[] }> {
|
||||||
|
const r = await api.post("/shares/transclusion/lookup", params);
|
||||||
|
return r.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function listReferences(params: {
|
||||||
|
sourcePageId: string;
|
||||||
|
transclusionId: string;
|
||||||
|
}): Promise<ReferencingPagesResponse> {
|
||||||
|
const r = await api.post("/pages/transclusion/references", params);
|
||||||
|
return r.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function unsyncReference(params: {
|
||||||
|
referencePageId: string;
|
||||||
|
sourcePageId: string;
|
||||||
|
transclusionId: string;
|
||||||
|
}): Promise<{ content: unknown }> {
|
||||||
|
const r = await api.post("/pages/transclusion/unsync-reference", params);
|
||||||
|
return r.data;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
export type TransclusionLookup =
|
||||||
|
| {
|
||||||
|
sourcePageId: string;
|
||||||
|
transclusionId: string;
|
||||||
|
content: unknown;
|
||||||
|
sourceUpdatedAt: string;
|
||||||
|
}
|
||||||
|
| { sourcePageId: string; transclusionId: string; status: "not_found" }
|
||||||
|
| { sourcePageId: string; transclusionId: string; status: "no_access" };
|
||||||
|
|
||||||
|
export type ReferencingPage = {
|
||||||
|
id: string;
|
||||||
|
slugId: string;
|
||||||
|
title: string | null;
|
||||||
|
icon: string | null;
|
||||||
|
spaceId: string;
|
||||||
|
spaceSlug: string | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type ReferencingPagesResponse = {
|
||||||
|
source: ReferencingPage | null;
|
||||||
|
references: ReferencingPage[];
|
||||||
|
};
|
||||||
@@ -60,6 +60,10 @@ export function UserProvider({ children }: React.PropsWithChildren) {
|
|||||||
}
|
}
|
||||||
}, [data, isLoading]);
|
}, [data, isLoading]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
document.documentElement.lang = i18n.resolvedLanguage || i18n.language || "en-US";
|
||||||
|
}, [i18n.language, i18n.resolvedLanguage]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (entitlements) {
|
if (entitlements) {
|
||||||
setEntitlements(entitlements);
|
setEntitlements(entitlements);
|
||||||
|
|||||||
+5
-1
@@ -83,7 +83,11 @@ export default function MemberActionMenu({ userId, deactivatedAt }: Props) {
|
|||||||
arrowPosition="center"
|
arrowPosition="center"
|
||||||
>
|
>
|
||||||
<Menu.Target>
|
<Menu.Target>
|
||||||
<ActionIcon variant="subtle" c="gray">
|
<ActionIcon
|
||||||
|
variant="subtle"
|
||||||
|
c="gray"
|
||||||
|
aria-label={t("Member actions")}
|
||||||
|
>
|
||||||
<IconDots size={20} stroke={2} />
|
<IconDots size={20} stroke={2} />
|
||||||
</ActionIcon>
|
</ActionIcon>
|
||||||
</Menu.Target>
|
</Menu.Target>
|
||||||
|
|||||||
+1
@@ -34,6 +34,7 @@ export default function WorkspaceInvitesTable() {
|
|||||||
<Table.Th>{t("Email")}</Table.Th>
|
<Table.Th>{t("Email")}</Table.Th>
|
||||||
<Table.Th>{t("Role")}</Table.Th>
|
<Table.Th>{t("Role")}</Table.Th>
|
||||||
<Table.Th>{t("Date")}</Table.Th>
|
<Table.Th>{t("Date")}</Table.Th>
|
||||||
|
<Table.Th aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
|
|
||||||
|
|||||||
+1
@@ -61,6 +61,7 @@ export default function WorkspaceMembersTable() {
|
|||||||
<Table.Th>{t("User")}</Table.Th>
|
<Table.Th>{t("User")}</Table.Th>
|
||||||
<Table.Th>{t("Status")}</Table.Th>
|
<Table.Th>{t("Status")}</Table.Th>
|
||||||
<Table.Th>{t("Role")}</Table.Th>
|
<Table.Th>{t("Role")}</Table.Th>
|
||||||
|
<Table.Th aria-label={t("Action")} />
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
</Table.Thead>
|
</Table.Thead>
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import {
|
|||||||
Table,
|
Table,
|
||||||
Container,
|
Container,
|
||||||
Title,
|
Title,
|
||||||
ActionIcon,
|
ThemeIcon,
|
||||||
Button,
|
Button,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
@@ -71,13 +71,13 @@ export default function FavoritesPage() {
|
|||||||
>
|
>
|
||||||
<Group wrap="nowrap">
|
<Group wrap="nowrap">
|
||||||
{fav.page.icon || (
|
{fav.page.icon || (
|
||||||
<ActionIcon
|
<ThemeIcon
|
||||||
variant="transparent"
|
variant="transparent"
|
||||||
color="gray"
|
color="gray"
|
||||||
size={18}
|
size={18}
|
||||||
>
|
>
|
||||||
<IconFileDescription size={18} />
|
<IconFileDescription size={18} />
|
||||||
</ActionIcon>
|
</ThemeIcon>
|
||||||
)}
|
)}
|
||||||
<Text fw={500} size="md" lineClamp={1}>
|
<Text fw={500} size="md" lineClamp={1}>
|
||||||
{fav.page.title || t("Untitled")}
|
{fav.page.title || t("Untitled")}
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ export default function SharedPage() {
|
|||||||
title={data.page.title}
|
title={data.page.title}
|
||||||
content={data.page.content}
|
content={data.page.content}
|
||||||
pageId={data.page.id}
|
pageId={data.page.id}
|
||||||
|
shareId={data.share.id}
|
||||||
/>
|
/>
|
||||||
</Container>
|
</Container>
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ export const mantineCssResolver: CSSVariablesResolver = (theme) => ({
|
|||||||
"--input-error-size": theme.fontSizes.sm,
|
"--input-error-size": theme.fontSizes.sm,
|
||||||
},
|
},
|
||||||
light: {
|
light: {
|
||||||
"--mantine-color-dimmed": "#6b7280",
|
"--mantine-color-dimmed": "#4b5563",
|
||||||
"--mantine-color-dark-light-color": "#4e5359",
|
"--mantine-color-dark-light-color": "#4e5359",
|
||||||
"--mantine-color-dark-light-hover": "var(--mantine-color-gray-light-hover)",
|
"--mantine-color-dark-light-hover": "var(--mantine-color-gray-light-hover)",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -33,10 +33,11 @@
|
|||||||
"@ai-sdk/google": "^3.0.52",
|
"@ai-sdk/google": "^3.0.52",
|
||||||
"@ai-sdk/openai": "^3.0.47",
|
"@ai-sdk/openai": "^3.0.47",
|
||||||
"@ai-sdk/openai-compatible": "^2.0.37",
|
"@ai-sdk/openai-compatible": "^2.0.37",
|
||||||
"@aws-sdk/client-s3": "3.1037.0",
|
"@aws-sdk/client-s3": "3.1040.0",
|
||||||
"@aws-sdk/lib-storage": "3.1037.0",
|
"@aws-sdk/lib-storage": "3.1040.0",
|
||||||
"@aws-sdk/s3-request-presigner": "3.1037.0",
|
"@aws-sdk/s3-request-presigner": "3.1040.0",
|
||||||
"@clickhouse/client": "^1.18.2",
|
"@clickhouse/client": "^1.18.2",
|
||||||
|
"@docmost/pdf-inspector": "1.9.4",
|
||||||
"@fastify/cookie": "^11.0.2",
|
"@fastify/cookie": "^11.0.2",
|
||||||
"@fastify/multipart": "^10.0.0",
|
"@fastify/multipart": "^10.0.0",
|
||||||
"@fastify/static": "^9.1.3",
|
"@fastify/static": "^9.1.3",
|
||||||
@@ -62,8 +63,6 @@
|
|||||||
"@nestjs/throttler": "^6.5.0",
|
"@nestjs/throttler": "^6.5.0",
|
||||||
"@nestjs/websockets": "^11.1.19",
|
"@nestjs/websockets": "^11.1.19",
|
||||||
"@node-saml/passport-saml": "^5.1.0",
|
"@node-saml/passport-saml": "^5.1.0",
|
||||||
"@react-email/components": "1.0.10",
|
|
||||||
"@react-email/render": "2.0.4",
|
|
||||||
"@socket.io/redis-adapter": "^8.3.0",
|
"@socket.io/redis-adapter": "^8.3.0",
|
||||||
"ai": "^6.0.134",
|
"ai": "^6.0.134",
|
||||||
"ai-sdk-ollama": "^3.8.1",
|
"ai-sdk-ollama": "^3.8.1",
|
||||||
@@ -100,7 +99,6 @@
|
|||||||
"p-limit": "^7.3.0",
|
"p-limit": "^7.3.0",
|
||||||
"passport-google-oauth20": "^2.0.0",
|
"passport-google-oauth20": "^2.0.0",
|
||||||
"passport-jwt": "^4.0.1",
|
"passport-jwt": "^4.0.1",
|
||||||
"pdfjs-dist": "^5.5.207",
|
|
||||||
"pg-tsquery": "^8.4.2",
|
"pg-tsquery": "^8.4.2",
|
||||||
"pgvector": "^0.2.1",
|
"pgvector": "^0.2.1",
|
||||||
"pino-http": "^11.0.0",
|
"pino-http": "^11.0.0",
|
||||||
@@ -108,6 +106,7 @@
|
|||||||
"postgres": "^3.4.8",
|
"postgres": "^3.4.8",
|
||||||
"postmark": "^4.0.7",
|
"postmark": "^4.0.7",
|
||||||
"react": "^18.3.1",
|
"react": "^18.3.1",
|
||||||
|
"react-email": "6.0.8",
|
||||||
"reflect-metadata": "^0.2.2",
|
"reflect-metadata": "^0.2.2",
|
||||||
"rxjs": "^7.8.2",
|
"rxjs": "^7.8.2",
|
||||||
"sanitize-filename": "1.6.3",
|
"sanitize-filename": "1.6.3",
|
||||||
@@ -146,7 +145,6 @@
|
|||||||
"jest": "^30.3.0",
|
"jest": "^30.3.0",
|
||||||
"kysely-codegen": "^0.20.0",
|
"kysely-codegen": "^0.20.0",
|
||||||
"prettier": "^3.8.1",
|
"prettier": "^3.8.1",
|
||||||
"react-email": "5.2.10",
|
|
||||||
"source-map-support": "^0.5.21",
|
"source-map-support": "^0.5.21",
|
||||||
"supertest": "^7.2.2",
|
"supertest": "^7.2.2",
|
||||||
"ts-jest": "^29.4.6",
|
"ts-jest": "^29.4.6",
|
||||||
@@ -165,10 +163,11 @@
|
|||||||
"rootDir": "src",
|
"rootDir": "src",
|
||||||
"testRegex": ".*\\.spec\\.ts$",
|
"testRegex": ".*\\.spec\\.ts$",
|
||||||
"transform": {
|
"transform": {
|
||||||
|
"happy-dom.+\\.js$": ["babel-jest", { "presets": [["@babel/preset-env", { "targets": { "node": "current" } }]] }],
|
||||||
"^.+\\.(t|j)s$": "ts-jest"
|
"^.+\\.(t|j)s$": "ts-jest"
|
||||||
},
|
},
|
||||||
"transformIgnorePatterns": [
|
"transformIgnorePatterns": [
|
||||||
"/node_modules/(?!(\\.pnpm/)?(nanoid|uuid|image-dimensions|marked)(@|/))"
|
"/node_modules/(?!(\\.pnpm/)?(nanoid|uuid|image-dimensions|marked|happy-dom)(@|/))"
|
||||||
],
|
],
|
||||||
"collectCoverageFrom": [
|
"collectCoverageFrom": [
|
||||||
"**/*.(t|j)s"
|
"**/*.(t|j)s"
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user