update react-email

.env.example

@@ -48,13 +48,6 @@ GOTENBERG_URL=
 
 DISABLE_TELEMETRY=false
 
-# Allow other sites to embed Docmost in an iframe.
-IFRAME_EMBED_ALLOWED=false
-
-# Only used when IFRAME_EMBED_ALLOWED=true. When empty, any origin is allowed.
-# Example: https://intranet.example.com,https://portal.example.com
-IFRAME_ALLOWED_ORIGINS=
-
 # Enable debug logging in production (default: false)
 DEBUG_MODE=false
 

apps/client/package.json

@@ -7,89 +7,79 @@
     "build": "tsc && vite build",
     "lint": "eslint .",
     "preview": "vite preview",
-    "format": "prettier --write \"src/**/*.tsx\" \"src/**/*.ts\"",
+    "format": "prettier --write \"src/**/*.tsx\" \"src/**/*.ts\""
-    "test": "vitest run",
-    "test:watch": "vitest"
   },
   "dependencies": {
-    "@atlaskit/pragmatic-drag-and-drop": "1.8.1",
+    "@casl/react": "^5.0.1",
-    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "2.1.5",
-    "@atlaskit/pragmatic-drag-and-drop-flourish": "2.0.15",
-    "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
-    "@atlaskit/pragmatic-drag-and-drop-live-region": "1.3.4",
-    "@casl/react": "5.0.1",
     "@docmost/editor-ext": "workspace:*",
+    "@emoji-mart/data": "^1.2.1",
+    "@emoji-mart/react": "^1.1.1",
     "@excalidraw/excalidraw": "0.18.0-3a5ef40",
-    "@mantine/core": "8.3.18",
+    "@mantine/core": "^8.3.18",
-    "@mantine/dates": "8.3.18",
+    "@mantine/dates": "^8.3.18",
-    "@mantine/form": "8.3.18",
+    "@mantine/form": "^8.3.18",
-    "@mantine/hooks": "8.3.18",
+    "@mantine/hooks": "^8.3.18",
-    "@mantine/modals": "8.3.18",
+    "@mantine/modals": "^8.3.18",
-    "@mantine/notifications": "8.3.18",
+    "@mantine/notifications": "^8.3.18",
-    "@mantine/spotlight": "8.3.18",
+    "@mantine/spotlight": "^8.3.18",
-    "@slidoapp/emoji-mart": "5.8.7",
+    "@tabler/icons-react": "^3.40.0",
-    "@slidoapp/emoji-mart-data": "1.2.4",
-    "@slidoapp/emoji-mart-react": "1.1.5",
-    "@tabler/icons-react": "3.40.0",
     "@tanstack/react-query": "5.90.17",
-    "@tanstack/react-virtual": "3.13.24",
+    "alfaaz": "^1.1.0",
-    "alfaaz": "1.1.0",
+    "axios": "1.15.0",
-    "axios": "1.16.0",
+    "blueimp-load-image": "^5.16.0",
-    "blueimp-load-image": "5.16.0",
+    "clsx": "^2.1.1",
-    "clsx": "2.1.1",
+    "emoji-mart": "^5.6.0",
-    "file-saver": "2.0.5",
+    "file-saver": "^2.0.5",
-    "highlightjs-sap-abap": "0.3.0",
+    "highlightjs-sap-abap": "^0.3.0",
     "i18next": "25.10.1",
     "i18next-http-backend": "3.0.6",
-    "jotai": "2.18.1",
+    "jotai": "^2.18.1",
-    "jotai-optics": "0.4.0",
+    "jotai-optics": "^0.4.0",
-    "js-cookie": "3.0.5",
+    "js-cookie": "^3.0.5",
-    "jwt-decode": "4.0.0",
+    "jwt-decode": "^4.0.0",
     "katex": "0.16.40",
-    "lowlight": "3.3.0",
+    "lowlight": "^3.3.0",
-    "mantine-form-zod-resolver": "1.3.0",
+    "mantine-form-zod-resolver": "^1.3.0",
-    "mermaid": "11.15.0",
+    "mermaid": "^11.13.0",
-    "mitt": "3.0.1",
+    "mitt": "^3.0.1",
     "posthog-js": "1.372.2",
-    "react": "18.3.1",
+    "react": "^18.3.1",
+    "react-arborist": "3.4.0",
     "react-clear-modal": "^2.0.18",
     "react-dom": "^18.3.1",
-    "react-drawio": "1.0.7",
+    "react-drawio": "^1.0.7",
-    "react-error-boundary": "6.1.1",
+    "react-error-boundary": "^6.1.1",
-    "react-helmet-async": "3.0.0",
+    "react-helmet-async": "^3.0.0",
     "react-i18next": "16.5.8",
-    "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",
-    "zod": "4.3.6"
+    "tiptap-extension-global-drag-handle": "^0.1.18",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@eslint/js": "9.28.0",
+    "@eslint/js": "^9.28.0",
-    "@tanstack/eslint-plugin-query": "5.94.4",
+    "@tanstack/eslint-plugin-query": "^5.94.4",
-    "@testing-library/jest-dom": "6.6.0",
+    "@types/blueimp-load-image": "^5.16.6",
-    "@testing-library/react": "16.1.0",
+    "@types/file-saver": "^2.0.7",
-    "@types/blueimp-load-image": "5.16.6",
+    "@types/js-cookie": "^3.0.6",
-    "@types/file-saver": "2.0.7",
+    "@types/katex": "^0.16.8",
-    "@types/js-cookie": "3.0.6",
-    "@types/katex": "0.16.8",
     "@types/node": "22.19.1",
-    "@types/react": "18.3.12",
+    "@types/react": "^18.3.12",
-    "@types/react-dom": "18.3.1",
+    "@types/react-dom": "^18.3.1",
-    "@vitejs/plugin-react": "6.0.1",
+    "@vitejs/plugin-react": "^6.0.1",
-    "eslint": "9.28.0",
+    "eslint": "^9.28.0",
-    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "7.0.1",
+    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "0.5.2",
+    "eslint-plugin-react-refresh": "^0.5.2",
-    "globals": "15.13.0",
+    "globals": "^15.13.0",
-    "jsdom": "25.0.0",
+    "optics-ts": "^2.4.1",
-    "optics-ts": "2.4.1",
+    "postcss": "^8.5.12",
-    "postcss": "8.5.14",
+    "postcss-preset-mantine": "^1.18.0",
-    "postcss-preset-mantine": "1.18.0",
+    "postcss-simple-vars": "^7.0.1",
-    "postcss-simple-vars": "7.0.1",
+    "prettier": "^3.8.1",
-    "prettier": "3.8.1",
+    "typescript": "^5.9.3",
-    "typescript": "5.9.3",
+    "typescript-eslint": "^8.57.1",
-    "typescript-eslint": "8.57.1",
+    "vite": "8.0.5"
-    "vite": "8.0.5",
-    "vitest": "4.1.6"
   }
 }

apps/client/public/locales/en-US/translation.json

@@ -71,7 +71,6 @@
   "Export": "Export",
   "Failed to create page": "Failed to create page",
   "Failed to delete page": "Failed to delete page",
-  "Failed to restore page": "Failed to restore page",
   "Failed to fetch recent pages": "Failed to fetch recent pages",
   "Failed to import pages": "Failed to import pages",
   "Failed to load page. An error occurred.": "Failed to load page. An error occurred.",
@@ -287,19 +286,6 @@
   "Add row above": "Add row above",
   "Add row below": "Add row below",
   "Delete table": "Delete table",
-  "Add column left": "Add column left",
-  "Add column right": "Add column right",
-  "Clear cell": "Clear cell",
-  "Clear cells": "Clear cells",
-  "Toggle header cell": "Toggle header cell",
-  "Toggle header column": "Toggle header column",
-  "Toggle header row": "Toggle header row",
-  "Move column left": "Move column left",
-  "Move column right": "Move column right",
-  "Move row down": "Move row down",
-  "Move row up": "Move row up",
-  "Sort A → Z": "Sort A → Z",
-  "Sort Z → A": "Sort Z → A",
   "Info": "Info",
   "Note": "Note",
   "Success": "Success",
@@ -362,8 +348,6 @@
   "Create block quote.": "Create block quote.",
   "Insert code snippet.": "Insert code snippet.",
   "Insert horizontal rule divider": "Insert horizontal rule divider",
-  "Page break": "Page break",
-  "Insert a page break for printing.": "Insert a page break for printing.",
   "Upload any image from your device.": "Upload any image from your device.",
   "Upload any video from your device.": "Upload any video from your device.",
   "Upload any audio from your device.": "Upload any audio from your device.",
@@ -582,8 +566,6 @@
   "Move to trash": "Move to trash",
   "Move this page to trash?": "Move this page to trash?",
   "Restore page": "Restore page",
-  "Permanently delete": "Permanently delete",
-  "<b>{{name}}</b> moved this page to Trash {{time}}.": "<b>{{name}}</b> moved this page to Trash {{time}}.",
   "Page moved to trash": "Page moved to trash",
   "Page restored successfully": "Page restored successfully",
   "Deleted by": "Deleted by",
@@ -888,12 +870,6 @@
   "Previous 7 days": "Previous 7 days",
   "Previous 30 days": "Previous 30 days",
   "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.",
   "Summarize this page": "Summarize this page",
   "Toggle AI Chat": "Toggle AI Chat",
@@ -936,35 +912,6 @@
   "Page actions": "Page actions",
   "Pick emoji": "Pick emoji",
   "Template menu": "Template menu",
-  "Use": "Use",
-  "Use template": "Use template",
-  "Preview template: {{title}}": "Preview template: {{title}}",
-  "Use a template": "Use a template",
-  "Search templates...": "Search templates...",
-  "Search spaces...": "Search spaces...",
-  "No templates found": "No templates found",
-  "No spaces found": "No spaces found",
-  "Browse all templates": "Browse all templates",
-  "This space": "This space",
-  "All templates": "All templates",
-  "Global": "Global",
-  "New template": "New template",
-  "Edit template": "Edit template",
-  "Are you sure you want to delete this template?": "Are you sure you want to delete this template?",
-  "Template scope updated": "Template scope updated",
-  "Choose which space this template belongs to": "Choose which space this template belongs to",
-  "Scope": "Scope",
-  "Select scope": "Select scope",
-  "Title": "Title",
-  "Saving...": "Saving...",
-  "Saved": "Saved",
-  "Save failed. Retry": "Save failed. Retry",
-  "By {{name}}": "By {{name}}",
-  "Updated {{time}}": "Updated {{time}}",
-  "Choose destination": "Choose destination",
-  "Search pages and spaces...": "Search pages and spaces...",
-  "No results found": "No results found",
-  "You don't have permission to create pages here": "You don't have permission to create pages here",
   "Chat menu": "Chat menu",
   "API key menu": "API key menu",
   "Jump to comment selection": "Jump to comment selection",
@@ -979,73 +926,5 @@
   "Settings navigation": "Settings navigation",
   "AI navigation": "AI navigation",
   "Breadcrumb": "Breadcrumb",
-  "Synced block": "Synced block",
+  "Skip to main content": "Skip to main content"
-  "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",
-  "Fixed editor toolbar": "Fixed editor toolbar",
-  "Show a formatting toolbar above the editor with quick access to common actions.": "Show a formatting toolbar above the editor with quick access to common actions.",
-  "Toggle fixed editor toolbar": "Toggle fixed editor toolbar",
-  "Normal text": "Normal text",
-  "More inline formatting": "More inline formatting",
-  "Subscript": "Subscript",
-  "Superscript": "Superscript",
-  "Inline code": "Inline code",
-  "Insert media": "Insert media",
-  "Mention": "Mention",
-  "Emoji": "Emoji",
-  "Columns": "Columns",
-  "More inserts": "More inserts",
-  "Embeds": "Embeds",
-  "Diagrams": "Diagrams",
-  "Advanced": "Advanced",
-  "Utility": "Utility",
-  "Decrease indent": "Decrease indent",
-  "Increase indent": "Increase indent",
-  "Clear formatting": "Clear formatting",
-  "Code block": "Code block",
-  "Experimental": "Experimental",
-  "Strikethrough": "Strikethrough",
-  "Undo": "Undo",
-  "Redo": "Redo",
-  "Backlinks": "Backlinks",
-  "Last updated by": "Last updated by",
-  "Last updated": "Last updated",
-  "Stats": "Stats",
-  "Word count": "Word count",
-  "Characters": "Characters",
-  "Incoming links": "Incoming links",
-  "Outgoing links": "Outgoing links",
-  "Incoming links ({{count}})": "Incoming links ({{count}})",
-  "Outgoing links ({{count}})": "Outgoing links ({{count}})",
-  "No pages link here yet.": "No pages link here yet.",
-  "This page doesn't link to other pages yet.": "This page doesn't link to other pages yet.",
-  "Verified until {{date}}": "Verified until {{date}}",
-  "Labels": "Labels",
-  "Add label": "Add label",
-  "No labels yet": "No labels yet",
-  "Already added": "Already added",
-  "Invalid label name": "Invalid label name",
-  "No matches": "No matches",
-  "Search or create…": "Search or create…",
-  "Remove label {{name}}": "Remove label {{name}}",
-  "Failed to add label": "Failed to add label",
-  "Failed to remove label": "Failed to remove label",
-  "No pages with this label": "No pages with this label",
-  "Pages tagged with this label will appear here.": "Pages tagged with this label will appear here.",
-  "No pages match your search.": "No pages match your search.",
-  "Updated {{date}}": "Updated {{date}}",
-  "Cell actions": "Cell actions",
-  "Column actions": "Column actions",
-  "Row actions": "Row actions"
 }

apps/client/src/App.tsx

@@ -45,7 +45,6 @@ import TemplateEditor from "@/ee/template/pages/template-editor";
 import FavoritesPage from "@/pages/favorites/favorites-page";
 import AiChat from "@/ee/ai-chat/pages/ai-chat.tsx";
 import VerifyEmail from "@/ee/pages/verify-email.tsx";
-import LabelPage from "@/pages/label/label-page";
 
 export default function App() {
   const { t } = useTranslation();
@@ -93,7 +92,6 @@ export default function App() {
           <Route path={"/ai/chat/:chatId"} element={<AiChat />} />
           <Route path={"/spaces"} element={<SpacesPage />} />
           <Route path={"/favorites"} element={<FavoritesPage />} />
-          <Route path={"/labels/:labelName"} element={<LabelPage />} />
           <Route path={"/templates"} element={<TemplateList />} />
           <Route
             path={"/templates/:templateId"}

apps/client/src/components/layouts/global/app-shell.module.css

@@ -27,3 +27,23 @@
     background: light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-5))
   }
 }
+
+.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);
+  }
+}
+
+

apps/client/src/components/layouts/global/aside.tsx

@@ -1,5 +1,4 @@
-import { ActionIcon, Box, Group, ScrollArea, Text, Tooltip } from "@mantine/core";
+import { Box, ScrollArea, Text } from "@mantine/core";
-import { IconX } from "@tabler/icons-react";
 import CommentListWithTabs from "@/features/comment/components/comment-list-with-tabs.tsx";
 import { useAtom } from "jotai";
 import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
@@ -9,13 +8,11 @@ import { TableOfContents } from "@/features/editor/components/table-of-contents/
 import { useAtomValue } from "jotai";
 import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 import AsideChatPanel from "@/ee/ai-chat/components/aside-chat-panel";
-import { PageDetailsAside } from "@/features/page-details/components/page-details-aside.tsx";
 
 export default function Aside() {
-  const [{ tab }, setAsideState] = useAtom(asideStateAtom);
+  const [{ tab }] = useAtom(asideStateAtom);
   const { t } = useTranslation();
   const pageEditor = useAtomValue(pageEditorAtom);
-  const closeAside = () => setAsideState((s) => ({ ...s, isAsideOpen: false }));
 
   let title: string;
   let component: ReactNode;
@@ -33,10 +30,6 @@ export default function Aside() {
       component = <AsideChatPanel />;
       title = "AI Chat";
       break;
-    case "details":
-      component = <PageDetailsAside />;
-      title = "Details";
-      break;
     default:
       component = null;
       title = null;
@@ -47,19 +40,9 @@ export default function Aside() {
       {component && (
         <>
           {tab !== "chat" && (
-            <Group justify="space-between" wrap="nowrap" mb="md">
+            <Text mb="md" fw={500}>
-              <Text fw={500}>{t(title)}</Text>
+              {t(title)}
-              <Tooltip label={t("Close")} withArrow>
+            </Text>
-                <ActionIcon
-                  variant="subtle"
-                  color="gray"
-                  onClick={closeAside}
-                  aria-label={t("Close")}
-                >
-                  <IconX size={18} />
-                </ActionIcon>
-              </Tooltip>
-            </Group>
           )}
 
           {tab === "comments" || tab === "chat" ? (

apps/client/src/components/layouts/global/global-app-shell.tsx

@@ -81,7 +81,11 @@ export default function GlobalAppShell({
   const showGlobalSidebar = !isSpaceRoute && !isSettingsRoute && !isAiRoute;
 
   return (
-    <AppShell
+    <>
+      <a href="#main-content" className={classes.skipLink}>
+        {t("Skip to main content")}
+      </a>
+      <AppShell
       header={{ height: 45 }}
       navbar={{
         width: isSpaceRoute ? sidebarWidth : 300,
@@ -147,14 +151,13 @@ export default function GlobalAppShell({
                 ? t("Table of contents")
                 : asideTab === "chat"
                   ? t("AI Chat")
-                  : asideTab === "details"
+                  : undefined
-                    ? t("Details")
-                    : undefined
           }
         >
           <Aside />
         </AppShell.Aside>
       )}
     </AppShell>
+    </>
   );
 }

apps/client/src/components/layouts/global/global-sidebar.module.css

@@ -38,16 +38,6 @@
             color: light-dark(var(--mantine-color-black), var(--mantine-color-white));
         }
     }
-
-    &[data-disabled] {
-        cursor: not-allowed;
-        opacity: 0.5;
-
-        @mixin hover {
-            background-color: transparent;
-            color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
-        }
-    }
 }
 
 .linkIcon {

apps/client/src/components/layouts/global/global-sidebar.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { ScrollArea, Text, Divider, Modal, UnstyledButton, Tooltip } from "@mantine/core";
+import { ScrollArea, Text, Divider, Modal, UnstyledButton } from "@mantine/core";
 import {
   IconHome,
   IconClock,
@@ -7,7 +7,6 @@ import {
   IconLayoutGrid,
   IconSettings,
   IconUserPlus,
-  IconTemplate,
 } from "@tabler/icons-react";
 import { Link, useLocation } from "react-router-dom";
 import classes from "./global-sidebar.module.css";
@@ -21,9 +20,12 @@ import { useDisclosure } from "@mantine/hooks";
 import { WorkspaceInviteForm } from "@/features/workspace/components/members/components/workspace-invite-form";
 import { CustomAvatar } from "@/components/ui/custom-avatar";
 import { AvatarIconType } from "@/features/attachments/types/attachment.types";
-import { useHasFeature } from "@/ee/hooks/use-feature";
+
-import { Feature } from "@/ee/features";
+const mainNavItems = [
-import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
+  { label: "Home", icon: IconHome, path: "/home" },
+  { label: "Favorites", icon: IconStar, path: "/favorites" },
+  { label: "Spaces", icon: IconLayoutGrid, path: "/spaces" },
+];
 
 export default function GlobalSidebar() {
   const { t } = useTranslation();
@@ -31,19 +33,6 @@ export default function GlobalSidebar() {
   const [active, setActive] = useState(location.pathname);
   const [mobileSidebarOpened] = useAtom(mobileSidebarAtom);
   const toggleMobileSidebar = useToggleSidebar(mobileSidebarAtom);
-  const hasTemplates = useHasFeature(Feature.TEMPLATES);
-  const upgradeLabel = useUpgradeLabel();
-  const mainNavItems = [
-    { label: "Home", icon: IconHome, path: "/home" },
-    { label: "Favorites", icon: IconStar, path: "/favorites" },
-    { label: "Spaces", icon: IconLayoutGrid, path: "/spaces" },
-    {
-      label: "Templates",
-      icon: IconTemplate,
-      path: "/templates",
-      disabled: !hasTemplates,
-    },
-  ];
   const { data: favoriteSpacesData, isPending: isFavoritesPending } = useFavoritesQuery("space");
   const favoriteSpaces = favoriteSpacesData?.pages.flatMap((p) => p.items) ?? [];
   const sortedFavoriteSpaces = [...favoriteSpaces]
@@ -69,37 +58,18 @@ export default function GlobalSidebar() {
     <div className={classes.navbar}>
       <ScrollArea w="100%" style={{ flex: 1 }}>
         <div className={classes.section}>
-          {mainNavItems.map((item) =>
+          {mainNavItems.map((item) => (
-            item.disabled ? (
+            <Link
-              <Tooltip
+              key={item.label}
-                key={item.label}
+              className={classes.link}
-                label={upgradeLabel}
+              data-active={active === item.path || undefined}
-                position="right"
+              to={item.path}
-                withArrow
+              onClick={handleNavClick}
-              >
+            >
-                <UnstyledButton
+              <item.icon className={classes.linkIcon} stroke={2} />
-                  className={classes.link}
+              <span>{t(item.label)}</span>
-                  data-disabled
+            </Link>
-                  aria-disabled="true"
+          ))}
-                  tabIndex={-1}
-                >
-                  <item.icon className={classes.linkIcon} stroke={2} />
-                  <span>{t(item.label)}</span>
-                </UnstyledButton>
-              </Tooltip>
-            ) : (
-              <Link
-                key={item.label}
-                className={classes.link}
-                data-active={active === item.path || undefined}
-                to={item.path}
-                onClick={handleNavClick}
-              >
-                <item.icon className={classes.linkIcon} stroke={2} />
-                <span>{t(item.label)}</span>
-              </Link>
-            ),
-          )}
         </div>
 
         <Divider my="xs" />

apps/client/src/components/layouts/global/hooks/atoms/sidebar-atom.ts

@@ -10,7 +10,6 @@ export const desktopSidebarAtom = atomWithWebStorage<boolean>(
 
 export const desktopAsideAtom = atom<boolean>(false);
 
-// Valid `tab` values: "" | "comments" | "toc" | "chat" | "details"
 type AsideStateType = {
   tab: string;
   isAsideOpen: boolean;

apps/client/src/components/settings/app-version.tsx

@@ -29,7 +29,7 @@ export default function AppVersion() {
       >
         <Indicator
           label={t("New update")}
-          color="gray"
+          color="dark"
           inline
           size={16}
           position="middle-end"

apps/client/src/components/ui/custom-avatar.tsx

@@ -42,11 +42,6 @@ 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<
   HTMLInputElement,
   CustomAvatarProps
@@ -54,13 +49,12 @@ export const CustomAvatar = React.forwardRef<
   const avatarLink = getAvatarUrl(avatarUrl, type);
   const resolvedColor =
     !color || color === "initials" ? pickInitialsColor(name ?? "") : color;
-  const initialsSource = sanitizeInitialsSource(name ?? "");
 
   return (
     <Avatar
       ref={ref}
       src={avatarLink}
-      name={initialsSource}
+      name={name}
       alt={name}
       color={resolvedColor}
       {...props}

apps/client/src/components/ui/destination-picker/destination-picker-modal.tsx

@@ -16,8 +16,6 @@ export function DestinationPickerModal({
   loading,
   excludePageId,
   pageLimit,
-  initialSpaceId,
-  searchSpacesOnly,
 }: DestinationPickerModalProps) {
   const { t } = useTranslation();
   const [selection, setSelection] = useState<DestinationSelection | null>(null);
@@ -48,8 +46,6 @@ export function DestinationPickerModal({
             onSelectionChange={setSelection}
             excludePageId={excludePageId}
             pageLimit={pageLimit}
-            initialSpaceId={initialSpaceId}
-            searchSpacesOnly={searchSpacesOnly}
           />
 
           <Group justify="flex-end" mt="md">

apps/client/src/components/ui/destination-picker/destination-picker.module.css

@@ -13,7 +13,6 @@
     display: flex;
     align-items: center;
     gap: 8px;
-    color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-0));
     transition: background-color 150ms ease;
     user-select: none;
 
@@ -23,11 +22,6 @@
                 var(--mantine-color-dark-6)
         );
     }
-
-    &:focus-visible {
-        outline: 2px solid var(--mantine-primary-color-filled);
-        outline-offset: -2px;
-    }
 }
 
 .selected {
@@ -63,7 +57,7 @@
     border-radius: var(--mantine-radius-sm);
     flex-shrink: 0;
     transition: transform 150ms ease;
-    color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
+    color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
 
     @mixin hover {
         background-color: light-dark(
@@ -117,7 +111,7 @@
 }
 
 .spaceName {
-    color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
+    color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
     font-size: var(--mantine-font-size-xs);
     flex-shrink: 0;
 }

apps/client/src/components/ui/destination-picker/destination-picker.tsx

@@ -1,7 +1,7 @@
-import { useState, useCallback, useEffect, useMemo, useRef } from "react";
+import { useState, useCallback } from "react";
-import { ActionIcon, TextInput, ScrollArea, Loader } from "@mantine/core";
+import { TextInput, ScrollArea, Loader } from "@mantine/core";
 import { useDebouncedValue } from "@mantine/hooks";
-import { IconSearch, IconFileDescription } from "@tabler/icons-react";
+import { IconSearch, IconFile } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
 import { useSearchSuggestionsQuery } from "@/features/search/queries/search-query";
@@ -15,29 +15,23 @@ type DestinationPickerProps = {
   onSelectionChange: (selection: DestinationSelection | null) => void;
   excludePageId?: string;
   pageLimit?: number;
-  initialSpaceId?: string;
-  searchSpacesOnly?: boolean;
 };
 
 export function DestinationPicker({
   onSelectionChange,
   excludePageId,
   pageLimit = 15,
-  initialSpaceId,
-  searchSpacesOnly,
 }: DestinationPickerProps) {
   const { t } = useTranslation();
   const [searchQuery, setSearchQuery] = useState("");
   const [selection, setSelection] = useState<DestinationSelection | null>(null);
   const [debouncedQuery] = useDebouncedValue(searchQuery, 300);
-  const viewportRef = useRef<HTMLDivElement>(null);
 
   const { data: spacesData, isLoading: spacesLoading } = useGetSpacesQuery({
     limit: 100,
   });
 
-  const searchEnabled =
+  const searchEnabled = debouncedQuery && debouncedQuery.length >= 2;
-    !searchSpacesOnly && debouncedQuery && debouncedQuery.length >= 2;
 
   const { data: searchData, isLoading: searchLoading } =
     useSearchSuggestionsQuery({
@@ -48,18 +42,6 @@ export function DestinationPicker({
 
   const isSearching = !!searchEnabled;
 
-  const filteredSpaces = useMemo(() => {
-    const items = spacesData?.items ?? [];
-    if (!searchSpacesOnly || !debouncedQuery) return items;
-    const fold = (s: string) =>
-      s
-        .normalize("NFD")
-        .replace(/[̀-ͯ]/g, "")
-        .toLocaleLowerCase();
-    const term = fold(debouncedQuery);
-    return items.filter((s) => fold(s.name).includes(term));
-  }, [spacesData, searchSpacesOnly, debouncedQuery]);
-
   const selectedId =
     selection?.type === "space" ? selection.spaceId : selection?.pageId ?? null;
 
@@ -105,48 +87,18 @@ export function DestinationPicker({
     [updateSelection],
   );
 
-  // Pre-select space when initialSpaceId is set and spaces have loaded.
-  // Only runs once: skip if user has already made a selection.
-  useEffect(() => {
-    if (!initialSpaceId || selection) return;
-    const match = spacesData?.items?.find((s) => s.id === initialSpaceId);
-    if (match) {
-      updateSelection({ type: "space", spaceId: match.id, space: match });
-      requestAnimationFrame(() => {
-        const el = viewportRef.current?.querySelector<HTMLElement>(
-          `[data-space-id="${match.id}"]`,
-        );
-        el?.scrollIntoView({ block: "nearest" });
-      });
-    }
-  }, [initialSpaceId, selection, spacesData, updateSelection]);
-
   return (
     <>
       <TextInput
         leftSection={<IconSearch size={16} />}
-        placeholder={
+        placeholder={t("Search pages and spaces...")}
-          searchSpacesOnly
-            ? t("Search spaces...")
-            : t("Search pages and spaces...")
-        }
-        aria-label={
-          searchSpacesOnly
-            ? t("Search spaces...")
-            : t("Search pages and spaces...")
-        }
         variant="filled"
         value={searchQuery}
         onChange={(e) => setSearchQuery(e.currentTarget.value)}
         className={classes.searchInput}
       />
 
-      <ScrollArea
+      <ScrollArea h="50vh" offsetScrollbars className={classes.scrollArea}>
-        h="50vh"
-        offsetScrollbars
-        className={classes.scrollArea}
-        viewportRef={viewportRef}
-      >
         {isSearching ? (
           searchLoading ? (
             <div className={classes.emptyState}>
@@ -159,28 +111,16 @@ export function DestinationPicker({
                   <div
                     key={page.id}
                     className={classes.searchResult}
-                    role="button"
-                    tabIndex={0}
                     onClick={() => handleSearchResultClick(page)}
-                    onKeyDown={(e) => {
-                      if (e.key === "Enter" || e.key === " ") {
-                        e.preventDefault();
-                        handleSearchResultClick(page);
-                      }
-                    }}
                   >
                     <div className={classes.iconWrapper}>
                       {page.icon ? (
                         page.icon
                       ) : (
-                        <ActionIcon
+                        <IconFile
-                          component="div"
+                          size={16}
-                          variant="transparent"
+                          color="var(--mantine-color-gray-5)"
-                          c="gray"
+                        />
-                          size={22}
-                        >
-                          <IconFileDescription size={18} />
-                        </ActionIcon>
                       )}
                     </div>
                     <div className={classes.pageTitle}>
@@ -201,14 +141,8 @@ export function DestinationPicker({
           <div className={classes.emptyState}>
             <Loader size="xs" />
           </div>
-        ) : filteredSpaces.length === 0 ? (
-          <div className={classes.emptyState}>
-            {searchSpacesOnly && debouncedQuery
-              ? t("No spaces found")
-              : t("No results found")}
-          </div>
         ) : (
-          filteredSpaces.map((space) => (
+          spacesData?.items?.map((space) => (
             <SpaceRow
               key={space.id}
               space={space}

apps/client/src/components/ui/destination-picker/destination-picker.types.ts

@@ -20,6 +20,4 @@ export type DestinationPickerModalProps = {
   loading?: boolean;
   excludePageId?: string;
   pageLimit?: number;
-  initialSpaceId?: string;
-  searchSpacesOnly?: boolean;
 };

apps/client/src/components/ui/destination-picker/page-row.tsx

@@ -1,6 +1,5 @@
-import { KeyboardEvent, useState } from "react";
+import { useState } from "react";
-import { ActionIcon } from "@mantine/core";
+import { IconChevronRight, IconFile } from "@tabler/icons-react";
-import { IconChevronRight, IconFileDescription } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { IPage } from "@/features/page/types/page.types";
 import { PageChildren } from "./page-children";
@@ -37,44 +36,23 @@ export function PageRow({
     .filter(Boolean)
     .join(" ");
 
-  const handleSelect = () => {
-    if (!isExcluded) onSelect(page);
-  };
-
-  const handleRowKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
-    if (e.target !== e.currentTarget) return;
-    if (e.key === "Enter" || e.key === " ") {
-      e.preventDefault();
-      handleSelect();
-    }
-  };
-
   return (
     <>
       <div
         className={rowClasses}
         style={{ paddingLeft: depth * 20 + 12 }}
-        role="button"
+        onClick={() => !isExcluded && onSelect(page)}
-        tabIndex={isExcluded ? -1 : 0}
-        aria-disabled={isExcluded || undefined}
-        onClick={handleSelect}
-        onKeyDown={handleRowKeyDown}
       >
         {page.hasChildren ? (
-          <ActionIcon
+          <div
             className={`${classes.chevron} ${expanded ? classes.chevronExpanded : ""}`}
-            variant="subtle"
-            color="gray"
-            size="sm"
-            aria-label={expanded ? t("Collapse") : t("Expand")}
-            aria-expanded={expanded}
             onClick={(e) => {
               e.stopPropagation();
               setExpanded(!expanded);
             }}
           >
             <IconChevronRight size={14} />
-          </ActionIcon>
+          </div>
         ) : (
           <div style={{ width: 20, flexShrink: 0 }} />
         )}
@@ -83,14 +61,10 @@ export function PageRow({
           {page.icon ? (
             page.icon
           ) : (
-            <ActionIcon
+            <IconFile
-              component="div"
+              size={16}
-              variant="transparent"
+              color="var(--mantine-color-gray-5)"
-              c="gray"
+            />
-              size={22}
-            >
-              <IconFileDescription size={18} />
-            </ActionIcon>
           )}
         </div>
 

apps/client/src/components/ui/destination-picker/space-row.tsx

@@ -1,5 +1,5 @@
-import { KeyboardEvent, useState } from "react";
+import { useState } from "react";
-import { ActionIcon, Tooltip } from "@mantine/core";
+import { Tooltip } from "@mantine/core";
 import { IconChevronRight, IconLock } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { ISpace } from "@/features/space/types/space.types";
@@ -42,43 +42,21 @@ export function SpaceRow({
     .filter(Boolean)
     .join(" ");
 
-  const handleSelect = () => {
-    if (writable) onSelectSpace(space);
-  };
-
-  const handleRowKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
-    if (e.target !== e.currentTarget) return;
-    if (e.key === "Enter" || e.key === " ") {
-      e.preventDefault();
-      handleSelect();
-    }
-  };
-
   const rowContent = (
     <div
       className={rowClasses}
-      data-space-id={space.id}
+      onClick={() => writable && onSelectSpace(space)}
-      role="button"
-      tabIndex={writable ? 0 : -1}
-      aria-disabled={!writable || undefined}
-      onClick={handleSelect}
-      onKeyDown={handleRowKeyDown}
     >
       {writable ? (
-        <ActionIcon
+        <div
           className={`${classes.chevron} ${expanded ? classes.chevronExpanded : ""}`}
-          variant="subtle"
-          color="gray"
-          size="sm"
-          aria-label={expanded ? t("Collapse") : t("Expand")}
-          aria-expanded={expanded}
           onClick={(e) => {
             e.stopPropagation();
             setExpanded(!expanded);
           }}
         >
           <IconChevronRight size={14} />
-        </ActionIcon>
+        </div>
       ) : (
         <div style={{ width: 20, flexShrink: 0 }} />
       )}

apps/client/src/components/ui/emoji-picker.tsx

@@ -1,4 +1,4 @@
-import React, { ReactNode, useEffect, useState } from "react";
+import React, { ReactNode, useState } from "react";
 import {
   ActionIcon,
   Popover,
@@ -7,24 +7,9 @@ import {
 } from "@mantine/core";
 import { useClickOutside, useDisclosure, useWindowEvent } from "@mantine/hooks";
 import { Suspense } from "react";
+const Picker = React.lazy(() => import("@emoji-mart/react"));
 import { useTranslation } from "react-i18next";
 
-// Load the picker module AND the emoji data in parallel inside the lazy
-// resolution, then bind the data into the component. React.lazy only finishes
-// suspending once both are in memory, so the Suspense boundary hides the
-// Remove button until the Picker can render with real content.
-const Picker = React.lazy(async () => {
-  const [pickerModule, dataModule] = await Promise.all([
-    import("@slidoapp/emoji-mart-react"),
-    import("@slidoapp/emoji-mart-data"),
-  ]);
-  const PickerComp = pickerModule.default;
-  const data = dataModule.default;
-  return {
-    default: (props: any) => <PickerComp {...props} data={data} />,
-  };
-});
-
 export interface EmojiPickerInterface {
   onEmojiSelect: (emoji: any) => void;
   icon: ReactNode;
@@ -34,7 +19,6 @@ export interface EmojiPickerInterface {
     size?: string;
     variant?: string;
     c?: string;
-    tabIndex?: number;
   };
 }
 
@@ -66,38 +50,6 @@ function EmojiPicker({
     }
   });
 
-  // emoji-mart's built-in autoFocus calls .focus() without preventScroll, which
-  // makes the browser scroll every scrollable ancestor of the search input to
-  // bring it on screen — including the page editor's scroll container, so the
-  // page jumps to the top whenever the picker is opened from a scrolled-down
-  // position. The search input lives inside the <em-emoji-picker> custom
-  // element's shadow root, so we poll for it after the dropdown mounts and
-  // focus it ourselves with preventScroll.
-  useEffect(() => {
-    if (!opened || !dropdown) return;
-    let cancelled = false;
-    let rafId = 0;
-    const tryFocus = (attempts: number) => {
-      if (cancelled) return;
-      const pickerEl = dropdown.querySelector("em-emoji-picker");
-      const input = pickerEl?.shadowRoot?.querySelector<HTMLInputElement>(
-        'input[type="search"]',
-      );
-      if (input) {
-        input.focus({ preventScroll: true });
-        return;
-      }
-      if (attempts < 60) {
-        rafId = requestAnimationFrame(() => tryFocus(attempts + 1));
-      }
-    };
-    rafId = requestAnimationFrame(() => tryFocus(0));
-    return () => {
-      cancelled = true;
-      cancelAnimationFrame(rafId);
-    };
-  }, [opened, dropdown]);
-
   const handleEmojiSelect = (emoji) => {
     onEmojiSelect(emoji);
     handlers.close();
@@ -122,7 +74,6 @@ function EmojiPicker({
           c={actionIconProps?.c || "gray"}
           variant={actionIconProps?.variant || "transparent"}
           size={actionIconProps?.size}
-          tabIndex={actionIconProps?.tabIndex}
           onClick={handlers.toggle}
           aria-label={t("Pick emoji")}
           aria-haspopup="dialog"
@@ -134,6 +85,7 @@ function EmojiPicker({
       <Suspense fallback={null}>
         <Popover.Dropdown bg="000" style={{ border: "none" }} ref={setDropdown}>
           <Picker
+            data={async () => (await import("@emoji-mart/data")).default}
             onEmojiSelect={handleEmojiSelect}
             perLine={8}
             skinTonePosition="search"

apps/client/src/ee/ai-chat/components/ai-chat-sidebar.tsx

@@ -137,8 +137,7 @@ export default function AiChatSidebar() {
 
       <TextInput
         className={classes.searchInput}
-        placeholder={t("Search chats...")}
+        placeholder="Search chats..."
-        aria-label={t("Search chats")}
         leftSection={<IconSearch size={14} />}
         size="xs"
         value={search}

apps/client/src/ee/ai-chat/components/aside-chat-panel.tsx

@@ -178,7 +178,6 @@ export default function AsideChatPanel() {
             href="/ai"
             variant="subtle"
             color="dark"
-            aria-label={t("New chat")}
             onClick={handleNewChat}
           >
             <IconPlus size={20} stroke={1.75} />
@@ -186,23 +185,13 @@ export default function AsideChatPanel() {
         </Tooltip>
 
         <Tooltip label={t("Open full page")} openDelay={250}>
-          <ActionIcon
+          <ActionIcon variant="subtle" color="dark" onClick={handleExpand}>
-            variant="subtle"
-            color="dark"
-            aria-label={t("Open full page")}
-            onClick={handleExpand}
-          >
             <IconArrowsDiagonal size={18} stroke={1.5} />
           </ActionIcon>
         </Tooltip>
 
         <Tooltip label={t("Close")} openDelay={250}>
-          <ActionIcon
+          <ActionIcon variant="subtle" color="dark" onClick={handleClose}>
-            variant="subtle"
-            color="dark"
-            aria-label={t("Close")}
-            onClick={handleClose}
-          >
             <IconX size={20} stroke={1.75} />
           </ActionIcon>
         </Tooltip>

apps/client/src/ee/ai-chat/components/chat-empty-state.tsx

@@ -65,7 +65,7 @@ export default function ChatEmptyState({ isStreaming, onSend, onStop }: Props) {
           isStreaming={isStreaming}
           onSend={onSend}
           onStop={onStop}
-          placeholder={t("Ask anything... Use @ to mention pages")}
+          placeholder="Ask anything... Use @ to mention pages"
           autofocus
         />
       </div>

apps/client/src/ee/ai-chat/components/chat-input.tsx

@@ -200,7 +200,7 @@ export default function ChatInput({
         link: false,
       }),
       Placeholder.configure({
-        placeholder: placeholder || t("Ask anything... Use @ to mention pages"),
+        placeholder: placeholder || "Ask anything... Use @ to mention pages",
       }),
       CharacterCount.configure({
         limit: 50000,
@@ -225,10 +225,6 @@ export default function ChatInput({
       }),
     ],
     editorProps: {
-      attributes: {
-        "aria-label": placeholder || t("Ask anything... Use @ to mention pages"),
-        "aria-multiline": "true",
-      },
       handleDOMEvents: {
         keydown: (_view, event) => {
           if (
@@ -279,8 +275,6 @@ export default function ChatInput({
         type="file"
         accept={ACCEPTED_FILE_TYPES}
         multiple
-        aria-label={t("Add files")}
-        tabIndex={-1}
         style={{ display: "none" }}
         onChange={(e) => handleFileSelect(e.target.files)}
       />

apps/client/src/ee/ai-chat/components/chat-tool-group.tsx

@@ -31,16 +31,7 @@ export default function ChatToolGroup({ toolCalls, isStreaming }: Props) {
     <div className={classes.toolGroup}>
       <div
         className={classes.toolGroupHeader}
-        role="button"
-        tabIndex={0}
-        aria-expanded={expanded}
         onClick={() => setExpanded((prev) => !prev)}
-        onKeyDown={(event) => {
-          if (event.key === "Enter" || event.key === " ") {
-            event.preventDefault();
-            setExpanded((prev) => !prev);
-          }
-        }}
       >
         {activeLabel ? (
           <IconLoader2 size={12} className={classes.processingSpinner} />

apps/client/src/ee/ai-chat/styles/ai-chat.module.css

@@ -98,7 +98,7 @@
   font-weight: 600;
   letter-spacing: 0.08em;
   text-transform: uppercase;
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
   margin-bottom: var(--mantine-spacing-xs);
 }
 
@@ -125,7 +125,7 @@
 .suggestionsLabel {
   font-size: var(--mantine-font-size-xs);
   font-weight: 500;
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
   text-transform: uppercase;
   letter-spacing: 0.5px;
   margin-bottom: var(--mantine-spacing-sm);

apps/client/src/ee/ai-chat/styles/chat-input.module.css

@@ -43,7 +43,7 @@
   margin-top: 6px;
   text-align: center;
   font-size: var(--mantine-font-size-xs);
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
 }
 
 .attachmentChips {

apps/client/src/ee/ai-chat/styles/chat-sidebar.module.css

@@ -36,7 +36,7 @@
   padding: 4px var(--mantine-spacing-xs);
   font-size: var(--mantine-font-size-xs);
   font-weight: 600;
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
   user-select: none;
 }
 
@@ -104,7 +104,7 @@
 
 .chatItemDate {
   font-size: var(--mantine-font-size-xs);
-  color: var(--mantine-color-dimmed);
+  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
   white-space: nowrap;
   transition: opacity 150ms;
 }

apps/client/src/ee/components/sso-login.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useState } from "react";
 import { useWorkspacePublicDataQuery } from "@/features/workspace/queries/workspace-query.ts";
 import { Button, Divider, Stack } from "@mantine/core";
 import { IconLock, IconServer } from "@tabler/icons-react";
@@ -7,37 +7,15 @@ import { buildSsoLoginUrl } from "@/ee/security/sso.utils.ts";
 import { SSO_PROVIDER } from "@/ee/security/contants.ts";
 import { GoogleIcon } from "@/components/icons/google-icon.tsx";
 import { LdapLoginModal } from "@/ee/components/ldap-login-modal.tsx";
-import { getRedirectParam } from "@/lib/app-route.ts";
-import useCurrentUser from "@/features/user/hooks/use-current-user.ts";
-
-const SSO_AUTO_ATTEMPT_KEY = "docmost:ssoAutoAttempt";
-const SSO_AUTO_ATTEMPT_TTL_MS = 5 * 60_000;
-
-function recentAutoAttempt(): boolean {
-  try {
-    const raw = window.sessionStorage.getItem(SSO_AUTO_ATTEMPT_KEY);
-    if (!raw) return false;
-    const ts = Number(raw);
-    return Number.isFinite(ts) && Date.now() - ts < SSO_AUTO_ATTEMPT_TTL_MS;
-  } catch {
-    return false;
-  }
-}
-
-function markAutoAttempt(): void {
-  try {
-    window.sessionStorage.setItem(SSO_AUTO_ATTEMPT_KEY, String(Date.now()));
-  } catch {
-    /* sessionStorage unavailable (private mode, etc.) — best effort */
-  }
-}
 
 export default function SsoLogin() {
   const { data, isLoading } = useWorkspacePublicDataQuery();
-  const { data: currentUser } = useCurrentUser();
   const [ldapModalOpened, setLdapModalOpened] = useState(false);
   const [selectedLdapProvider, setSelectedLdapProvider] = useState<IAuthProvider | null>(null);
-  const autoRedirectedRef = useRef(false);
+
+  if (!data?.authProviders || data?.authProviders?.length === 0) {
+    return null;
+  }
 
   const handleSsoLogin = (provider: IAuthProvider) => {
     if (provider.type === SSO_PROVIDER.LDAP) {
@@ -50,47 +28,10 @@ export default function SsoLogin() {
         providerId: provider.id,
         type: provider.type,
         workspaceId: data.id,
-        redirect: getRedirectParam() ?? undefined,
       });
     }
   };
 
-  // Auto-redirect when SSO is enforced and there is exactly one non-LDAP
-  // provider. The user has no other option, so skip the extra click.
-  useEffect(() => {
-    if (autoRedirectedRef.current) return;
-    if (!data?.enforceSso) return;
-    if (!data.authProviders || data.authProviders.length !== 1) return;
-    const onlyProvider = data.authProviders[0];
-    if (onlyProvider.type === SSO_PROVIDER.LDAP) return;
-
-    // Already signed in: let useRedirectIfAuthenticated handle navigation
-    // instead of racing it through the IdP.
-    if (currentUser?.user) return;
-
-    // Explicit logout: don't immediately bounce them back to the IdP.
-    const params = new URLSearchParams(window.location.search);
-    if (params.has("logout")) return;
-
-    // Circuit-breaker: if we already auto-redirected within the TTL, the
-    // user came back (likely from an IdP failure). Show the page so they
-    // can read errors or pick a different account.
-    if (recentAutoAttempt()) return;
-
-    autoRedirectedRef.current = true;
-    markAutoAttempt();
-    window.location.href = buildSsoLoginUrl({
-      providerId: onlyProvider.id,
-      type: onlyProvider.type,
-      workspaceId: data.id,
-      redirect: getRedirectParam() ?? undefined,
-    });
-  }, [data, currentUser]);
-
-  if (!data?.authProviders || data?.authProviders?.length === 0) {
-    return null;
-  }
-
   const getProviderIcon = (provider: IAuthProvider) => {
     if (provider.type === SSO_PROVIDER.GOOGLE) {
       return <GoogleIcon size={16} />;

apps/client/src/ee/page-verification/components/page-verification-modal.tsx

@@ -118,20 +118,10 @@ export function PageVerificationBadge({
 
   if (status === "none" && readOnly) return null;
 
-  const tooltipLabel =
-    status === "verified" && verificationInfo?.expiresAt
-      ? t("Verified until {{date}}", {
-          date: new Date(verificationInfo.expiresAt).toLocaleDateString(
-            undefined,
-            { month: "long", day: "numeric", year: "numeric" },
-          ),
-        })
-      : getStatusLabel(status, t);
-
   return (
     <>
       {status !== "none" ? (
-        <Tooltip label={tooltipLabel} withArrow openDelay={250}>
+        <Tooltip label={getStatusLabel(status, t)} withArrow openDelay={250}>
           <Group
             gap={4}
             onClick={open}

apps/client/src/ee/security/components/allow-member-templates.tsx

@@ -34,7 +34,7 @@ function AllowMemberTemplatesToggle() {
   const [checked, setChecked] = useState(
     workspace?.settings?.templates?.allowMemberTemplates === true,
   );
-  const hasTemplates = useHasFeature(Feature.TEMPLATES);
+  const hasSecuritySettings = useHasFeature(Feature.SECURITY_SETTINGS);
   const upgradeLabel = useUpgradeLabel();
 
   const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -54,11 +54,15 @@ function AllowMemberTemplatesToggle() {
   };
 
   return (
-    <Tooltip label={upgradeLabel} disabled={hasTemplates} refProp="rootRef">
+    <Tooltip
+      label={upgradeLabel}
+      disabled={hasSecuritySettings}
+      refProp="rootRef"
+    >
       <Switch
         checked={checked}
         onChange={handleChange}
-        disabled={!hasTemplates}
+        disabled={!hasSecuritySettings}
         aria-label={t("Toggle allow members to create templates")}
       />
     </Tooltip>

apps/client/src/ee/security/pages/security.tsx

@@ -137,6 +137,7 @@ export default function Security() {
                     { max: SCIM_TOKEN_LIMIT },
                   )}
                   disabled={(scimData?.items.length ?? 0) < SCIM_TOKEN_LIMIT}
+                  refProp="rootRef"
                 >
                   <Button
                     onClick={() => setCreateOpen(true)}

apps/client/src/ee/security/sso.utils.ts

@@ -18,21 +18,14 @@ export function buildSsoLoginUrl(opts: {
   providerId: string;
   type: SSO_PROVIDER;
   workspaceId?: string;
-  redirect?: string;
 }): string {
-  const { providerId, type, workspaceId, redirect } = opts;
+  const { providerId, type, workspaceId } = opts;
   const domain = getAppUrl();
 
-  const params = new URLSearchParams();
-  if (redirect) params.set("redirect", redirect);
-
   if (type === SSO_PROVIDER.GOOGLE) {
-    if (workspaceId) params.set("workspaceId", workspaceId);
+    return `${getServerAppUrl()}/api/sso/${type}/login?workspaceId=${workspaceId}`;
-    return `${getServerAppUrl()}/api/sso/${type}/login?${params.toString()}`;
   }
-  const query = params.toString();
+  return `${domain}/api/sso/${type}/${providerId}/login`;
-  const base = `${domain}/api/sso/${type}/${providerId}/login`;
-  return query ? `${base}?${query}` : base;
 }
 
 export function getGoogleSignupUrl(): string {

apps/client/src/ee/template/components/template-card.module.css

@@ -8,11 +8,6 @@
     @mixin hover {
         transform: scale(1.02);
     }
-
-    &:focus-visible {
-        outline: 2px solid var(--mantine-primary-color-filled);
-        outline-offset: 2px;
-    }
 }
 
 .cardBody {
@@ -55,27 +50,18 @@
 .footer {
     display: flex;
     align-items: center;
-    gap: 6px;
+    justify-content: space-between;
+    gap: var(--mantine-spacing-xs);
     padding-top: var(--mantine-spacing-sm);
     margin-top: var(--mantine-spacing-lg);
     border-top: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
 }
 
-.scopeDot {
-    display: inline-block;
-    width: 6px;
-    height: 6px;
-    border-radius: 50%;
-    flex-shrink: 0;
-    background-color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-}
-
 .menuTarget {
     opacity: 0;
     transition: opacity 100ms ease;
 
-    .card:hover &,
+    .card:hover & {
-    .card:focus-within & {
         opacity: 1;
     }
 }

apps/client/src/ee/template/components/template-card.tsx

@@ -1,4 +1,4 @@
-import { Button, Card, Text, ActionIcon, Menu, Group } from "@mantine/core";
+import { Card, Text, ActionIcon, Menu, Group } from "@mantine/core";
 import {
   IconDots,
   IconEdit,
@@ -12,7 +12,6 @@ import classes from "./template-card.module.css";
 type TemplateCardProps = {
   template: ITemplate;
   spaceName?: string;
-  onPreview: (template: ITemplate) => void;
   onUse: (template: ITemplate) => void;
   onEdit?: (template: ITemplate) => void;
   onDelete?: (template: ITemplate) => void;
@@ -22,7 +21,6 @@ type TemplateCardProps = {
 export default function TemplateCard({
   template,
   spaceName,
-  onPreview,
   onUse,
   onEdit,
   onDelete,
@@ -36,17 +34,7 @@ export default function TemplateCard({
       padding="lg"
       className={classes.card}
       style={{ cursor: "pointer" }}
-      role="button"
+      onClick={() => onUse(template)}
-      tabIndex={0}
-      aria-label={t("Preview template: {{title}}", { title: template.title })}
-      onClick={() => onPreview(template)}
-      onKeyDown={(e) => {
-        if (e.target !== e.currentTarget) return;
-        if (e.key === "Enter" || e.key === " ") {
-          e.preventDefault();
-          onPreview(template);
-        }
-      }}
     >
       <div className={classes.cardBody}>
         <Group justify="space-between" align="flex-start" wrap="nowrap" mb="md">
@@ -59,17 +47,6 @@ export default function TemplateCard({
           )}
 
           <Group gap={6} wrap="nowrap">
-            <Button
-              size="compact-xs"
-              variant="filled"
-              className={classes.menuTarget}
-              onClick={(e) => {
-                e.stopPropagation();
-                onUse(template);
-              }}
-            >
-              {t("Use")}
-            </Button>
             {canManage && (
               <Menu width={150} shadow="md" withArrow>
                 <Menu.Target>
@@ -114,7 +91,6 @@ export default function TemplateCard({
         <div className={classes.title}>{template.title}</div>
 
         <div className={classes.footer}>
-          <span className={classes.scopeDot} aria-hidden="true" />
           <Text size="sm" fw={500} c="dimmed">
             {template.spaceId ? (spaceName || t("Space")) : t("Global")}
           </Text>

apps/client/src/ee/template/components/template-picker-modal.module.css

@@ -1,70 +0,0 @@
-.row {
-    position: relative;
-    display: flex;
-    align-items: center;
-    gap: var(--mantine-spacing-sm);
-    padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
-    border-radius: var(--mantine-radius-sm);
-    width: 100%;
-
-    @mixin hover {
-        background-color: light-dark(
-                var(--mantine-color-gray-1),
-                var(--mantine-color-dark-6)
-        );
-    }
-}
-
-.icon {
-    width: 22px;
-    height: 22px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-shrink: 0;
-    font-size: 16px;
-    line-height: 1;
-}
-
-.title {
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: var(--mantine-font-size-sm);
-    text-align: left;
-}
-
-.scope {
-    color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
-    font-size: var(--mantine-font-size-xs);
-    flex-shrink: 0;
-    transition: opacity 100ms ease;
-
-    .row:hover &,
-    .row:focus-within & {
-        opacity: 0;
-    }
-}
-
-.useButton {
-    position: absolute;
-    top: 50%;
-    right: var(--mantine-spacing-sm);
-    transform: translateY(-50%);
-    opacity: 0;
-    transition: opacity 100ms ease;
-
-    .row:hover &,
-    .row:focus-within &,
-    &:focus-visible {
-        opacity: 1;
-    }
-}
-
-.empty {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: var(--mantine-spacing-xl);
-}

apps/client/src/ee/template/components/template-picker-modal.tsx

@@ -1,259 +0,0 @@
-import { useMemo, useState } from "react";
-import {
-  Button,
-  Modal,
-  TextInput,
-  ScrollArea,
-  Loader,
-  Text,
-  UnstyledButton,
-  Group,
-  SegmentedControl,
-} from "@mantine/core";
-import { useDebouncedValue } from "@mantine/hooks";
-import {
-  IconArrowRight,
-  IconSearch,
-  IconFileText,
-} from "@tabler/icons-react";
-import { Link, useNavigate } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-import {
-  useGetTemplatesQuery,
-  useUseTemplateMutation,
-} from "@/ee/template/queries/template-query";
-import { useGetSpacesQuery } from "@/features/space/queries/space-query";
-import { ITemplate } from "@/ee/template/types/template.types";
-import UseTemplateModal from "@/ee/template/components/use-template-modal";
-import TemplatePreviewModal from "@/ee/template/components/template-preview-modal";
-import { buildPageUrl } from "@/features/page/page.utils";
-import classes from "./template-picker-modal.module.css";
-
-type TemplatePickerModalProps = {
-  opened: boolean;
-  onClose: () => void;
-  /** Pre-select this space in the destination picker after a template is chosen. */
-  initialSpaceId?: string;
-};
-
-type ScopeFilter = "current" | "all";
-
-export default function TemplatePickerModal({
-  opened,
-  onClose,
-  initialSpaceId,
-}: TemplatePickerModalProps) {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-  const useTemplateMutation = useUseTemplateMutation();
-  const [query, setQuery] = useState("");
-  const [debouncedQuery] = useDebouncedValue(query, 200);
-  const [scope, setScope] = useState<ScopeFilter>(
-    initialSpaceId ? "current" : "all",
-  );
-  // Two-stage selection: previewing first, then destination-picker.
-  // `previewTemplate` is set when the user clicks a row in the picker.
-  // `destinationTemplate` is set when they click "Use template" in the preview.
-  const [previewTemplate, setPreviewTemplate] = useState<ITemplate | null>(
-    null,
-  );
-  const [destinationTemplate, setDestinationTemplate] =
-    useState<ITemplate | null>(null);
-
-  const { data, isPending } = useGetTemplatesQuery({
-    spaceId: scope === "current" ? initialSpaceId : undefined,
-  });
-  const { data: spacesData } = useGetSpacesQuery({ limit: 100 });
-
-  const spaceNamesById = useMemo(() => {
-    const map = new Map<string, string>();
-    spacesData?.items?.forEach((s) => map.set(s.id, s.name));
-    return map;
-  }, [spacesData]);
-
-  const filtered = useMemo(() => {
-    const all = data?.pages.flatMap((p) => p.items) ?? [];
-    const term = debouncedQuery.trim().toLowerCase();
-    if (!term) return all;
-    return all.filter((tpl) => tpl.title.toLowerCase().includes(term));
-  }, [data, debouncedQuery]);
-
-  const createInInitialSpace = async (tpl: ITemplate) => {
-    if (!initialSpaceId) return;
-    try {
-      const page = await useTemplateMutation.mutateAsync({
-        templateId: tpl.id,
-        spaceId: initialSpaceId,
-      });
-      setPreviewTemplate(null);
-      onClose();
-      const space = spacesData?.items?.find((s) => s.id === initialSpaceId);
-      if (page?.slugId && space?.slug) {
-        navigate(buildPageUrl(space.slug, page.slugId, page.title));
-      }
-    } catch {
-      // error notification handled by mutation's onError
-    }
-  };
-
-  const handlePick = (tpl: ITemplate) => {
-    setPreviewTemplate(tpl);
-  };
-
-  const handleQuickUse = (tpl: ITemplate) => {
-    if (initialSpaceId) {
-      createInInitialSpace(tpl);
-      return;
-    }
-    setDestinationTemplate(tpl);
-  };
-
-  const handlePreviewClose = () => {
-    // Closing preview returns to the picker list (no full unmount).
-    setPreviewTemplate(null);
-  };
-
-  const handlePreviewUse = () => {
-    if (initialSpaceId && previewTemplate) {
-      createInInitialSpace(previewTemplate);
-      return;
-    }
-    // Move from preview into destination-picker stage.
-    setDestinationTemplate(previewTemplate);
-    setPreviewTemplate(null);
-  };
-
-  const handleDestinationClose = () => {
-    setDestinationTemplate(null);
-    onClose();
-  };
-
-  const handleClose = () => {
-    setQuery("");
-    setScope(initialSpaceId ? "current" : "all");
-    setPreviewTemplate(null);
-    setDestinationTemplate(null);
-    onClose();
-  };
-
-  return (
-    <>
-      <Modal
-        opened={opened && !previewTemplate && !destinationTemplate}
-        onClose={handleClose}
-        size={550}
-        padding="lg"
-        yOffset="10vh"
-        title={<Text fw={500}>{t("Use a template")}</Text>}
-      >
-        <TextInput
-          leftSection={<IconSearch size={16} />}
-          placeholder={t("Search templates...")}
-          variant="filled"
-          value={query}
-          onChange={(e) => setQuery(e.currentTarget.value)}
-          mb="xs"
-          autoFocus
-        />
-
-        {initialSpaceId && (
-          <SegmentedControl
-            fullWidth
-            size="xs"
-            mb="sm"
-            value={scope}
-            onChange={(v) => setScope(v as ScopeFilter)}
-            data={[
-              { label: t("This space"), value: "current" },
-              { label: t("All templates"), value: "all" },
-            ]}
-          />
-        )}
-
-        <ScrollArea h="50vh" offsetScrollbars>
-          {isPending ? (
-            <div className={classes.empty}>
-              <Loader size="xs" />
-            </div>
-          ) : filtered.length === 0 ? (
-            <div className={classes.empty}>
-              <Text size="sm" c="dimmed">
-                {t("No templates found")}
-              </Text>
-            </div>
-          ) : (
-            filtered.map((tpl) => (
-              <UnstyledButton
-                key={tpl.id}
-                className={classes.row}
-                onClick={() => handlePick(tpl)}
-              >
-                <div className={classes.icon}>
-                  {tpl.icon ? (
-                    <span>{tpl.icon}</span>
-                  ) : (
-                    <IconFileText
-                      size={16}
-                      color="var(--mantine-color-gray-6)"
-                    />
-                  )}
-                </div>
-                <div className={classes.title}>{tpl.title}</div>
-                <div className={classes.scope}>
-                  {tpl.spaceId
-                    ? spaceNamesById.get(tpl.spaceId) ?? t("Space")
-                    : t("Global")}
-                </div>
-                <Button
-                  size="compact-xs"
-                  variant="filled"
-                  className={classes.useButton}
-                  loading={useTemplateMutation.isPending}
-                  disabled={useTemplateMutation.isPending}
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    handleQuickUse(tpl);
-                  }}
-                >
-                  {t("Use")}
-                </Button>
-              </UnstyledButton>
-            ))
-          )}
-        </ScrollArea>
-
-        <Group justify="flex-end" mt="md">
-          <Button
-            component={Link}
-            to="/templates"
-            variant="subtle"
-            size="sm"
-            rightSection={<IconArrowRight size={16} />}
-            onClick={handleClose}
-          >
-            {t("Browse all templates")}
-          </Button>
-        </Group>
-      </Modal>
-
-      {previewTemplate && (
-        <TemplatePreviewModal
-          templateId={previewTemplate.id}
-          opened={true}
-          onClose={handlePreviewClose}
-          onUse={handlePreviewUse}
-          useLoading={useTemplateMutation.isPending}
-        />
-      )}
-
-      {destinationTemplate && (
-        <UseTemplateModal
-          template={destinationTemplate}
-          opened={true}
-          onClose={handleDestinationClose}
-          initialSpaceId={initialSpaceId}
-        />
-      )}
-    </>
-  );
-}

apps/client/src/ee/template/components/template-preview-modal.tsx

@@ -9,7 +9,6 @@ type TemplatePreviewModalProps = {
   onClose: () => void;
   onUse: () => void;
   onEdit?: () => void;
-  useLoading?: boolean;
 };
 
 export default function TemplatePreviewModal({
@@ -18,7 +17,6 @@ export default function TemplatePreviewModal({
   onClose,
   onUse,
   onEdit,
-  useLoading,
 }: TemplatePreviewModalProps) {
   const { t } = useTranslation();
   const { data: template, isLoading } = useGetTemplateByIdQuery(templateId);
@@ -39,19 +37,14 @@ export default function TemplatePreviewModal({
             </Group>
           </Modal.Title>
           <Group gap="sm">
-            <Button
-              size="xs"
-              onClick={onUse}
-              loading={useLoading}
-              disabled={useLoading}
-            >
-              {t("Use template")}
-            </Button>
             {onEdit && (
               <Button size="xs" variant="default" onClick={onEdit}>
                 {t("Edit")}
               </Button>
             )}
+            <Button size="xs" onClick={onUse}>
+              {t("Use template")}
+            </Button>
             <Modal.CloseButton />
           </Group>
         </Modal.Header>

apps/client/src/ee/template/components/use-template-modal.tsx

@@ -10,14 +10,12 @@ type UseTemplateModalProps = {
   template: ITemplate;
   opened: boolean;
   onClose: () => void;
-  initialSpaceId?: string;
 };
 
 export default function UseTemplateModal({
   template,
   opened,
   onClose,
-  initialSpaceId,
 }: UseTemplateModalProps) {
   const { t } = useTranslation();
   const navigate = useNavigate();
@@ -56,8 +54,6 @@ export default function UseTemplateModal({
       actionLabel={t("Create page")}
       onSelect={handleSelect}
       loading={useTemplateMutation.isPending}
-      initialSpaceId={initialSpaceId ?? template.spaceId}
-      searchSpacesOnly
     />
   );
 }

apps/client/src/ee/template/pages/template-editor.tsx

@@ -75,18 +75,6 @@ export default function TemplateEditor() {
   const editor = useEditor({
     extensions: templateExtensions,
     content: "",
-    editorProps: {
-      handleDOMEvents: {
-        keydown: (_view, event) => {
-          if (["ArrowUp", "ArrowDown", "Enter"].includes(event.key)) {
-            const slashCommand = document.querySelector("#slash-command");
-            if (slashCommand) {
-              return true;
-            }
-          }
-        },
-      },
-    },
     onUpdate() {
       if (loadedRef.current) {
         markDirty();

apps/client/src/ee/template/pages/template-list.tsx

@@ -160,8 +160,7 @@ export default function TemplateList() {
                       ? spaceNameMap.get(template.spaceId)
                       : undefined
                   }
-                  onPreview={handlePreview}
+                  onUse={handlePreview}
-                  onUse={handleUse}
                   onEdit={handleEdit}
                   onDelete={handleDelete}
                   canManage={isWorkspaceAdmin}

apps/client/src/ee/template/queries/template-query.ts

@@ -6,7 +6,6 @@ import {
   UseQueryResult,
   InfiniteData,
 } from "@tanstack/react-query";
-import { useAtom, useStore } from "jotai";
 import {
   getTemplates,
   getTemplateById,
@@ -19,12 +18,6 @@ import { ITemplate } from "@/ee/template/types/template.types";
 import { IPagination } from "@/lib/types.ts";
 import { notifications } from "@mantine/notifications";
 import { useTranslation } from "react-i18next";
-import { invalidateOnCreatePage } from "@/features/page/queries/page-query.ts";
-import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
-import { treeModel } from "@/features/page/tree/model/tree-model";
-import { SpaceTreeNode } from "@/features/page/tree/types.ts";
-import { IPage } from "@/features/page/types/page.types.ts";
-import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
 
 export function useGetTemplatesQuery(params?: { spaceId?: string }) {
   const { spaceId } = params ?? {};
@@ -156,64 +149,13 @@ export function useDeleteTemplateMutation() {
 
 export function useUseTemplateMutation() {
   const { t } = useTranslation();
-  const [, setTreeData] = useAtom(treeDataAtom);
-  const store = useStore();
-  const emit = useQueryEmit();
 
-  return useMutation<
+  return useMutation({
-    IPage,
+    mutationFn: (data: {
-    Error,
+      templateId: string;
-    { templateId: string; spaceId: string; parentPageId?: string }
+      spaceId: string;
-  >({
+      parentPageId?: string;
-    mutationFn: (data) => useTemplate(data),
+    }) => useTemplate(data),
-    onSuccess: (page) => {
-      // React Query sidebar-pages cache update (same path useCreatePageMutation takes).
-      invalidateOnCreatePage(page);
-
-      const parentId = page.parentPageId ?? null;
-      const newNode: SpaceTreeNode = {
-        id: page.id,
-        slugId: page.slugId,
-        name: page.title,
-        icon: page.icon,
-        position: page.position,
-        spaceId: page.spaceId,
-        parentPageId: page.parentPageId,
-        hasChildren: false,
-        children: [],
-      };
-
-      // Only mutate the tree atom and broadcast if it currently represents
-      // this space. Cross-space template-use (e.g., from the gallery picking
-      // a different space) lets the target space's clients pick up the new
-      // page on their next React Query refetch (focus, navigation, etc.).
-      // Without this guard we'd both pollute the local tree and send a wrong
-      // `index` to remote clients in the target space.
-      const current = store.get(treeDataAtom);
-      const treeIsForThisSpace = current[0]?.spaceId === page.spaceId;
-      if (!treeIsForThisSpace) return;
-
-      const lastIndex =
-        parentId === null
-          ? current.length
-          : (treeModel.find(current, parentId)?.children?.length ?? 0);
-
-      setTreeData((prev) =>
-        treeModel.insert(prev, parentId, newNode, lastIndex),
-      );
-
-      setTimeout(() => {
-        emit({
-          operation: "addTreeNode",
-          spaceId: page.spaceId,
-          payload: {
-            parentId,
-            index: lastIndex,
-            data: newNode,
-          },
-        });
-      }, 50);
-    },
     onError: (error) => {
       const errorMessage = error["response"]?.data?.message;
       notifications.show({

apps/client/src/ee/template/services/template-service.ts

@@ -1,6 +1,5 @@
 import api from "@/lib/api-client";
 import { ITemplate } from "@/ee/template/types/template.types";
-import { IPage } from "@/features/page/types/page.types";
 import { IPagination } from "@/lib/types.ts";
 
 export async function getTemplates(params?: {
@@ -41,7 +40,7 @@ export async function useTemplate(data: {
   templateId: string;
   spaceId: string;
   parentPageId?: string;
-}): Promise<IPage> {
+}): Promise<any> {
-  const req = await api.post<IPage>("/templates/use", data);
+  const req = await api.post("/templates/use", data);
   return req.data;
 }

apps/client/src/features/auth/hooks/use-auth.ts

@@ -166,7 +166,7 @@ export default function useAuth() {
   const handleLogout = async () => {
     setCurrentUser(RESET);
     await logout();
-    window.location.replace(`${APP_ROUTE.AUTH.LOGIN}?logout=1`);
+    window.location.replace(APP_ROUTE.AUTH.LOGIN);
   };
 
   const handleForgotPassword = async (data: IForgotPassword) => {

apps/client/src/features/editor/atoms/editor-atoms.ts

@@ -1,6 +1,5 @@
 import { atom } from "jotai";
 import { Editor } from "@tiptap/core";
-import { PageEditMode } from "@/features/user/types/user.types.ts";
 
 export const pageEditorAtom = atom<Editor | null>(null);
 
@@ -13,7 +12,3 @@ export const yjsConnectionStatusAtom = atom<string>("");
 export const showAiMenuAtom = atom(false);
 
 export const showLinkMenuAtom = atom(false);
-
-// Current page's edit mode — initialized from the user's saved preference on
-// first load, can be toggled locally without persisting to the server.
-export const currentPageEditModeAtom = atom<PageEditMode>(PageEditMode.Edit);

apps/client/src/features/editor/components/audio/audio-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -47,7 +46,7 @@ export function AudioMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "audio";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/bubble-menu/bubble-menu.module.css

@@ -28,18 +28,6 @@
   }
 }
 
-.colorSwatch:focus-visible {
-  outline: none;
-  box-shadow: 0 0 0 2px var(--mantine-color-blue-6);
-  position: relative;
-  z-index: 1;
-}
-
-.removeColor:focus-visible {
-  outline: none;
-  box-shadow: inset 0 0 0 2px var(--mantine-color-blue-6);
-}
-
 .buttonRoot {
   height: 34px;
   padding-left: rem(8);

apps/client/src/features/editor/components/bubble-menu/bubble-menu.tsx

@@ -27,7 +27,7 @@ import { isCellSelection, isTextSelected } from "@docmost/editor-ext";
 import { LinkSelector } from "@/features/editor/components/bubble-menu/link-selector.tsx";
 import { useTranslation } from "react-i18next";
 import { showAiMenuAtom, showLinkMenuAtom } from "@/features/editor/atoms/editor-atoms";
-import { userAtom, workspaceAtom } from "@/features/user/atoms/current-user-atom";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom";
 
 export interface BubbleMenuItem {
   name: string;
@@ -46,9 +46,6 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
   const [showCommentPopup, setShowCommentPopup] = useAtom(showCommentPopupAtom);
   const workspace = useAtomValue(workspaceAtom);
   const isGenerativeAiEnabled = workspace?.settings?.ai?.generative === true;
-  const user = useAtomValue(userAtom);
-  const editorToolbarEnabled =
-    user?.settings?.preferences?.editorToolbar ?? false;
   const [, setDraftCommentId] = useAtom(draftCommentIdAtom);
   const showCommentPopupRef = useRef(showCommentPopup);
   const showAiMenuRef = useRef(showAiMenu);
@@ -152,7 +149,7 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
       return isTextSelected(editor);
     },
     options: {
-      placement: editorToolbarEnabled ? "bottom" : "top",
+      placement: "top",
       offset: 8,
       onHide: () => {
         setIsNodeSelectorOpen(false);
@@ -191,60 +188,56 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
             <div className={classes.divider} />
           </>
         )}
-        {!editorToolbarEnabled && (
+        <NodeSelector
-          <>
+          editor={props.editor}
-            <NodeSelector
+          isOpen={isNodeSelectorOpen}
-              editor={props.editor}
+          setIsOpen={() => {
-              isOpen={isNodeSelectorOpen}
+            setIsNodeSelectorOpen(!isNodeSelectorOpen);
-              setIsOpen={() => {
+            setIsTextAlignmentOpen(false);
-                setIsNodeSelectorOpen(!isNodeSelectorOpen);
+            setIsColorSelectorOpen(false);
-                setIsTextAlignmentOpen(false);
+          }}
-                setIsColorSelectorOpen(false);
+        />
-              }}
-            />
 
-            <TextAlignmentSelector
+        <TextAlignmentSelector
-              editor={props.editor}
+          editor={props.editor}
-              isOpen={isTextAlignmentSelectorOpen}
+          isOpen={isTextAlignmentSelectorOpen}
-              setIsOpen={() => {
+          setIsOpen={() => {
-                setIsTextAlignmentOpen(!isTextAlignmentSelectorOpen);
+            setIsTextAlignmentOpen(!isTextAlignmentSelectorOpen);
-                setIsNodeSelectorOpen(false);
+            setIsNodeSelectorOpen(false);
-                setIsColorSelectorOpen(false);
+            setIsColorSelectorOpen(false);
-              }}
+          }}
-            />
+        />
 
-            <ActionIcon.Group>
+        <ActionIcon.Group>
-              {items.map((item, index) => (
+          {items.map((item, index) => (
-                <Tooltip key={index} label={t(item.name)} withArrow>
+            <Tooltip key={index} label={t(item.name)} withArrow>
-                  <ActionIcon
+              <ActionIcon
-                    key={index}
+                key={index}
-                    variant="default"
+                variant="default"
-                    size="lg"
+                size="lg"
-                    radius="0"
+                radius="0"
-                    aria-label={t(item.name)}
+                aria-label={t(item.name)}
-                    className={clsx({ [classes.active]: item.isActive() })}
+                className={clsx({ [classes.active]: item.isActive() })}
-                    style={{ border: "none" }}
+                style={{ border: "none" }}
-                    onClick={item.command}
+                onClick={item.command}
-                  >
+              >
-                    <item.icon style={{ width: rem(16) }} stroke={2} />
+                <item.icon style={{ width: rem(16) }} stroke={2} />
-                  </ActionIcon>
+              </ActionIcon>
-                </Tooltip>
+            </Tooltip>
-              ))}
+          ))}
-            </ActionIcon.Group>
+        </ActionIcon.Group>
 
-            <LinkSelector />
+        <LinkSelector />
 
-            <ColorSelector
+        <ColorSelector
-              editor={props.editor}
+          editor={props.editor}
-              isOpen={isColorSelectorOpen}
+          isOpen={isColorSelectorOpen}
-              setIsOpen={() => {
+          setIsOpen={() => {
-                setIsColorSelectorOpen(!isColorSelectorOpen);
+            setIsColorSelectorOpen(!isColorSelectorOpen);
-                setIsNodeSelectorOpen(false);
+            setIsNodeSelectorOpen(false);
-                setIsTextAlignmentOpen(false);
+            setIsTextAlignmentOpen(false);
-              }}
+          }}
-            />
+        />
-          </>
-        )}
 
         <Tooltip label={t(commentItem.name)} withArrow withinPortal={false}>
           <ActionIcon

apps/client/src/features/editor/components/bubble-menu/color-selector.tsx

@@ -4,6 +4,7 @@ import {
   Button,
   Popover,
   rem,
+  ScrollArea,
   Text,
   Tooltip,
   SimpleGrid,
@@ -113,63 +114,6 @@ const HIGHLIGHT_COLORS: BubbleColorMenuItem[] = [
   },
 ];
 
-const COLOR_GRID_COLS = 5;
-
-function focusSwatch(grid: "text" | "highlight", index: number) {
-  const el = document.querySelector<HTMLElement>(
-    `[data-color-grid="${grid}"][data-color-index="${index}"]`,
-  );
-  el?.focus();
-}
-
-function handleColorKeyNav(
-  e: React.KeyboardEvent<HTMLDivElement>,
-  index: number,
-  grid: "text" | "highlight",
-) {
-  const cols = COLOR_GRID_COLS;
-  const total =
-    grid === "text" ? TEXT_COLORS.length : HIGHLIGHT_COLORS.length;
-  const col = index % cols;
-
-  if (e.key === "ArrowRight") {
-    e.preventDefault();
-    if (index < total - 1) focusSwatch(grid, index + 1);
-    return;
-  }
-  if (e.key === "ArrowLeft") {
-    e.preventDefault();
-    if (index > 0) focusSwatch(grid, index - 1);
-    return;
-  }
-  if (e.key === "ArrowDown") {
-    e.preventDefault();
-    const next = index + cols;
-    if (next < total) {
-      focusSwatch(grid, next);
-    } else if (grid === "text") {
-      focusSwatch("highlight", Math.min(col, HIGHLIGHT_COLORS.length - 1));
-    } else if (grid === "highlight") {
-      document
-        .querySelector<HTMLElement>('[data-color-grid="remove"]')
-        ?.focus();
-    }
-    return;
-  }
-  if (e.key === "ArrowUp") {
-    e.preventDefault();
-    const prev = index - cols;
-    if (prev >= 0) {
-      focusSwatch(grid, prev);
-    } else if (grid === "highlight") {
-      const lastRowStart =
-        Math.floor((TEXT_COLORS.length - 1) / cols) * cols;
-      focusSwatch("text", Math.min(lastRowStart + col, TEXT_COLORS.length - 1));
-    }
-    return;
-  }
-}
-
 export const ColorSelector: FC<ColorSelectorProps> = ({
   editor,
   isOpen,
@@ -213,20 +157,13 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
   );
 
   return (
-    <Popover
+    <Popover width={220} opened={isOpen} withArrow>
-      width={220}
-      opened={isOpen}
-      onChange={setIsOpen}
-      trapFocus
-      withArrow
-    >
       <Popover.Target>
         <Tooltip label={t("Text color")} withArrow>
           <Button
             variant="default"
             radius="0"
             rightSection={<IconChevronDown size={16} />}
-            onMouseDown={(e) => e.preventDefault()}
             onClick={() => setIsOpen(!isOpen)}
             data-text-color={activeColorItem?.color || ""}
             data-highlight-color={activeHighlightItem?.color || ""}
@@ -244,8 +181,9 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
         </Tooltip>
       </Popover.Target>
 
-      <Popover.Dropdown onMouseDown={(e) => e.preventDefault()}>
+      <Popover.Dropdown>
-        <Stack gap="md" p="2px">
+        <ScrollArea.Autosize type="scroll" mah="400">
+          <Stack gap="md">
             <Box>
               <Text size="sm" fw={600} mb="xs">
                 {t("Text color")}
@@ -269,10 +207,6 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                     <Box
                       role="button"
                       tabIndex={0}
-                      data-autofocus={index === 0 ? true : undefined}
-                      data-color-grid="text"
-                      data-color-index={index}
-                      className={classes.colorSwatch}
                       aria-label={t(name)}
                       aria-pressed={!!editorState[`text_${color}`]}
                       onClick={applyTextColor}
@@ -280,9 +214,7 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                         if (e.key === "Enter" || e.key === " ") {
                           e.preventDefault();
                           applyTextColor();
-                          return;
                         }
-                        handleColorKeyNav(e, index, "text");
                       }}
                       style={{
                         width: rem(28),
@@ -335,9 +267,6 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                     <Box
                       role="button"
                       tabIndex={0}
-                      data-color-grid="highlight"
-                      data-color-index={index}
-                      className={classes.colorSwatch}
                       aria-label={t(name)}
                       aria-pressed={!!editorState[`highlight_${color}`]}
                       onClick={applyHighlight}
@@ -345,9 +274,7 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
                         if (e.key === "Enter" || e.key === " ") {
                           e.preventDefault();
                           applyHighlight();
-                          return;
                         }
-                        handleColorKeyNav(e, index, "highlight");
                       }}
                       style={{
                         width: rem(28),
@@ -383,27 +310,16 @@ export const ColorSelector: FC<ColorSelectorProps> = ({
             <Button
               variant="default"
               fullWidth
-              data-color-grid="remove"
-              className={classes.removeColor}
               onClick={() => {
                 editor.commands.unsetColor();
                 editor.commands.unsetHighlight();
                 setIsOpen(false);
               }}
-              onKeyDown={(e) => {
-                if (e.key === "ArrowUp") {
-                  e.preventDefault();
-                  const lastRowStart =
-                    Math.floor(
-                      (HIGHLIGHT_COLORS.length - 1) / COLOR_GRID_COLS,
-                    ) * COLOR_GRID_COLS;
-                  focusSwatch("highlight", lastRowStart);
-                }
-              }}
             >
               {t("Remove color")}
             </Button>
           </Stack>
+        </ScrollArea.Autosize>
       </Popover.Dropdown>
     </Popover>
   );

apps/client/src/features/editor/components/bubble-menu/node-selector.tsx

@@ -12,7 +12,6 @@ import {
   IconInfoCircle,
   IconList,
   IconListNumbers,
-  IconQuote,
   IconTypography,
 } from "@tabler/icons-react";
 import { Popover, Button, ScrollArea, Tooltip } from "@mantine/core";
@@ -60,7 +59,6 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
         isCodeBlock: ctx.editor.isActive("codeBlock"),
         isCallout: ctx.editor.isActive("callout"),
         isDetails: ctx.editor.isActive("details"),
-        isTransclusionSource: ctx.editor.isActive("transclusionSource"),
       };
     },
   });
@@ -124,12 +122,6 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
           .run(),
       isActive: () => editorState?.isBlockquote,
     },
-    {
-      name: "Synced block",
-      icon: IconQuote,
-      command: () => editor.chain().focus().toggleTransclusionSource().run(),
-      isActive: () => editorState?.isTransclusionSource,
-    },
     {
       name: "Code",
       icon: IconCode,
@@ -155,14 +147,9 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
   };
 
   return (
-    <Popover opened={isOpen} onChange={setIsOpen} withArrow>
+    <Popover opened={isOpen} withArrow>
       <Popover.Target>
-        <Tooltip
+        <Tooltip label={t("Turn into")} withArrow withinPortal={false} disabled={isOpen}>
-          label={t("Turn into")}
-          withArrow
-          withinPortal={false}
-          disabled={isOpen}
-        >
           <Button
             className={classes.buttonRoot}
             variant="default"

apps/client/src/features/editor/components/bubble-menu/text-alignment-selector.tsx

@@ -7,7 +7,7 @@ import {
   IconCheck,
   IconChevronDown,
 } from "@tabler/icons-react";
-import { Menu, Button, Tooltip, rem } from "@mantine/core";
+import { Popover, Button, ScrollArea, Tooltip, rem } from "@mantine/core";
 import type { Editor } from "@tiptap/react";
 import { useEditorState } from "@tiptap/react";
 import { useTranslation } from "react-i18next";
@@ -82,22 +82,15 @@ export const TextAlignmentSelector: FC<TextAlignmentProps> = ({
   const activeItem = items.filter((item) => item.isActive()).pop() ?? items[0];
 
   return (
-    <Menu
+    <Popover opened={isOpen} withArrow>
-      shadow="md"
+      <Popover.Target>
-      position="bottom-start"
+        <Tooltip label={t("Text align")} withArrow withinPortal={false} disabled={isOpen}>
-      withArrow={false}
-      opened={isOpen}
-      onChange={setIsOpen}
-    >
-      <Menu.Target>
-        <Tooltip label={t("Text align")} withArrow disabled={isOpen}>
           <Button
             variant="default"
             style={{ border: "none", height: "34px" }}
             px="5"
             radius="0"
             rightSection={<IconChevronDown size={16} />}
-            onMouseDown={(e) => e.preventDefault()}
             onClick={() => setIsOpen(!isOpen)}
             aria-label={t("Text align")}
             aria-haspopup="menu"
@@ -106,25 +99,33 @@ export const TextAlignmentSelector: FC<TextAlignmentProps> = ({
             <activeItem.icon style={{ width: rem(16) }} stroke={2} />
           </Button>
         </Tooltip>
-      </Menu.Target>
+      </Popover.Target>
 
-      <Menu.Dropdown>
+      <Popover.Dropdown>
-        {items.map((item, index) => (
+        <ScrollArea.Autosize type="scroll" mah={400}>
-          <Menu.Item
+          <Button.Group orientation="vertical">
-            key={index}
+            {items.map((item, index) => (
-            leftSection={<item.icon size={16} />}
+              <Button
-            rightSection={
+                key={index}
-              activeItem.name === item.name ? <IconCheck size={16} /> : null
+                variant="default"
-            }
+                leftSection={<item.icon size={16} />}
-            onClick={() => {
+                rightSection={
-              item.command();
+                  activeItem.name === item.name && <IconCheck size={16} />
-              setIsOpen(false);
+                }
-            }}
+                justify="left"
-          >
+                fullWidth
-            {t(item.name)}
+                onClick={() => {
-          </Menu.Item>
+                  item.command();
-        ))}
+                  setIsOpen(false);
-      </Menu.Dropdown>
+                }}
-    </Menu>
+                style={{ border: "none" }}
+              >
+                {t(item.name)}
+              </Button>
+            ))}
+          </Button.Group>
+        </ScrollArea.Autosize>
+      </Popover.Dropdown>
+    </Popover>
   );
 };

apps/client/src/features/editor/components/callout/callout-menu.tsx

@@ -16,7 +16,7 @@ import {
   IconMoodSmile,
   IconNotes,
 } from "@tabler/icons-react";
-import { CalloutType, isEditorReady, isTextSelected } from "@docmost/editor-ext";
+import { CalloutType, isTextSelected } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
 import EmojiPicker from "@/components/ui/emoji-picker.tsx";
 import classes from "../common/toolbar-menu.module.css";
@@ -55,7 +55,7 @@ export function CalloutMenu({ editor }: EditorMenuProps) {
   });
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "callout";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/columns/columns-menu.tsx

@@ -19,7 +19,7 @@ import {
   IconCopy,
   IconTrash,
 } from "@tabler/icons-react";
-import { isEditorReady, isTextSelected } from "@docmost/editor-ext";
+import { isTextSelected } from "@docmost/editor-ext";
 import type { WidthMode, ColumnsLayout } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
 import classes from "../common/toolbar-menu.module.css";
@@ -82,7 +82,7 @@ export function ColumnsMenu({ editor }: EditorMenuProps) {
 
   const shouldShow = useCallback(
     ({ state }: ShouldShowProps) => {
-      if (!state || !isEditorReady(editor)) return false;
+      if (!state) return false;
       if (!editor.isActive("columns")) return false;
       if (isTextSelected(editor)) return false;
       if (nodesWithMenus.some((name) => editor.isActive(name))) return false;
@@ -121,7 +121,7 @@ export function ColumnsMenu({ editor }: EditorMenuProps) {
   });
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "columns";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/drawio/drawio-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -82,7 +81,7 @@ export function DrawioMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "drawio";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/emoji-menu/emoji-items.ts

@@ -1,26 +1,30 @@
 import { CommandProps, EmojiMenuItemType } from "./types";
-import { buildEmojiIndex, getFrequentlyUsedEmoji, sortFrequentlyUsedEmoji } from "./utils";
+import { SearchIndex } from "emoji-mart";
+import { getFrequentlyUsedEmoji, sortFrequentlyUsedEmoji } from "./utils";
 
-const MAX_RESULTS = 5;
+const searchEmoji = async (value: string): Promise<EmojiMenuItemType[]> => {
-
+  if (value === "") {
-const searchEmoji = async (query: string): Promise<EmojiMenuItemType[]> => {
+    const frequentlyUsedEmoji = getFrequentlyUsedEmoji();
-  if (query === "") {
+    return sortFrequentlyUsedEmoji(frequentlyUsedEmoji);
-    return sortFrequentlyUsedEmoji(getFrequentlyUsedEmoji());
   }
 
-  const q = query.toLowerCase();
+  const emojis = await SearchIndex.search(value);
-  const index = await buildEmojiIndex();
+  const results = emojis.map((emoji: any) => {
-
+    return {
-  return index
+      id: emoji.id,
-    .filter((e) => e.name.includes(q) || e.id.includes(q))
+      emoji: emoji.skins[0].native,
-    .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();
+        editor
+          .chain()
+          .focus()
+          .deleteRange(range)
+          .insertContent(emoji.skins[0].native + " ")
+          .run();
       },
-    }));
+    };
+  });
+
+  return results;
 };
 
 export const getEmojiItems = async ({

apps/client/src/features/editor/components/emoji-menu/emoji-list.tsx

@@ -1,208 +1,154 @@
-import { Loader, Paper, ScrollArea, Text, UnstyledButton } from "@mantine/core";
-import clsx from "clsx";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { EmojiMenuItemType } from "./types";
 import {
-  EmojiCategory,
+  ActionIcon,
-  EmojiIndexEntry,
+  Loader,
-  getEmojiCategories,
+  Paper,
-  incrementEmojiUsage,
+  ScrollArea,
-} from "./utils";
+  SimpleGrid,
+  Text,
+} from "@mantine/core";
+import { EmojiMenuItemType } from "./types";
+import clsx from "clsx";
 import classes from "./emoji-menu.module.css";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { GRID_COLUMNS, incrementEmojiUsage } from "./utils";
 
-const COLS = 8;
+const EmojiList = ({
-
-const CAT_ICONS: Record<string, string> = {
-  people:   "😀",
-  nature:   "🌿",
-  foods:    "🍕",
-  activity: "🎮",
-  places:   "🗺️",
-  objects:  "🔧",
-  symbols:  "💯",
-  flags:    "🚩",
-};
-
-function EmojiList({
   items,
   isLoading,
   command,
   editor,
   range,
-  query = "",
 }: {
   items: EmojiMenuItemType[];
   isLoading: boolean;
-  command: (item: EmojiMenuItemType) => void;
+  command: any;
   editor: any;
   range: any;
-  query?: string;
+}) => {
-}) {
+  const [selectedIndex, setSelectedIndex] = useState(0);
-  const { t } = useTranslation();
+  const viewportRef = useRef<HTMLDivElement>(null);
-  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 searching = query.length > 0;
+  const selectItem = useCallback(
-  const browseLoading = !searching && cats.length === 0;
+    (index: number) => {
-  const gridItems = cats.find((c) => c.id === activeCat)?.emojis ?? [];
+      const item = items[index];
-
+      if (item) {
-  useEffect(() => {
+        command(item);
-    getEmojiCategories().then((data) => {
+        incrementEmojiUsage(item.id);
-      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],
-  );
-
-  const pickGridItem = useCallback(
-    (entry: EmojiIndexEntry) => {
-      editor.chain().focus().deleteRange(range).insertContent(entry.native + " ").run();
-      incrementEmojiUsage(entry.id);
-    },
-    [editor, range],
-  );
-
-  useEffect(() => {
-    function onKey(e: KeyboardEvent) {
-      if (searching) {
-        if      (e.key === "ArrowDown") { e.preventDefault(); setIdx((i) => Math.min(i + 1, items.length - 1)); }
-        else if (e.key === "ArrowUp")   { e.preventDefault(); setIdx((i) => Math.max(i - 1, 0)); }
-        else if (e.key === "Enter")     { e.preventDefault(); pickSearchItem(idx); }
-      } else if (focusZone === "tabs") {
-        const catIdx = cats.findIndex((c) => c.id === activeCat);
-        if      (e.key === "ArrowRight") { e.preventDefault(); const next = cats[Math.min(catIdx + 1, cats.length - 1)]; if (next) setActiveCat(next.id); }
-        else if (e.key === "ArrowLeft")  { e.preventDefault(); const prev = cats[Math.max(catIdx - 1, 0)]; if (prev) setActiveCat(prev.id); }
-        else if (e.key === "ArrowDown" || e.key === "Enter") { e.preventDefault(); setFocusZone("grid"); }
-        else if (e.key === "ArrowUp")    { e.preventDefault(); }
-      } else {
-        const total = gridItems.length;
-        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)); }
-        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]); }
       }
-    }
+    },
-    document.addEventListener("keydown", onKey);
+    [command, items]
-    return () => document.removeEventListener("keydown", onKey);
+  );
-  }, [searching, items, idx, gridItems, pickSearchItem, pickGridItem, focusZone, cats, activeCat]);
 
-  return (
+  useEffect(() => {
+    const navigationKeys = [
+      "ArrowRight",
+      "ArrowLeft",
+      "ArrowUp",
+      "ArrowDown",
+      "Enter",
+    ];
+    const onKeyDown = (e: KeyboardEvent) => {
+      if (navigationKeys.includes(e.key)) {
+        e.preventDefault();
+
+        if (e.key === "ArrowRight") {
+          setSelectedIndex(
+            selectedIndex + 1 < items.length ? selectedIndex + 1 : selectedIndex
+          );
+          return true;
+        }
+
+        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);
+    return () => {
+      document.removeEventListener("keydown", onKeyDown);
+    };
+  }, [items, selectedIndex, setSelectedIndex]);
+
+  useEffect(() => {
+    setSelectedIndex(0);
+  }, [items]);
+
+  useEffect(() => {
+    viewportRef.current
+      ?.querySelector(`[data-item-index="${selectedIndex}"]`)
+      ?.scrollIntoView({ block: "nearest" });
+  }, [selectedIndex]);
+
+  return items.length > 0 || isLoading ? (
     <Paper
       id="emoji-command"
-      p={0}
+      p="0"
       shadow="md"
       withBorder
-      style={{ width: 280 }}
       role="listbox"
-      aria-label={t("Emoji picker")}
+      aria-label="Emoji results"
+      aria-activedescendant={
+        items.length > 0 ? `emoji-command-option-${selectedIndex}` : undefined
+      }
     >
-      {searching ? (
+      {isLoading && <Loader m="xs" color="blue" type="dots" />}
-        <>
+      {items.length > 0 && (
-          {isLoading && <Loader m="xs" size="xs" color="blue" type="dots" />}
+        <ScrollArea.Autosize
-          <ScrollArea.Autosize mah={260} scrollbarSize={6} viewportRef={listViewport}>
+          viewportRef={viewportRef}
-            <div style={{ padding: 4 }}>
+          mah={250}
-              {items.length === 0 && !isLoading ? (
+          scrollbarSize={8}
-                <Text size="sm" c="dimmed" p="xs">{t("No results")}</Text>
+          pr="5"
-              ) : items.map((item, i) => (
+        >
-                <UnstyledButton
+          <SimpleGrid cols={GRID_COLUMNS} p="xs" spacing="xs">
-                  key={item.id}
+            {items.map((item, index: number) => (
-                  data-i={i}
+              <ActionIcon
-                  w="100%"
+                data-item-index={index}
-                  className={clsx(classes.row, { [classes.active]: i === idx })}
+                id={`emoji-command-option-${index}`}
-                  onClick={() => pickSearchItem(i)}
+                role="option"
-                  onMouseEnter={() => setIdx(i)}
+                aria-selected={index === selectedIndex}
-                  role="option"
+                aria-label={item.id}
-                  aria-selected={i === idx}
+                variant="transparent"
-                >
+                key={item.id}
-                  <span style={{ fontSize: 20, lineHeight: 1, minWidth: 26 }}>{item.emoji}</span>
+                className={clsx(classes.menuBtn, {
-                  <Text size="sm" c="dimmed" ff="monospace" span>:{item.id}:</Text>
+                  [classes.selectedItem]: index === selectedIndex,
-                </UnstyledButton>
+                })}
-              ))}
+                onClick={() => selectItem(index)}
-            </div>
+              >
-          </ScrollArea.Autosize>
+                <Text size="xl">{item.emoji}</Text>
-        </>
+              </ActionIcon>
-      ) : browseLoading ? (
+            ))}
-        <Loader m="xs" size="xs" color="blue" type="dots" />
+          </SimpleGrid>
-      ) : (
+        </ScrollArea.Autosize>
-        <>
-          <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>
-  );
+  ) : null;
-}
+};
 
 export default EmojiList;

apps/client/src/features/editor/components/emoji-menu/emoji-menu.module.css

@@ -1,13 +1,9 @@
-.row {
+.menuBtn {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 6px 10px;
   border-radius: var(--mantine-radius-sm);
 
   &:hover {
     @mixin light {
-      background: var(--mantine-color-gray-1);
+      background: var(--mantine-color-gray-2);
     }
 
     @mixin dark {
@@ -16,7 +12,7 @@
   }
 }
 
-.active {
+.selectedItem {
   @mixin light {
     background: var(--mantine-color-gray-2);
   }
@@ -25,83 +21,3 @@
     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);
-    }
-  }
-}
-

apps/client/src/features/editor/components/emoji-menu/render-emoji-items.ts

@@ -1,5 +1,6 @@
 import { ReactRenderer, useEditor } from "@tiptap/react";
 import EmojiList from "./emoji-list";
+import { init } from "emoji-mart";
 import {
   autoUpdate,
   computePosition,
@@ -36,6 +37,10 @@ const renderEmojiItems = () => {
       editor: ReturnType<typeof useEditor>;
       clientRect: () => DOMRect;
     }) => {
+      init({
+        data: async () => (await import("@emoji-mart/data")).default,
+      });
+
       component = new ReactRenderer(EmojiList, {
         props: { isLoading: true, items: [] },
         editor: props.editor,

apps/client/src/features/editor/components/emoji-menu/utils.ts

@@ -1,4 +1,8 @@
-import { CommandProps, EmojiMartFrequentlyType, EmojiMenuItemType } from "./types";
+import { CommandProps } 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";
 
@@ -15,76 +19,41 @@ export const DEFAULT_FREQUENTLY_USED_EMOJI_MART = `{
     "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('@slidoapp/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) => {
-  const stored = JSON.parse(
+  const frequentlyUsedEmoji =
-    localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART,
+    JSON.parse(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 (
-  frequentlyUsedEmoji: EmojiMartFrequentlyType,
+  frequentlyUsedEmoji: EmojiMartFrequentlyType
 ): Promise<EmojiMenuItemType[]> => {
-  const index = await buildEmojiIndex();
+  const data = await Promise.all(
-  const results: EmojiMenuItemType[] = Object.entries(frequentlyUsedEmoji)
+    Object.entries(frequentlyUsedEmoji).map(
-    .map(([id, count]): EmojiMenuItemType | null => {
+      async ([id, count]): Promise<EmojiMenuItemType> => ({
-      const entry = index.find((e) => e.id === id);
-      if (!entry) return null;
-      return {
         id,
         count,
-        emoji: entry.native,
+        emoji: (await getEmojiDataFromNative(id))?.native,
-        command: ({ editor, range }: CommandProps) => {
+        command: async ({ editor, range }: CommandProps) => {
-          editor.chain().focus().deleteRange(range).insertContent(entry.native + " ").run();
+          editor
+            .chain()
+            .focus()
+            .deleteRange(range)
+            .insertContent((await getEmojiDataFromNative(id))?.native + " ")
+            .run();
         },
-      };
+      })
-    })
+    )
-    .filter((e): e is EmojiMenuItemType => e !== null);
-  return results.sort((a, b) => (b.count ?? 0) - (a.count ?? 0)).slice(0, 5);
-};
-
-export const getFrequentlyUsedEmoji = (): EmojiMartFrequentlyType => {
-  return JSON.parse(
-    localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART,
   );
+  return data.sort((a, b) => b.count - a.count);
 };
 
-export type EmojiCategory = { id: string; emojis: EmojiIndexEntry[] };
+export const getFrequentlyUsedEmoji = () => {
-
+  return JSON.parse(localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART);
-let _cats: EmojiCategory[] | null = null;
+}
-
-export const getEmojiCategories = async (): Promise<EmojiCategory[]> => {
-  if (_cats) return _cats;
-  const [{ default: data }, index] = await Promise.all([
-    import("@slidoapp/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;
-};

apps/client/src/features/editor/components/excalidraw/excalidraw-menu-lazy.tsx

@@ -1,14 +0,0 @@
-import { lazy, Suspense } from "react";
-import { EditorMenuProps } from "@/features/editor/components/table/types/types.ts";
-
-const ExcalidrawMenu = lazy(
-  () => import("@/features/editor/components/excalidraw/excalidraw-menu.tsx"),
-);
-
-export default function ExcalidrawMenuLazy(props: EditorMenuProps) {
-  return (
-    <Suspense fallback={null}>
-      <ExcalidrawMenu {...props} />
-    </Suspense>
-  );
-}

apps/client/src/features/editor/components/excalidraw/excalidraw-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { lazy, Suspense, useCallback, useEffect, useRef, useState } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -95,7 +94,7 @@ export function ExcalidrawMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "excalidraw";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/excalidraw/excalidraw-view-lazy.tsx

@@ -1,14 +0,0 @@
-import { lazy, Suspense } from "react";
-import { NodeViewProps } from "@tiptap/react";
-
-const ExcalidrawView = lazy(
-  () => import("@/features/editor/components/excalidraw/excalidraw-view.tsx"),
-);
-
-export default function ExcalidrawViewLazy(props: NodeViewProps) {
-  return (
-    <Suspense fallback={null}>
-      <ExcalidrawView {...props} />
-    </Suspense>
-  );
-}

apps/client/src/features/editor/components/fixed-toolbar/fixed-toolbar.module.css

@@ -1,72 +0,0 @@
-.fixedToolbar {
-  position: fixed;
-  top: calc(var(--app-shell-header-offset, 0rem) + 45px);
-  inset-inline-start: var(--app-shell-navbar-offset, 0rem);
-  inset-inline-end: var(--app-shell-aside-offset, 0rem);
-  z-index: 99;
-  display: flex;
-  align-items: center;
-  background: var(--mantine-color-body);
-  border-bottom: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  overflow-x: auto;
-}
-
-.fixedToolbar::-webkit-scrollbar {
-  height: 2px;
-}
-
-.fixedToolbar::-webkit-scrollbar-track {
-  background: transparent;
-}
-
-.fixedToolbar::-webkit-scrollbar-thumb {
-  background: light-dark(
-    var(--mantine-color-gray-4),
-    var(--mantine-color-dark-3)
-  );
-  border-radius: 1px;
-}
-
-.inner {
-  display: flex;
-  align-items: center;
-  flex-wrap: nowrap;
-  gap: 4px;
-  padding: 4px 8px;
-  margin-inline: auto;
-}
-
-.inner > * {
-  flex-shrink: 0;
-}
-
-.spacer {
-  height: 45px;
-}
-
-.divider {
-  flex-shrink: 0;
-  width: 1px;
-  height: 20px;
-  margin: 0 4px;
-  background: light-dark(
-    var(--mantine-color-gray-3),
-    var(--mantine-color-dark-4)
-  );
-}
-
-.active,
-.active:hover {
-  color: var(--mantine-color-blue-6);
-  background-color: light-dark(
-    var(--mantine-color-gray-1),
-    var(--mantine-color-dark-5)
-  );
-}
-
-@media print {
-  .fixedToolbar {
-    display: none;
-  }
-}

apps/client/src/features/editor/components/fixed-toolbar/fixed-toolbar.tsx

@@ -1,66 +0,0 @@
-import { FC } from "react";
-import { useAtomValue } from "jotai";
-import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms";
-import { useToolbarState } from "./use-toolbar-state";
-import { BlockTypeGroup } from "./groups/block-type-group";
-import { InlineMarksGroup } from "./groups/inline-marks-group";
-import { ColorGroup } from "./groups/color-group";
-import { ListsGroup } from "./groups/lists-group";
-import { LinkGroup } from "./groups/link-group";
-import { AlignmentGroup } from "./groups/alignment-group";
-import { MediaGroup } from "./groups/media-group";
-import { QuickInsertsGroup } from "./groups/quick-inserts-group";
-import { MoreInsertsGroup } from "./groups/more-inserts-group";
-import { HistoryGroup } from "./groups/history-group";
-import { AskAiGroup } from "./groups/ask-ai-group";
-import { workspaceAtom } from "@/features/user/atoms/current-user-atom";
-import classes from "./fixed-toolbar.module.css";
-
-export const FixedToolbar: FC = () => {
-  const editor = useAtomValue(pageEditorAtom);
-  const state = useToolbarState(editor);
-  const workspace = useAtomValue(workspaceAtom);
-  const isGenerativeAiEnabled = workspace?.settings?.ai?.generative === true;
-
-  if (!editor || !state) return null;
-
-  return (
-    <>
-      <div
-        className={classes.fixedToolbar}
-        data-fixed-toolbar="true"
-        role="toolbar"
-        aria-label="Editor toolbar"
-        onMouseDown={(e) => e.preventDefault()}
-      >
-        <div className={classes.inner}>
-          {/* {isGenerativeAiEnabled && (
-            <>
-              <AskAiGroup />
-              <div className={classes.divider} />
-            </>
-          )} */}
-          <BlockTypeGroup editor={editor} />
-          <div className={classes.divider} />
-          <InlineMarksGroup editor={editor} state={state} />
-          <div className={classes.divider} />
-          <ColorGroup editor={editor} />
-          <div className={classes.divider} />
-          <ListsGroup editor={editor} state={state} />
-          <div className={classes.divider} />
-          <LinkGroup />
-          <div className={classes.divider} />
-          <AlignmentGroup editor={editor} />
-          <div className={classes.divider} />
-          <MediaGroup editor={editor} />
-          <div className={classes.divider} />
-          <QuickInsertsGroup editor={editor} />
-          <MoreInsertsGroup editor={editor} />
-          <div className={classes.divider} />
-          <HistoryGroup editor={editor} state={state} />
-        </div>
-      </div>
-      <div className={classes.spacer} aria-hidden />
-    </>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/alignment-group.tsx

@@ -1,28 +0,0 @@
-import { FC, useEffect, useState } from "react";
-import type { Editor } from "@tiptap/react";
-import { TextAlignmentSelector } from "@/features/editor/components/bubble-menu/text-alignment-selector";
-
-interface Props {
-  editor: Editor;
-}
-
-export const AlignmentGroup: FC<Props> = ({ editor }) => {
-  const [isOpen, setIsOpen] = useState(false);
-
-  useEffect(() => {
-    if (!isOpen) return;
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key === "Escape") setIsOpen(false);
-    };
-    document.addEventListener("keydown", handleKeyDown);
-    return () => document.removeEventListener("keydown", handleKeyDown);
-  }, [isOpen]);
-
-  return (
-    <TextAlignmentSelector
-      editor={editor}
-      isOpen={isOpen}
-      setIsOpen={setIsOpen}
-    />
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/ask-ai-group.tsx

@@ -1,23 +0,0 @@
-import { FC } from "react";
-import { Button } from "@mantine/core";
-import { IconSparkles } from "@tabler/icons-react";
-import { useSetAtom } from "jotai";
-import { useTranslation } from "react-i18next";
-import { showAiMenuAtom } from "@/features/editor/atoms/editor-atoms";
-
-export const AskAiGroup: FC = () => {
-  const { t } = useTranslation();
-  const setShowAiMenu = useSetAtom(showAiMenuAtom);
-
-  return (
-    <Button
-      variant="subtle"
-      color="dark"
-      size="xs"
-      leftSection={<IconSparkles size={14} />}
-      onClick={() => setShowAiMenu(true)}
-    >
-      {t("Ask AI")}
-    </Button>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/block-type-group.tsx

@@ -1,115 +0,0 @@
-import { FC } from "react";
-import type { Editor } from "@tiptap/react";
-import { useEditorState } from "@tiptap/react";
-import { Button, Menu } from "@mantine/core";
-import {
-  IconBlockquote,
-  IconBraces,
-  IconChevronDown,
-  IconH1,
-  IconH2,
-  IconH3,
-  IconMenu4,
-  IconPageBreak,
-  IconTypography,
-} from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-
-interface Props {
-  editor: Editor;
-}
-
-export const BlockTypeGroup: FC<Props> = ({ editor }) => {
-  const { t } = useTranslation();
-
-  const state = useEditorState({
-    editor,
-    selector: (ctx) => ({
-      isHeading1: ctx.editor.isActive("heading", { level: 1 }),
-      isHeading2: ctx.editor.isActive("heading", { level: 2 }),
-      isHeading3: ctx.editor.isActive("heading", { level: 3 }),
-      isBlockquote: ctx.editor.isActive("blockquote"),
-      isCodeBlock: ctx.editor.isActive("codeBlock"),
-    }),
-  });
-
-  let label = t("Normal text");
-  if (state.isHeading1) label = t("Heading 1");
-  else if (state.isHeading2) label = t("Heading 2");
-  else if (state.isHeading3) label = t("Heading 3");
-  else if (state.isBlockquote) label = t("Quote");
-  else if (state.isCodeBlock) label = t("Code block");
-
-  return (
-    <Menu shadow="md" position="bottom-start" withArrow={false}>
-      <Menu.Target>
-        <Button
-          variant="subtle"
-          color="dark"
-          size="xs"
-          rightSection={<IconChevronDown size={14} />}
-        >
-          {label}
-        </Button>
-      </Menu.Target>
-      <Menu.Dropdown>
-        <Menu.Item
-          leftSection={<IconTypography size={16} />}
-          onClick={() =>
-            editor.chain().focus().toggleNode("paragraph", "paragraph").run()
-          }
-        >
-          {t("Text")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconH1 size={16} />}
-          onClick={() =>
-            editor.chain().focus().toggleHeading({ level: 1 }).run()
-          }
-        >
-          {t("Heading 1")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconH2 size={16} />}
-          onClick={() =>
-            editor.chain().focus().toggleHeading({ level: 2 }).run()
-          }
-        >
-          {t("Heading 2")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconH3 size={16} />}
-          onClick={() =>
-            editor.chain().focus().toggleHeading({ level: 3 }).run()
-          }
-        >
-          {t("Heading 3")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconBlockquote size={16} />}
-          onClick={() => editor.chain().focus().toggleBlockquote().run()}
-        >
-          {t("Quote")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconBraces size={16} />}
-          onClick={() => editor.chain().focus().toggleCodeBlock().run()}
-        >
-          {t("Code block")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconMenu4 size={16} />}
-          onClick={() => editor.chain().focus().setHorizontalRule().run()}
-        >
-          {t("Divider")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconPageBreak size={16} />}
-          onClick={() => editor.chain().focus().setPageBreak().run()}
-        >
-          {t("Page break")}
-        </Menu.Item>
-      </Menu.Dropdown>
-    </Menu>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/color-group.tsx

@@ -1,24 +0,0 @@
-import { FC, useEffect, useState } from "react";
-import type { Editor } from "@tiptap/react";
-import { ColorSelector } from "@/features/editor/components/bubble-menu/color-selector";
-
-interface Props {
-  editor: Editor;
-}
-
-export const ColorGroup: FC<Props> = ({ editor }) => {
-  const [isOpen, setIsOpen] = useState(false);
-
-  useEffect(() => {
-    if (!isOpen) return;
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key === "Escape") setIsOpen(false);
-    };
-    document.addEventListener("keydown", handleKeyDown);
-    return () => document.removeEventListener("keydown", handleKeyDown);
-  }, [isOpen]);
-
-  return (
-    <ColorSelector editor={editor} isOpen={isOpen} setIsOpen={setIsOpen} />
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/history-group.tsx

@@ -1,44 +0,0 @@
-import { FC } from "react";
-import type { Editor } from "@tiptap/react";
-import { ActionIcon, Tooltip } from "@mantine/core";
-import { IconArrowBackUp, IconArrowForwardUp } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import type { ToolbarState } from "../use-toolbar-state";
-
-interface Props {
-  editor: Editor;
-  state: ToolbarState;
-}
-
-export const HistoryGroup: FC<Props> = ({ editor, state }) => {
-  const { t } = useTranslation();
-
-  return (
-    <ActionIcon.Group>
-      <Tooltip label={t("Undo")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Undo")}
-          disabled={!state.canUndo}
-          onClick={() => editor.chain().focus().undo().run()}
-        >
-          <IconArrowBackUp size={16} />
-        </ActionIcon>
-      </Tooltip>
-      <Tooltip label={t("Redo")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Redo")}
-          disabled={!state.canRedo}
-          onClick={() => editor.chain().focus().redo().run()}
-        >
-          <IconArrowForwardUp size={16} />
-        </ActionIcon>
-      </Tooltip>
-    </ActionIcon.Group>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/inline-marks-group.tsx

@@ -1,131 +0,0 @@
-import { FC } from "react";
-import type { Editor } from "@tiptap/react";
-import { ActionIcon, Menu, Tooltip } from "@mantine/core";
-import {
-  IconBold,
-  IconChevronDown,
-  IconClearFormatting,
-  IconCode,
-  IconIndentDecrease,
-  IconIndentIncrease,
-  IconItalic,
-  IconStrikethrough,
-  IconSubscript,
-  IconSuperscript,
-  IconUnderline,
-} from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import clsx from "clsx";
-import type { ToolbarState } from "../use-toolbar-state";
-import classes from "../fixed-toolbar.module.css";
-
-interface Props {
-  editor: Editor;
-  state: ToolbarState;
-}
-
-export const InlineMarksGroup: FC<Props> = ({ editor, state }) => {
-  const { t } = useTranslation();
-
-  return (
-    <ActionIcon.Group>
-      <Tooltip label={t("Bold")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Bold")}
-          aria-pressed={state.isBold}
-          className={clsx({ [classes.active]: state.isBold })}
-          onClick={() => editor.chain().focus().toggleBold().run()}
-        >
-          <IconBold size={16} />
-        </ActionIcon>
-      </Tooltip>
-      <Tooltip label={t("Underline")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Underline")}
-          aria-pressed={state.isUnderline}
-          className={clsx({ [classes.active]: state.isUnderline })}
-          onClick={() => editor.chain().focus().toggleUnderline().run()}
-        >
-          <IconUnderline size={16} />
-        </ActionIcon>
-      </Tooltip>
-      <Tooltip label={t("Italic")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Italic")}
-          aria-pressed={state.isItalic}
-          className={clsx({ [classes.active]: state.isItalic })}
-          onClick={() => editor.chain().focus().toggleItalic().run()}
-        >
-          <IconItalic size={16} />
-        </ActionIcon>
-      </Tooltip>
-      <Menu shadow="md" position="bottom-start" withArrow={false}>
-        <Menu.Target>
-          <ActionIcon
-            variant="subtle"
-            color="dark"
-            size="md"
-            aria-label={t("More inline formatting")}
-          >
-            <IconChevronDown size={14} />
-          </ActionIcon>
-        </Menu.Target>
-        <Menu.Dropdown>
-          <Menu.Item
-            leftSection={<IconStrikethrough size={16} />}
-            onClick={() => editor.chain().focus().toggleStrike().run()}
-          >
-            {t("Strikethrough")}
-          </Menu.Item>
-          <Menu.Item
-            leftSection={<IconCode size={16} />}
-            onClick={() => editor.chain().focus().toggleCode().run()}
-          >
-            {t("Inline code")}
-          </Menu.Item>
-          <Menu.Item
-            leftSection={<IconSubscript size={16} />}
-            onClick={() => editor.chain().focus().toggleSubscript().run()}
-          >
-            {t("Subscript")}
-          </Menu.Item>
-          <Menu.Item
-            leftSection={<IconSuperscript size={16} />}
-            onClick={() => editor.chain().focus().toggleSuperscript().run()}
-          >
-            {t("Superscript")}
-          </Menu.Item>
-          <Menu.Divider />
-          <Menu.Item
-            leftSection={<IconIndentIncrease size={16} />}
-            onClick={() => editor.chain().focus().indent().run()}
-          >
-            {t("Increase indent")}
-          </Menu.Item>
-          <Menu.Item
-            leftSection={<IconIndentDecrease size={16} />}
-            onClick={() => editor.chain().focus().outdent().run()}
-          >
-            {t("Decrease indent")}
-          </Menu.Item>
-          <Menu.Divider />
-          <Menu.Item
-            leftSection={<IconClearFormatting size={16} />}
-            onClick={() => editor.chain().focus().unsetAllMarks().run()}
-          >
-            {t("Clear formatting")}
-          </Menu.Item>
-        </Menu.Dropdown>
-      </Menu>
-    </ActionIcon.Group>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/link-group.tsx

@@ -1,6 +0,0 @@
-import { FC } from "react";
-import { LinkSelector } from "@/features/editor/components/bubble-menu/link-selector";
-
-export const LinkGroup: FC = () => {
-  return <LinkSelector />;
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/lists-group.tsx

@@ -1,61 +0,0 @@
-import { FC } from "react";
-import type { Editor } from "@tiptap/react";
-import { ActionIcon, Tooltip } from "@mantine/core";
-import { IconCheckbox, IconList, IconListNumbers } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import clsx from "clsx";
-import type { ToolbarState } from "../use-toolbar-state";
-import classes from "../fixed-toolbar.module.css";
-
-interface Props {
-  editor: Editor;
-  state: ToolbarState;
-}
-
-export const ListsGroup: FC<Props> = ({ editor, state }) => {
-  const { t } = useTranslation();
-
-  return (
-    <ActionIcon.Group>
-      <Tooltip label={t("Bullet List")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Bullet List")}
-          aria-pressed={state.isBulletList}
-          className={clsx({ [classes.active]: state.isBulletList })}
-          onClick={() => editor.chain().focus().toggleBulletList().run()}
-        >
-          <IconList size={16} />
-        </ActionIcon>
-      </Tooltip>
-      <Tooltip label={t("Numbered List")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Numbered List")}
-          aria-pressed={state.isOrderedList}
-          className={clsx({ [classes.active]: state.isOrderedList })}
-          onClick={() => editor.chain().focus().toggleOrderedList().run()}
-        >
-          <IconListNumbers size={16} />
-        </ActionIcon>
-      </Tooltip>
-      <Tooltip label={t("To-do List")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("To-do List")}
-          aria-pressed={state.isTaskList}
-          className={clsx({ [classes.active]: state.isTaskList })}
-          onClick={() => editor.chain().focus().toggleTaskList().run()}
-        >
-          <IconCheckbox size={16} />
-        </ActionIcon>
-      </Tooltip>
-    </ActionIcon.Group>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/media-group.tsx

@@ -1,118 +0,0 @@
-import { FC } from "react";
-import type { Editor } from "@tiptap/react";
-import { ActionIcon, Menu, Tooltip } from "@mantine/core";
-import {
-  IconFileTypePdf,
-  IconMovie,
-  IconMusic,
-  IconPaperclip,
-  IconPhoto,
-} from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { uploadImageAction } from "@/features/editor/components/image/upload-image-action";
-import { uploadVideoAction } from "@/features/editor/components/video/upload-video-action";
-import { uploadAudioAction } from "@/features/editor/components/audio/upload-audio-action";
-import { uploadAttachmentAction } from "@/features/editor/components/attachment/upload-attachment-action";
-import { uploadPdfAction } from "@/features/editor/components/pdf/upload-pdf-action";
-
-interface Props {
-  editor: Editor;
-}
-
-type UploadFn = (
-  file: File,
-  editor: Editor,
-  pos: number,
-  pageId: string,
-  ...rest: any[]
-) => void;
-
-function pickFile(
-  editor: Editor,
-  accept: string,
-  multiple: boolean,
-  upload: UploadFn,
-  extra?: boolean,
-) {
-  // @ts-ignore — editor.storage.pageId is set by PageEditor.onCreate
-  const pageId = editor.storage?.pageId as string | undefined;
-  if (!pageId) return;
-
-  const input = document.createElement("input");
-  input.type = "file";
-  input.accept = accept;
-  input.multiple = multiple;
-  input.style.display = "none";
-  document.body.appendChild(input);
-  input.onchange = () => {
-    if (input.files?.length) {
-      for (const file of input.files) {
-        const pos = editor.view.state.selection.from;
-        if (extra !== undefined) {
-          upload(file, editor, pos, pageId, extra);
-        } else {
-          upload(file, editor, pos, pageId);
-        }
-      }
-    }
-    input.remove();
-  };
-  input.click();
-}
-
-export const MediaGroup: FC<Props> = ({ editor }) => {
-  const { t } = useTranslation();
-
-  return (
-    <Menu shadow="md" position="bottom-start" withArrow={false}>
-      <Menu.Target>
-        <Tooltip label={t("Insert media")} withArrow>
-          <ActionIcon
-            variant="subtle"
-            color="dark"
-            size="md"
-            aria-label={t("Insert media")}
-          >
-            <IconPhoto size={16} />
-          </ActionIcon>
-        </Tooltip>
-      </Menu.Target>
-      <Menu.Dropdown>
-        <Menu.Item
-          leftSection={<IconPhoto size={16} />}
-          onClick={() => pickFile(editor, "image/*", true, uploadImageAction)}
-        >
-          {t("Image")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconMovie size={16} />}
-          onClick={() => pickFile(editor, "video/*", true, uploadVideoAction)}
-        >
-          {t("Video")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconMusic size={16} />}
-          onClick={() => pickFile(editor, "audio/*", true, uploadAudioAction)}
-        >
-          {t("Audio")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconFileTypePdf size={16} />}
-          onClick={() =>
-            pickFile(editor, "application/pdf", false, uploadPdfAction)
-          }
-        >
-          PDF
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconPaperclip size={16} />}
-          onClick={() =>
-            pickFile(editor, "", true, uploadAttachmentAction, true)
-          }
-        >
-          {t("File attachment")}
-        </Menu.Item>
-      </Menu.Dropdown>
-    </Menu>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/more-inserts-group.tsx

@@ -1,217 +0,0 @@
-import { FC } from "react";
-import type { Editor } from "@tiptap/react";
-import { ActionIcon, Menu, Tooltip } from "@mantine/core";
-import {
-  IconAppWindow,
-  IconCalendar,
-  IconCaretRightFilled,
-  IconChevronDown,
-  IconInfoCircle,
-  IconMath,
-  IconMathFunction,
-  IconRotate2,
-  IconSitemap,
-  IconTag,
-} from "@tabler/icons-react";
-import IconExcalidraw from "@/components/icons/icon-excalidraw";
-import IconMermaid from "@/components/icons/icon-mermaid";
-import IconDrawio from "@/components/icons/icon-drawio";
-import {
-  AirtableIcon,
-  FigmaIcon,
-  FramerIcon,
-  GoogleDriveIcon,
-  GoogleSheetsIcon,
-  LoomIcon,
-  MiroIcon,
-  TypeformIcon,
-  VimeoIcon,
-  YoutubeIcon,
-} from "@/components/icons";
-import { useTranslation } from "react-i18next";
-
-interface Props {
-  editor: Editor;
-}
-
-export const MoreInsertsGroup: FC<Props> = ({ editor }) => {
-  const { t } = useTranslation();
-
-  const setEmbed = (provider: string) =>
-    editor.chain().focus().setEmbed({ provider }).run();
-
-  const insertDate = () => {
-    const currentDate = new Date().toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "long",
-      day: "numeric",
-    });
-    editor.chain().focus().insertContent(currentDate).run();
-  };
-
-  return (
-    <Menu shadow="md" position="bottom-start" withArrow={false} width={240}>
-      <Menu.Target>
-        <Tooltip label={t("More inserts")} withArrow>
-          <ActionIcon
-            variant="subtle"
-            color="dark"
-            size="md"
-            aria-label={t("More inserts")}
-          >
-            <IconChevronDown size={16} />
-          </ActionIcon>
-        </Tooltip>
-      </Menu.Target>
-      <Menu.Dropdown mah={400} style={{ overflowY: "auto" }}>
-        <Menu.Label>{t("Advanced")}</Menu.Label>
-        <Menu.Item
-          leftSection={<IconInfoCircle size={16} />}
-          onClick={() => editor.chain().focus().toggleCallout().run()}
-        >
-          {t("Callout")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconCaretRightFilled size={16} />}
-          onClick={() => editor.chain().focus().setDetails().run()}
-        >
-          {t("Toggle block")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconTag size={16} />}
-          onClick={() =>
-            editor.chain().focus().setStatus({ text: "", color: "gray" }).run()
-          }
-        >
-          {t("Status")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconSitemap size={16} />}
-          onClick={() => editor.chain().focus().insertSubpages().run()}
-        >
-          {t("Subpages")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconRotate2 size={16} />}
-          onClick={() =>
-            editor.chain().focus().insertTransclusionSource().run()
-          }
-        >
-          {t("Synced block")}
-        </Menu.Item>
-
-        <Menu.Divider />
-        <Menu.Label>{t("Diagrams")}</Menu.Label>
-        <Menu.Item
-          leftSection={<IconMermaid size={16} />}
-          onClick={() =>
-            editor
-              .chain()
-              .focus()
-              .setCodeBlock({ language: "mermaid" })
-              .insertContent("flowchart LR\n    A --> B")
-              .run()
-          }
-        >
-          {t("Mermaid diagram")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconDrawio size={16} />}
-          onClick={() => editor.chain().focus().setDrawio().run()}
-        >
-          Draw.io
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconExcalidraw size={16} />}
-          onClick={() => editor.chain().focus().setExcalidraw().run()}
-        >
-          Excalidraw
-        </Menu.Item>
-
-        <Menu.Divider />
-        <Menu.Label>{t("Embeds")}</Menu.Label>
-        <Menu.Item
-          leftSection={<IconAppWindow size={16} />}
-          onClick={() => setEmbed("iframe")}
-        >
-          Iframe
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<YoutubeIcon size={16} />}
-          onClick={() => setEmbed("youtube")}
-        >
-          YouTube
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<VimeoIcon size={16} />}
-          onClick={() => setEmbed("vimeo")}
-        >
-          Vimeo
-        </Menu.Item>
-        <Menu.Item leftSection={<LoomIcon size={16} />} onClick={() => setEmbed("loom")}>
-          Loom
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<FigmaIcon size={16} />}
-          onClick={() => setEmbed("figma")}
-        >
-          Figma
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<AirtableIcon size={16} />}
-          onClick={() => setEmbed("airtable")}
-        >
-          Airtable
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<TypeformIcon size={16} />}
-          onClick={() => setEmbed("typeform")}
-        >
-          Typeform
-        </Menu.Item>
-        <Menu.Item leftSection={<MiroIcon size={16} />} onClick={() => setEmbed("miro")}>
-          Miro
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<FramerIcon size={16} />}
-          onClick={() => setEmbed("framer")}
-        >
-          Framer
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<GoogleDriveIcon size={16} />}
-          onClick={() => setEmbed("gdrive")}
-        >
-          Google Drive
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<GoogleSheetsIcon size={16} />}
-          onClick={() => setEmbed("gsheets")}
-        >
-          Google Sheets
-        </Menu.Item>
-
-        <Menu.Divider />
-        <Menu.Label>{t("Utility")}</Menu.Label>
-        <Menu.Item
-          leftSection={<IconCalendar size={16} />}
-          onClick={insertDate}
-        >
-          {t("Date")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconMathFunction size={16} />}
-          onClick={() => editor.chain().focus().setMathInline().run()}
-        >
-          {t("Math inline")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconMath size={16} />}
-          onClick={() => editor.chain().focus().setMathBlock().run()}
-        >
-          {t("Math block")}
-        </Menu.Item>
-      </Menu.Dropdown>
-    </Menu>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/groups/quick-inserts-group.tsx

@@ -1,117 +0,0 @@
-import { FC } from "react";
-import type { Editor } from "@tiptap/react";
-import { ActionIcon, Menu, Tooltip } from "@mantine/core";
-import {
-  IconAt,
-  IconColumns2,
-  IconColumns3,
-  IconMoodSmile,
-  IconTable,
-} from "@tabler/icons-react";
-import { IconColumns4 } from "@/components/icons/icon-columns-4";
-import { IconColumns5 } from "@/components/icons/icon-columns-5";
-import { useTranslation } from "react-i18next";
-
-interface Props {
-  editor: Editor;
-}
-
-export const QuickInsertsGroup: FC<Props> = ({ editor }) => {
-  const { t } = useTranslation();
-
-  return (
-    <ActionIcon.Group>
-      <Tooltip label={t("Mention")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Mention")}
-          onClick={() => editor.chain().focus().insertContent("@").run()}
-        >
-          <IconAt size={16} />
-        </ActionIcon>
-      </Tooltip>
-      <Tooltip label={t("Emoji")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Emoji")}
-          onClick={() => editor.chain().focus().insertContent(":").run()}
-        >
-          <IconMoodSmile size={16} />
-        </ActionIcon>
-      </Tooltip>
-      <Menu shadow="md" position="bottom-start" withArrow={false}>
-        <Menu.Target>
-          <Tooltip label={t("Columns")} withArrow>
-            <ActionIcon
-              variant="subtle"
-              color="dark"
-              size="md"
-              aria-label={t("Columns")}
-            >
-              <IconColumns2 size={16} />
-            </ActionIcon>
-          </Tooltip>
-        </Menu.Target>
-        <Menu.Dropdown>
-          <Menu.Item
-            leftSection={<IconColumns2 size={16} />}
-            onClick={() =>
-              editor.chain().focus().insertColumns({ layout: "two_equal" }).run()
-            }
-          >
-            {t("{{count}} Columns", { count: 2 })}
-          </Menu.Item>
-          <Menu.Item
-            leftSection={<IconColumns3 size={16} />}
-            onClick={() =>
-              editor
-                .chain()
-                .focus()
-                .insertColumns({ layout: "three_equal" })
-                .run()
-            }
-          >
-            {t("{{count}} Columns", { count: 3 })}
-          </Menu.Item>
-          <Menu.Item
-            leftSection={<IconColumns4 size={16} />}
-            onClick={() =>
-              editor.chain().focus().insertColumns({ layout: "four_equal" }).run()
-            }
-          >
-            {t("{{count}} Columns", { count: 4 })}
-          </Menu.Item>
-          <Menu.Item
-            leftSection={<IconColumns5 size={16} />}
-            onClick={() =>
-              editor.chain().focus().insertColumns({ layout: "five_equal" }).run()
-            }
-          >
-            {t("{{count}} Columns", { count: 5 })}
-          </Menu.Item>
-        </Menu.Dropdown>
-      </Menu>
-      <Tooltip label={t("Table")} withArrow>
-        <ActionIcon
-          variant="subtle"
-          color="dark"
-          size="md"
-          aria-label={t("Table")}
-          onClick={() =>
-            editor
-              .chain()
-              .focus()
-              .insertTable({ rows: 3, cols: 3, withHeaderRow: true })
-              .run()
-          }
-        >
-          <IconTable size={16} />
-        </ActionIcon>
-      </Tooltip>
-    </ActionIcon.Group>
-  );
-};

apps/client/src/features/editor/components/fixed-toolbar/use-toolbar-state.ts

@@ -1,50 +0,0 @@
-import type { Editor } from "@tiptap/react";
-import { useEditorState } from "@tiptap/react";
-
-export interface ToolbarState {
-  isBold: boolean;
-  isItalic: boolean;
-  isUnderline: boolean;
-  isStrike: boolean;
-  isCode: boolean;
-  isSubscript: boolean;
-  isSuperscript: boolean;
-  isBulletList: boolean;
-  isOrderedList: boolean;
-  isTaskList: boolean;
-  canUndo: boolean;
-  canRedo: boolean;
-}
-
-// Undo/redo come from either StarterKit's history or the Yjs collaboration
-// history extension. During the brief moment a page is rendered with the
-// static editor (mainExtensions only, undoRedo disabled), neither is loaded
-// and editor.can().undo/redo is undefined.
-function safeCan(editor: Editor, command: "undo" | "redo"): boolean {
-  const can = editor.can() as Record<string, unknown>;
-  const fn = can[command];
-  return typeof fn === "function" ? (fn as () => boolean)() : false;
-}
-
-export function useToolbarState(editor: Editor | null): ToolbarState | null {
-  return useEditorState({
-    editor,
-    selector: (ctx) => {
-      if (!ctx.editor) return null;
-      return {
-        isBold: ctx.editor.isActive("bold"),
-        isItalic: ctx.editor.isActive("italic"),
-        isUnderline: ctx.editor.isActive("underline"),
-        isStrike: ctx.editor.isActive("strike"),
-        isCode: ctx.editor.isActive("code"),
-        isSubscript: ctx.editor.isActive("subscript"),
-        isSuperscript: ctx.editor.isActive("superscript"),
-        isBulletList: ctx.editor.isActive("bulletList"),
-        isOrderedList: ctx.editor.isActive("orderedList"),
-        isTaskList: ctx.editor.isActive("taskList"),
-        canUndo: safeCan(ctx.editor, "undo"),
-        canRedo: safeCan(ctx.editor, "redo"),
-      };
-    },
-  });
-}

apps/client/src/features/editor/components/image/image-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import React, { useCallback, useRef } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -57,7 +56,7 @@ export function ImageMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "image";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/mention/mention-list.tsx

@@ -3,6 +3,7 @@ import React, {
   useCallback,
   useEffect,
   useImperativeHandle,
+  useMemo,
   useRef,
   useState,
 } from "react";
@@ -35,7 +36,7 @@ import {
   usePageQuery,
 } from "@/features/page/queries/page-query";
 import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom";
-import { treeModel } from "@/features/page/tree/model/tree-model";
+import { SimpleTree } from "react-arborist";
 import { SpaceTreeNode } from "@/features/page/tree/types";
 import { useTranslation } from "react-i18next";
 import { useQueryEmit } from "@/features/websocket/use-query-emit";
@@ -52,6 +53,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
   const [renderItems, setRenderItems] = useState<MentionSuggestionItem[]>([]);
   const { t } = useTranslation();
   const [data, setData] = useAtom(treeDataAtom);
+  const tree = useMemo(() => new SimpleTree<SpaceTreeNode>(data), [data]);
   const createPageMutation = useCreatePageMutation();
   const emit = useQueryEmit();
   const isInCommentContext = props.isInCommentContext ?? false;
@@ -218,20 +220,20 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
     try {
       createdPage = await createPageMutation.mutateAsync(payload);
       const parentId = page.id || null;
-      const newNode: SpaceTreeNode = {
+      const data = {
         id: createdPage.id,
         slugId: createdPage.slugId,
         name: createdPage.title,
         position: createdPage.position,
         spaceId: createdPage.spaceId,
         parentPageId: createdPage.parentPageId,
-        hasChildren: false,
         children: [],
-      };
+      } as any;
 
-      const lastIndex = data.length;
+      const lastIndex = tree.data.length;
 
-      setData(treeModel.insert(data, parentId, newNode, lastIndex));
+      tree.create({ parentId, index: lastIndex, data });
+      setData(tree.data);
 
       props.command({
         id: uuid7(),
@@ -249,7 +251,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
           payload: {
             parentId,
             index: lastIndex,
-            data: newNode,
+            data,
           },
         });
       }, 50);

apps/client/src/features/editor/components/pdf/pdf-menu.tsx

@@ -2,7 +2,6 @@ import { BubbleMenu as BaseBubbleMenu } from "@tiptap/react/menus";
 import { findParentNode, posToDOMRect, useEditorState } from "@tiptap/react";
 import { useCallback } from "react";
 import { Node as PMNode } from "@tiptap/pm/model";
-import { isEditorReady } from "@docmost/editor-ext";
 import {
   EditorMenuProps,
   ShouldShowProps,
@@ -38,8 +37,9 @@ export function PdfMenu({ editor }: EditorMenuProps) {
 
   const shouldShow = useCallback(
     ({ state }: ShouldShowProps) => {
-      if (!state || !isEditorReady(editor)) return false;
+      if (!state || !editor.isActive("pdf")) {
-      if (!editor.isActive("pdf")) return false;
+        return false;
+      }
 
       const { selection } = state;
       const dom = editor.view.nodeDOM(selection.from) as HTMLElement | null;
@@ -51,7 +51,7 @@ export function PdfMenu({ editor }: EditorMenuProps) {
   );
 
   const getReferencedVirtualElement = useCallback(() => {
-    if (!isEditorReady(editor)) return;
+    if (!editor) return;
     const { selection } = editor.state;
     const predicate = (node: PMNode) => node.type.name === "pdf";
     const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/slash-menu/menu-items.ts

@@ -19,15 +19,12 @@ import {
   IconTable,
   IconTypography,
   IconMenu4,
-  IconPageBreak,
   IconCalendar,
   IconAppWindow,
   IconSitemap,
   IconColumns3,
   IconColumns2,
   IconTag,
-  IconMoodSmile,
-  IconRotate2,
 } from "@tabler/icons-react";
 import {
   CommandProps,
@@ -135,7 +132,7 @@ const CommandGroups: SlashMenuGroupedItemsType = {
     {
       title: "Numbered list",
       description: "Create a list with numbering.",
-      searchTerms: ["numbered", "ordered", "list", "ol"],
+      searchTerms: ["numbered", "ordered", "list"],
       icon: IconListNumbers,
       command: ({ editor, range }: CommandProps) => {
         editor.chain().focus().deleteRange(range).toggleOrderedList().run();
@@ -165,14 +162,6 @@ const CommandGroups: SlashMenuGroupedItemsType = {
       command: ({ editor, range }: CommandProps) =>
         editor.chain().focus().deleteRange(range).setHorizontalRule().run(),
     },
-    {
-      title: "Page break",
-      description: "Insert a page break for printing.",
-      searchTerms: ["page", "break", "pagebreak", "print"],
-      icon: IconPageBreak,
-      command: ({ editor, range }: CommandProps) =>
-        editor.chain().focus().deleteRange(range).setPageBreak().run(),
-    },
     {
       title: "Image",
       description: "Upload any image from your device.",
@@ -242,15 +231,7 @@ const CommandGroups: SlashMenuGroupedItemsType = {
     {
       title: "Audio",
       description: "Upload any audio from your device.",
-      searchTerms: [
+      searchTerms: ["audio", "music", "sound", "mp3", "media", "file", "attachment"],
-        "audio",
-        "music",
-        "sound",
-        "mp3",
-        "media",
-        "file",
-        "attachment",
-      ],
       icon: IconMusic,
       command: ({ editor, range }) => {
         editor.chain().focus().deleteRange(range).run();
@@ -487,53 +468,15 @@ const CommandGroups: SlashMenuGroupedItemsType = {
           .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)",
       description: "List all subpages of the current page",
-      searchTerms: [
+      searchTerms: ["subpages", "child", "children", "nested", "hierarchy"],
-        "subpages",
-        "child",
-        "children",
-        "nested",
-        "hierarchy",
-        "toc",
-      ],
       icon: IconSitemap,
       command: ({ editor, range }: CommandProps) => {
         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",
       description: "Split content into two columns.",

apps/client/src/features/editor/components/subpages/subpages-menu.tsx

@@ -6,7 +6,6 @@ import { ActionIcon, Tooltip } from "@mantine/core";
 import { IconTrash } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { Editor } from "@tiptap/core";
-import { isEditorReady } from "@docmost/editor-ext";
 
 interface SubpagesMenuProps {
   editor: Editor;
@@ -34,7 +33,6 @@ export const SubpagesMenu = React.memo(
     );
 
     const getReferenceClientRect = useCallback(() => {
-      if (!isEditorReady(editor)) return new DOMRect();
       const { selection } = editor.state;
       const predicate = (node: PMNode) => node.type.name === "subpages";
       const parent = findParentNode(predicate)(selection);

apps/client/src/features/editor/components/table-of-contents/table-of-contents.tsx

@@ -25,7 +25,7 @@ const recalculateLinks = (nodePos: NodePos[]) => {
     (acc, item) => {
       const label = item.node.textContent;
       const level = Number(item.node.attrs.level);
-      if (label.length && level <= 4) {
+      if (label.length && level <= 3) {
         acc.push({
           label,
           level,

apps/client/src/features/editor/components/table/handle/cell-chevron.tsx

@@ -1,126 +0,0 @@
-import React, { useCallback, useEffect } from "react";
-import type { Editor } from "@tiptap/react";
-import { useEditorState } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { TextSelection } from "@tiptap/pm/state";
-import { columnResizingPluginKey } from "@tiptap/pm/tables";
-import { useFloating, offset, autoUpdate, hide } from "@floating-ui/react";
-import { Menu, UnstyledButton } from "@mantine/core";
-import { IconChevronDown } from "@tabler/icons-react";
-import clsx from "clsx";
-import { useTranslation } from "react-i18next";
-import { isCellSelection } from "@docmost/editor-ext";
-import { CellChevronMenu } from "./menus/cell-chevron-menu";
-import classes from "./handle.module.css";
-
-interface CellChevronProps {
-  editor: Editor;
-  cellPos: number;
-  tableNode: ProseMirrorNode;
-  tablePos: number;
-}
-
-export const CellChevron = React.memo(function CellChevron({
-  editor,
-  cellPos,
-  tableNode,
-  tablePos,
-}: CellChevronProps) {
-  const { t } = useTranslation();
-  const cellDom = editor.view.nodeDOM(cellPos) as HTMLElement | null;
-
-  const { refs, floatingStyles, middlewareData } = useFloating({
-    placement: "top-end",
-    // crossAxis pulls the chevron INWARD from the cell's right edge. We need
-    // enough inset that we don't overlap PM-tables' column-resize hot zone
-    // (~5px wide around the column boundary). Without this, hovering near the
-    // column edge picks up the chevron's `cursor: pointer` instead of
-    // `col-resize`, and a drag near the edge clicks the chevron.
-    middleware: [offset({ mainAxis: -22, crossAxis: -10 }), hide()],
-    whileElementsMounted: autoUpdate,
-    strategy: "absolute",
-  });
-  const isReferenceHidden = !!middlewareData.hide?.referenceHidden;
-
-  useEffect(() => {
-    refs.setReference(cellDom);
-  }, [cellDom, refs]);
-
-  // Hide the chevron while the user is resizing a column. PM-tables sets
-  // `activeHandle > -1` whenever the mouse is near a column boundary OR
-  // actively dragging it. Either way we don't want the chevron in the way.
-  const isResizingColumn = useEditorState({
-    editor,
-    selector: (ctx) => {
-      if (!ctx.editor) return false;
-      const state = columnResizingPluginKey.getState(ctx.editor.state) as
-        | { activeHandle: number }
-        | undefined;
-      return !!state && state.activeHandle > -1;
-    },
-  });
-
-  const onOpen = useCallback(() => {
-    const current = editor.state.selection;
-
-    // Preserve an existing multi-cell CellSelection that already covers
-    // this cell so merge etc. operate on the user's whole range.
-    let preserveExisting = false;
-    if (isCellSelection(current)) {
-      current.forEachCell((_node, pos) => {
-        if (pos === cellPos) preserveExisting = true;
-      });
-    }
-
-    if (!preserveExisting) {
-      // Drop a collapsed cursor inside the cell rather than a single-cell
-      // CellSelection — PM-tables paints the latter as a text-range
-      // highlight on the cell content.
-      try {
-        const $inside = editor.state.doc.resolve(cellPos + 1);
-        const sel = TextSelection.near($inside, 1);
-        editor.view.dispatch(editor.state.tr.setSelection(sel));
-      } catch {}
-    }
-    editor.commands.freezeHandles();
-  }, [editor, cellPos]);
-
-  const onClose = useCallback(() => {
-    editor.commands.unfreezeHandles();
-  }, [editor]);
-
-  if (!cellDom) return null;
-  if (isResizingColumn) return null;
-
-  return (
-    <Menu
-      position="bottom-end"
-      onOpen={onOpen}
-      onClose={onClose}
-      withinPortal
-      shadow="md"
-    >
-      <Menu.Target>
-        <UnstyledButton
-          ref={refs.setFloating}
-          style={{
-            ...floatingStyles,
-            ...(isReferenceHidden ? { visibility: "hidden" as const } : {}),
-          }}
-          className={clsx(classes.cellChevron)}
-          aria-label={t("Cell actions")}
-        >
-          <IconChevronDown size={14} />
-        </UnstyledButton>
-      </Menu.Target>
-      <Menu.Dropdown>
-        <CellChevronMenu
-          editor={editor}
-          cellPos={cellPos}
-          tableNode={tableNode}
-          tablePos={tablePos}
-        />
-      </Menu.Dropdown>
-    </Menu>
-  );
-});

apps/client/src/features/editor/components/table/handle/column-handle.tsx

@@ -1,132 +0,0 @@
-import React, { useCallback, useEffect, useRef, useState } from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { useFloating, offset, autoUpdate, hide } from "@floating-ui/react";
-import { Menu } from "@mantine/core";
-import clsx from "clsx";
-import { useTranslation } from "react-i18next";
-import { useTableHandleDrag } from "./hooks/use-table-handle-drag";
-import { useColumnRowMenuLifecycle } from "./hooks/use-column-row-menu-lifecycle";
-import { ColumnHandleMenu } from "./menus/column-handle-menu";
-import classes from "./handle.module.css";
-
-interface ColumnHandleProps {
-  editor: Editor;
-  index: number;
-  anchorPos: number;
-  tableNode: ProseMirrorNode;
-  tablePos: number;
-}
-
-export const ColumnHandle = React.memo(function ColumnHandle({
-  editor,
-  index,
-  anchorPos,
-  tableNode,
-  tablePos,
-}: ColumnHandleProps) {
-  const { t } = useTranslation();
-  // Hold the cell DOM in a ref-backed state so we never unmount the handle
-  // mid-drag. A remote edit can transiently flip `nodeDOM(anchorPos)` to null
-  // (the plugin re-emits `hoveringCell` with the mapped pos a tick later);
-  // unmounting the source element here would make pragmatic-dnd silently
-  // abort the active drag.
-  // `nodeDOM` is typed as `Node | null` — when `anchorPos` goes stale (e.g.
-  // an external drop reflows the doc before the plugin re-emits
-  // hoveringCell), it can resolve to a Text node, on which `.closest` is
-  // undefined. Filter to HTMLElement so downstream consumers stay safe.
-  const lookupDom = editor.view.nodeDOM(anchorPos);
-  const lookupCellDom = lookupDom instanceof HTMLElement ? lookupDom : null;
-  const [cellDom, setCellDom] = useState<HTMLElement | null>(lookupCellDom);
-  const lastCellDomRef = useRef<HTMLElement | null>(lookupCellDom);
-  useEffect(() => {
-    if (lookupCellDom && lookupCellDom !== lastCellDomRef.current) {
-      lastCellDomRef.current = lookupCellDom;
-      setCellDom(lookupCellDom);
-    }
-  }, [lookupCellDom]);
-
-  const [handleEl, setHandleEl] = useState<HTMLDivElement | null>(null);
-
-  const { refs, floatingStyles, middlewareData } = useFloating({
-    placement: "top",
-    middleware: [offset(-4), hide()],
-    whileElementsMounted: autoUpdate,
-  });
-  const isReferenceHidden = !!middlewareData.hide?.referenceHidden;
-
-  useEffect(() => {
-    refs.setReference(cellDom);
-  }, [cellDom, refs]);
-
-  // `cellDom` is inside the table, so `closest('.tableWrapper')` finds the
-  // wrapper for this drag's auto-scroll. The handle itself lives in a
-  // floating layer outside the editor DOM, so we can't walk up from it.
-  const wrapper = cellDom?.closest<HTMLElement>(".tableWrapper") ?? null;
-
-  const [menuOpened, setMenuOpened] = useState(false);
-  const closeMenu = useCallback(() => setMenuOpened(false), []);
-  useTableHandleDrag(editor, "col", handleEl, wrapper, closeMenu);
-
-  const { onOpen, onClose } = useColumnRowMenuLifecycle({
-    editor,
-    orientation: "col",
-    index,
-    tableNode,
-    tablePos,
-  });
-
-  if (!cellDom) return null;
-
-  return (
-    <Menu
-      opened={menuOpened}
-      onChange={setMenuOpened}
-      position="bottom-start"
-      onOpen={onOpen}
-      onClose={onClose}
-      withinPortal
-      shadow="md"
-    >
-      <Menu.Target>
-        <div
-          ref={(node) => {
-            refs.setFloating(node);
-            setHandleEl(node);
-          }}
-          style={{
-            ...floatingStyles,
-            ...(isReferenceHidden ? { visibility: "hidden" as const } : {}),
-          }}
-          className={clsx(classes.handle, classes.columnHandle)}
-          role="button"
-          tabIndex={0}
-          aria-label={t("Column actions")}
-        >
-          <span style={{ pointerEvents: "none", display: "inline-flex" }}>
-            <GripIcon />
-          </span>
-        </div>
-      </Menu.Target>
-      <Menu.Dropdown>
-        <ColumnHandleMenu
-          editor={editor}
-          index={index}
-          tableNode={tableNode}
-          tablePos={tablePos}
-        />
-      </Menu.Dropdown>
-    </Menu>
-  );
-});
-
-function GripIcon() {
-  return (
-    <svg viewBox="0 0 10 10" width="14" height="14" aria-hidden>
-      <path
-        fill="currentColor"
-        d="M3,2 A1,1 0 1 1 3,0 A1,1 0 0 1 3,2 Z M3,6 A1,1 0 1 1 3,4 A1,1 0 0 1 3,6 Z M3,10 A1,1 0 1 1 3,8 A1,1 0 0 1 3,10 Z M7,2 A1,1 0 1 1 7,0 A1,1 0 0 1 7,2 Z M7,6 A1,1 0 1 1 7,4 A1,1 0 0 1 7,6 Z M7,10 A1,1 0 1 1 7,8 A1,1 0 0 1 7,10 Z"
-      />
-    </svg>
-  );
-}

apps/client/src/features/editor/components/table/handle/handle.module.css

@@ -1,108 +0,0 @@
-.handle {
-  position: absolute;
-  z-index: 50;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 4px;
-  color: rgba(55, 53, 47, 0.45);
-  background: var(--mantine-color-body);
-  border: 1px solid rgba(55, 53, 47, 0.12);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
-  cursor: grab;
-  padding: 0;
-  transition: background-color 120ms ease, color 120ms ease;
-
-  @mixin dark {
-    color: rgba(255, 255, 255, 0.55);
-    background: var(--mantine-color-dark-7);
-    border-color: rgba(255, 255, 255, 0.12);
-  }
-}
-
-.handle:hover {
-  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-0)
-  );
-}
-
-.handle:active {
-  cursor: grabbing;
-}
-
-.columnHandle {
-  width: 28px;
-  height: 16px;
-}
-
-.columnHandle svg {
-  transform: rotate(90deg);
-}
-
-.rowHandle {
-  width: 16px;
-  height: 28px;
-}
-
-@media (max-width: 600px) {
-  .handle {
-    display: none;
-  }
-}
-
-.cellChevron {
-  position: absolute;
-  z-index: 50;
-  width: 18px;
-  height: 18px;
-  border-radius: 4px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  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: 1px solid rgba(55, 53, 47, 0.12);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
-  cursor: pointer;
-  padding: 0;
-  transition: background-color 120ms ease, color 120ms ease;
-
-  @mixin dark {
-    border-color: rgba(255, 255, 255, 0.12);
-  }
-}
-
-.cellChevron:hover {
-  background: light-dark(
-    var(--mantine-color-gray-2),
-    var(--mantine-color-dark-4)
-  );
-  color: light-dark(
-    var(--mantine-color-gray-8),
-    var(--mantine-color-dark-0)
-  );
-}
-
-@media (max-width: 600px) {
-  .cellChevron {
-    display: none;
-  }
-}
-
-@media print {
-  .handle,
-  .cellChevron {
-    display: none !important;
-  }
-}

apps/client/src/features/editor/components/table/handle/hooks/use-column-row-menu-lifecycle.ts

@@ -1,40 +0,0 @@
-import { useCallback } from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { buildRowOrColumnSelection, Orientation } from "../lib/select-row-column";
-
-interface Args {
-  editor: Editor;
-  orientation: Orientation;
-  index: number;
-  tableNode: ProseMirrorNode;
-  tablePos: number;
-}
-
-export function useColumnRowMenuLifecycle({
-  editor,
-  orientation,
-  index,
-  tableNode,
-  tablePos,
-}: Args) {
-  const onOpen = useCallback(() => {
-    const selection = buildRowOrColumnSelection(
-      editor.state,
-      tableNode,
-      tablePos,
-      orientation,
-      index,
-    );
-    const tr = editor.state.tr;
-    if (selection) tr.setSelection(selection);
-    editor.view.dispatch(tr);
-    editor.commands.freezeHandles();
-  }, [editor, orientation, index, tableNode, tablePos]);
-
-  const onClose = useCallback(() => {
-    editor.commands.unfreezeHandles();
-  }, [editor]);
-
-  return { onOpen, onClose };
-}

apps/client/src/features/editor/components/table/handle/hooks/use-table-clear.ts

@@ -1,54 +0,0 @@
-import { useCallback } from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { TableMap } from "@tiptap/pm/tables";
-
-type Scope =
-  | { kind: "col"; index: number }
-  | { kind: "row"; index: number }
-  | { kind: "cell"; cellPos: number };
-
-export function useTableClear(
-  editor: Editor,
-  tableNode: ProseMirrorNode,
-  tablePos: number,
-  scope: Scope,
-) {
-  return useCallback(() => {
-    const tr = editor.state.tr;
-    const tableStart = tablePos + 1;
-    const map = TableMap.get(tableNode);
-    const paragraph = editor.schema.nodes.paragraph;
-    if (!paragraph) return;
-
-    const cellOffsets: number[] = [];
-
-    if (scope.kind === "col") {
-      for (let row = 0; row < map.height; row++) {
-        cellOffsets.push(map.map[row * map.width + scope.index]);
-      }
-    } else if (scope.kind === "row") {
-      for (let col = 0; col < map.width; col++) {
-        cellOffsets.push(map.map[scope.index * map.width + col]);
-      }
-    }
-
-    const targets =
-      scope.kind === "cell"
-        ? [scope.cellPos]
-        : Array.from(new Set(cellOffsets)).map((o) => tableStart + o);
-
-    // Process in reverse position order so earlier replacements don't shift later ones.
-    targets.sort((a, b) => b - a);
-
-    for (const cellPos of targets) {
-      const node = tr.doc.nodeAt(cellPos);
-      if (!node) continue;
-      const start = cellPos + 1;
-      const end = cellPos + node.nodeSize - 1;
-      tr.replaceWith(start, end, paragraph.create());
-    }
-
-    if (tr.docChanged) editor.view.dispatch(tr);
-  }, [editor, tableNode, tablePos, scope]);
-}

apps/client/src/features/editor/components/table/handle/hooks/use-table-handle-drag.ts

@@ -1,79 +0,0 @@
-import { useEffect } from "react";
-import type { Editor } from "@tiptap/react";
-import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
-import { draggable } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
-import { disableNativeDragPreview } from "@atlaskit/pragmatic-drag-and-drop/element/disable-native-drag-preview";
-import {
-  autoScrollForElements,
-  autoScrollWindowForElements,
-} from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";
-import { getTableHandlePluginSpec } from "@docmost/editor-ext";
-
-// Uses pragmatic-drag-and-drop instead of native HTML5 DnD because the native
-// dragstart→dragover→drop lifecycle was being silently cancelled
-export function useTableHandleDrag(
-  editor: Editor,
-  orientation: "col" | "row",
-  element: HTMLElement | null,
-  wrapper: HTMLElement | null,
-  onDragStart?: () => void,
-) {
-  useEffect(() => {
-    if (!element) return;
-
-    return combine(
-      draggable({
-        element,
-        getInitialData: () => ({ type: `table-${orientation}` }),
-        onGenerateDragPreview: ({ nativeSetDragImage }) => {
-          // We render our own floating preview via PreviewController, so hide
-          // the native drag image entirely.
-          disableNativeDragPreview({ nativeSetDragImage });
-        },
-        onDragStart: ({ location }) => {
-          // The menu (if open from a prior click on the handle) won't dismiss
-          // on its own — pragmatic-dnd swallows the events Mantine listens for.
-          onDragStart?.();
-          const spec = getTableHandlePluginSpec(editor);
-          if (!spec) return;
-          const { clientX, clientY } = location.initial.input;
-          spec.startDragFromHandle(orientation, clientX, clientY);
-        },
-        onDrag: ({ location }) => {
-          const spec = getTableHandlePluginSpec(editor);
-          if (!spec) return;
-          const { clientX, clientY } = location.current.input;
-          spec.updateDragPosition(clientX, clientY);
-        },
-        onDrop: ({ location }) => {
-          const spec = getTableHandlePluginSpec(editor);
-          if (!spec) return;
-          const { clientX, clientY } = location.current.input;
-          // Make sure the final position is recorded before committing the drop.
-          spec.updateDragPosition(clientX, clientY);
-          spec.commitDrop();
-          spec.endDrag();
-        },
-      }),
-      // Wrapper owns horizontal auto-scroll (it has `overflow-x: auto`);
-      // window owns vertical. Locking each axis prevents the window's
-      // horizontal auto-scroll from running when the cursor approaches
-      // the viewport edge — without the cap, the preview's `left` follows
-      // the cursor past the viewport, the page widens to contain it, the
-      // plugin scrolls the now-wider page further, and the loop never
-      // ends.
-      // Only the column handle registers wrapper auto-scroll (rows can't
-      // scroll horizontally) — registering twice on the same wrapper
-      // triggers a dev-mode warning from pragmatic-dnd-auto-scroll.
-      orientation === "col" &&
-      wrapper &&
-      !wrapper.classList.contains("tableWrapperNoOverflow")
-        ? autoScrollForElements({
-            element: wrapper,
-            getAllowedAxis: () => "horizontal",
-          })
-        : () => {},
-      autoScrollWindowForElements({ getAllowedAxis: () => "vertical" }),
-    );
-  }, [editor, orientation, element, wrapper, onDragStart]);
-}

apps/client/src/features/editor/components/table/handle/hooks/use-table-handle-state.ts

@@ -1,23 +0,0 @@
-import type { Editor } from "@tiptap/react";
-import { useEditorState } from "@tiptap/react";
-import { TableDndKey, TableHandleState } from "@docmost/editor-ext";
-
-const FALLBACK: TableHandleState = {
-  hoveringCell: null,
-  tableNode: null,
-  tablePos: null,
-  dragging: null,
-  frozen: false,
-};
-
-export function useTableHandleState(editor: Editor | null): TableHandleState {
-  const state = useEditorState({
-    editor,
-    selector: (ctx) => {
-      if (!ctx.editor) return null;
-      return TableDndKey.getState(ctx.editor.state) ?? null;
-    },
-  });
-
-  return state ?? FALLBACK;
-}

apps/client/src/features/editor/components/table/handle/hooks/use-table-move-row-column.ts

@@ -1,50 +0,0 @@
-import { useCallback, useMemo } from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { TableMap } from "@tiptap/pm/tables";
-import { moveColumn, moveRow } from "@docmost/editor-ext";
-
-export type MoveDirection = "left" | "right" | "up" | "down";
-
-export function useTableMoveRowColumn(
-  editor: Editor,
-  orientation: "col" | "row",
-  index: number,
-  direction: MoveDirection,
-  tableNode: ProseMirrorNode,
-  tablePos: number,
-) {
-  const target =
-    direction === "left" || direction === "up" ? index - 1 : index + 1;
-
-  const maxIndex = useMemo(() => {
-    const map = TableMap.get(tableNode);
-    return orientation === "col" ? map.width - 1 : map.height - 1;
-  }, [tableNode, orientation]);
-
-  const canMove = target >= 0 && target <= maxIndex;
-
-  const handleMove = useCallback(() => {
-    if (!canMove) return;
-    const tr = editor.state.tr;
-    const moved =
-      orientation === "col"
-        ? moveColumn({
-            tr,
-            originIndex: index,
-            targetIndex: target,
-            select: true,
-            pos: tablePos + 1,
-          })
-        : moveRow({
-            tr,
-            originIndex: index,
-            targetIndex: target,
-            select: true,
-            pos: tablePos + 1,
-          });
-    if (moved) editor.view.dispatch(tr);
-  }, [editor, orientation, index, target, tablePos, canMove]);
-
-  return { canMove, handleMove };
-}

apps/client/src/features/editor/components/table/handle/hooks/use-table-sort.ts

@@ -1,100 +0,0 @@
-import { useCallback, useMemo } from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import {
-  convertArrayOfRowsToTableNode,
-  convertTableNodeToArrayOfRows,
-  transpose,
-} from "@docmost/editor-ext";
-import {
-  getCellSortText,
-  isCellEmpty,
-  isHeaderCell,
-  type SortDirection,
-  type SortableItem,
-  sortItems,
-  weaveItems,
-} from "../lib/sort-cells";
-
-interface Args {
-  editor: Editor;
-  orientation: "col" | "row";
-  index: number;
-  tableNode: ProseMirrorNode;
-  tablePos: number;
-  direction: SortDirection;
-}
-
-function tableHasMergedCells(tableNode: ProseMirrorNode): boolean {
-  for (let r = 0; r < tableNode.childCount; r++) {
-    const row = tableNode.child(r);
-    for (let c = 0; c < row.childCount; c++) {
-      const { colspan = 1, rowspan = 1 } = row.child(c).attrs;
-      if (colspan > 1 || rowspan > 1) return true;
-    }
-  }
-  return false;
-}
-
-function isAllHeader(cells: (ProseMirrorNode | null)[]): boolean {
-  return cells.every((c) => c !== null && isHeaderCell(c));
-}
-
-export function useTableSort({
-  editor,
-  orientation,
-  index,
-  tableNode,
-  tablePos,
-  direction,
-}: Args) {
-  const canSort = useMemo(() => {
-    if (tableHasMergedCells(tableNode)) return false;
-
-    const rows = convertTableNodeToArrayOfRows(tableNode);
-    const axes = orientation === "col" ? rows : transpose(rows);
-    if (axes.length < 2) return false;
-
-    return axes.some((cells) => {
-      if (isAllHeader(cells)) return false;
-      const sortCell = cells[index];
-      return !!sortCell && !isCellEmpty(sortCell);
-    });
-  }, [tableNode, orientation, index]);
-
-  const handleSort = useCallback(() => {
-    if (!canSort) return;
-
-    const rows = convertTableNodeToArrayOfRows(tableNode);
-    const axes = orientation === "col" ? rows : transpose(rows);
-
-    const items: SortableItem<(ProseMirrorNode | null)[]>[] = axes.map(
-      (cells, originalOrder) => {
-        const sortCell = cells[index];
-        return {
-          payload: cells,
-          text: sortCell ? getCellSortText(sortCell) : "",
-          isHeader: isAllHeader(cells),
-          isEmpty: !sortCell || isCellEmpty(sortCell),
-          originalOrder,
-        };
-      },
-    );
-
-    const dataItems = items.filter((it) => !it.isHeader);
-    const sortedData = sortItems(dataItems, direction);
-    const woven = weaveItems(items, sortedData);
-
-    const newAxes = woven.map((it) => it.payload);
-    const newRows = orientation === "col" ? newAxes : transpose(newAxes);
-
-    const newTable = convertArrayOfRowsToTableNode(tableNode, newRows);
-
-    const tr = editor.state.tr;
-    tr.replaceWith(tablePos, tablePos + tableNode.nodeSize, newTable);
-
-    if (tr.docChanged) editor.view.dispatch(tr);
-  }, [editor, tableNode, tablePos, orientation, index, direction, canSort]);
-
-  return { canSort, handleSort };
-}

apps/client/src/features/editor/components/table/handle/lib/select-row-column.ts

@@ -1,34 +0,0 @@
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import type { EditorState } from "@tiptap/pm/state";
-import { CellSelection, TableMap } from "@tiptap/pm/tables";
-
-export type Orientation = "col" | "row";
-
-export function buildRowOrColumnSelection(
-  state: EditorState,
-  tableNode: ProseMirrorNode,
-  tablePos: number,
-  orientation: Orientation,
-  index: number,
-): CellSelection | null {
-  const map = TableMap.get(tableNode);
-  const tableStart = tablePos + 1;
-
-  if (orientation === "col") {
-    if (index < 0 || index >= map.width) return null;
-    const firstCellPos = tableStart + map.map[index];
-    const lastCellPos =
-      tableStart + map.map[(map.height - 1) * map.width + index];
-    const $first = state.doc.resolve(firstCellPos);
-    const $last = state.doc.resolve(lastCellPos);
-    return CellSelection.colSelection($first, $last);
-  }
-
-  if (index < 0 || index >= map.height) return null;
-  const firstCellPos = tableStart + map.map[index * map.width];
-  const lastCellPos =
-    tableStart + map.map[index * map.width + (map.width - 1)];
-  const $first = state.doc.resolve(firstCellPos);
-  const $last = state.doc.resolve(lastCellPos);
-  return CellSelection.rowSelection($first, $last);
-}

apps/client/src/features/editor/components/table/handle/lib/sort-cells.ts

@@ -1,57 +0,0 @@
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-
-export type SortDirection = "asc" | "desc";
-
-export interface SortableItem<T> {
-  payload: T;
-  text: string;
-  isHeader: boolean;
-  isEmpty: boolean;
-  originalOrder: number;
-}
-
-const HEADER_TYPE_NAMES = new Set(["tableHeader", "table_header"]);
-
-export function isHeaderCell(node: ProseMirrorNode): boolean {
-  if (HEADER_TYPE_NAMES.has(node.type.name)) return true;
-  return node.attrs?.header === true;
-}
-
-export function getCellSortText(node: ProseMirrorNode): string {
-  let text = "";
-  node.descendants((child) => {
-    if (child.isText) text += child.text ?? "";
-    return true;
-  });
-  return text.trim().toLowerCase();
-}
-
-export function isCellEmpty(node: ProseMirrorNode): boolean {
-  return getCellSortText(node) === "";
-}
-
-export const collator = new Intl.Collator(undefined, {
-  sensitivity: "base",
-  numeric: true,
-});
-
-export function sortItems<T>(
-  data: SortableItem<T>[],
-  direction: SortDirection,
-): SortableItem<T>[] {
-  return [...data].sort((a, b) => {
-    if (a.isEmpty && !b.isEmpty) return 1;
-    if (!a.isEmpty && b.isEmpty) return -1;
-    if (a.isEmpty && b.isEmpty) return a.originalOrder - b.originalOrder;
-    const cmp = collator.compare(a.text, b.text);
-    return direction === "asc" ? cmp : -cmp;
-  });
-}
-
-export function weaveItems<T>(
-  all: SortableItem<T>[],
-  sortedData: SortableItem<T>[],
-): SortableItem<T>[] {
-  const dataQueue = [...sortedData];
-  return all.map((item) => (item.isHeader ? item : dataQueue.shift()!));
-}

apps/client/src/features/editor/components/table/handle/menus/alignment-submenu.tsx

@@ -1,49 +0,0 @@
-import React from "react";
-import type { Editor } from "@tiptap/react";
-import { Menu } from "@mantine/core";
-import {
-  IconAlignCenter,
-  IconAlignLeft,
-  IconAlignRight,
-} from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-
-interface AlignmentSubmenuProps {
-  editor: Editor;
-}
-
-export const AlignmentSubmenu = React.memo(function AlignmentSubmenu({
-  editor,
-}: AlignmentSubmenuProps) {
-  const { t } = useTranslation();
-
-  return (
-    <Menu.Sub position="right-start">
-      <Menu.Sub.Target>
-        <Menu.Sub.Item leftSection={<IconAlignLeft size={16} />}>
-          {t("Text alignment")}
-        </Menu.Sub.Item>
-      </Menu.Sub.Target>
-      <Menu.Sub.Dropdown>
-        <Menu.Item
-          leftSection={<IconAlignLeft size={16} />}
-          onClick={() => editor.chain().focus().setTextAlign("left").run()}
-        >
-          {t("Align left")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconAlignCenter size={16} />}
-          onClick={() => editor.chain().focus().setTextAlign("center").run()}
-        >
-          {t("Align center")}
-        </Menu.Item>
-        <Menu.Item
-          leftSection={<IconAlignRight size={16} />}
-          onClick={() => editor.chain().focus().setTextAlign("right").run()}
-        >
-          {t("Align right")}
-        </Menu.Item>
-      </Menu.Sub.Dropdown>
-    </Menu.Sub>
-  );
-});

apps/client/src/features/editor/components/table/handle/menus/cell-chevron-menu.tsx

@@ -1,154 +0,0 @@
-import React from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { ColorSwatch, Menu } from "@mantine/core";
-import {
-  IconBoxMargin,
-  IconColumnInsertRight,
-  IconColumnRemove,
-  IconEraser,
-  IconPalette,
-  IconRowInsertBottom,
-  IconRowRemove,
-  IconSquareToggle,
-  IconTableRow,
-} from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useTableClear } from "../hooks/use-table-clear";
-import { TABLE_COLORS } from "../../table-background-color";
-import { AlignmentSubmenu } from "./alignment-submenu";
-
-interface CellChevronMenuProps {
-  editor: Editor;
-  cellPos: number;
-  tableNode: ProseMirrorNode;
-  tablePos: number;
-}
-
-export const CellChevronMenu = React.memo(function CellChevronMenu({
-  editor,
-  cellPos,
-  tableNode,
-  tablePos,
-}: CellChevronMenuProps) {
-  const { t } = useTranslation();
-
-  const clearCell = useTableClear(editor, tableNode, tablePos, {
-    kind: "cell",
-    cellPos,
-  });
-
-  const setBackground = (color: string, name: string) => {
-    editor
-      .chain()
-      .focus()
-      .updateAttributes("tableCell", {
-        backgroundColor: color || null,
-        backgroundColorName: color ? name : null,
-      })
-      .updateAttributes("tableHeader", {
-        backgroundColor: color || null,
-        backgroundColorName: color ? name : null,
-      })
-      .run();
-  };
-
-  return (
-    <>
-      <Menu.Sub position="right-start">
-        <Menu.Sub.Target>
-          <Menu.Sub.Item leftSection={<IconPalette size={16} />}>
-            {t("Background color")}
-          </Menu.Sub.Item>
-        </Menu.Sub.Target>
-        <Menu.Sub.Dropdown>
-          <div
-            style={{
-              display: "grid",
-              gridTemplateColumns: "repeat(4, 1fr)",
-              gap: 8,
-              padding: 8,
-            }}
-          >
-            {TABLE_COLORS.map((c) => (
-              <button
-                key={c.name}
-                type="button"
-                onClick={() => setBackground(c.color, c.name)}
-                aria-label={t(c.name)}
-                style={{
-                  border: "none",
-                  background: "transparent",
-                  padding: 0,
-                  cursor: "pointer",
-                }}
-              >
-                <ColorSwatch
-                  color={c.color || "#ffffff"}
-                  size={22}
-                  style={{
-                    border: c.color === "" ? "1px solid #e5e7eb" : undefined,
-                  }}
-                />
-              </button>
-            ))}
-          </div>
-        </Menu.Sub.Dropdown>
-      </Menu.Sub>
-
-      <AlignmentSubmenu editor={editor} />
-
-      <Menu.Item
-        leftSection={<IconBoxMargin size={16} />}
-        onClick={() => editor.chain().focus().mergeCells().run()}
-        disabled={!editor.can().mergeCells()}
-      >
-        {t("Merge cells")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconSquareToggle size={16} />}
-        onClick={() => editor.chain().focus().splitCell().run()}
-        disabled={!editor.can().splitCell()}
-      >
-        {t("Split cell")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconTableRow size={16} />}
-        onClick={() => editor.chain().focus().toggleHeaderCell().run()}
-      >
-        {t("Toggle header cell")}
-      </Menu.Item>
-
-      <Menu.Divider />
-
-      <Menu.Item
-        leftSection={<IconColumnInsertRight size={16} />}
-        onClick={() => editor.chain().focus().addColumnAfter().run()}
-      >
-        {t("Add column right")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconRowInsertBottom size={16} />}
-        onClick={() => editor.chain().focus().addRowAfter().run()}
-      >
-        {t("Add row below")}
-      </Menu.Item>
-
-      <Menu.Item leftSection={<IconEraser size={16} />} onClick={clearCell}>
-        {t("Clear cell")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconColumnRemove size={16} />}
-        onClick={() => editor.chain().focus().deleteColumn().run()}
-      >
-        {t("Delete column")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconRowRemove size={16} />}
-        onClick={() => editor.chain().focus().deleteRow().run()}
-      >
-        {t("Delete row")}
-      </Menu.Item>
-    </>
-  );
-});

apps/client/src/features/editor/components/table/handle/menus/column-handle-menu.tsx

@@ -1,177 +0,0 @@
-import React from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { ColorSwatch, Menu } from "@mantine/core";
-import { TABLE_COLORS } from "../../table-background-color";
-import {
-  IconArrowLeft,
-  IconArrowRight,
-  IconColumnInsertLeft,
-  IconColumnInsertRight,
-  IconColumnRemove,
-  IconEraser,
-  IconPalette,
-  IconSortAscendingLetters,
-  IconSortDescendingLetters,
-} from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useTableMoveRowColumn } from "../hooks/use-table-move-row-column";
-import { useTableClear } from "../hooks/use-table-clear";
-import { useTableSort } from "../hooks/use-table-sort";
-import { AlignmentSubmenu } from "./alignment-submenu";
-
-interface ColumnHandleMenuProps {
-  editor: Editor;
-  index: number;
-  tableNode: ProseMirrorNode;
-  tablePos: number;
-}
-
-export const ColumnHandleMenu = React.memo(function ColumnHandleMenu({
-  editor,
-  index,
-  tableNode,
-  tablePos,
-}: ColumnHandleMenuProps) {
-  const { t } = useTranslation();
-
-  const moveLeft = useTableMoveRowColumn(editor, "col", index, "left", tableNode, tablePos);
-  const moveRight = useTableMoveRowColumn(editor, "col", index, "right", tableNode, tablePos);
-  const clearCol = useTableClear(editor, tableNode, tablePos, {
-    kind: "col",
-    index,
-  });
-
-  const setBackground = (color: string, name: string) => {
-    editor
-      .chain()
-      .focus()
-      .updateAttributes("tableCell", {
-        backgroundColor: color || null,
-        backgroundColorName: color ? name : null,
-      })
-      .updateAttributes("tableHeader", {
-        backgroundColor: color || null,
-        backgroundColorName: color ? name : null,
-      })
-      .run();
-  };
-
-  const sortAsc = useTableSort({
-    editor,
-    orientation: "col",
-    index,
-    tableNode,
-    tablePos,
-    direction: "asc",
-  });
-  const sortDesc = useTableSort({
-    editor,
-    orientation: "col",
-    index,
-    tableNode,
-    tablePos,
-    direction: "desc",
-  });
-
-  return (
-    <>
-      <Menu.Item
-        leftSection={<IconSortAscendingLetters size={16} />}
-        onClick={sortAsc.handleSort}
-        disabled={!sortAsc.canSort}
-      >
-        {t("Sort A → Z")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconSortDescendingLetters size={16} />}
-        onClick={sortDesc.handleSort}
-        disabled={!sortDesc.canSort}
-      >
-        {t("Sort Z → A")}
-      </Menu.Item>
-      <Menu.Divider />
-
-      <Menu.Sub position="right-start">
-        <Menu.Sub.Target>
-          <Menu.Sub.Item leftSection={<IconPalette size={16} />}>
-            {t("Background color")}
-          </Menu.Sub.Item>
-        </Menu.Sub.Target>
-        <Menu.Sub.Dropdown>
-          <div style={{ display: "grid", gridTemplateColumns: "repeat(4, 1fr)", gap: 8, padding: 8 }}>
-            {TABLE_COLORS.map((c) => (
-              <button
-                key={c.name}
-                type="button"
-                onClick={() => setBackground(c.color, c.name)}
-                aria-label={t(c.name)}
-                style={{
-                  border: "none",
-                  background: "transparent",
-                  padding: 0,
-                  cursor: "pointer",
-                }}
-              >
-                <ColorSwatch
-                  color={c.color || "#ffffff"}
-                  size={22}
-                  style={{ border: c.color === "" ? "1px solid #e5e7eb" : undefined }}
-                />
-              </button>
-            ))}
-          </div>
-        </Menu.Sub.Dropdown>
-      </Menu.Sub>
-
-      <AlignmentSubmenu editor={editor} />
-
-      <Menu.Divider />
-
-      <Menu.Item
-        leftSection={<IconColumnInsertLeft size={16} />}
-        onClick={() => editor.chain().focus().addColumnBefore().run()}
-      >
-        {t("Add column left")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconColumnInsertRight size={16} />}
-        onClick={() => editor.chain().focus().addColumnAfter().run()}
-      >
-        {t("Add column right")}
-      </Menu.Item>
-
-      <Menu.Divider />
-
-      <Menu.Item
-        leftSection={<IconEraser size={16} />}
-        onClick={clearCol}
-      >
-        {t("Clear cells")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconColumnRemove size={16} />}
-        onClick={() => editor.chain().focus().deleteColumn().run()}
-      >
-        {t("Delete column")}
-      </Menu.Item>
-
-      <Menu.Divider />
-
-      <Menu.Item
-        leftSection={<IconArrowLeft size={16} />}
-        onClick={moveLeft.handleMove}
-        disabled={!moveLeft.canMove}
-      >
-        {t("Move column left")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconArrowRight size={16} />}
-        onClick={moveRight.handleMove}
-        disabled={!moveRight.canMove}
-      >
-        {t("Move column right")}
-      </Menu.Item>
-    </>
-  );
-});

apps/client/src/features/editor/components/table/handle/menus/row-handle-menu.tsx

@@ -1,138 +0,0 @@
-import React from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { ColorSwatch, Menu } from "@mantine/core";
-import { TABLE_COLORS } from "../../table-background-color";
-import {
-  IconArrowDown,
-  IconArrowUp,
-  IconEraser,
-  IconPalette,
-  IconRowInsertBottom,
-  IconRowInsertTop,
-  IconRowRemove,
-} from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useTableMoveRowColumn } from "../hooks/use-table-move-row-column";
-import { useTableClear } from "../hooks/use-table-clear";
-import { AlignmentSubmenu } from "./alignment-submenu";
-
-interface RowHandleMenuProps {
-  editor: Editor;
-  index: number;
-  tableNode: ProseMirrorNode;
-  tablePos: number;
-}
-
-export const RowHandleMenu = React.memo(function RowHandleMenu({
-  editor,
-  index,
-  tableNode,
-  tablePos,
-}: RowHandleMenuProps) {
-  const { t } = useTranslation();
-
-  const setBackground = (color: string, name: string) => {
-    editor
-      .chain()
-      .focus()
-      .updateAttributes("tableCell", {
-        backgroundColor: color || null,
-        backgroundColorName: color ? name : null,
-      })
-      .updateAttributes("tableHeader", {
-        backgroundColor: color || null,
-        backgroundColorName: color ? name : null,
-      })
-      .run();
-  };
-
-  const moveUp = useTableMoveRowColumn(editor, "row", index, "up", tableNode, tablePos);
-  const moveDown = useTableMoveRowColumn(editor, "row", index, "down", tableNode, tablePos);
-  const clearRow = useTableClear(editor, tableNode, tablePos, {
-    kind: "row",
-    index,
-  });
-
-  return (
-    <>
-      <Menu.Sub position="right-start">
-        <Menu.Sub.Target>
-          <Menu.Sub.Item leftSection={<IconPalette size={16} />}>
-            {t("Background color")}
-          </Menu.Sub.Item>
-        </Menu.Sub.Target>
-        <Menu.Sub.Dropdown>
-          <div style={{ display: "grid", gridTemplateColumns: "repeat(4, 1fr)", gap: 8, padding: 8 }}>
-            {TABLE_COLORS.map((c) => (
-              <button
-                key={c.name}
-                type="button"
-                onClick={() => setBackground(c.color, c.name)}
-                aria-label={t(c.name)}
-                style={{
-                  border: "none",
-                  background: "transparent",
-                  padding: 0,
-                  cursor: "pointer",
-                }}
-              >
-                <ColorSwatch
-                  color={c.color || "#ffffff"}
-                  size={22}
-                  style={{ border: c.color === "" ? "1px solid #e5e7eb" : undefined }}
-                />
-              </button>
-            ))}
-          </div>
-        </Menu.Sub.Dropdown>
-      </Menu.Sub>
-
-      <AlignmentSubmenu editor={editor} />
-
-      <Menu.Divider />
-
-      <Menu.Item
-        leftSection={<IconRowInsertTop size={16} />}
-        onClick={() => editor.chain().focus().addRowBefore().run()}
-      >
-        {t("Add row above")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconRowInsertBottom size={16} />}
-        onClick={() => editor.chain().focus().addRowAfter().run()}
-      >
-        {t("Add row below")}
-      </Menu.Item>
-
-      <Menu.Divider />
-
-      <Menu.Item leftSection={<IconEraser size={16} />} onClick={clearRow}>
-        {t("Clear cells")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconRowRemove size={16} />}
-        onClick={() => editor.chain().focus().deleteRow().run()}
-      >
-        {t("Delete row")}
-      </Menu.Item>
-
-      <Menu.Divider />
-
-      <Menu.Item
-        leftSection={<IconArrowUp size={16} />}
-        onClick={moveUp.handleMove}
-        disabled={!moveUp.canMove}
-      >
-        {t("Move row up")}
-      </Menu.Item>
-      <Menu.Item
-        leftSection={<IconArrowDown size={16} />}
-        onClick={moveDown.handleMove}
-        disabled={!moveDown.canMove}
-      >
-        {t("Move row down")}
-      </Menu.Item>
-    </>
-  );
-});

apps/client/src/features/editor/components/table/handle/row-handle.tsx

@@ -1,127 +0,0 @@
-import React, { useCallback, useEffect, useRef, useState } from "react";
-import type { Editor } from "@tiptap/react";
-import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
-import { useFloating, offset, autoUpdate, hide } from "@floating-ui/react";
-import { Menu } from "@mantine/core";
-import clsx from "clsx";
-import { useTranslation } from "react-i18next";
-import { useTableHandleDrag } from "./hooks/use-table-handle-drag";
-import { useColumnRowMenuLifecycle } from "./hooks/use-column-row-menu-lifecycle";
-import { RowHandleMenu } from "./menus/row-handle-menu";
-import classes from "./handle.module.css";
-
-interface RowHandleProps {
-  editor: Editor;
-  index: number;
-  anchorPos: number;
-  tableNode: ProseMirrorNode;
-  tablePos: number;
-}
-
-export const RowHandle = React.memo(function RowHandle({
-  editor,
-  index,
-  anchorPos,
-  tableNode,
-  tablePos,
-}: RowHandleProps) {
-  const { t } = useTranslation();
-  // See ColumnHandle for the rationale: keep the last valid cell DOM cached
-  // so the handle div stays mounted across stale-anchor renders, otherwise
-  // pragmatic-dnd silently aborts an in-flight drag.
-  // `nodeDOM` is typed as `Node | null` — when `anchorPos` goes stale (e.g.
-  // an external drop reflows the doc before the plugin re-emits
-  // hoveringCell), it can resolve to a Text node, on which `.closest` is
-  // undefined. Filter to HTMLElement so downstream consumers stay safe.
-  const lookupDom = editor.view.nodeDOM(anchorPos);
-  const lookupCellDom = lookupDom instanceof HTMLElement ? lookupDom : null;
-  const [cellDom, setCellDom] = useState<HTMLElement | null>(lookupCellDom);
-  const lastCellDomRef = useRef<HTMLElement | null>(lookupCellDom);
-  useEffect(() => {
-    if (lookupCellDom && lookupCellDom !== lastCellDomRef.current) {
-      lastCellDomRef.current = lookupCellDom;
-      setCellDom(lookupCellDom);
-    }
-  }, [lookupCellDom]);
-
-  const [handleEl, setHandleEl] = useState<HTMLDivElement | null>(null);
-
-  const { refs, floatingStyles, middlewareData } = useFloating({
-    placement: "left",
-    middleware: [offset(-4), hide()],
-    whileElementsMounted: autoUpdate,
-  });
-  const isReferenceHidden = !!middlewareData.hide?.referenceHidden;
-
-  useEffect(() => {
-    refs.setReference(cellDom);
-  }, [cellDom, refs]);
-
-  const wrapper = cellDom?.closest<HTMLElement>(".tableWrapper") ?? null;
-
-  const [menuOpened, setMenuOpened] = useState(false);
-  const closeMenu = useCallback(() => setMenuOpened(false), []);
-  useTableHandleDrag(editor, "row", handleEl, wrapper, closeMenu);
-
-  const { onOpen, onClose } = useColumnRowMenuLifecycle({
-    editor,
-    orientation: "row",
-    index,
-    tableNode,
-    tablePos,
-  });
-
-  if (!cellDom) return null;
-
-  return (
-    <Menu
-      opened={menuOpened}
-      onChange={setMenuOpened}
-      position="right-start"
-      onOpen={onOpen}
-      onClose={onClose}
-      withinPortal
-      shadow="md"
-    >
-      <Menu.Target>
-        <div
-          ref={(node) => {
-            refs.setFloating(node);
-            setHandleEl(node);
-          }}
-          style={{
-            ...floatingStyles,
-            ...(isReferenceHidden ? { visibility: "hidden" as const } : {}),
-          }}
-          className={clsx(classes.handle, classes.rowHandle)}
-          role="button"
-          tabIndex={0}
-          aria-label={t("Row actions")}
-        >
-          <span style={{ pointerEvents: "none", display: "inline-flex" }}>
-            <GripIcon />
-          </span>
-        </div>
-      </Menu.Target>
-      <Menu.Dropdown>
-        <RowHandleMenu
-          editor={editor}
-          index={index}
-          tableNode={tableNode}
-          tablePos={tablePos}
-        />
-      </Menu.Dropdown>
-    </Menu>
-  );
-});
-
-function GripIcon() {
-  return (
-    <svg viewBox="0 0 10 10" width="14" height="14" aria-hidden>
-      <path
-        fill="currentColor"
-        d="M3,2 A1,1 0 1 1 3,0 A1,1 0 0 1 3,2 Z M3,6 A1,1 0 1 1 3,4 A1,1 0 0 1 3,6 Z M3,10 A1,1 0 1 1 3,8 A1,1 0 0 1 3,10 Z M7,2 A1,1 0 1 1 7,0 A1,1 0 0 1 7,2 Z M7,6 A1,1 0 1 1 7,4 A1,1 0 0 1 7,6 Z M7,10 A1,1 0 1 1 7,8 A1,1 0 0 1 7,10 Z"
-      />
-    </svg>
-  );
-}

apps/client/src/features/editor/components/table/handle/table-handles-layer.tsx

@@ -1,44 +0,0 @@
-import React from "react";
-import type { Editor } from "@tiptap/react";
-import { useTableHandleState } from "./hooks/use-table-handle-state";
-import { ColumnHandle } from "./column-handle";
-import { RowHandle } from "./row-handle";
-import { CellChevron } from "./cell-chevron";
-
-interface TableHandlesLayerProps {
-  editor: Editor | null;
-}
-
-export const TableHandlesLayer = React.memo(function TableHandlesLayer({
-  editor,
-}: TableHandlesLayerProps) {
-  const state = useTableHandleState(editor);
-
-  if (!editor || !editor.isEditable) return null;
-  if (!state.hoveringCell || !state.tableNode || state.tablePos == null) return null;
-
-  return (
-    <>
-      <ColumnHandle
-        editor={editor}
-        index={state.hoveringCell.colIndex}
-        anchorPos={state.hoveringCell.colFirstCellPos}
-        tableNode={state.tableNode!}
-        tablePos={state.tablePos!}
-      />
-      <RowHandle
-        editor={editor}
-        index={state.hoveringCell.rowIndex}
-        anchorPos={state.hoveringCell.rowFirstCellPos}
-        tableNode={state.tableNode!}
-        tablePos={state.tablePos!}
-      />
-      <CellChevron
-        editor={editor}
-        cellPos={state.hoveringCell.cellPos}
-        tableNode={state.tableNode!}
-        tablePos={state.tablePos!}
-      />
-    </>
-  );
-});

apps/client/src/features/editor/components/table/table-background-color.tsx

@@ -22,7 +22,7 @@ interface TableBackgroundColorProps {
   editor: Editor | null;
 }
 
-export const TABLE_COLORS: TableColorItem[] = [
+const TABLE_COLORS: TableColorItem[] = [
   { name: "Default", color: "" },
   { name: "Blue", color: "#b4d5ff" },
   { name: "Green", color: "#acf5d2" },

apps/client/src/features/editor/components/table/table-menu.tsx

@@ -18,7 +18,7 @@ import {
   IconTrashX,
 } from "@tabler/icons-react";
 import { BubbleMenu } from "@tiptap/react/menus";
-import { isCellSelection, isEditorReady, isTextSelected } from "@docmost/editor-ext";
+import { isCellSelection, isTextSelected } from "@docmost/editor-ext";
 import { useTranslation } from "react-i18next";
 import classes from "../common/toolbar-menu.module.css";
 
@@ -38,7 +38,6 @@ export const TableMenu = React.memo(
     );
 
     const getReferencedVirtualElement = useCallback(() => {
-      if (!isEditorReady(editor)) return;
       const { selection } = editor.state;
       const predicate = (node: PMNode) => node.type.name === "table";
       const parent = findParentNode(predicate)(selection);
@@ -105,12 +104,12 @@ export const TableMenu = React.memo(
           element.style.zIndex = "99";
         }}
         options={{
-          placement: "bottom",
+          placement: "top",
           offset: {
             mainAxis: 15,
           },
           flip: {
-            fallbackPlacements: ["bottom", "top"],
+            fallbackPlacements: ["top", "bottom"],
             padding: { top: 35 + 15, left: 8, right: 8, bottom: -Infinity },
             boundary: editor.options.element as HTMLElement,
           },