feat(editor): indentation

apps/client/package.json

@@ -7,18 +7,13 @@
     "build": "tsc && vite build",
     "lint": "eslint .",
     "preview": "vite preview",
-    "format": "prettier --write \"src/**/*.tsx\" \"src/**/*.ts\"",
-    "test": "vitest run",
-    "test:watch": "vitest"
+    "format": "prettier --write \"src/**/*.tsx\" \"src/**/*.ts\""
   },
   "dependencies": {
-    "@atlaskit/pragmatic-drag-and-drop": "^1.8.1",
-    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
-    "@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/dates": "^8.3.18",
@@ -27,16 +22,13 @@
     "@mantine/modals": "^8.3.18",
     "@mantine/notifications": "^8.3.18",
     "@mantine/spotlight": "^8.3.18",
-    "@slidoapp/emoji-mart": "^5.8.7",
-    "@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",
-    "axios": "1.16.0",
+    "axios": "1.15.0",
     "blueimp-load-image": "^5.16.0",
     "clsx": "^2.1.1",
+    "emoji-mart": "^5.6.0",
     "file-saver": "^2.0.5",
     "highlightjs-sap-abap": "^0.3.0",
     "i18next": "25.10.1",
@@ -52,6 +44,7 @@
     "mitt": "^3.0.1",
     "posthog-js": "1.372.2",
     "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",
@@ -66,8 +59,6 @@
   "devDependencies": {
     "@eslint/js": "^9.28.0",
     "@tanstack/eslint-plugin-query": "^5.94.4",
-    "@testing-library/jest-dom": "^6.6.0",
-    "@testing-library/react": "^16.1.0",
     "@types/blueimp-load-image": "^5.16.6",
     "@types/file-saver": "^2.0.7",
     "@types/js-cookie": "^3.0.6",
@@ -81,7 +72,6 @@
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-react-refresh": "^0.5.2",
     "globals": "^15.13.0",
-    "jsdom": "^25.0.0",
     "optics-ts": "^2.4.1",
     "postcss": "^8.5.12",
     "postcss-preset-mantine": "^1.18.0",
@@ -89,7 +79,6 @@
     "prettier": "^3.8.1",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.57.1",
-    "vite": "8.0.5",
-    "vitest": "^4.1.6"
+    "vite": "8.0.5"
   }
 }

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

@@ -932,6 +932,7 @@
   "Settings navigation": "Settings navigation",
   "AI navigation": "AI navigation",
   "Breadcrumb": "Breadcrumb",
+  "Skip to main content": "Skip to main content"
   "Synced block": "Synced block",
   "Create a block that stays in sync across pages.": "Create a block that stays in sync across pages.",
   "Editing original": "Editing original",
@@ -945,57 +946,5 @@
   "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}}"
+  "Failed to load this synced block": "Failed to load this synced block"
 }

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

@@ -8,7 +8,6 @@ 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 }] = useAtom(asideStateAtom);
@@ -31,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;

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"
-                    ? t("Details")
-                    : undefined
+                  : undefined
           }
         >
           <Aside />
         </AppShell.Aside>
       )}
     </AppShell>
+    </>
   );
 }

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/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/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/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}
-              isOpen={isNodeSelectorOpen}
-              setIsOpen={() => {
-                setIsNodeSelectorOpen(!isNodeSelectorOpen);
-                setIsTextAlignmentOpen(false);
-                setIsColorSelectorOpen(false);
-              }}
-            />
+        <NodeSelector
+          editor={props.editor}
+          isOpen={isNodeSelectorOpen}
+          setIsOpen={() => {
+            setIsNodeSelectorOpen(!isNodeSelectorOpen);
+            setIsTextAlignmentOpen(false);
+            setIsColorSelectorOpen(false);
+          }}
+        />
 
-            <TextAlignmentSelector
-              editor={props.editor}
-              isOpen={isTextAlignmentSelectorOpen}
-              setIsOpen={() => {
-                setIsTextAlignmentOpen(!isTextAlignmentSelectorOpen);
-                setIsNodeSelectorOpen(false);
-                setIsColorSelectorOpen(false);
-              }}
-            />
+        <TextAlignmentSelector
+          editor={props.editor}
+          isOpen={isTextAlignmentSelectorOpen}
+          setIsOpen={() => {
+            setIsTextAlignmentOpen(!isTextAlignmentSelectorOpen);
+            setIsNodeSelectorOpen(false);
+            setIsColorSelectorOpen(false);
+          }}
+        />
 
-            <ActionIcon.Group>
-              {items.map((item, index) => (
-                <Tooltip key={index} label={t(item.name)} withArrow>
-                  <ActionIcon
-                    key={index}
-                    variant="default"
-                    size="lg"
-                    radius="0"
-                    aria-label={t(item.name)}
-                    className={clsx({ [classes.active]: item.isActive() })}
-                    style={{ border: "none" }}
-                    onClick={item.command}
-                  >
-                    <item.icon style={{ width: rem(16) }} stroke={2} />
-                  </ActionIcon>
-                </Tooltip>
-              ))}
-            </ActionIcon.Group>
+        <ActionIcon.Group>
+          {items.map((item, index) => (
+            <Tooltip key={index} label={t(item.name)} withArrow>
+              <ActionIcon
+                key={index}
+                variant="default"
+                size="lg"
+                radius="0"
+                aria-label={t(item.name)}
+                className={clsx({ [classes.active]: item.isActive() })}
+                style={{ border: "none" }}
+                onClick={item.command}
+              >
+                <item.icon style={{ width: rem(16) }} stroke={2} />
+              </ActionIcon>
+            </Tooltip>
+          ))}
+        </ActionIcon.Group>
 
-            <LinkSelector />
+        <LinkSelector />
 
-            <ColorSelector
-              editor={props.editor}
-              isOpen={isColorSelectorOpen}
-              setIsOpen={() => {
-                setIsColorSelectorOpen(!isColorSelectorOpen);
-                setIsNodeSelectorOpen(false);
-                setIsTextAlignmentOpen(false);
-              }}
-            />
-          </>
-        )}
+        <ColorSelector
+          editor={props.editor}
+          isOpen={isColorSelectorOpen}
+          setIsOpen={() => {
+            setIsColorSelectorOpen(!isColorSelectorOpen);
+            setIsNodeSelectorOpen(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
-      width={220}
-      opened={isOpen}
-      onChange={setIsOpen}
-      trapFocus
-      withArrow
-    >
+    <Popover width={220} opened={isOpen} 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()}>
-        <Stack gap="md" p="2px">
+      <Popover.Dropdown>
+        <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

@@ -155,7 +155,7 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
   };
 
   return (
-    <Popover opened={isOpen} onChange={setIsOpen} withArrow>
+    <Popover opened={isOpen} withArrow>
       <Popover.Target>
         <Tooltip
           label={t("Turn into")}

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
-      shadow="md"
-      position="bottom-start"
-      withArrow={false}
-      opened={isOpen}
-      onChange={setIsOpen}
-    >
-      <Menu.Target>
-        <Tooltip label={t("Text align")} withArrow disabled={isOpen}>
+    <Popover opened={isOpen} withArrow>
+      <Popover.Target>
+        <Tooltip label={t("Text align")} withArrow withinPortal={false} 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>
-        {items.map((item, index) => (
-          <Menu.Item
-            key={index}
-            leftSection={<item.icon size={16} />}
-            rightSection={
-              activeItem.name === item.name ? <IconCheck size={16} /> : null
-            }
-            onClick={() => {
-              item.command();
-              setIsOpen(false);
-            }}
-          >
-            {t(item.name)}
-          </Menu.Item>
-        ))}
-      </Menu.Dropdown>
-    </Menu>
+      <Popover.Dropdown>
+        <ScrollArea.Autosize type="scroll" mah={400}>
+          <Button.Group orientation="vertical">
+            {items.map((item, index) => (
+              <Button
+                key={index}
+                variant="default"
+                leftSection={<item.icon size={16} />}
+                rightSection={
+                  activeItem.name === item.name && <IconCheck size={16} />
+                }
+                justify="left"
+                fullWidth
+                onClick={() => {
+                  item.command();
+                  setIsOpen(false);
+                }}
+                style={{ border: "none" }}
+              >
+                {t(item.name)}
+              </Button>
+            ))}
+          </Button.Group>
+        </ScrollArea.Autosize>
+      </Popover.Dropdown>
+    </Popover>
   );
 };

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 (query: string): Promise<EmojiMenuItemType[]> => {
-  if (query === "") {
-    return sortFrequentlyUsedEmoji(getFrequentlyUsedEmoji());
+const searchEmoji = async (value: string): Promise<EmojiMenuItemType[]> => {
+  if (value === "") {
+    const frequentlyUsedEmoji = getFrequentlyUsedEmoji();
+    return sortFrequentlyUsedEmoji(frequentlyUsedEmoji);
   }
 
-  const q = query.toLowerCase();
-  const index = await buildEmojiIndex();
-
-  return index
-    .filter((e) => e.name.includes(q) || e.id.includes(q))
-    .slice(0, MAX_RESULTS)
-    .map((entry) => ({
-      id: entry.id,
-      emoji: entry.native,
+  const emojis = await SearchIndex.search(value);
+  const results = emojis.map((emoji: any) => {
+    return {
+      id: emoji.id,
+      emoji: emoji.skins[0].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,
-  EmojiIndexEntry,
-  getEmojiCategories,
-  incrementEmojiUsage,
-} from "./utils";
+  ActionIcon,
+  Loader,
+  Paper,
+  ScrollArea,
+  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 CAT_ICONS: Record<string, string> = {
-  people:   "😀",
-  nature:   "🌿",
-  foods:    "🍕",
-  activity: "🎮",
-  places:   "🗺️",
-  objects:  "🔧",
-  symbols:  "💯",
-  flags:    "🚩",
-};
-
-function EmojiList({
+const EmojiList = ({
   items,
   isLoading,
   command,
   editor,
   range,
-  query = "",
 }: {
   items: EmojiMenuItemType[];
   isLoading: boolean;
-  command: (item: EmojiMenuItemType) => void;
+  command: any;
   editor: any;
   range: any;
-  query?: string;
-}) {
-  const { t } = useTranslation();
-  const [idx, setIdx] = useState(0);
-  const [cats, setCats] = useState<EmojiCategory[]>([]);
-  const [activeCat, setActiveCat] = useState("");
-  const [focusZone, setFocusZone] = useState<"grid" | "tabs">("grid");
-  const listViewport = useRef<HTMLDivElement>(null);
-  const gridViewport = useRef<HTMLDivElement>(null);
-  const catBar = useRef<HTMLDivElement>(null);
+}) => {
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const viewportRef = useRef<HTMLDivElement>(null);
 
-  const searching = query.length > 0;
-  const browseLoading = !searching && cats.length === 0;
-  const gridItems = cats.find((c) => c.id === activeCat)?.emojis ?? [];
-
-  useEffect(() => {
-    getEmojiCategories().then((data) => {
-      setCats(data);
-      setActiveCat((prev) => prev || data[0]?.id || "");
-    });
-  }, []);
-
-  useEffect(() => { setIdx(0); }, [query, activeCat]);
-
-  useEffect(() => { if (searching) setFocusZone("grid"); }, [searching]);
-
-  useEffect(() => {
-    if (focusZone !== "tabs") return;
-    catBar.current?.querySelector<HTMLElement>(`[data-cat="${activeCat}"]`)?.scrollIntoView({ block: "nearest", inline: "nearest" });
-  }, [activeCat, focusZone]);
-
-  useEffect(() => {
-    if (focusZone === "tabs") return;
-    const vp = searching ? listViewport.current : gridViewport.current;
-    vp?.querySelector<HTMLElement>(`[data-i="${idx}"]`)?.scrollIntoView({ block: "nearest" });
-  }, [idx, searching, focusZone]);
-
-  const pickSearchItem = useCallback(
-    (i: number) => {
-      const item = items[i];
-      if (!item) return;
-      command(item);
-      incrementEmojiUsage(item.id);
-    },
-    [command, items],
-  );
-
-  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]); }
+  const selectItem = useCallback(
+    (index: number) => {
+      const item = items[index];
+      if (item) {
+        command(item);
+        incrementEmojiUsage(item.id);
       }
-    }
-    document.addEventListener("keydown", onKey);
-    return () => document.removeEventListener("keydown", onKey);
-  }, [searching, items, idx, gridItems, pickSearchItem, pickGridItem, focusZone, cats, activeCat]);
+    },
+    [command, items]
+  );
 
-  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" size="xs" color="blue" type="dots" />}
-          <ScrollArea.Autosize mah={260} scrollbarSize={6} viewportRef={listViewport}>
-            <div style={{ padding: 4 }}>
-              {items.length === 0 && !isLoading ? (
-                <Text size="sm" c="dimmed" p="xs">{t("No results")}</Text>
-              ) : items.map((item, i) => (
-                <UnstyledButton
-                  key={item.id}
-                  data-i={i}
-                  w="100%"
-                  className={clsx(classes.row, { [classes.active]: i === idx })}
-                  onClick={() => pickSearchItem(i)}
-                  onMouseEnter={() => setIdx(i)}
-                  role="option"
-                  aria-selected={i === idx}
-                >
-                  <span style={{ fontSize: 20, lineHeight: 1, minWidth: 26 }}>{item.emoji}</span>
-                  <Text size="sm" c="dimmed" ff="monospace" span>:{item.id}:</Text>
-                </UnstyledButton>
-              ))}
-            </div>
-          </ScrollArea.Autosize>
-        </>
-      ) : browseLoading ? (
-        <Loader m="xs" size="xs" color="blue" type="dots" />
-      ) : (
-        <>
-          <div className={classes.catBar} role="tablist" ref={catBar}>
-            {cats.map((c) => {
-              const isActive = c.id === activeCat;
-              const isFocused = isActive && focusZone === "tabs";
-              return (
-                <button
-                  key={c.id}
-                  data-cat={c.id}
-                  title={c.id}
-                  role="tab"
-                  aria-selected={isActive}
-                  className={clsx(classes.catTab, {
-                    [classes.catTabActive]: isActive,
-                    [classes.catTabFocused]: isFocused,
-                  })}
-                  onClick={() => { setActiveCat(c.id); setFocusZone("grid"); }}
-                  onMouseEnter={() => setFocusZone("grid")}
-                >
-                  {CAT_ICONS[c.id] ?? "🔣"}
-                </button>
-              );
-            })}
-          </div>
-          <ScrollArea.Autosize mah={220} scrollbarSize={6} viewportRef={gridViewport}>
-            <div className={classes.grid} style={{ gridTemplateColumns: `repeat(${COLS}, 1fr)` }}>
-              {gridItems.map((entry, i) => (
-                <button
-                  key={entry.id}
-                  data-i={i}
-                  title={`:${entry.id}:`}
-                  className={clsx(classes.emojiBtn, { [classes.active]: i === idx })}
-                  onClick={() => pickGridItem(entry)}
-                  onMouseEnter={() => setIdx(i)}
-                >
-                  {entry.native}
-                </button>
-              ))}
-            </div>
-          </ScrollArea.Autosize>
-        </>
+      {isLoading && <Loader m="xs" color="blue" type="dots" />}
+      {items.length > 0 && (
+        <ScrollArea.Autosize
+          viewportRef={viewportRef}
+          mah={250}
+          scrollbarSize={8}
+          pr="5"
+        >
+          <SimpleGrid cols={GRID_COLUMNS} p="xs" spacing="xs">
+            {items.map((item, index: number) => (
+              <ActionIcon
+                data-item-index={index}
+                id={`emoji-command-option-${index}`}
+                role="option"
+                aria-selected={index === selectedIndex}
+                aria-label={item.id}
+                variant="transparent"
+                key={item.id}
+                className={clsx(classes.menuBtn, {
+                  [classes.selectedItem]: index === selectedIndex,
+                })}
+                onClick={() => selectItem(index)}
+              >
+                <Text size="xl">{item.emoji}</Text>
+              </ActionIcon>
+            ))}
+          </SimpleGrid>
+        </ScrollArea.Autosize>
       )}
     </Paper>
-  );
-}
+  ) : null;
+};
 
 export default EmojiList;

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

@@ -1,13 +1,9 @@
-.row {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 6px 10px;
+.menuBtn {
   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(
-    localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART,
+  const frequentlyUsedEmoji =
+    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 results: EmojiMenuItemType[] = Object.entries(frequentlyUsedEmoji)
-    .map(([id, count]): EmojiMenuItemType | null => {
-      const entry = index.find((e) => e.id === id);
-      if (!entry) return null;
-      return {
+  const data = await Promise.all(
+    Object.entries(frequentlyUsedEmoji).map(
+      async ([id, count]): Promise<EmojiMenuItemType> => ({
         id,
         count,
-        emoji: entry.native,
-        command: ({ editor, range }: CommandProps) => {
-          editor.chain().focus().deleteRange(range).insertContent(entry.native + " ").run();
+        emoji: (await getEmojiDataFromNative(id))?.native,
+        command: async ({ editor, range }: CommandProps) => {
+          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[] };
-
-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;
-};
+export const getFrequentlyUsedEmoji = () => {
+  return JSON.parse(localStorage.getItem(LOCAL_STORAGE_FREQUENT_KEY) || DEFAULT_FREQUENTLY_USED_EMOJI_MART);
+}

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: 50;
-  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,65 +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}
-        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,108 +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,
-  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.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/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/slash-menu/menu-items.ts

@@ -25,7 +25,6 @@ import {
   IconColumns3,
   IconColumns2,
   IconTag,
-  IconMoodSmile,
   IconRotate2,
 } from "@tabler/icons-react";
 import {
@@ -478,15 +477,6 @@ 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",

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/full-editor.tsx

@@ -3,27 +3,20 @@ import React from "react";
 import { TitleEditor } from "@/features/editor/title-editor";
 import PageEditor from "@/features/editor/page-editor";
 import {
-  ActionIcon,
   Container,
   Divider,
   Group,
   Popover,
   Stack,
   Text,
-  Tooltip,
   UnstyledButton,
 } from "@mantine/core";
-import { IconInfoCircle } from "@tabler/icons-react";
 import { useAtom } from "jotai";
 import { userAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { PageVerificationBadge } from "@/ee/page-verification";
 import { useTranslation } from "react-i18next";
 import { IContributor } from "@/features/page/types/page.types.ts";
-import { FixedToolbar } from "@/features/editor/components/fixed-toolbar/fixed-toolbar";
-import { PageEditMode } from "@/features/user/types/user.types.ts";
-import useToggleAside from "@/hooks/use-toggle-aside.tsx";
-import clsx from "clsx";
 
 const MemoizedTitleEditor = React.memo(TitleEditor);
 const MemoizedPageEditor = React.memo(PageEditor);
@@ -59,11 +52,6 @@ export function FullEditor({
 }: FullEditorProps) {
   const [user] = useAtom(userAtom);
   const fullPageWidth = user.settings?.preferences?.fullPageWidth;
-  const editorToolbarEnabled =
-    user.settings?.preferences?.editorToolbar ?? false;
-  const userPageEditMode =
-    user.settings?.preferences?.pageEditMode ?? PageEditMode.Edit;
-  const isEditMode = userPageEditMode === PageEditMode.Edit;
 
   return (
     <Container
@@ -71,7 +59,6 @@ export function FullEditor({
       size={!fullPageWidth && 900}
       className={classes.editor}
     >
-      {editorToolbarEnabled && editable && isEditMode && <FixedToolbar />}
       <MemoizedTitleEditor
         pageId={pageId}
         slugId={slugId}
@@ -106,7 +93,6 @@ function PageByline({
   readOnly,
 }: PageBylineProps) {
   const { t } = useTranslation();
-  const toggleAside = useToggleAside();
 
   const otherContributors = (contributors ?? []).filter(
     (c) => c.id !== creator?.id,
@@ -116,8 +102,8 @@ function PageByline({
     <Group
       gap="sm"
       mb="md"
-      className={clsx("print-hide", classes.byline)}
-      style={{ marginTop: "-0.5em" }}
+      className="print-hide"
+      style={{ marginTop: "-0.5em", paddingLeft: "3rem" }}
     >
       {creator && (
         <Popover position="bottom-start" shadow="md" width={280} withArrow>
@@ -179,17 +165,6 @@ function PageByline({
           </Popover.Dropdown>
         </Popover>
       )}
-      <Tooltip label={t("Details")} withArrow openDelay={250}>
-        <ActionIcon
-          variant="subtle"
-          color="gray"
-          aria-label={t("Details")}
-          onClick={() => toggleAside("details")}
-        >
-          <IconInfoCircle size={20} stroke={1.5} />
-        </ActionIcon>
-      </Tooltip>
-
       <PageVerificationBadge readOnly={readOnly} />
     </Group>
   );

apps/client/src/features/editor/styles/editor.module.css

@@ -9,15 +9,3 @@
     }
 }
 
-.byline {
-    padding-left: 3rem;
-
-    @media (max-width: $mantine-breakpoint-sm) {
-        padding-left: 1rem;
-    }
-
-    @media print {
-        padding-left: 0;
-    }
-}
-

apps/client/src/features/label/components/label-chip.tsx

@@ -1,51 +0,0 @@
-import { Link } from "react-router-dom";
-import { useComputedColorScheme } from "@mantine/core";
-import { IconX } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { ILabel } from "@/features/label/types/label.types.ts";
-import { getLabelColor } from "@/features/label/utils/label-colors.ts";
-import classes from "@/features/label/label.module.css";
-
-type LabelChipProps = {
-  label: Pick<ILabel, "id" | "name">;
-  onRemove?: () => void;
-  asLink?: boolean;
-};
-
-export function LabelChip({ label, onRemove, asLink }: LabelChipProps) {
-  const { t } = useTranslation();
-  const scheme = useComputedColorScheme("light");
-  const c = getLabelColor(label.name, scheme);
-
-  const nameNode = asLink ? (
-    <Link
-      to={`/labels/${encodeURIComponent(label.name)}`}
-      className={classes.chipLink}
-      onClick={(e) => e.stopPropagation()}
-    >
-      <span className={classes.chipName}>{label.name}</span>
-    </Link>
-  ) : (
-    <span className={classes.chipName}>{label.name}</span>
-  );
-
-  return (
-    <span className={classes.chip} style={{ background: c.bg, color: c.fg }}>
-      {nameNode}
-      {onRemove && (
-        <button
-          type="button"
-          className={classes.chipX}
-          onClick={(e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            onRemove();
-          }}
-          aria-label={t("Remove label {{name}}", { name: label.name })}
-        >
-          <IconX size={12} stroke={2} />
-        </button>
-      )}
-    </span>
-  );
-}

apps/client/src/features/label/components/label-page-row-skeleton.tsx

@@ -1,29 +0,0 @@
-import { Skeleton } from "@mantine/core";
-import classes from "@/features/label/label.module.css";
-
-type LabelPageRowSkeletonProps = {
-  titleWidth?: number;
-  metaWidth?: number;
-};
-
-export function LabelPageRowSkeleton({
-  titleWidth = 220,
-  metaWidth = 180,
-}: LabelPageRowSkeletonProps) {
-  return (
-    <div className={classes.row} aria-hidden="true">
-      <div className={classes.rowMain}>
-        <div className={classes.rowIcon}>
-          <Skeleton height={18} width={18} radius="sm" />
-        </div>
-        <div className={classes.rowBody}>
-          <Skeleton height={15} width={titleWidth} radius="xs" />
-          <div className={classes.rowMeta}>
-            <Skeleton height={18} width={18} radius="sm" />
-            <Skeleton height={12} width={metaWidth} radius="xs" />
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/client/src/features/label/components/label-page-row.tsx

@@ -1,91 +0,0 @@
-import { Link } from "react-router-dom";
-import { ThemeIcon, Tooltip } from "@mantine/core";
-import { IconFileDescription } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { ILabelPageItem } from "@/features/label/types/label.types.ts";
-import { LabelChip } from "@/features/label/components/label-chip.tsx";
-import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
-import { buildPageUrl } from "@/features/page/page.utils";
-import { formatLabelListDate } from "@/features/label/utils/format-label-date.ts";
-import classes from "@/features/label/label.module.css";
-
-type LabelPageRowProps = {
-  page: ILabelPageItem;
-  currentLabelName: string;
-};
-
-const MAX_VISIBLE_CHIPS = 3;
-
-export function LabelPageRow({ page, currentLabelName }: LabelPageRowProps) {
-  const { t } = useTranslation();
-
-  const otherLabels = page.labels.filter((l) => l.name !== currentLabelName);
-  const visibleLabels = otherLabels.slice(0, MAX_VISIBLE_CHIPS);
-  const hiddenLabels = otherLabels.slice(MAX_VISIBLE_CHIPS);
-
-  return (
-    <Link
-      to={buildPageUrl(page.space?.slug, page.slugId, page.title ?? undefined)}
-      className={classes.row}
-    >
-      <div className={classes.rowMain}>
-        <div className={classes.rowIcon}>
-          {page.icon ? (
-            <span style={{ fontSize: 16, lineHeight: 1 }}>{page.icon}</span>
-          ) : (
-            <ThemeIcon variant="transparent" color="gray" size={18}>
-              <IconFileDescription size={18} />
-            </ThemeIcon>
-          )}
-        </div>
-        <div className={classes.rowBody}>
-          <div className={classes.rowTitle}>
-            {page.title || t("Untitled")}
-          </div>
-          <div className={classes.rowMeta}>
-            {page.space && (
-              <>
-                <CustomAvatar
-                  name={page.space.name}
-                  avatarUrl={page.space.logo ?? undefined}
-                  type={AvatarIconType.SPACE_ICON}
-                  color="initials"
-                  variant="filled"
-                  size={18}
-                />
-                <span>{page.space.name}</span>
-                <span className={classes.metaDot} aria-hidden="true">
-                  •
-                </span>
-              </>
-            )}
-            <span className={classes.rowDate}>
-              {t("Updated {{date}}", {
-                date: formatLabelListDate(new Date(page.updatedAt)),
-              })}
-            </span>
-          </div>
-          {/* {otherLabels.length > 0 && (
-            <div className={classes.rowChips}>
-              {visibleLabels.map((label) => (
-                <LabelChip key={label.id} label={label} asLink />
-              ))}
-              {hiddenLabels.length > 0 && (
-                <Tooltip
-                  label={hiddenLabels.map((l) => l.name).join(", ")}
-                  withArrow
-                  openDelay={200}
-                >
-                  <span className={classes.chipMore}>
-                    +{hiddenLabels.length}
-                  </span>
-                </Tooltip>
-              )}
-            </div>
-          )} */}
-        </div>
-      </div>
-    </Link>
-  );
-}

apps/client/src/features/label/components/label-picker.tsx

@@ -1,160 +0,0 @@
-import { useMemo, useRef, useState, KeyboardEvent } from "react";
-import clsx from "clsx";
-import { IconPlus } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useComputedColorScheme } from "@mantine/core";
-import { ILabel } from "@/features/label/types/label.types.ts";
-import { useWorkspaceLabelsQuery } from "@/features/label/queries/label-query.ts";
-import { getLabelColor } from "@/features/label/utils/label-colors.ts";
-import { normalizeLabelName } from "@/features/label/utils/normalize-label.ts";
-import classes from "@/features/label/label.module.css";
-
-type LabelPickerProps = {
-  applied: ILabel[];
-  enabled: boolean;
-  onAdd: (name: string) => void;
-  onClose: () => void;
-};
-
-const NAME_PATTERN = /^[a-z0-9_-][a-z0-9_~-]*$/;
-const MAX_LABEL_NAME_LENGTH = 100;
-
-function isValidLabelName(name: string): boolean {
-  return (
-    name.length > 0 &&
-    name.length <= MAX_LABEL_NAME_LENGTH &&
-    NAME_PATTERN.test(name)
-  );
-}
-
-export function LabelPicker({
-  applied,
-  enabled,
-  onAdd,
-  onClose,
-}: LabelPickerProps) {
-  const { t } = useTranslation();
-  const scheme = useComputedColorScheme("light");
-  const [query, setQuery] = useState("");
-  const [hover, setHover] = useState(0);
-  const inputRef = useRef<HTMLInputElement>(null);
-
-  const normalized = normalizeLabelName(query);
-  const { data } = useWorkspaceLabelsQuery(normalized, enabled);
-
-  const appliedNames = useMemo(
-    () => new Set(applied.map((l) => l.name.toLowerCase())),
-    [applied],
-  );
-
-  const suggestions = useMemo(() => {
-    const items = data?.items ?? [];
-    return items.filter((l) => !appliedNames.has(l.name.toLowerCase()));
-  }, [data, appliedNames]);
-
-  const exact = suggestions.find((l) => l.name === normalized);
-  const canCreate =
-    !exact && !appliedNames.has(normalized) && isValidLabelName(normalized);
-
-  const total = suggestions.length + (canCreate ? 1 : 0);
-
-  const select = (idx: number) => {
-    if (idx < suggestions.length) {
-      onAdd(suggestions[idx].name);
-    } else if (canCreate) {
-      onAdd(normalized);
-    }
-    setQuery("");
-    setHover(0);
-    inputRef.current?.focus();
-  };
-
-  const onKey = (e: KeyboardEvent<HTMLInputElement>) => {
-    if (e.key === "ArrowDown") {
-      e.preventDefault();
-      setHover((h) => Math.min(Math.max(total - 1, 0), h + 1));
-    } else if (e.key === "ArrowUp") {
-      e.preventDefault();
-      setHover((h) => Math.max(0, h - 1));
-    } else if (e.key === "Enter") {
-      e.preventDefault();
-      if (total === 0) return;
-      select(hover);
-    } else if (e.key === "Escape") {
-      e.preventDefault();
-      onClose();
-    }
-  };
-
-  return (
-    <div className={classes.popover}>
-      <div className={classes.popoverSearch}>
-        <input
-          ref={inputRef}
-          type="text"
-          autoFocus
-          maxLength={MAX_LABEL_NAME_LENGTH}
-          placeholder={t("Search or create…")}
-          value={query}
-          onChange={(e) => {
-            setQuery(e.target.value);
-            setHover(0);
-          }}
-          onKeyDown={onKey}
-        />
-      </div>
-      <div className={classes.popoverList}>
-        {total === 0 && (
-          <div className={classes.popoverEmpty}>
-            {normalized.length === 0
-              ? t("No labels yet")
-              : appliedNames.has(normalized)
-                ? t("Already added")
-                : !isValidLabelName(normalized)
-                  ? t("Invalid label name")
-                  : t("No matches")}
-          </div>
-        )}
-        {suggestions.map((s, i) => {
-          const c = getLabelColor(s.name, scheme);
-          return (
-            <button
-              key={s.id}
-              type="button"
-              className={clsx(
-                classes.popoverItem,
-                hover === i && classes.popoverItemHover,
-              )}
-              onMouseEnter={() => setHover(i)}
-              onClick={() => select(i)}
-            >
-              <span
-                className={classes.popoverItemDot}
-                style={{ background: c.dot }}
-              />
-              <span className={classes.popoverItemName}>{s.name}</span>
-            </button>
-          );
-        })}
-        {canCreate && (
-          <button
-            type="button"
-            className={clsx(
-              classes.popoverItem,
-              hover === suggestions.length && classes.popoverItemHover,
-            )}
-            onMouseEnter={() => setHover(suggestions.length)}
-            onClick={() => select(suggestions.length)}
-          >
-            <span className={classes.popoverCreatePlus}>
-              <IconPlus size={12} stroke={2} />
-            </span>
-            <span className={classes.popoverItemName}>
-              {t("Create")} <b>"{normalized}"</b>
-            </span>
-          </button>
-        )}
-      </div>
-    </div>
-  );
-}

apps/client/src/features/label/components/labels-section.tsx

@@ -1,93 +0,0 @@
-import { useState } from "react";
-import clsx from "clsx";
-import { Divider, Popover, Stack, Text } from "@mantine/core";
-import { IconPlus } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { LabelChip } from "@/features/label/components/label-chip.tsx";
-import { LabelPicker } from "@/features/label/components/label-picker.tsx";
-import {
-  useAddLabelsMutation,
-  usePageLabelsQuery,
-  useRemoveLabelMutation,
-} from "@/features/label/queries/label-query.ts";
-import classes from "@/features/label/label.module.css";
-
-type LabelsSectionProps = {
-  pageId: string;
-  canEdit: boolean;
-};
-
-export function LabelsSection({ pageId, canEdit }: LabelsSectionProps) {
-  const { t } = useTranslation();
-  const [open, setOpen] = useState(false);
-
-  const { data } = usePageLabelsQuery(pageId);
-  const addMutation = useAddLabelsMutation(pageId);
-  const removeMutation = useRemoveLabelMutation(pageId);
-
-  const labels = data?.items ?? [];
-
-  if (!canEdit && labels.length === 0) {
-    return null;
-  }
-
-  const handleAdd = (name: string) => {
-    addMutation.mutate({ pageId, names: [name] });
-  };
-
-  const handleRemove = (labelId: string) => {
-    removeMutation.mutate({ pageId, labelId });
-  };
-
-  return (
-    <>
-      <Divider />
-      <Stack gap="xs">
-        <Text size="xs" fw={500} c="dimmed">
-          {t("Labels")}
-        </Text>
-        <div className={classes.labelsWrap}>
-          {labels.map((label) => (
-            <LabelChip
-              key={label.id}
-              label={label}
-              asLink
-              onRemove={canEdit ? () => handleRemove(label.id) : undefined}
-            />
-          ))}
-          {canEdit && (
-            <Popover
-              opened={open}
-              onChange={setOpen}
-              position="bottom-end"
-              shadow="lg"
-              withinPortal
-              offset={6}
-            >
-              <Popover.Target>
-                <button
-                  type="button"
-                  className={clsx(classes.addBtn, open && classes.addBtnOpen)}
-                  onClick={() => setOpen((v) => !v)}
-                >
-                  <IconPlus size={12} stroke={2} />
-                  <span>
-                    {labels.length === 0 ? t("Add label") : t("Add")}
-                  </span>
-                </button>
-              </Popover.Target>
-              <Popover.Dropdown p={0} className={classes.popover}>
-                <LabelPicker
-                  applied={labels}
-                  enabled={open}
-                  onAdd={(name) => handleAdd(name)}
-                  onClose={() => setOpen(false)}
-                />
-              </Popover.Dropdown>
-            </Popover>
-          )}
-        </div>
-      </Stack>
-    </>
-  );
-}

apps/client/src/features/label/label.module.css

@@ -1,325 +0,0 @@
-.labelsWrap {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 6px;
-  align-items: center;
-  margin-top: 4px;
-}
-
-.chip {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  height: 24px;
-  padding: 0 8px;
-  border-radius: 4px;
-  font-size: 12.5px;
-  font-weight: 500;
-  line-height: 1;
-  user-select: none;
-  white-space: nowrap;
-}
-
-.chipName {
-  letter-spacing: 0.005em;
-}
-
-.chipX {
-  appearance: none;
-  border: 0;
-  background: transparent;
-  color: currentColor;
-  width: 18px;
-  height: 18px;
-  border-radius: 4px;
-  margin-right: -4px;
-  margin-left: 0;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  padding: 0;
-  opacity: 0.6;
-}
-
-.chipX:hover {
-  opacity: 1;
-  background: light-dark(rgba(0, 0, 0, 0.08), rgba(255, 255, 255, 0.12));
-}
-
-.addBtn {
-  appearance: none;
-  border: 1px dashed
-    light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-3));
-  background: transparent;
-  color: var(--mantine-color-dimmed);
-  height: 24px;
-  padding: 0 8px;
-  border-radius: 4px;
-  font: inherit;
-  font-size: 12.5px;
-  font-weight: 500;
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  cursor: pointer;
-  transition:
-    background 100ms ease,
-    border-color 100ms ease,
-    color 100ms ease;
-}
-
-.addBtn:hover {
-  background: light-dark(rgba(0, 0, 0, 0.03), rgba(255, 255, 255, 0.04));
-  color: var(--mantine-color-text);
-  border-color: light-dark(
-    var(--mantine-color-gray-5),
-    var(--mantine-color-dark-2)
-  );
-}
-
-.addBtnOpen {
-  background: var(--mantine-color-body);
-  border-style: solid;
-  border-color: light-dark(
-    var(--mantine-color-gray-5),
-    var(--mantine-color-dark-2)
-  );
-  color: var(--mantine-color-text);
-}
-
-.popover {
-  width: 240px;
-  padding: 0;
-  overflow: hidden;
-}
-
-.popoverSearch {
-  padding: 8px 8px 4px;
-  border-bottom: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
-}
-
-.popoverSearch input {
-  width: 100%;
-  border: 0;
-  background: transparent;
-  font: inherit;
-  font-size: 13px;
-  padding: 4px 4px;
-  color: var(--mantine-color-text);
-  outline: none;
-}
-
-.popoverSearch input::placeholder {
-  color: var(--mantine-color-placeholder);
-}
-
-.popoverList {
-  max-height: 240px;
-  overflow-y: auto;
-  padding: 4px;
-}
-
-.popoverEmpty {
-  padding: 12px 8px;
-  color: var(--mantine-color-dimmed);
-  font-size: 12.5px;
-  text-align: center;
-}
-
-.popoverItem {
-  appearance: none;
-  width: 100%;
-  border: 0;
-  background: transparent;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 6px 8px;
-  border-radius: 4px;
-  font: inherit;
-  font-size: 13px;
-  color: var(--mantine-color-text);
-  cursor: pointer;
-  text-align: left;
-}
-
-.popoverItemHover {
-  background: light-dark(
-    var(--mantine-color-gray-1),
-    var(--mantine-color-dark-5)
-  );
-}
-
-.popoverItemDot {
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-  flex-shrink: 0;
-}
-
-.popoverItemName {
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.popoverCreatePlus {
-  width: 14px;
-  height: 14px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--mantine-color-dimmed);
-}
-
-.headerChip {
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-  height: 36px;
-  padding: 0 14px;
-  border-radius: 8px;
-  font-size: 22px;
-  font-weight: 600;
-  line-height: 1;
-  letter-spacing: -0.005em;
-  text-decoration: none;
-  user-select: none;
-  transition: filter 100ms ease;
-}
-
-.headerChip:hover {
-  filter: brightness(0.97);
-}
-
-.headerDot {
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
-  flex-shrink: 0;
-}
-
-.row {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 16px;
-  padding: 14px 12px;
-  margin: 0 -12px;
-  border-radius: 8px;
-  text-decoration: none;
-  color: inherit;
-  cursor: pointer;
-  transition: background-color 80ms ease;
-}
-
-.row + .row {
-  border-top: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
-}
-
-.row:hover {
-  background-color: light-dark(
-    var(--mantine-color-gray-0),
-    var(--mantine-color-dark-6)
-  );
-}
-
-.row:hover + .row,
-.row:has(+ .row:hover) {
-  border-top-color: transparent;
-}
-
-.rowMain {
-  display: flex;
-  gap: 12px;
-  min-width: 0;
-  flex: 1;
-}
-
-.rowIcon {
-  width: 20px;
-  height: 20px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  flex-shrink: 0;
-  color: var(--mantine-color-dimmed);
-  margin-top: 2px;
-}
-
-.rowBody {
-  min-width: 0;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.rowTitle {
-  font-size: 15px;
-  font-weight: 500;
-  color: var(--mantine-color-text);
-  line-height: 1.3;
-  word-break: break-word;
-}
-
-.rowChips {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 6px;
-}
-
-.chipMore {
-  display: inline-flex;
-  align-items: center;
-  height: 24px;
-  padding: 0 8px;
-  border-radius: 4px;
-  font-size: 12.5px;
-  font-weight: 500;
-  line-height: 1;
-  color: var(--mantine-color-dimmed);
-  background: light-dark(
-    var(--mantine-color-gray-1),
-    var(--mantine-color-dark-5)
-  );
-  user-select: none;
-  white-space: nowrap;
-}
-
-.rowMeta {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  flex-wrap: wrap;
-  color: var(--mantine-color-dimmed);
-  font-size: 13px;
-}
-
-.rowDate {
-  color: var(--mantine-color-dimmed);
-  font-size: 13px;
-  white-space: nowrap;
-  flex-shrink: 0;
-}
-
-.metaDot {
-  font-size: 14px;
-  line-height: 1;
-  color: var(--mantine-color-dimmed);
-}
-
-.chipLink {
-  text-decoration: none;
-  color: inherit;
-  display: inline-flex;
-}
-
-.chipLink:hover {
-  filter: brightness(0.97);
-}

apps/client/src/features/label/queries/label-query.ts

@@ -1,157 +0,0 @@
-import {
-  keepPreviousData,
-  useInfiniteQuery,
-  useMutation,
-  useQuery,
-  useQueryClient,
-} from "@tanstack/react-query";
-import {
-  addLabelsToPage,
-  findPagesByLabel,
-  getLabelInfo,
-  getPageLabels,
-  getWorkspaceLabels,
-  removeLabelFromPage,
-} from "@/features/label/services/label-service.ts";
-import {
-  IAddLabels,
-  ILabel,
-  IRemoveLabel,
-} from "@/features/label/types/label.types.ts";
-import { IPagination } from "@/lib/types.ts";
-import { notifications } from "@mantine/notifications";
-import { useTranslation } from "react-i18next";
-
-const PAGE_LABELS_KEY = (pageId: string) => ["page-labels", pageId];
-const WORKSPACE_LABELS_KEY = (query?: string) => ["workspace-labels", query ?? ""];
-
-export function usePageLabelsQuery(pageId: string | undefined) {
-  return useQuery({
-    queryKey: PAGE_LABELS_KEY(pageId ?? ""),
-    queryFn: () => getPageLabels({ pageId: pageId as string, limit: 100 }),
-    enabled: !!pageId,
-  });
-}
-
-export function useWorkspaceLabelsQuery(query: string, enabled: boolean) {
-  return useQuery({
-    queryKey: WORKSPACE_LABELS_KEY(query),
-    queryFn: () => getWorkspaceLabels({ type: "page", query, limit: 50 }),
-    enabled,
-    staleTime: 30 * 1000,
-  });
-}
-
-export function useAddLabelsMutation(pageId: string | undefined) {
-  const queryClient = useQueryClient();
-  const { t } = useTranslation();
-
-  return useMutation<ILabel[], Error, IAddLabels>({
-    mutationFn: (data) => addLabelsToPage(data),
-    onSuccess: (added) => {
-      queryClient.setQueryData<IPagination<ILabel>>(
-        PAGE_LABELS_KEY(pageId ?? ""),
-        (cache) => {
-          if (!cache) return cache;
-          const existing = new Set(cache.items.map((l) => l.id));
-          const additions = added.filter((l) => !existing.has(l.id));
-          if (additions.length === 0) return cache;
-          return { ...cache, items: [...cache.items, ...additions] };
-        },
-      );
-
-      queryClient.setQueriesData<IPagination<ILabel>>(
-        { queryKey: ["workspace-labels"] },
-        (cache) => {
-          if (!cache) return cache;
-          const existing = new Set(cache.items.map((l) => l.id));
-          const additions = added.filter((l) => !existing.has(l.id));
-          if (additions.length === 0) return cache;
-          return {
-            ...cache,
-            items: [...cache.items, ...additions].sort((a, b) =>
-              a.name.localeCompare(b.name),
-            ),
-          };
-        },
-      );
-
-      queryClient.invalidateQueries({ queryKey: ["label-pages"] });
-      queryClient.invalidateQueries({ queryKey: ["label-info"] });
-    },
-    onError: (error: any) => {
-      notifications.show({
-        message: error?.response?.data?.message ?? t("Failed to add label"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useRemoveLabelMutation(pageId: string | undefined) {
-  const queryClient = useQueryClient();
-  const { t } = useTranslation();
-
-  return useMutation<void, Error, IRemoveLabel>({
-    mutationFn: (data) => removeLabelFromPage(data),
-    onSuccess: (_data, variables) => {
-      const cache = queryClient.getQueryData<IPagination<ILabel>>(
-        PAGE_LABELS_KEY(pageId ?? ""),
-      );
-      if (cache) {
-        queryClient.setQueryData<IPagination<ILabel>>(
-          PAGE_LABELS_KEY(pageId ?? ""),
-          {
-            ...cache,
-            items: cache.items.filter((l) => l.id !== variables.labelId),
-          },
-        );
-      }
-      queryClient.invalidateQueries({ queryKey: ["workspace-labels"] });
-      queryClient.invalidateQueries({ queryKey: ["label-pages"] });
-      queryClient.invalidateQueries({ queryKey: ["label-info"] });
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to remove label"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useLabelInfoQuery(name: string, spaceId?: string) {
-  return useQuery({
-    queryKey: ["label-info", name, spaceId ?? ""],
-    queryFn: () => getLabelInfo({ name, type: "page", spaceId }),
-    enabled: !!name,
-    placeholderData: keepPreviousData,
-  });
-}
-
-const LABEL_PAGES_LIMIT = 25;
-
-export function useLabelPagesQuery(
-  name: string,
-  query: string,
-  spaceId?: string,
-) {
-  return useInfiniteQuery({
-    queryKey: ["label-pages", name, query, spaceId ?? ""],
-    queryFn: ({ pageParam }) =>
-      findPagesByLabel({
-        name,
-        query,
-        spaceId,
-        cursor: pageParam,
-        limit: LABEL_PAGES_LIMIT,
-      }),
-    enabled: !!name,
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: (lastPage) =>
-      lastPage.meta.hasNextPage
-        ? (lastPage.meta.nextCursor ?? undefined)
-        : undefined,
-    placeholderData: keepPreviousData,
-  });
-}

apps/client/src/features/label/services/label-service.ts

@@ -1,55 +0,0 @@
-import api from "@/lib/api-client";
-import { IPagination } from "@/lib/types.ts";
-import {
-  IAddLabels,
-  IFindPagesByLabelParams,
-  ILabel,
-  ILabelInfo,
-  ILabelInfoParams,
-  ILabelPageItem,
-  IListLabelsParams,
-  IPageLabelsParams,
-  IRemoveLabel,
-} from "@/features/label/types/label.types.ts";
-
-export async function getPageLabels(
-  params: IPageLabelsParams,
-): Promise<IPagination<ILabel>> {
-  const req = await api.post<IPagination<ILabel>>("/pages/labels", params);
-  return req.data;
-}
-
-export async function getWorkspaceLabels(
-  params: IListLabelsParams,
-): Promise<IPagination<ILabel>> {
-  const req = await api.post<IPagination<ILabel>>("/labels", params);
-  return req.data;
-}
-
-export async function addLabelsToPage(
-  data: IAddLabels,
-): Promise<ILabel[]> {
-  const req = await api.post<ILabel[]>("/pages/labels/add", data);
-  return req.data;
-}
-
-export async function removeLabelFromPage(data: IRemoveLabel): Promise<void> {
-  await api.post("/pages/labels/remove", data);
-}
-
-export async function getLabelInfo(
-  params: ILabelInfoParams,
-): Promise<ILabelInfo> {
-  const req = await api.post<ILabelInfo>("/labels/info", params);
-  return req.data;
-}
-
-export async function findPagesByLabel(
-  params: IFindPagesByLabelParams,
-): Promise<IPagination<ILabelPageItem>> {
-  const req = await api.post<IPagination<ILabelPageItem>>(
-    "/labels/pages",
-    params,
-  );
-  return req.data;
-}

apps/client/src/features/label/types/label.types.ts

@@ -1,70 +0,0 @@
-import { QueryParams } from "@/lib/types.ts";
-
-export type LabelType = "page" | "space";
-
-export interface ILabel {
-  id: string;
-  name: string;
-  type: LabelType;
-  workspaceId: string;
-  createdAt: string;
-  updatedAt: string;
-}
-
-export interface IAddLabels {
-  pageId: string;
-  names: string[];
-}
-
-export interface IRemoveLabel {
-  pageId: string;
-  labelId: string;
-}
-
-export interface IPageLabelsParams {
-  pageId: string;
-  cursor?: string;
-  limit?: number;
-}
-
-export interface IListLabelsParams {
-  type: LabelType;
-  query?: string;
-  cursor?: string;
-  limit?: number;
-}
-
-export interface ILabelInfo {
-  name: string;
-  usageCount: number;
-}
-
-export interface ILabelPageItem {
-  id: string;
-  slugId: string;
-  title: string | null;
-  icon: string | null;
-  spaceId: string;
-  createdAt: string;
-  updatedAt: string;
-  space: {
-    id: string;
-    name: string;
-    slug: string;
-    logo: string | null;
-  } | null;
-  creator: { id: string; name: string; avatarUrl: string | null } | null;
-  labels: { id: string; name: string }[];
-}
-
-export interface IFindPagesByLabelParams extends QueryParams {
-  labelId?: string;
-  name?: string;
-  spaceId?: string;
-}
-
-export interface ILabelInfoParams {
-  name: string;
-  type: LabelType;
-  spaceId?: string;
-}

apps/client/src/features/label/utils/format-label-date.ts

@@ -1,15 +0,0 @@
-import { format, isThisYear, isToday, isYesterday } from "date-fns";
-import i18n from "@/i18n.ts";
-
-export function formatLabelListDate(date: Date): string {
-  if (isToday(date)) {
-    return i18n.t("Today, {{time}}", { time: format(date, "h:mma") });
-  }
-  if (isYesterday(date)) {
-    return i18n.t("Yesterday, {{time}}", { time: format(date, "h:mma") });
-  }
-  if (isThisYear(date)) {
-    return format(date, "MMM dd");
-  }
-  return format(date, "MMM dd, yyyy");
-}

apps/client/src/features/label/utils/label-colors.ts

@@ -1,55 +0,0 @@
-type LabelColor = {
-  bg: string;
-  fg: string;
-  dot: string;
-};
-
-const LABEL_PALETTE: Record<string, LabelColor> = {
-  slate: { bg: "#eef1f5", fg: "#3b475a", dot: "#6b7a90" },
-  blue: { bg: "#e6f0ff", fg: "#1e4fbf", dot: "#3b82f6" },
-  green: { bg: "#e3f5ea", fg: "#1f7a47", dot: "#22a05a" },
-  amber: { bg: "#fbf0d9", fg: "#8a5a00", dot: "#d99c1f" },
-  red: { bg: "#fde6e6", fg: "#a02b2b", dot: "#dc4a4a" },
-  purple: { bg: "#efe9fb", fg: "#5a3aa8", dot: "#8b6bd9" },
-  pink: { bg: "#fce6ee", fg: "#a8336d", dot: "#dc6699" },
-  teal: { bg: "#daf1ee", fg: "#1f6f6a", dot: "#2fa39a" },
-};
-
-const PALETTE_KEYS = Object.keys(LABEL_PALETTE);
-
-const DARK_PALETTE: Record<string, LabelColor> = {
-  slate: { bg: "#2a3140", fg: "#c8d3e3", dot: "#7e8da8" },
-  blue: { bg: "#152a52", fg: "#a9c4ff", dot: "#5b9aff" },
-  green: { bg: "#143b27", fg: "#9ce3b8", dot: "#3ec97c" },
-  amber: { bg: "#3d2c0e", fg: "#f5cf85", dot: "#e6b34a" },
-  red: { bg: "#401a1a", fg: "#f1a8a8", dot: "#e26565" },
-  purple: { bg: "#2a1f4d", fg: "#c8b4f4", dot: "#a48ce6" },
-  pink: { bg: "#3c1a2a", fg: "#f3a9c9", dot: "#e07ab0" },
-  teal: { bg: "#103633", fg: "#92d5cf", dot: "#48b8af" },
-};
-
-function hashName(name: string): number {
-  // Per-char accumulation with 31. Note: 31 ≡ -1 (mod 8), so the low bits of
-  // this hash are highly correlated across short strings — `% 8` would cluster.
-  let h = 0;
-  for (let i = 0; i < name.length; i++) {
-    h = (Math.imul(h, 31) + name.charCodeAt(i)) | 0;
-  }
-  // Murmur3 fmix32 finalizer — avalanches high bits into low bits so the
-  // subsequent `% palette.length` (small power of two) is well-distributed.
-  h ^= h >>> 16;
-  h = Math.imul(h, 0x85ebca6b);
-  h ^= h >>> 13;
-  h = Math.imul(h, 0xc2b2ae35);
-  h ^= h >>> 16;
-  return h >>> 0;
-}
-
-export function getLabelColor(
-  name: string,
-  scheme: "light" | "dark" = "light",
-): LabelColor {
-  const key = PALETTE_KEYS[hashName(name) % PALETTE_KEYS.length];
-  const palette = scheme === "dark" ? DARK_PALETTE : LABEL_PALETTE;
-  return palette[key];
-}

apps/client/src/features/label/utils/normalize-label.ts

@@ -1,3 +0,0 @@
-export function normalizeLabelName(name: string): string {
-  return name.trim().replace(/\s+/g, "-").toLowerCase();
-}

apps/client/src/features/page-details/components/backlinks-list.tsx

@@ -1,113 +0,0 @@
-import {
-  Button,
-  Center,
-  Group,
-  Loader,
-  Stack,
-  Text,
-  UnstyledButton,
-} from "@mantine/core";
-import { Link } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-import { useBacklinksQuery } from "@/features/page-details/queries/backlinks-query.ts";
-import {
-  BacklinkDirection,
-  IBacklinkPageItem,
-} from "@/features/page-details/types/backlink.types.ts";
-import { buildPageUrl } from "@/features/page/page.utils.ts";
-import { getPageIcon } from "@/lib";
-
-interface BacklinksListProps {
-  pageId: string;
-  direction: BacklinkDirection;
-  enabled: boolean;
-  onItemClick: () => void;
-}
-
-export function BacklinksList({
-  pageId,
-  direction,
-  enabled,
-  onItemClick,
-}: BacklinksListProps) {
-  const { t } = useTranslation();
-  const { data, isLoading, fetchNextPage, hasNextPage, isFetchingNextPage } =
-    useBacklinksQuery(pageId, direction, enabled);
-
-  if (!enabled) return null;
-
-  if (isLoading) {
-    return (
-      <Center py="sm">
-        <Loader size="sm" />
-      </Center>
-    );
-  }
-
-  const items: IBacklinkPageItem[] =
-    data?.pages.flatMap((page) => page.items) ?? [];
-
-  if (items.length === 0) {
-    return (
-      <Text c="dimmed" size="sm" py="md">
-        {direction === "incoming"
-          ? t("No pages link here yet.")
-          : t("This page doesn't link to other pages yet.")}
-      </Text>
-    );
-  }
-
-  const handleClick = (e: React.MouseEvent) => {
-    if (e.metaKey || e.ctrlKey || e.shiftKey || e.button === 1) {
-      return;
-    }
-    onItemClick();
-  };
-
-  return (
-    <Stack gap={4}>
-      {items.map((item) => (
-        <UnstyledButton
-          key={item.id}
-          component={Link}
-          to={
-            item.space?.slug
-              ? buildPageUrl(
-                  item.space.slug,
-                  item.slugId,
-                  item.title ?? undefined,
-                )
-              : "#"
-          }
-          onClick={handleClick}
-          style={{ padding: "8px 4px", borderRadius: 4, userSelect: "none" }}
-        >
-          <Group gap="xs" wrap="nowrap">
-            {getPageIcon(item.icon ?? "")}
-            <Stack gap={0} style={{ flex: 1, minWidth: 0 }}>
-              <Text size="sm" fw={500} lineClamp={1}>
-                {item.title || t("Untitled")}
-              </Text>
-              {item.space?.name && (
-                <Text size="xs" c="dimmed" lineClamp={1}>
-                  {item.space.name}
-                </Text>
-              )}
-            </Stack>
-          </Group>
-        </UnstyledButton>
-      ))}
-      {hasNextPage && (
-        <Button
-          variant="subtle"
-          size="xs"
-          loading={isFetchingNextPage}
-          onClick={() => fetchNextPage()}
-          mt="xs"
-        >
-          {t("Load more")}
-        </Button>
-      )}
-    </Stack>
-  );
-}

apps/client/src/features/page-details/components/backlinks-modal.tsx

@@ -1,62 +0,0 @@
-import { Modal, Stack, Text } from "@mantine/core";
-import { useTranslation } from "react-i18next";
-import { useBacklinksCountQuery } from "@/features/page-details/queries/backlinks-query.ts";
-import { BacklinksList } from "./backlinks-list";
-
-interface BacklinksModalProps {
-  pageId: string;
-  opened: boolean;
-  onClose: () => void;
-}
-
-export function BacklinksModal({
-  pageId,
-  opened,
-  onClose,
-}: BacklinksModalProps) {
-  const { t } = useTranslation();
-  const { data: counts } = useBacklinksCountQuery(pageId);
-
-  return (
-    <Modal.Root opened={opened} onClose={onClose} size={640} yOffset="10vh">
-      <Modal.Overlay />
-      <Modal.Content>
-        <Modal.Header>
-          <Modal.Title fw={500}>{t("Backlinks")}</Modal.Title>
-          <Modal.CloseButton />
-        </Modal.Header>
-        <Modal.Body>
-          <Stack gap="lg">
-            <Stack gap="xs">
-              <Text size="sm" fw={500} c="dimmed">
-                {t("Incoming links ({{count}})", {
-                  count: counts?.incoming ?? 0,
-                })}
-              </Text>
-              <BacklinksList
-                pageId={pageId}
-                direction="incoming"
-                enabled={opened}
-                onItemClick={onClose}
-              />
-            </Stack>
-
-            <Stack gap="xs">
-              <Text size="sm" fw={500} c="dimmed">
-                {t("Outgoing links ({{count}})", {
-                  count: counts?.outgoing ?? 0,
-                })}
-              </Text>
-              <BacklinksList
-                pageId={pageId}
-                direction="outgoing"
-                enabled={opened}
-                onItemClick={onClose}
-              />
-            </Stack>
-          </Stack>
-        </Modal.Body>
-      </Modal.Content>
-    </Modal.Root>
-  );
-}

apps/client/src/features/page-details/components/page-details-aside.tsx

@@ -1,239 +0,0 @@
-import {
-  Divider,
-  Group,
-  Skeleton,
-  Stack,
-  Text,
-  UnstyledButton,
-} from "@mantine/core";
-import { IconChevronRight } from "@tabler/icons-react";
-import { useDisclosure } from "@mantine/hooks";
-import { useAtomValue } from "jotai";
-import { useParams } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-import { extractPageSlugId } from "@/lib";
-import { usePageQuery } from "@/features/page/queries/page-query.ts";
-import { pageEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
-import { useBacklinksCountQuery } from "@/features/page-details/queries/backlinks-query.ts";
-import { BacklinksModal } from "./backlinks-modal";
-import { formattedDate, timeAgo } from "@/lib/time.ts";
-import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
-import { LabelsSection } from "@/features/label/components/labels-section.tsx";
-
-export function PageDetailsAside() {
-  const { pageSlug } = useParams();
-  const { data: page } = usePageQuery({
-    pageId: extractPageSlugId(pageSlug),
-  });
-  const pageEditor = useAtomValue(pageEditorAtom);
-  const { data: counts, isLoading: countsLoading } = useBacklinksCountQuery(page?.id);
-  const [modalOpened, { open: openModal, close: closeModal }] =
-    useDisclosure(false);
-
-  if (!page) return null;
-
-  const wordCount: number =
-    pageEditor?.storage?.characterCount?.words?.() ?? 0;
-  const characterCount: number =
-    pageEditor?.storage?.characterCount?.characters?.() ?? 0;
-
-  return (
-    <>
-      <Stack gap="md">
-        <PeopleSection
-          creator={page.creator}
-          lastUpdatedBy={page.lastUpdatedBy}
-        />
-
-        <Divider />
-
-        <StatsSection
-          wordCount={wordCount}
-          characterCount={characterCount}
-          createdAt={page.createdAt}
-          updatedAt={page.updatedAt}
-        />
-
-        <Divider />
-
-        <BacklinksSection
-          incomingCount={counts?.incoming ?? 0}
-          outgoingCount={counts?.outgoing ?? 0}
-          isLoading={countsLoading}
-          onClick={openModal}
-        />
-
-        <LabelsSection
-          pageId={page.id}
-          canEdit={page.permissions?.canEdit ?? false}
-        />
-      </Stack>
-
-      <BacklinksModal
-        pageId={page.id}
-        opened={modalOpened}
-        onClose={closeModal}
-      />
-    </>
-  );
-}
-
-function PeopleSection({
-  creator,
-  lastUpdatedBy,
-}: {
-  creator: { id: string; name: string; avatarUrl: string } | null;
-  lastUpdatedBy: { id: string; name: string; avatarUrl: string } | null;
-}) {
-  const { t } = useTranslation();
-  return (
-    <Stack gap="xs">
-      <PersonRow label={t("Created by")} person={creator} />
-      <PersonRow label={t("Last updated by")} person={lastUpdatedBy} />
-    </Stack>
-  );
-}
-
-function PersonRow({
-  label,
-  person,
-}: {
-  label: string;
-  person: { id: string; name: string; avatarUrl: string } | null;
-}) {
-  return (
-    <Group justify="space-between" wrap="nowrap">
-      <Text size="sm" c="dimmed">
-        {label}
-      </Text>
-      {person ? (
-        <Group gap={6} wrap="nowrap">
-          <CustomAvatar
-            avatarUrl={person.avatarUrl}
-            name={person.name}
-            size={20}
-            radius="xl"
-          />
-          <Text size="sm" lineClamp={1}>
-            {person.name}
-          </Text>
-        </Group>
-      ) : (
-        <Text size="sm" c="dimmed">
-          —
-        </Text>
-      )}
-    </Group>
-  );
-}
-
-function StatsSection({
-  wordCount,
-  characterCount,
-  createdAt,
-  updatedAt,
-}: {
-  wordCount: number;
-  characterCount: number;
-  createdAt: Date | string;
-  updatedAt: Date | string;
-}) {
-  const { t } = useTranslation();
-  return (
-    <Stack gap="xs">
-      <Text size="xs" fw={500} c="dimmed">
-        {t("Stats")}
-      </Text>
-      <StatRow label={t("Word count")} value={String(wordCount)} />
-      <StatRow label={t("Characters")} value={String(characterCount)} />
-      <StatRow
-        label={t("Created")}
-        value={formattedDate(new Date(createdAt))}
-      />
-      <StatRow
-        label={t("Last updated")}
-        value={timeAgo(new Date(updatedAt))}
-      />
-    </Stack>
-  );
-}
-
-function StatRow({ label, value }: { label: string; value: string }) {
-  return (
-    <Group justify="space-between" wrap="nowrap">
-      <Text size="sm" c="dimmed">
-        {label}
-      </Text>
-      <Text size="sm">{value}</Text>
-    </Group>
-  );
-}
-
-function BacklinksSection({
-  incomingCount,
-  outgoingCount,
-  isLoading,
-  onClick,
-}: {
-  incomingCount: number;
-  outgoingCount: number;
-  isLoading: boolean;
-  onClick: () => void;
-}) {
-  const { t } = useTranslation();
-  return (
-    <Stack gap="xs">
-      <Text size="xs" fw={500} c="dimmed">
-        {t("Backlinks")}
-      </Text>
-      <BacklinksRow
-        label={t("Incoming links")}
-        count={incomingCount}
-        isLoading={isLoading}
-        onClick={onClick}
-      />
-      <BacklinksRow
-        label={t("Outgoing links")}
-        count={outgoingCount}
-        isLoading={isLoading}
-        onClick={onClick}
-      />
-    </Stack>
-  );
-}
-
-function BacklinksRow({
-  label,
-  count,
-  isLoading,
-  onClick,
-}: {
-  label: string;
-  count: number;
-  isLoading: boolean;
-  onClick: () => void;
-}) {
-  return (
-    <UnstyledButton
-      onClick={onClick}
-      style={{
-        padding: "4px 4px",
-        borderRadius: 4,
-      }}
-    >
-      <Group justify="space-between" wrap="nowrap">
-        <Text size="sm" c="dimmed">
-          {label}
-        </Text>
-        <Group gap={6} wrap="nowrap">
-          {isLoading ? (
-            <Skeleton height={18} width={20} />
-          ) : (
-            <Text size="sm">{count}</Text>
-          )}
-          <IconChevronRight size={16} stroke={2} color="var(--mantine-color-dimmed)" />
-        </Group>
-      </Group>
-    </UnstyledButton>
-  );
-}

apps/client/src/features/page-details/queries/backlinks-query.ts

@@ -1,45 +0,0 @@
-import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import {
-  getBacklinks,
-  getBacklinksCount,
-} from "@/features/page-details/services/backlinks-service.ts";
-import {
-  BacklinkDirection,
-  IBacklinkCount,
-} from "@/features/page-details/types/backlink.types.ts";
-
-const BACKLINKS_STALE_TIME = 30 * 1000;
-const BACKLINKS_PAGE_LIMIT = 100;
-
-export function useBacklinksCountQuery(pageId: string | undefined) {
-  return useQuery<IBacklinkCount>({
-    queryKey: ["backlinks-count", pageId],
-    queryFn: () => getBacklinksCount(pageId as string),
-    enabled: !!pageId,
-    staleTime: BACKLINKS_STALE_TIME,
-  });
-}
-
-export function useBacklinksQuery(
-  pageId: string | undefined,
-  direction: BacklinkDirection,
-  enabled: boolean,
-) {
-  return useInfiniteQuery({
-    queryKey: ["backlinks", pageId, direction],
-    queryFn: ({ pageParam }) =>
-      getBacklinks({
-        pageId: pageId as string,
-        direction,
-        cursor: pageParam,
-        limit: BACKLINKS_PAGE_LIMIT,
-      }),
-    enabled: enabled && !!pageId,
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: (lastPage) =>
-      lastPage.meta.hasNextPage
-        ? (lastPage.meta.nextCursor ?? undefined)
-        : undefined,
-    staleTime: BACKLINKS_STALE_TIME,
-  });
-}

apps/client/src/features/page-details/services/backlinks-service.ts

@@ -1,26 +0,0 @@
-import api from "@/lib/api-client";
-import { IPagination } from "@/lib/types.ts";
-import {
-  IBacklinkCount,
-  IBacklinkPageItem,
-  IBacklinksListParams,
-} from "@/features/page-details/types/backlink.types.ts";
-
-export async function getBacklinksCount(
-  pageId: string,
-): Promise<IBacklinkCount> {
-  const req = await api.post<IBacklinkCount>("/pages/backlinks-count", {
-    pageId,
-  });
-  return req.data;
-}
-
-export async function getBacklinks(
-  params: IBacklinksListParams,
-): Promise<IPagination<IBacklinkPageItem>> {
-  const req = await api.post<IPagination<IBacklinkPageItem>>(
-    "/pages/backlinks",
-    params,
-  );
-  return req.data;
-}

apps/client/src/features/page-details/types/backlink.types.ts

@@ -1,23 +0,0 @@
-export type BacklinkDirection = "incoming" | "outgoing";
-
-export interface IBacklinkCount {
-  incoming: number;
-  outgoing: number;
-}
-
-export interface IBacklinkPageItem {
-  id: string;
-  slugId: string;
-  title: string | null;
-  icon: string | null;
-  spaceId: string;
-  space: { id: string; slug: string; name: string } | null;
-  updatedAt: string;
-}
-
-export interface IBacklinksListParams {
-  pageId: string;
-  direction: BacklinkDirection;
-  cursor?: string;
-  limit?: number;
-}

apps/client/src/features/page/components/header/page-header-menu.tsx

@@ -29,7 +29,7 @@ import { buildPageUrl } from "@/features/page/page.utils.ts";
 import { notifications } from "@mantine/notifications";
 import { getAppUrl } from "@/lib/config.ts";
 import { extractPageSlugId } from "@/lib";
-import { useTreeMutation } from "@/features/page/tree/hooks/use-tree-mutation.ts";
+import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
 import { useDeletePageModal } from "@/features/page/hooks/use-delete-page-modal.tsx";
 import { PageWidthToggle } from "@/features/user/components/page-width-pref.tsx";
 import { Trans, useTranslation } from "react-i18next";
@@ -134,7 +134,7 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
     pageId: extractPageSlugId(pageSlug),
   });
   const { openDeleteModal } = useDeletePageModal();
-  const { handleDelete } = useTreeMutation(page?.spaceId ?? "");
+  const [tree] = useAtom(treeApiAtom);
   const [exportOpened, { open: openExportModal, close: closeExportModal }] =
     useDisclosure(false);
   const [
@@ -183,7 +183,7 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
   };
 
   const handleDeletePage = () => {
-    openDeleteModal({ onConfirm: () => handleDelete(page.id) });
+    openDeleteModal({ onConfirm: () => tree?.delete(page.id) });
   };
 
   const handleToggleFavorite = () => {

apps/client/src/features/page/queries/page-query.ts

@@ -37,7 +37,7 @@ import { validate as isValidUuid } from "uuid";
 import { useTranslation } from "react-i18next";
 import { useAtom } from "jotai";
 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 { useQueryEmit } from "@/features/websocket/use-query-emit";
 
@@ -170,8 +170,11 @@ export function useRestorePageMutation() {
     onSuccess: async (restoredPage) => {
       notifications.show({ message: "Page restored successfully" });
 
+      // Add the restored page back to the tree
+      const treeApi = new SimpleTree<SpaceTreeNode>(treeData);
+
       // Check if the page already exists in the tree (it shouldn't)
-      if (!treeModel.find(treeData, restoredPage.id)) {
+      if (!treeApi.find(restoredPage.id)) {
         // Create the tree node data with hasChildren from backend
         const nodeData: SpaceTreeNode = {
           id: restoredPage.id,
@@ -190,17 +193,24 @@ export function useRestorePageMutation() {
         let index = 0;
 
         if (parentId) {
-          const parentNode = treeModel.find(treeData, parentId);
+          const parentNode = treeApi.find(parentId);
           if (parentNode) {
             index = parentNode.children?.length || 0;
           }
         } else {
           // Root level page
-          index = treeData.length;
+          index = treeApi.data.length;
         }
 
         // Add the node to the tree
-        setTreeData(treeModel.insert(treeData, parentId, nodeData, index));
+        treeApi.create({
+          parentId,
+          index,
+          data: nodeData,
+        });
+
+        // Update the tree data
+        setTreeData(treeApi.data);
 
         // Emit websocket event to sync with other users
         setTimeout(() => {

apps/client/src/features/page/tree/atoms/open-tree-nodes-atom.ts

@@ -1,5 +0,0 @@
-import { atom } from "jotai";
-
-export type OpenMap = Record<string, boolean>;
-
-export const openTreeNodesAtom = atom<OpenMap>({});

apps/client/src/features/page/tree/atoms/tree-api-atom.ts

@@ -0,0 +1,5 @@
+import { atom } from "jotai";
+import { TreeApi } from "react-arborist";
+import { SpaceTreeNode } from "../types";
+
+export const treeApiAtom = atom<TreeApi<SpaceTreeNode> | null>(null);

apps/client/src/features/page/tree/components/doc-tree-drag-preview.module.css

@@ -1,26 +0,0 @@
-.preview {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    padding: 4px 10px;
-    border-radius: 6px;
-    font-size: 13px;
-    font-weight: 500;
-    background-color: light-dark(
-        var(--mantine-color-white),
-        var(--mantine-color-dark-6)
-    );
-    color: light-dark(
-        var(--mantine-color-gray-9),
-        var(--mantine-color-dark-0)
-    );
-    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.18);
-    border: 1px solid light-dark(
-        var(--mantine-color-gray-3),
-        var(--mantine-color-dark-4)
-    );
-    max-width: 260px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}

apps/client/src/features/page/tree/components/doc-tree-drag-preview.tsx

@@ -1,9 +0,0 @@
-import styles from './doc-tree-drag-preview.module.css';
-
-type Props = {
-  label: string;
-};
-
-export function DocTreeDragPreview({ label }: Props) {
-  return <div className={styles.preview}>{label || 'Untitled'}</div>;
-}

apps/client/src/features/page/tree/components/doc-tree-drop-indicator.tsx

@@ -1,39 +0,0 @@
-import type { Instruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
-import styles from '../styles/tree.module.css';
-
-type Props = {
-  instruction: Instruction;
-  indentPx: number;
-};
-
-export function DocTreeDropIndicator({ instruction, indentPx }: Props) {
-  const blocked = instruction.type === 'instruction-blocked';
-  const inst = blocked ? instruction.desired : instruction;
-
-  const style = {
-    ['--drop-line-indent' as never]: `${indentPx}px`,
-  } as React.CSSProperties;
-
-  if (inst.type === 'reorder-above') {
-    return (
-      <div
-        className={styles.dropLine}
-        data-edge="top"
-        data-blocked={blocked || undefined}
-        style={style}
-      />
-    );
-  }
-  if (inst.type === 'reorder-below') {
-    return (
-      <div
-        className={styles.dropLine}
-        data-edge="bottom"
-        data-blocked={blocked || undefined}
-        style={style}
-      />
-    );
-  }
-  // 'combine' (make-child) is rendered via [data-receiving-drop] on the row itself.
-  return null;
-}

apps/client/src/features/page/tree/components/doc-tree-row.tsx

@@ -1,398 +0,0 @@
-import {
-  memo,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-  type ReactNode,
-} from 'react';
-import { createRoot } from 'react-dom/client';
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
-import {
-  draggable,
-  dropTargetForElements,
-} from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
-import { pointerOutsideOfPreview } from '@atlaskit/pragmatic-drag-and-drop/element/pointer-outside-of-preview';
-import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
-import {
-  attachInstruction,
-  extractInstruction,
-  type Instruction,
-  type ItemMode,
-} from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
-import { triggerPostMoveFlash } from '@atlaskit/pragmatic-drag-and-drop-flourish/trigger-post-move-flash';
-import * as liveRegion from '@atlaskit/pragmatic-drag-and-drop-live-region';
-
-import type { TreeNode, DropOp } from '../model/tree-model.types';
-import { treeModel } from '../model/tree-model';
-import { DocTreeDropIndicator } from './doc-tree-drop-indicator';
-import { DocTreeDragPreview } from './doc-tree-drag-preview';
-import type { RenderRowProps } from './doc-tree';
-import styles from '../styles/tree.module.css';
-
-type Props<T extends object> = {
-  node: TreeNode<T>;
-  level: number;
-  isLastSibling: boolean;
-  openIds: ReadonlySet<string>;
-  selectedId?: string;
-  // Roving tabindex: the single row that currently carries tabIndex={0}.
-  activeId?: string;
-  renderRow: (props: RenderRowProps<T>) => ReactNode;
-  indentPerLevel: number;
-  onMove: (sourceId: string, op: DropOp) => void | Promise<void>;
-  onToggle: (id: string, isOpen: boolean) => void;
-  readOnly: boolean;
-  disableDrag?: (node: TreeNode<T>) => boolean;
-  disableDrop?: (node: TreeNode<T>) => boolean;
-  getDragLabel: (node: TreeNode<T>) => string;
-  contextId: symbol;
-  registerRowElement: (id: string, el: HTMLElement | null) => void;
-  // Stable accessor — calling it returns the latest tree. Avoids passing the
-  // tree itself as a prop (which would break memo and re-run every row's DnD
-  // useEffect on every mutation).
-  getRootData: () => TreeNode<T>[];
-};
-
-const DRAG_TYPE = 'doc-tree-item';
-const AUTO_EXPAND_MS = 500;
-
-function DocTreeRowInner<T extends object>(props: Props<T>) {
-  const {
-    node,
-    level,
-    isLastSibling,
-    openIds,
-    selectedId,
-    activeId,
-    renderRow,
-    indentPerLevel,
-    onMove,
-    onToggle,
-    readOnly,
-    disableDrag,
-    disableDrop,
-    getDragLabel,
-    contextId,
-    registerRowElement,
-    getRootData,
-  } = props;
-
-  const isOpen = openIds.has(node.id);
-  // "Has children" includes both already-loaded children AND the consumer's
-  // own server-side flag (`hasChildren` is a docmost convention on
-  // SpaceTreeNode / SharedPageTreeNode). The flag lets the chevron and the
-  // auto-expand timer recognize unloaded subtrees so the consumer's lazy-load
-  // (via onToggle) can populate them on demand.
-  const hasLoadedChildren = !!node.children && node.children.length > 0;
-  const declaredHasChildren =
-    (node as { hasChildren?: boolean }).hasChildren === true;
-  const hasChildren = hasLoadedChildren || declaredHasChildren;
-  const isSelected = selectedId === node.id;
-
-  const rowRef = useRef<HTMLElement>(null);
-  const [isDragging, setIsDragging] = useState(false);
-  const [instruction, setInstruction] = useState<Instruction | null>(null);
-  const autoExpandTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  const cancelAutoExpand = useCallback(() => {
-    if (autoExpandTimerRef.current) {
-      clearTimeout(autoExpandTimerRef.current);
-      autoExpandTimerRef.current = null;
-    }
-  }, []);
-
-  const toggleOpen = useCallback(() => {
-    onToggle(node.id, !isOpen);
-  }, [onToggle, node.id, isOpen]);
-
-  useEffect(() => {
-    registerRowElement(node.id, rowRef.current);
-    return () => registerRowElement(node.id, null);
-  }, [registerRowElement, node.id]);
-
-  // Restore lazy-loaded children when the row mounts open but its children
-  // aren't loaded (e.g. cross-space page move drops a node into a new tree
-  // that still has its id in openIds). Calling onToggle(id, true) is
-  // idempotent for open state and triggers the consumer's lazy-load.
-  useEffect(() => {
-    if (isOpen && declaredHasChildren && !hasLoadedChildren) {
-      onToggle(node.id, true);
-    }
-  }, [isOpen, declaredHasChildren, hasLoadedChildren, node.id, onToggle]);
-
-  useEffect(() => {
-    const el = rowRef.current;
-    if (!el || readOnly) return;
-    const dragDisabled = disableDrag?.(node) ?? false;
-    const dropDisabled = disableDrop?.(node) ?? false;
-
-    const cleanups: Array<() => void> = [];
-
-    if (!dragDisabled) {
-      cleanups.push(
-        draggable({
-          element: el,
-          getInitialData: () => ({
-            id: node.id,
-            type: DRAG_TYPE,
-            uniqueContextId: contextId,
-            isOpenOnDragStart: isOpen,
-          }),
-          onGenerateDragPreview: ({ nativeSetDragImage }) => {
-            setCustomNativeDragPreview({
-              nativeSetDragImage,
-              getOffset: pointerOutsideOfPreview({ x: '16px', y: '8px' }),
-              render: ({ container }) => {
-                const root = createRoot(container);
-                root.render(<DocTreeDragPreview label={getDragLabel(node)} />);
-                return () => root.unmount();
-              },
-            });
-          },
-          onDragStart: () => setIsDragging(true),
-          onDrop: () => setIsDragging(false),
-        }),
-      );
-    }
-
-    if (!dropDisabled) {
-      const mode: ItemMode =
-        isOpen && hasChildren
-          ? 'expanded'
-          : isLastSibling
-            ? 'last-in-group'
-            : 'standard';
-      // Always block 'reparent' (out of scope per spec).
-      // Block 'reorder-below' when the row is open with children — ambiguous gesture,
-      // force users to drop into the folder via 'make-child' instead.
-      const block: Instruction['type'][] = ['reparent'];
-      if (isOpen && hasChildren) block.push('reorder-below');
-
-      cleanups.push(
-        dropTargetForElements({
-          element: el,
-          canDrop: ({ source }) =>
-            source.data.type === DRAG_TYPE &&
-            source.data.uniqueContextId === contextId &&
-            source.data.id !== node.id &&
-            !treeModel.isDescendant(
-              getRootData(),
-              source.data.id as string,
-              node.id,
-            ),
-          getData: ({ input, element }) =>
-            attachInstruction(
-              { id: node.id, type: DRAG_TYPE },
-              {
-                input,
-                element,
-                currentLevel: level,
-                indentPerLevel,
-                mode,
-                block,
-              },
-            ),
-          onDrag: ({ self }) => {
-            const inst = extractInstruction(self.data);
-            setInstruction(inst);
-            // Auto-expand on hover over any collapsed row that has children,
-            // regardless of the specific instruction type. Reorder-before and
-            // reorder-after also benefit: once expanded, the user can see the
-            // children and refine their drop target.
-            if (
-              inst &&
-              hasChildren &&
-              !isOpen &&
-              !autoExpandTimerRef.current
-            ) {
-              autoExpandTimerRef.current = setTimeout(() => {
-                onToggle(node.id, true);
-                autoExpandTimerRef.current = null;
-              }, AUTO_EXPAND_MS);
-            }
-          },
-          onDragLeave: () => {
-            setInstruction(null);
-            cancelAutoExpand();
-          },
-          onDrop: ({ source, self }) => {
-            setInstruction(null);
-            cancelAutoExpand();
-            const inst = extractInstruction(self.data);
-            if (!inst || inst.type === 'instruction-blocked') return;
-            const sourceId = source.data.id as string;
-            const op: DropOp =
-              inst.type === 'reorder-above'
-                ? { kind: 'reorder-before', targetId: node.id }
-                : inst.type === 'reorder-below'
-                  ? { kind: 'reorder-after', targetId: node.id }
-                  : inst.type === 'make-child'
-                    ? { kind: 'make-child', targetId: node.id }
-                    : null!;
-            if (!op) return;
-            onMove(sourceId, op);
-            triggerPostMoveFlash(el);
-            const liveTree = getRootData();
-            const parentName =
-              op.kind === 'make-child'
-                ? getDragLabel(node)
-                : (() => {
-                    const sib = treeModel.siblingsOf(liveTree, op.targetId);
-                    const parent = sib?.parentId
-                      ? treeModel.find(liveTree, sib.parentId)
-                      : null;
-                    return parent ? getDragLabel(parent) : 'root';
-                  })();
-            const sourceNode = treeModel.find(liveTree, sourceId);
-            const sourceLabel = sourceNode
-              ? getDragLabel(sourceNode)
-              : 'item';
-            liveRegion.announce(`Moved ${sourceLabel} under ${parentName}.`);
-            // After a make-child drop, expand this row so the user sees the
-            // just-dropped child — especially important when the row had no
-            // children before (chevron just appeared) so the drop would
-            // otherwise be invisible.
-            if (op.kind === 'make-child') onToggle(node.id, true);
-            if (source.data.isOpenOnDragStart) onToggle(sourceId, true);
-          },
-        }),
-      );
-    }
-
-    return combine(...cleanups);
-  }, [
-    node,
-    level,
-    isOpen,
-    hasChildren,
-    isLastSibling,
-    readOnly,
-    disableDrag,
-    disableDrop,
-    contextId,
-    indentPerLevel,
-    getDragLabel,
-    onMove,
-    onToggle,
-    getRootData,
-    cancelAutoExpand,
-  ]);
-
-  useEffect(() => () => cancelAutoExpand(), [cancelAutoExpand]);
-
-  const effectiveInst =
-    instruction?.type === 'instruction-blocked'
-      ? instruction.desired
-      : instruction;
-  const blocked = instruction?.type === 'instruction-blocked';
-  const receivingDrop: 'before' | 'after' | 'make-child' | null = (() => {
-    if (!effectiveInst) return null;
-    if (effectiveInst.type === 'reorder-above') return 'before';
-    if (effectiveInst.type === 'reorder-below') return 'after';
-    if (effectiveInst.type === 'make-child') return 'make-child';
-    return null;
-  })();
-
-  // Treeitem semantics ride on the row's focusable element (the consumer's
-  // <a>). The outer <li> is presentational layout. aria-label uses the row's
-  // label so the SR's accessible name is just the page title, not the
-  // concatenation of inner action-button aria-labels.
-  const treeItemProps = {
-    role: 'treeitem' as const,
-    'aria-level': level + 1,
-    'aria-expanded': hasChildren ? isOpen : undefined,
-    'aria-selected': isSelected ? (true as const) : undefined,
-    'aria-current': isSelected ? ('page' as const) : undefined,
-    'aria-label': getDragLabel(node),
-    'data-row-id': node.id,
-  };
-
-  return (
-    <div
-      className={styles.rowWrapper}
-      style={{ paddingLeft: level * indentPerLevel }}
-    >
-      <div
-        className={styles.node}
-        data-dragging={isDragging || undefined}
-        data-selected={isSelected || undefined}
-        data-receiving-drop={
-          receivingDrop === 'make-child'
-            ? blocked
-              ? 'make-child-blocked'
-              : 'make-child'
-            : undefined
-        }
-      >
-        {renderRow({
-          node,
-          level,
-          isOpen,
-          hasChildren,
-          isSelected,
-          isDragging,
-          isReceivingDrop: receivingDrop,
-          rowRef,
-          tabIndex: activeId === node.id ? 0 : -1,
-          treeItemProps,
-          toggleOpen,
-        })}
-      </div>
-      {instruction && (
-        <DocTreeDropIndicator
-          instruction={instruction}
-          indentPx={level * indentPerLevel}
-        />
-      )}
-    </div>
-  );
-}
-
-// Custom memo comparator. The default shallow compare re-renders every row
-// when `openIds` (a Set) or `selectedId` (a string) on the parent changes,
-// because all rows receive the same reference via {...props} spread. With 1K
-// rows that's a perceptible stall on every expand and every navigate.
-//
-// Resolve openIds / selectedId per-row: only re-render if THIS row's own
-// open-state or selected-state actually flipped. Everything else uses
-// reference equality (callbacks are useCallback-stable from the parent).
-function arePropsEqual<T extends object>(
-  prev: Props<T>,
-  next: Props<T>,
-): boolean {
-  if (prev.node !== next.node) return false;
-  if (prev.level !== next.level) return false;
-  if (prev.isLastSibling !== next.isLastSibling) return false;
-  if (prev.readOnly !== next.readOnly) return false;
-  if (prev.contextId !== next.contextId) return false;
-  if (prev.indentPerLevel !== next.indentPerLevel) return false;
-  if (prev.renderRow !== next.renderRow) return false;
-  if (prev.onMove !== next.onMove) return false;
-  if (prev.onToggle !== next.onToggle) return false;
-  if (prev.disableDrag !== next.disableDrag) return false;
-  if (prev.disableDrop !== next.disableDrop) return false;
-  if (prev.getDragLabel !== next.getDragLabel) return false;
-  if (prev.registerRowElement !== next.registerRowElement) return false;
-  if (prev.getRootData !== next.getRootData) return false;
-
-  const id = next.node.id;
-  // openIds: only this row's own membership matters.
-  if (prev.openIds.has(id) !== next.openIds.has(id)) return false;
-  // selectedId: re-render only the rows whose isSelected actually flipped.
-  const wasSelected = prev.selectedId === id;
-  const isSelected = next.selectedId === id;
-  if (wasSelected !== isSelected) return false;
-  // activeId: same trick — only the outgoing and incoming active rows
-  // re-render when the user moves focus through the tree.
-  const wasActive = prev.activeId === id;
-  const isActive = next.activeId === id;
-  if (wasActive !== isActive) return false;
-
-  return true;
-}
-
-export const DocTreeRow = memo(
-  DocTreeRowInner,
-  arePropsEqual,
-) as typeof DocTreeRowInner;

apps/client/src/features/page/tree/components/doc-tree.tsx

@@ -1,541 +0,0 @@
-import {
-  forwardRef,
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useMemo,
-  useRef,
-  useState,
-  type ReactNode,
-  type Ref,
-} from 'react';
-import { useVirtualizer } from '@tanstack/react-virtual';
-import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
-import type { TreeNode, DropOp } from '../model/tree-model.types';
-import { treeModel } from '../model/tree-model';
-import { DocTreeRow } from './doc-tree-row';
-import styles from '../styles/tree.module.css';
-
-export type RenderRowProps<T extends object> = {
-  node: TreeNode<T>;
-  level: number;
-  isOpen: boolean;
-  hasChildren: boolean;
-  isSelected: boolean;
-  isDragging: boolean;
-  isReceivingDrop: 'before' | 'after' | 'make-child' | null;
-
-  rowRef: Ref<HTMLElement>;
-  // Roving tabindex: exactly one row in the tree carries tabIndex={0} (the
-  // active row); every other row gets tabIndex={-1}. Consumers must spread
-  // this onto the same element they wire rowRef to.
-  tabIndex: 0 | -1;
-  // Treeitem semantics for the row's focusable element. Consumers MUST spread
-  // these onto the same element rowRef points at, so the focused element IS
-  // the treeitem. This makes screen readers announce "treeitem" (not "link")
-  // and replaces the descendant-text accname with the row's label, so action
-  // button labels inside the row don't get concatenated.
-  treeItemProps: {
-    role: 'treeitem';
-    'aria-level': number;
-    'aria-expanded'?: boolean;
-    'aria-selected'?: true;
-    'aria-current'?: 'page';
-    'aria-label': string;
-    'data-row-id': string;
-  };
-  toggleOpen: () => void;
-};
-
-export type DocTreeProps<T extends object> = {
-  data: TreeNode<T>[];
-  openIds: ReadonlySet<string>;
-  selectedId?: string;
-
-  renderRow: (props: RenderRowProps<T>) => ReactNode;
-  indentPerLevel?: number;
-  rowHeight?: number;
-  emptyState?: ReactNode;
-
-  onMove: (sourceId: string, op: DropOp) => void | Promise<void>;
-  onToggle: (id: string, isOpen: boolean) => void;
-  onSelect?: (id: string) => void;
-
-  readOnly?: boolean;
-  disableDrag?: (node: TreeNode<T>) => boolean;
-  disableDrop?: (node: TreeNode<T>) => boolean;
-
-  getDragLabel: (node: TreeNode<T>) => string;
-  uniqueContextId?: symbol;
-
-  // Accessible name for the tree itself (e.g. "Pages"). Rendered as
-  // aria-label on the <ul role="tree"> so screen readers announce what
-  // collection of items the user has entered.
-  'aria-label'?: string;
-};
-
-export type DocTreeApi = {
-  select: (
-    id: string,
-    opts?: { scrollIntoView?: boolean; focus?: boolean },
-  ) => void;
-  scrollTo: (id: string) => void;
-  focus: (id: string) => void;
-};
-
-type FlatRow<T extends object> = {
-  node: TreeNode<T>;
-  level: number;
-  isLastSibling: boolean;
-};
-
-// DFS-walk the tree, emitting only the visible nodes (root nodes always, plus
-// the descendants of nodes whose id is in `openIds`). Each emitted row carries
-// the precomputed `level` and `isLastSibling` it needs.
-function flattenVisible<T extends object>(
-  data: TreeNode<T>[],
-  openIds: ReadonlySet<string>,
-): FlatRow<T>[] {
-  const out: FlatRow<T>[] = [];
-  const walk = (nodes: TreeNode<T>[], level: number) => {
-    for (let i = 0; i < nodes.length; i++) {
-      const node = nodes[i];
-      out.push({ node, level, isLastSibling: i === nodes.length - 1 });
-      if (openIds.has(node.id) && node.children?.length) {
-        walk(node.children, level + 1);
-      }
-    }
-  };
-  walk(data, 0);
-  return out;
-}
-
-type RowElementMap = Map<string, HTMLElement>;
-
-function DocTreeInner<T extends object>(
-  props: DocTreeProps<T>,
-  ref: Ref<DocTreeApi>,
-) {
-  const {
-    data,
-    openIds,
-    selectedId,
-    renderRow,
-    indentPerLevel = 16,
-    rowHeight = 32,
-    onMove,
-    onToggle,
-    onSelect,
-    readOnly = false,
-    disableDrag,
-    disableDrop,
-    getDragLabel,
-    uniqueContextId,
-    emptyState,
-    'aria-label': ariaLabel,
-  } = props;
-
-  const scrollRef = useRef<HTMLDivElement>(null);
-  const rowElementsRef = useRef<RowElementMap>(new Map());
-  // Set by the keyboard handler when the navigation target hasn't been
-  // virtualized yet. Consumed by registerRowElement when the row mounts.
-  const pendingFocusIdRef = useRef<string | null>(null);
-  // Typeahead state: accumulated buffer, plus the timer that clears it after
-  // ~500ms of no typing. Refs only — no re-render needed per keystroke.
-  const typeaheadBufferRef = useRef('');
-  const typeaheadTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  // Roving tabindex: the row most-recently focused by the user. Falls back
-  // to selectedId, then to the first visible row, when the tracked id is
-  // gone from the flat list (e.g. its branch was collapsed).
-  const [activeId, setActiveId] = useState<string | undefined>(undefined);
-  const contextId = useMemo(
-    () => uniqueContextId ?? Symbol('doc-tree'),
-    [uniqueContextId],
-  );
-
-  const registerRowElement = useCallback(
-    (id: string, el: HTMLElement | null) => {
-      if (el) {
-        rowElementsRef.current.set(id, el);
-        if (pendingFocusIdRef.current === id) {
-          pendingFocusIdRef.current = null;
-          // rAF lets the virtualizer settle layout/transform before focus,
-          // so the freshly-scrolled-in row is actually painted in view.
-          requestAnimationFrame(() => el.focus());
-        }
-      } else {
-        rowElementsRef.current.delete(id);
-      }
-    },
-    [],
-  );
-
-  // Stable live tree accessor — keeps the row useEffect deps stable across
-  // tree mutations.
-  const rootDataRef = useRef(data);
-  rootDataRef.current = data;
-  const getRootData = useCallback(() => rootDataRef.current, []);
-
-  // Flat visible list drives virtualization. Re-flattens on data or openIds
-  // change — cheap O(N) walk of the loaded tree.
-  const flat = useMemo(
-    () => flattenVisible(data, openIds),
-    [data, openIds],
-  );
-
-  // Membership lookup for the flat list. Used to validate activeId/selectedId
-  // before promoting them to the effective active row.
-  const flatIds = useMemo(() => new Set(flat.map((r) => r.node.id)), [flat]);
-
-  // Effective active row for tabindex purposes. Prefers user-focused row,
-  // then the currently selected page, then the first visible row. The user's
-  // arrow / Home / End / typeahead navigation updates activeId via the focus
-  // event delegated on the <ul>; explicit clicks also flow through focus.
-  const effectiveActiveId = useMemo(() => {
-    if (activeId && flatIds.has(activeId)) return activeId;
-    if (selectedId && flatIds.has(selectedId)) return selectedId;
-    return flat[0]?.node.id;
-  }, [activeId, selectedId, flatIds, flat]);
-
-  const virtualizer = useVirtualizer({
-    count: flat.length,
-    getScrollElement: () => scrollRef.current,
-    estimateSize: () => rowHeight,
-    overscan: 10,
-  });
-
-  useImperativeHandle(
-    ref,
-    (): DocTreeApi => ({
-      select: (id, opts) => {
-        onSelect?.(id);
-        const idx = flat.findIndex((r) => r.node.id === id);
-        if (idx >= 0 && opts?.scrollIntoView) {
-          virtualizer.scrollToIndex(idx, { align: 'auto' });
-        }
-        if (opts?.focus) rowElementsRef.current.get(id)?.focus();
-      },
-      scrollTo: (id) => {
-        const idx = flat.findIndex((r) => r.node.id === id);
-        if (idx >= 0) virtualizer.scrollToIndex(idx, { align: 'auto' });
-      },
-      focus: (id) => {
-        rowElementsRef.current.get(id)?.focus();
-      },
-    }),
-    [onSelect, flat, virtualizer],
-  );
-
-  // Auto-scroll the container during drag so users can target rows currently
-  // scrolled off-screen. Scoped to drags originating in this DocTree instance
-  // via uniqueContextId.
-  useEffect(() => {
-    const el = scrollRef.current;
-    if (!el) return;
-    return autoScrollForElements({
-      element: el,
-      canScroll: ({ source }) =>
-        source.data.uniqueContextId === contextId,
-    });
-  }, [contextId]);
-
-  // Scroll the selected row into view when it enters the flat list. If the
-  // row is already fully visible, leave the user's scroll position alone —
-  // only scroll when it's off-screen, and when we do, center it for context.
-  // Deep pages may not be in flat at the moment selectedId changes (ancestors
-  // still lazy-loading); the effect re-fires once flat contains the row.
-  // Guarded by a ref so subsequent flat changes don't fight manual scroll.
-  const lastScrolledIdRef = useRef<string | undefined>(undefined);
-  useEffect(() => {
-    if (!selectedId) {
-      lastScrolledIdRef.current = undefined;
-      return;
-    }
-    if (lastScrolledIdRef.current === selectedId) return;
-    const idx = flat.findIndex((r) => r.node.id === selectedId);
-    if (idx < 0) return;
-
-    const containerHeight = scrollRef.current?.clientHeight ?? 0;
-    const scrollOffset = virtualizer.scrollOffset ?? 0;
-    const item = virtualizer
-      .getVirtualItems()
-      .find((v) => v.index === idx);
-    const isFullyVisible =
-      !!item &&
-      item.start >= scrollOffset &&
-      item.start + item.size <= scrollOffset + containerHeight;
-
-    if (!isFullyVisible) {
-      virtualizer.scrollToIndex(idx, { align: 'center' });
-    }
-    lastScrolledIdRef.current = selectedId;
-  }, [selectedId, flat, virtualizer]);
-
-  // Keyboard navigation handler — single delegated listener on the <ul role="tree">.
-  // The focused row is identified by walking up the DOM to the nearest element
-  // carrying data-row-id, so this works whether the user has focused the row
-  // itself or one of its inner buttons (chevron, +). No per-row re-renders;
-  // focus is moved via .focus() on the registered element, with a pending-id
-  // hand-off when the target row is currently virtualized out of view.
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLUListElement>) => {
-      // Ctrl/Alt/Meta are reserved for browser/OS shortcuts; bail out.
-      // Shift is allowed through so typeahead can match capital letters.
-      if (e.altKey || e.ctrlKey || e.metaKey) return;
-      const isNavKey =
-        !e.shiftKey &&
-        (e.key === 'ArrowDown' ||
-          e.key === 'ArrowUp' ||
-          e.key === 'ArrowLeft' ||
-          e.key === 'ArrowRight' ||
-          e.key === 'Home' ||
-          e.key === 'End');
-      // Star expands all sibling subtrees of the focused row (WAI-ARIA tree
-      // pattern). Allowed with Shift since on most keyboards Shift+8 is how
-      // "*" is produced. Handled separately from typeahead.
-      const isStarKey = e.key === '*';
-      // Space activates the focused row — same effect as clicking it. Native
-      // <a> doesn't get this for free (only <button> does), so we wire it up
-      // explicitly to satisfy the WAI-ARIA tree pattern.
-      const isActivateKey = e.key === ' ';
-      // Single printable character → typeahead. e.key.length === 1 excludes
-      // multi-char names like "ArrowDown", "Enter", "Tab", etc.
-      const isTypeahead =
-        e.key.length === 1 && !isNavKey && !isStarKey && !isActivateKey;
-      if (!isNavKey && !isTypeahead && !isStarKey && !isActivateKey) return;
-
-      const target = e.target as HTMLElement;
-      if (target.matches('input, textarea, [contenteditable="true"]')) return;
-      const rowEl = target.closest('[data-row-id]');
-      if (!rowEl) return;
-      const id = rowEl.getAttribute('data-row-id');
-      if (!id) return;
-
-      const idx = flat.findIndex((r) => r.node.id === id);
-      if (idx < 0) return;
-
-      const focusByIndex = (targetIdx: number) => {
-        if (targetIdx < 0 || targetIdx >= flat.length) return;
-        const targetId = flat[targetIdx].node.id;
-        const existing = rowElementsRef.current.get(targetId);
-        if (existing) {
-          existing.focus();
-        } else {
-          pendingFocusIdRef.current = targetId;
-          virtualizer.scrollToIndex(targetIdx, { align: 'auto' });
-        }
-      };
-
-      // Space activates the focused row by synthesizing a click on the
-      // registered row element (its <a> Link). Skip if focus is on an inner
-      // button (chevron, +, menu) — those handle Space via native button
-      // semantics, and intercepting here would block their default behavior.
-      if (isActivateKey) {
-        const registered = rowElementsRef.current.get(id);
-        if (target === registered) {
-          e.preventDefault();
-          registered.click();
-        }
-        return;
-      }
-
-      // Typeahead: accumulate printable chars, jump to next row whose label
-      // starts with the buffer. Same-letter presses cycle through matches; a
-      // multi-char buffer searches from the current row so the user can
-      // refine the prefix. Buffer resets after ~500ms of no typing.
-      if (isTypeahead) {
-        e.preventDefault();
-        const wasEmpty = typeaheadBufferRef.current.length === 0;
-        typeaheadBufferRef.current = (
-          typeaheadBufferRef.current + e.key
-        ).toLowerCase();
-        const buffer = typeaheadBufferRef.current;
-        if (typeaheadTimerRef.current) {
-          clearTimeout(typeaheadTimerRef.current);
-        }
-        typeaheadTimerRef.current = setTimeout(() => {
-          typeaheadBufferRef.current = '';
-          typeaheadTimerRef.current = null;
-        }, 500);
-        // Single-char buffer cycles to the next match (start at idx + 1);
-        // multi-char buffer can keep matching the current row.
-        const startIdx = wasEmpty ? (idx + 1) % flat.length : idx;
-        for (let i = 0; i < flat.length; i++) {
-          const probeIdx = (startIdx + i) % flat.length;
-          const label = getDragLabel(flat[probeIdx].node).toLowerCase();
-          if (label.startsWith(buffer)) {
-            focusByIndex(probeIdx);
-            break;
-          }
-        }
-        return;
-      }
-
-      const row = flat[idx];
-      const hasChildren =
-        (row.node.children && row.node.children.length > 0) ||
-        (row.node as { hasChildren?: boolean }).hasChildren === true;
-      const isOpen = openIds.has(row.node.id);
-
-      // Asterisk: expand every sibling subtree at the focused row's level.
-      // Walks the authoritative tree (not flat, which only carries visible
-      // rows) so we also expand siblings whose own subtree is currently
-      // collapsed. Focus and selection stay put per the WAI-ARIA pattern.
-      if (isStarKey) {
-        e.preventDefault();
-        const info = treeModel.siblingsOf(rootDataRef.current, row.node.id);
-        if (info) {
-          for (const sib of info.siblings) {
-            const sibHasChildren =
-              (sib.children && sib.children.length > 0) ||
-              (sib as { hasChildren?: boolean }).hasChildren === true;
-            if (sibHasChildren && !openIds.has(sib.id)) {
-              onToggle(sib.id, true);
-            }
-          }
-        }
-        return;
-      }
-
-      switch (e.key) {
-        case 'ArrowDown':
-          e.preventDefault();
-          focusByIndex(idx + 1);
-          break;
-        case 'ArrowUp':
-          e.preventDefault();
-          focusByIndex(idx - 1);
-          break;
-        case 'ArrowRight':
-          e.preventDefault();
-          if (hasChildren && !isOpen) {
-            onToggle(row.node.id, true);
-          } else if (
-            isOpen &&
-            row.node.children &&
-            row.node.children.length > 0
-          ) {
-            focusByIndex(idx + 1);
-          }
-          break;
-        case 'ArrowLeft': {
-          e.preventDefault();
-          if (isOpen && hasChildren) {
-            onToggle(row.node.id, false);
-          } else {
-            // Move to parent — first preceding row with smaller level.
-            // Bounded by sibling-count to parent in the flat list; tree depth
-            // and sibling counts are small in practice.
-            const currentLevel = row.level;
-            for (let i = idx - 1; i >= 0; i--) {
-              if (flat[i].level < currentLevel) {
-                focusByIndex(i);
-                break;
-              }
-            }
-          }
-          break;
-        }
-        case 'Home':
-          e.preventDefault();
-          focusByIndex(0);
-          break;
-        case 'End':
-          e.preventDefault();
-          focusByIndex(flat.length - 1);
-          break;
-      }
-    },
-    [flat, openIds, onToggle, virtualizer, getDragLabel],
-  );
-
-  // Clear the typeahead timer if the component unmounts mid-buffer.
-  useEffect(
-    () => () => {
-      if (typeaheadTimerRef.current) clearTimeout(typeaheadTimerRef.current);
-    },
-    [],
-  );
-
-  // Event-delegated focus tracking — when any descendant (a row's Link, or an
-  // inner action button) gains focus, mark the enclosing row as active. Keeps
-  // tabIndex aligned with the user's current position whether they got there
-  // by click, arrow nav, or focusByIndex's programmatic .focus() call.
-  const handleFocusIn = useCallback(
-    (e: React.FocusEvent<HTMLUListElement>) => {
-      const rowEl = (e.target as HTMLElement).closest('[data-row-id]');
-      const id = rowEl?.getAttribute('data-row-id');
-      if (id) setActiveId(id);
-    },
-    [],
-  );
-
-  if (data.length === 0 && emptyState) {
-    return <div className={styles.treeContainer}>{emptyState}</div>;
-  }
-
-  const virtualItems = virtualizer.getVirtualItems();
-  const totalSize = virtualizer.getTotalSize();
-
-  return (
-    <div ref={scrollRef} className={styles.treeContainer}>
-      <ul
-        role="tree"
-        aria-label={ariaLabel}
-        onKeyDown={handleKeyDown}
-        onFocus={handleFocusIn}
-        style={{
-          position: 'relative',
-          height: totalSize,
-          margin: 0,
-          padding: 0,
-          listStyle: 'none',
-        }}
-      >
-        {virtualItems.map((virtualItem) => {
-          const row = flat[virtualItem.index];
-          return (
-            <li
-              key={row.node.id}
-              // role="none" — the treeitem role lives on the focusable child
-              // (the row's <a>), so screen readers announce "treeitem" on
-              // navigation. The <li> is just layout glue.
-              role="none"
-              style={{
-                position: 'absolute',
-                top: 0,
-                left: 0,
-                width: '100%',
-                transform: `translateY(${virtualItem.start}px)`,
-              }}
-            >
-              <DocTreeRow
-                node={row.node}
-                level={row.level}
-                isLastSibling={row.isLastSibling}
-                openIds={openIds}
-                selectedId={selectedId}
-                activeId={effectiveActiveId}
-                renderRow={renderRow}
-                indentPerLevel={indentPerLevel}
-                onMove={onMove}
-                onToggle={onToggle}
-                readOnly={readOnly}
-                disableDrag={disableDrag}
-                disableDrop={disableDrop}
-                getDragLabel={getDragLabel}
-                contextId={contextId}
-                registerRowElement={registerRowElement}
-                getRootData={getRootData}
-              />
-            </li>
-          );
-        })}
-      </ul>
-    </div>
-  );
-}
-
-export const DocTree = forwardRef(DocTreeInner) as <T extends object>(
-  props: DocTreeProps<T> & { ref?: Ref<DocTreeApi> },
-) => ReturnType<typeof DocTreeInner>;

apps/client/src/features/page/tree/components/space-tree-node-menu.tsx

@@ -1,259 +0,0 @@
-import { useAtom } from "jotai";
-import { useTranslation } from "react-i18next";
-import { useParams } from "react-router-dom";
-import { ActionIcon, Menu, rem } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
-import { notifications } from "@mantine/notifications";
-import {
-  IconArrowRight,
-  IconCopy,
-  IconDotsVertical,
-  IconFileExport,
-  IconLink,
-  IconStar,
-  IconStarFilled,
-  IconTrash,
-} from "@tabler/icons-react";
-
-import ExportModal from "@/components/common/export-modal";
-import MovePageModal from "@/features/page/components/move-page-modal.tsx";
-import CopyPageModal from "@/features/page/components/copy-page-modal.tsx";
-import { useDeletePageModal } from "@/features/page/hooks/use-delete-page-modal.tsx";
-import { buildPageUrl } from "@/features/page/page.utils.ts";
-import { duplicatePage } from "@/features/page/services/page-service.ts";
-import { useClipboard } from "@/hooks/use-clipboard";
-import { getAppUrl } from "@/lib/config.ts";
-import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
-import {
-  useFavoriteIds,
-  useAddFavoriteMutation,
-  useRemoveFavoriteMutation,
-} from "@/features/favorite/queries/favorite-query";
-
-import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
-import { treeModel } from "@/features/page/tree/model/tree-model";
-import { useTreeMutation } from "@/features/page/tree/hooks/use-tree-mutation.ts";
-import type { SpaceTreeNode } from "@/features/page/tree/types.ts";
-
-export interface NodeMenuProps {
-  node: SpaceTreeNode;
-  canEdit: boolean;
-}
-
-export function NodeMenu({ node, canEdit }: NodeMenuProps) {
-  const { t } = useTranslation();
-  const clipboard = useClipboard({ timeout: 500 });
-  const { spaceSlug } = useParams();
-  const { openDeleteModal } = useDeletePageModal();
-  const { handleDelete } = useTreeMutation(node.spaceId);
-  const [data, setData] = useAtom(treeDataAtom);
-  const emit = useQueryEmit();
-  const [exportOpened, { open: openExportModal, close: closeExportModal }] =
-    useDisclosure(false);
-  const [
-    movePageModalOpened,
-    { open: openMovePageModal, close: closeMoveSpaceModal },
-  ] = useDisclosure(false);
-  const [
-    copyPageModalOpened,
-    { open: openCopyPageModal, close: closeCopySpaceModal },
-  ] = useDisclosure(false);
-  const favoriteIds = useFavoriteIds("page", node.spaceId);
-  const addFavorite = useAddFavoriteMutation();
-  const removeFavorite = useRemoveFavoriteMutation();
-  const isFavorited = favoriteIds.has(node.id);
-
-  const handleCopyLink = () => {
-    const pageUrl =
-      getAppUrl() + buildPageUrl(spaceSlug, node.slugId, node.name);
-    clipboard.copy(pageUrl);
-    notifications.show({ message: t("Link copied") });
-  };
-
-  const handleDuplicatePage = async () => {
-    try {
-      const duplicatedPage = await duplicatePage({ pageId: node.id });
-
-      // figure out parent + insertion index
-      const siblings = treeModel.siblingsOf(data, node.id);
-      const parentId = siblings?.parentId ?? null;
-      const currentIndex = siblings?.index ?? 0;
-      const newIndex = currentIndex + 1;
-
-      const treeNodeData: SpaceTreeNode = {
-        id: duplicatedPage.id,
-        slugId: duplicatedPage.slugId,
-        name: duplicatedPage.title,
-        position: duplicatedPage.position,
-        spaceId: duplicatedPage.spaceId,
-        parentPageId: duplicatedPage.parentPageId,
-        icon: duplicatedPage.icon,
-        hasChildren: duplicatedPage.hasChildren,
-        canEdit: true,
-        children: [],
-      };
-
-      setData((prev) =>
-        treeModel.insert(prev, parentId, treeNodeData, newIndex),
-      );
-
-      setTimeout(() => {
-        emit({
-          operation: "addTreeNode",
-          spaceId: node.spaceId,
-          payload: {
-            parentId,
-            index: newIndex,
-            data: treeNodeData,
-          },
-        });
-      }, 50);
-
-      notifications.show({ message: t("Page duplicated successfully") });
-    } catch (err: any) {
-      notifications.show({
-        message: err?.response?.data?.message || "An error occurred",
-        color: "red",
-      });
-    }
-  };
-
-  return (
-    <>
-      <Menu shadow="md" width={200}>
-        <Menu.Target>
-          <ActionIcon
-            variant="transparent"
-            c="gray"
-            aria-label={t("Page menu")}
-            tabIndex={-1}
-            onClick={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-            }}
-          >
-            <IconDotsVertical
-              style={{ width: rem(20), height: rem(20) }}
-              stroke={2}
-            />
-          </ActionIcon>
-        </Menu.Target>
-
-        <Menu.Dropdown>
-          <Menu.Item
-            leftSection={<IconLink size={16} />}
-            onClick={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              handleCopyLink();
-            }}
-          >
-            {t("Copy link")}
-          </Menu.Item>
-
-          <Menu.Item
-            leftSection={
-              isFavorited ? <IconStarFilled size={16} /> : <IconStar size={16} />
-            }
-            onClick={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              if (isFavorited) {
-                removeFavorite.mutate({ type: "page", pageId: node.id });
-              } else {
-                addFavorite.mutate({ type: "page", pageId: node.id });
-              }
-            }}
-          >
-            {isFavorited ? t("Remove from favorites") : t("Add to favorites")}
-          </Menu.Item>
-
-          <Menu.Item
-            leftSection={<IconFileExport size={16} />}
-            onClick={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              openExportModal();
-            }}
-          >
-            {t("Export page")}
-          </Menu.Item>
-
-          {canEdit && (
-            <>
-              <Menu.Item
-                leftSection={<IconCopy size={16} />}
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  handleDuplicatePage();
-                }}
-              >
-                {t("Duplicate")}
-              </Menu.Item>
-
-              <Menu.Item
-                leftSection={<IconArrowRight size={16} />}
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  openMovePageModal();
-                }}
-              >
-                {t("Move")}
-              </Menu.Item>
-
-              <Menu.Item
-                leftSection={<IconCopy size={16} />}
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  openCopyPageModal();
-                }}
-              >
-                {t("Copy to space")}
-              </Menu.Item>
-
-              <Menu.Divider />
-              <Menu.Item
-                c="red"
-                leftSection={<IconTrash size={16} />}
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  openDeleteModal({
-                    onConfirm: () => handleDelete(node.id),
-                  });
-                }}
-              >
-                {t("Move to trash")}
-              </Menu.Item>
-            </>
-          )}
-        </Menu.Dropdown>
-      </Menu>
-
-      <MovePageModal
-        pageId={node.id}
-        slugId={node.slugId}
-        currentSpaceSlug={spaceSlug}
-        onClose={closeMoveSpaceModal}
-        open={movePageModalOpened}
-      />
-
-      <CopyPageModal
-        pageId={node.id}
-        currentSpaceSlug={spaceSlug}
-        onClose={closeCopySpaceModal}
-        open={copyPageModalOpened}
-      />
-
-      <ExportModal
-        type="page"
-        id={node.id}
-        open={exportOpened}
-        onClose={closeExportModal}
-      />
-    </>
-  );
-}

apps/client/src/features/page/tree/components/space-tree-row.tsx

@@ -1,288 +0,0 @@
-import { useRef } from "react";
-import { Link, useParams } from "react-router-dom";
-import { useAtom } from "jotai";
-import { useTranslation } from "react-i18next";
-import { ActionIcon, rem } from "@mantine/core";
-import {
-  IconChevronDown,
-  IconChevronRight,
-  IconFileDescription,
-  IconPlus,
-  IconPointFilled,
-} from "@tabler/icons-react";
-
-import EmojiPicker from "@/components/ui/emoji-picker.tsx";
-import { queryClient } from "@/main.tsx";
-import { buildPageUrl } from "@/features/page/page.utils.ts";
-import { getPageById } from "@/features/page/services/page-service.ts";
-import {
-  useUpdatePageMutation,
-  fetchAllAncestorChildren,
-} from "@/features/page/queries/page-query.ts";
-import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
-import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
-import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
-
-import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
-import { treeModel } from "@/features/page/tree/model/tree-model";
-import { useTreeMutation } from "@/features/page/tree/hooks/use-tree-mutation.ts";
-import type { SpaceTreeNode } from "@/features/page/tree/types.ts";
-import type { RenderRowProps } from "./doc-tree";
-import { NodeMenu } from "./space-tree-node-menu";
-import classes from "@/features/page/tree/styles/tree.module.css";
-import { updateTreeNodeIcon } from "@/features/page/tree/utils/utils.ts";
-
-type SpaceTreeRowProps = RenderRowProps<SpaceTreeNode> & {
-  readOnly: boolean;
-};
-
-export function SpaceTreeRow({
-  node,
-  isOpen,
-  hasChildren,
-  toggleOpen,
-  rowRef,
-  tabIndex,
-  treeItemProps,
-  readOnly,
-}: SpaceTreeRowProps) {
-  const { t } = useTranslation();
-  const { spaceSlug } = useParams();
-  const updatePageMutation = useUpdatePageMutation();
-  const [, setTreeData] = useAtom(treeDataAtom);
-  const emit = useQueryEmit();
-  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const [mobileSidebarOpened] = useAtom(mobileSidebarAtom);
-  const toggleMobileSidebar = useToggleSidebar(mobileSidebarAtom);
-
-  const canEdit = !readOnly && node.canEdit !== false;
-  const pageUrl = buildPageUrl(spaceSlug, node.slugId, node.name);
-
-  const prefetchPage = () => {
-    timerRef.current = setTimeout(async () => {
-      const page = await queryClient.fetchQuery({
-        queryKey: ["pages", node.id],
-        queryFn: () => getPageById({ pageId: node.id }),
-        staleTime: 5 * 60 * 1000,
-      });
-      if (page?.slugId) {
-        queryClient.setQueryData(["pages", page.slugId], page);
-      }
-    }, 150);
-  };
-
-  const cancelPagePrefetch = () => {
-    if (timerRef.current) {
-      window.clearTimeout(timerRef.current);
-      timerRef.current = null;
-    }
-  };
-
-  const handleUpdateNodeIcon = (nodeId: string, newIcon: string | null) => {
-    setTreeData((prev) =>
-      updateTreeNodeIcon(prev, nodeId, newIcon),
-    );
-  };
-
-  const handleEmojiIconClick = (e: React.MouseEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-  };
-
-  const handleEmojiSelect = (emoji: { native: string }) => {
-    handleUpdateNodeIcon(node.id, emoji.native);
-    updatePageMutation
-      .mutateAsync({ pageId: node.id, icon: emoji.native })
-      .then((data) => {
-        setTimeout(() => {
-          emit({
-            operation: "updateOne",
-            spaceId: node.spaceId,
-            entity: ["pages"],
-            id: node.id,
-            payload: { icon: emoji.native, parentPageId: data.parentPageId },
-          });
-        }, 50);
-      });
-  };
-
-  const handleRemoveEmoji = () => {
-    handleUpdateNodeIcon(node.id, null);
-    updatePageMutation.mutateAsync({ pageId: node.id, icon: null });
-
-    setTimeout(() => {
-      emit({
-        operation: "updateOne",
-        spaceId: node.spaceId,
-        entity: ["pages"],
-        id: node.id,
-        payload: { icon: null },
-      });
-    }, 50);
-  };
-
-  const handleLoadChildren = async () => {
-    if (!node.hasChildren) return;
-    try {
-      const childrenTree = await fetchAllAncestorChildren({
-        pageId: node.id,
-        spaceId: node.spaceId,
-      });
-      setTreeData((prev) =>
-        treeModel.appendChildren(prev, node.id, childrenTree),
-      );
-    } catch (error) {
-      console.error("Failed to fetch children:", error);
-    }
-  };
-
-  return (
-    <Link
-      ref={rowRef as React.Ref<HTMLAnchorElement>}
-      to={pageUrl}
-      className={classes.node}
-      tabIndex={tabIndex}
-      {...treeItemProps}
-      onClick={() => {
-        if (mobileSidebarOpened) {
-          toggleMobileSidebar();
-        }
-      }}
-      onMouseEnter={prefetchPage}
-      onMouseLeave={cancelPagePrefetch}
-    >
-      <PageArrow
-        isOpen={isOpen}
-        hasChildren={hasChildren}
-        onToggle={toggleOpen}
-      />
-
-      <div onClick={handleEmojiIconClick} style={{ marginRight: "4px" }}>
-        <EmojiPicker
-          onEmojiSelect={handleEmojiSelect}
-          icon={
-            node.icon ? node.icon : <IconFileDescription size="18" />
-          }
-          readOnly={!canEdit}
-          removeEmojiAction={handleRemoveEmoji}
-          actionIconProps={{ tabIndex: -1 }}
-        />
-      </div>
-
-      <span className={classes.text}>{node.name || t("untitled")}</span>
-
-      <div className={classes.actions}>
-        <NodeMenu node={node} canEdit={canEdit} />
-
-        {canEdit && (
-          <CreateNode
-            node={node}
-            isOpen={isOpen}
-            hasChildren={hasChildren}
-            onToggle={toggleOpen}
-            onExpandTree={handleLoadChildren}
-          />
-        )}
-      </div>
-    </Link>
-  );
-}
-
-interface PageArrowProps {
-  isOpen: boolean;
-  hasChildren: boolean;
-  onToggle: () => void;
-}
-
-function PageArrow({ isOpen, hasChildren, onToggle }: PageArrowProps) {
-  const { t } = useTranslation();
-
-  if (!hasChildren) {
-    return (
-      <span
-        aria-hidden
-        style={{
-          width: 20,
-          height: 20,
-          display: "inline-flex",
-          alignItems: "center",
-          justifyContent: "center",
-          color: "var(--mantine-color-gray-6)",
-          flexShrink: 0,
-        }}
-      >
-        <IconPointFilled size={8} />
-      </span>
-    );
-  }
-
-  return (
-    <ActionIcon
-      size={20}
-      variant="subtle"
-      c="gray"
-      aria-label={isOpen ? t("Collapse") : t("Expand")}
-      aria-expanded={isOpen}
-      tabIndex={-1}
-      onClick={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        onToggle();
-      }}
-    >
-      {isOpen ? (
-        <IconChevronDown stroke={2} size={18} />
-      ) : (
-        <IconChevronRight stroke={2} size={18} />
-      )}
-    </ActionIcon>
-  );
-}
-
-interface CreateNodeProps {
-  node: SpaceTreeNode;
-  isOpen: boolean;
-  hasChildren: boolean;
-  onToggle: () => void;
-  onExpandTree: () => Promise<void> | void;
-}
-
-function CreateNode({
-  node,
-  isOpen,
-  hasChildren,
-  onToggle,
-  onExpandTree,
-}: CreateNodeProps) {
-  const { t } = useTranslation();
-  const { handleCreate } = useTreeMutation(node.spaceId);
-
-  async function handleClickCreate() {
-    if (node.hasChildren && !hasChildren) {
-      // Expand and lazy-load before creating a child. handleCreate reads the
-      // latest tree imperatively (via useStore) so we no longer need a
-      // setTimeout to wait for React to rerun the closure with fresh data.
-      if (!isOpen) onToggle();
-      await onExpandTree();
-    } else if (!isOpen) {
-      onToggle();
-    }
-    handleCreate(node.id);
-  }
-
-  return (
-    <ActionIcon
-      variant="transparent"
-      c="gray"
-      aria-label={t("Create page")}
-      tabIndex={-1}
-      onClick={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        handleClickCreate();
-      }}
-    >
-      <IconPlus style={{ width: rem(20), height: rem(20) }} stroke={2} />
-    </ActionIcon>
-  );
-}

apps/client/src/features/page/tree/components/space-tree.tsx

@@ -1,47 +1,110 @@
-import { useAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useParams } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-import { Text } from "@mantine/core";
+import {
+  NodeApi,
+  NodeRendererProps,
+  Tree,
+  TreeApi,
+  SimpleTree,
+} from "react-arborist";
+import { atom, useAtom } from "jotai";
+import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
 import {
   fetchAllAncestorChildren,
   useGetRootSidebarPagesQuery,
   usePageQuery,
+  useUpdatePageMutation,
 } from "@/features/page/queries/page-query.ts";
+import { useEffect, useRef, useState } from "react";
+import { Link, useParams } from "react-router-dom";
 import classes from "@/features/page/tree/styles/tree.module.css";
-import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
-import { openTreeNodesAtom } from "@/features/page/tree/atoms/open-tree-nodes-atom.ts";
+import { ActionIcon, Box, Menu, rem, Text } from "@mantine/core";
+import {
+  IconArrowRight,
+  IconChevronDown,
+  IconChevronRight,
+  IconCopy,
+  IconDotsVertical,
+  IconFileDescription,
+  IconFileExport,
+  IconLink,
+  IconPlus,
+  IconPointFilled,
+  IconStar,
+  IconStarFilled,
+  IconTrash,
+} from "@tabler/icons-react";
+import {
+  appendNodeChildrenAtom,
+  treeDataAtom,
+} from "@/features/page/tree/atoms/tree-data-atom.ts";
+import clsx from "clsx";
+import EmojiPicker from "@/components/ui/emoji-picker.tsx";
 import { useTreeMutation } from "@/features/page/tree/hooks/use-tree-mutation.ts";
 import {
+  appendNodeChildren,
   buildTree,
   buildTreeWithChildren,
   mergeRootTrees,
+  updateTreeNodeIcon,
 } from "@/features/page/tree/utils/utils.ts";
 import { SpaceTreeNode } from "@/features/page/tree/types.ts";
-import { treeModel } from "@/features/page/tree/model/tree-model";
-import { getPageBreadcrumbs } from "@/features/page/services/page-service.ts";
-import { IPage } from "@/features/page/types/page.types.ts";
+import {
+  getPageBreadcrumbs,
+  getPageById,
+  getSidebarPages,
+} from "@/features/page/services/page-service.ts";
+import { IPage, SidebarPagesParams } from "@/features/page/types/page.types.ts";
+import { queryClient } from "@/main.tsx";
+import { OpenMap } from "react-arborist/dist/main/state/open-slice";
+import { useDisclosure, useElementSize, useMergedRef } from "@mantine/hooks";
+import { useClipboard } from "@/hooks/use-clipboard";
+import { dfs } from "react-arborist/dist/module/utils";
+import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
+import { buildPageUrl } from "@/features/page/page.utils.ts";
+import { notifications } from "@mantine/notifications";
+import { getAppUrl } from "@/lib/config.ts";
 import { extractPageSlugId } from "@/lib";
-import { DocTree } from "./doc-tree";
-import { SpaceTreeRow } from "./space-tree-row";
+import { useDeletePageModal } from "@/features/page/hooks/use-delete-page-modal.tsx";
+import { useTranslation } from "react-i18next";
+import ExportModal from "@/components/common/export-modal";
+import MovePageModal from "../../components/move-page-modal.tsx";
+import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
+import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
+import CopyPageModal from "../../components/copy-page-modal.tsx";
+import { duplicatePage } from "../../services/page-service.ts";
+import { useFavoriteIds, useAddFavoriteMutation, useRemoveFavoriteMutation } from "@/features/favorite/queries/favorite-query";
 
 interface SpaceTreeProps {
   spaceId: string;
   readOnly: boolean;
 }
 
+const openTreeNodesAtom = atom<OpenMap>({});
+
 export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
   const { t } = useTranslation();
   const { pageSlug } = useParams();
-  const [data, setData] = useAtom(treeDataAtom);
-  const { handleMove } = useTreeMutation(spaceId);
+  const { data, setData, controllers } =
+    useTreeMutation<TreeApi<SpaceTreeNode>>(spaceId);
   const {
     data: pagesData,
     hasNextPage,
     fetchNextPage,
     isFetching,
-  } = useGetRootSidebarPagesQuery({ spaceId });
-  const [openTreeNodes, setOpenTreeNodes] = useAtom(openTreeNodesAtom);
+  } = useGetRootSidebarPagesQuery({
+    spaceId,
+  });
+  const [, setTreeApi] = useAtom<TreeApi<SpaceTreeNode>>(treeApiAtom);
+  const treeApiRef = useRef<TreeApi<SpaceTreeNode>>();
+  const [openTreeNodes, setOpenTreeNodes] = useAtom<OpenMap>(openTreeNodesAtom);
+  const rootElement = useRef<HTMLDivElement>();
+  const [isRootReady, setIsRootReady] = useState(false);
+  const { ref: sizeRef, width, height } = useElementSize();
+  const mergedRef = useMergedRef((element) => {
+    rootElement.current = element;
+    if (element && !isRootReady) {
+      setIsRootReady(true);
+    }
+  }, sizeRef);
   const [isDataLoaded, setIsDataLoaded] = useState(false);
   const spaceIdRef = useRef(spaceId);
   spaceIdRef.current = spaceId;
@@ -60,24 +123,23 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
   }, [hasNextPage, fetchNextPage, isFetching, spaceId]);
 
   useEffect(() => {
-    if (!pagesData?.pages || hasNextPage) return;
+    if (pagesData?.pages && !hasNextPage) {
+      const allItems = pagesData.pages.flatMap((page) => page.items);
+      const treeData = buildTree(allItems);
 
-    const allItems = pagesData.pages.flatMap((page) => page.items);
-    const treeData = buildTree(allItems);
+      setData((prev) => {
+        // fresh space; full reset
+        if (prev.length === 0 || prev[0]?.spaceId !== spaceId) {
+          setIsDataLoaded(true);
+          setOpenTreeNodes({});
+          return treeData;
+        }
 
-    setData((prev) => {
-      // Keep nodes belonging to other spaces — filteredData filters by spaceId
-      // for rendering, so accumulating is safe. Preserves lazy-loaded children
-      // and open-state when the user returns to a previously-visited space.
-      const otherSpaces = prev.filter((n) => n?.spaceId !== spaceId);
-      const currentSpace = prev.filter((n) => n?.spaceId === spaceId);
-      const refreshed =
-        currentSpace.length > 0
-          ? mergeRootTrees(currentSpace, treeData)
-          : treeData;
-      return [...otherSpaces, ...refreshed];
-    });
-    setIsDataLoaded(true);
+        // same space; append only missing roots
+        setIsDataLoaded(true);
+        return mergeRootTrees(prev, treeData);
+      });
+    }
   }, [pagesData, hasNextPage, spaceId]);
 
   useEffect(() => {
@@ -86,7 +148,7 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
     const fetchData = async () => {
       if (isDataLoaded && currentPage) {
         // check if pageId node is present in the tree
-        const node = treeModel.find(data, currentPage.id);
+        const node = dfs(treeApiRef.current?.root, currentPage.id);
         if (node) {
           // if node is found, no need to traverse its ancestors
           return;
@@ -98,12 +160,14 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
 
         if (spaceIdRef.current !== effectSpaceId) return;
 
-        if (ancestors && ancestors.length > 1) {
+        if (ancestors && ancestors?.length > 1) {
           let flatTreeItems = [...buildTree(ancestors)];
 
           const fetchAndUpdateChildren = async (ancestor: IPage) => {
             // we don't want to fetch the children of the opened page
-            if (ancestor.id === currentPage.id) return;
+            if (ancestor.id === currentPage.id) {
+              return;
+            }
             const children = await fetchAllAncestorChildren({
               pageId: ancestor.id,
               spaceId: ancestor.spaceId,
@@ -121,6 +185,7 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
             fetchAndUpdateChildren(ancestor),
           );
 
+          // Wait for all fetch operations to complete
           Promise.all(fetchPromises).then(() => {
             if (spaceIdRef.current !== effectSpaceId) return;
 
@@ -130,24 +195,15 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
             const rootChild = ancestorsTree[0];
 
             // attach built ancestors to tree using functional updater
+            // to avoid stale closure overwriting the current tree data
             setData((currentData) =>
-              treeModel.appendChildren(
-                currentData,
-                rootChild.id,
-                rootChild.children ?? [],
-              ),
+              appendNodeChildren(currentData, rootChild.id, rootChild.children),
             );
 
-            // open all ancestors of the current page. DocTree picks up the
-            // selectedId change and scrolls the row into view on its own once
-            // flat contains it.
-            setOpenTreeNodes((prev) => {
-              const next = { ...prev };
-              for (const a of ancestors) {
-                if (a.id !== currentPage.id) next[a.id] = true;
-              }
-              return next;
-            });
+            setTimeout(() => {
+              // focus on node and open all parents
+              treeApiRef.current?.select(currentPage.id);
+            }, 100);
           });
         }
       }
@@ -156,76 +212,556 @@ export default function SpaceTree({ spaceId, readOnly }: SpaceTreeProps) {
     fetchData();
   }, [isDataLoaded, currentPage?.id]);
 
-  const openIds = useMemo(
-    () => new Set(Object.keys(openTreeNodes).filter((k) => openTreeNodes[k])),
-    [openTreeNodes],
-  );
+  useEffect(() => {
+    if (currentPage?.id) {
+      setTimeout(() => {
+        // focus on node and open all parents
+        treeApiRef.current?.select(currentPage.id, { align: "auto" });
+      }, 200);
+    } else {
+      treeApiRef.current?.deselectAll();
+    }
+  }, [currentPage?.id]);
 
-  const handleToggle = useCallback(
-    async (id: string, isOpen: boolean) => {
-      setOpenTreeNodes((prev) => ({ ...prev, [id]: isOpen }));
-      if (isOpen) {
-        const node = treeModel.find(data, id) as SpaceTreeNode | null;
-        if (
-          node?.hasChildren &&
-          (!node.children || node.children.length === 0)
-        ) {
-          const fetched = await fetchAllAncestorChildren({
-            pageId: id,
-            spaceId: node.spaceId,
-          });
-          setData((prev) => treeModel.appendChildren(prev, id, fetched));
-        }
-      }
-    },
-    [data, setOpenTreeNodes, setData],
-  );
+  // Clean up tree API on unmount
+  useEffect(() => {
+    return () => {
+      // @ts-ignore
+      setTreeApi(null);
+    };
+  }, [setTreeApi]);
 
-  const filteredData = useMemo(
-    () => data.filter((node) => node?.spaceId === spaceId),
-    [data, spaceId],
-  );
-
-  // Stable callbacks for DocTree. Without these, every parent render recreates
-  // the props and tears down every row's draggable/dropTarget subscription,
-  // defeating memo(DocTreeRow).
-  const renderRow = useCallback(
-    (rowProps: Parameters<typeof SpaceTreeRow>[0]) => (
-      <SpaceTreeRow {...rowProps} readOnly={readOnly} />
-    ),
-    [readOnly],
-  );
-  const disableDragDrop = useCallback(
-    (n: SpaceTreeNode) => n.canEdit === false,
-    [],
-  );
-  const getDragLabel = useCallback(
-    (n: SpaceTreeNode) => n.name || t("untitled"),
-    [t],
-  );
+  const filteredData = data.filter((node) => node?.spaceId === spaceId);
 
   return (
-    <div className={classes.treeContainer}>
+    <div ref={mergedRef} className={classes.treeContainer}>
       {isDataLoaded && filteredData.length === 0 && (
         <Text size="xs" c="dimmed" py="xs" px="sm">
           {t("No pages yet")}
         </Text>
       )}
-      {isDataLoaded && filteredData.length > 0 && (
-        <DocTree<SpaceTreeNode>
+      {isRootReady && rootElement.current && (
+        <Tree
           data={filteredData}
-          openIds={openIds}
-          selectedId={currentPage?.id}
-          renderRow={renderRow}
-          onMove={handleMove}
-          onToggle={handleToggle}
-          readOnly={readOnly}
-          disableDrag={disableDragDrop}
-          disableDrop={disableDragDrop}
-          getDragLabel={getDragLabel}
-          aria-label={t("Pages")}
-        />
+          disableDrag={
+            readOnly
+              ? true
+              : (data) => {
+                  return data.canEdit === false;
+                }
+          }
+          disableDrop={
+            readOnly
+              ? true
+              : ({ parentNode }) => parentNode?.data?.canEdit === false
+          }
+          disableEdit={readOnly ? true : (data) => data.canEdit === false}
+          {...controllers}
+          width={width}
+          height={rootElement.current.clientHeight}
+          ref={(ref) => {
+            treeApiRef.current = ref;
+            if (ref) {
+              //@ts-ignore
+              setTreeApi(ref);
+            }
+          }}
+          openByDefault={false}
+          disableMultiSelection={true}
+          className={classes.tree}
+          rowClassName={classes.row}
+          rowHeight={30}
+          overscanCount={10}
+          dndRootElement={rootElement.current}
+          onToggle={() => {
+            setOpenTreeNodes(treeApiRef.current?.openState);
+          }}
+          initialOpenState={openTreeNodes}
+        >
+          {Node}
+        </Tree>
       )}
     </div>
   );
 }
+
+function Node({ node, style, dragHandle, tree }: NodeRendererProps<any>) {
+  const { t } = useTranslation();
+  const updatePageMutation = useUpdatePageMutation();
+  const [treeData, setTreeData] = useAtom(treeDataAtom);
+  const [, appendChildren] = useAtom(appendNodeChildrenAtom);
+  const emit = useQueryEmit();
+  const { spaceSlug } = useParams();
+  const timerRef = useRef(null);
+  const [mobileSidebarOpened] = useAtom(mobileSidebarAtom);
+  const toggleMobileSidebar = useToggleSidebar(mobileSidebarAtom);
+
+  const prefetchPage = () => {
+    timerRef.current = setTimeout(async () => {
+      const page = await queryClient.fetchQuery({
+        queryKey: ["pages", node.data.id],
+        queryFn: () => getPageById({ pageId: node.data.id }),
+        staleTime: 5 * 60 * 1000,
+      });
+      if (page?.slugId) {
+        queryClient.setQueryData(["pages", page.slugId], page);
+      }
+    }, 150);
+  };
+
+  const cancelPagePrefetch = () => {
+    if (timerRef.current) {
+      window.clearTimeout(timerRef.current);
+      timerRef.current = null;
+    }
+  };
+
+  async function handleLoadChildren(node: NodeApi<SpaceTreeNode>) {
+    if (!node.data.hasChildren) return;
+    // in conflict with use-query-subscription.ts => case "addTreeNode","moveTreeNode" etc with websocket
+    // if (node.data.children && node.data.children.length > 0) {
+    //   return;
+    // }
+
+    try {
+      const params: SidebarPagesParams = {
+        pageId: node.data.id,
+        spaceId: node.data.spaceId,
+      };
+
+      const childrenTree = await fetchAllAncestorChildren(params);
+
+      appendChildren({
+        parentId: node.data.id,
+        children: childrenTree,
+      });
+    } catch (error) {
+      console.error("Failed to fetch children:", error);
+    }
+  }
+
+  const handleUpdateNodeIcon = (nodeId: string, newIcon: string) => {
+    const updatedTree = updateTreeNodeIcon(treeData, nodeId, newIcon);
+    setTreeData(updatedTree);
+  };
+
+  const handleEmojiIconClick = (e: any) => {
+    e.preventDefault();
+    e.stopPropagation();
+  };
+
+  const handleEmojiSelect = (emoji: { native: string }) => {
+    handleUpdateNodeIcon(node.id, emoji.native);
+    updatePageMutation
+      .mutateAsync({ pageId: node.id, icon: emoji.native })
+      .then((data) => {
+        setTimeout(() => {
+          emit({
+            operation: "updateOne",
+            spaceId: node.data.spaceId,
+            entity: ["pages"],
+            id: node.id,
+            payload: { icon: emoji.native, parentPageId: data.parentPageId },
+          });
+        }, 50);
+      });
+  };
+
+  const handleRemoveEmoji = () => {
+    handleUpdateNodeIcon(node.id, null);
+    updatePageMutation.mutateAsync({ pageId: node.id, icon: null });
+
+    setTimeout(() => {
+      emit({
+        operation: "updateOne",
+        spaceId: node.data.spaceId,
+        entity: ["pages"],
+        id: node.id,
+        payload: { icon: null },
+      });
+    }, 50);
+  };
+
+  if (
+    node.willReceiveDrop &&
+    node.isClosed &&
+    (node.children.length > 0 || node.data.hasChildren)
+  ) {
+    handleLoadChildren(node);
+    setTimeout(() => {
+      if (node.state.willReceiveDrop) {
+        node.open();
+      }
+    }, 650);
+  }
+
+  const pageUrl = buildPageUrl(spaceSlug, node.data.slugId, node.data.name);
+
+  return (
+    <>
+      <Box
+        style={style}
+        className={clsx(classes.node, node.state)}
+        component={Link}
+        to={pageUrl}
+        // @ts-ignore
+        ref={dragHandle}
+        onClick={() => {
+          if (mobileSidebarOpened) {
+            toggleMobileSidebar();
+          }
+        }}
+        onMouseEnter={prefetchPage}
+        onMouseLeave={cancelPagePrefetch}
+      >
+        <PageArrow node={node} onExpandTree={() => handleLoadChildren(node)} />
+
+        <div onClick={handleEmojiIconClick} style={{ marginRight: "4px" }}>
+          <EmojiPicker
+            onEmojiSelect={handleEmojiSelect}
+            icon={
+              node.data.icon ? (
+                node.data.icon
+              ) : (
+                <IconFileDescription size="18" />
+              )
+            }
+            readOnly={
+              tree.props.disableEdit === true || node.data.canEdit === false
+            }
+            removeEmojiAction={handleRemoveEmoji}
+          />
+        </div>
+
+        <span className={classes.text}>{node.data.name || t("untitled")}</span>
+
+        <div className={classes.actions}>
+          <NodeMenu node={node} treeApi={tree} spaceId={node.data.spaceId} />
+
+          {tree.props.disableEdit !== true && node.data.canEdit !== false && (
+            <CreateNode
+              node={node}
+              treeApi={tree}
+              onExpandTree={() => handleLoadChildren(node)}
+            />
+          )}
+        </div>
+      </Box>
+    </>
+  );
+}
+
+interface CreateNodeProps {
+  node: NodeApi<SpaceTreeNode>;
+  treeApi: TreeApi<SpaceTreeNode>;
+  onExpandTree?: () => void;
+}
+
+function CreateNode({ node, treeApi, onExpandTree }: CreateNodeProps) {
+  const { t } = useTranslation();
+
+  function handleCreate() {
+    if (node.data.hasChildren && node.children.length === 0) {
+      node.toggle();
+      onExpandTree();
+
+      setTimeout(() => {
+        treeApi?.create({ type: "internal", parentId: node.id, index: 0 });
+      }, 500);
+    } else {
+      treeApi?.create({ type: "internal", parentId: node.id });
+    }
+  }
+
+  return (
+    <ActionIcon
+      variant="transparent"
+      c="gray"
+      aria-label={t("Create page")}
+      onClick={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        handleCreate();
+      }}
+    >
+      <IconPlus style={{ width: rem(20), height: rem(20) }} stroke={2} />
+    </ActionIcon>
+  );
+}
+
+interface NodeMenuProps {
+  node: NodeApi<SpaceTreeNode>;
+  treeApi: TreeApi<SpaceTreeNode>;
+  spaceId: string;
+}
+
+function NodeMenu({ node, treeApi, spaceId }: NodeMenuProps) {
+  const { t } = useTranslation();
+  const clipboard = useClipboard({ timeout: 500 });
+  const { spaceSlug } = useParams();
+  const { openDeleteModal } = useDeletePageModal();
+  const [data, setData] = useAtom(treeDataAtom);
+  const emit = useQueryEmit();
+  const [exportOpened, { open: openExportModal, close: closeExportModal }] =
+    useDisclosure(false);
+  const [
+    movePageModalOpened,
+    { open: openMovePageModal, close: closeMoveSpaceModal },
+  ] = useDisclosure(false);
+  const [
+    copyPageModalOpened,
+    { open: openCopyPageModal, close: closeCopySpaceModal },
+  ] = useDisclosure(false);
+  const favoriteIds = useFavoriteIds("page", spaceId);
+  const addFavorite = useAddFavoriteMutation();
+  const removeFavorite = useRemoveFavoriteMutation();
+  const isFavorited = favoriteIds.has(node.data.id);
+
+  const handleCopyLink = () => {
+    const pageUrl =
+      getAppUrl() + buildPageUrl(spaceSlug, node.data.slugId, node.data.name);
+    clipboard.copy(pageUrl);
+    notifications.show({ message: t("Link copied") });
+  };
+
+  const handleDuplicatePage = async () => {
+    try {
+      const duplicatedPage = await duplicatePage({
+        pageId: node.id,
+      });
+
+      // Find the index of the current node
+      const parentId =
+        node.parent?.id === "__REACT_ARBORIST_INTERNAL_ROOT__"
+          ? null
+          : node.parent?.id;
+      const siblings = parentId ? node.parent.children : treeApi?.props.data;
+      const currentIndex =
+        siblings?.findIndex((sibling) => sibling.id === node.id) || 0;
+      const newIndex = currentIndex + 1;
+
+      // Add the duplicated page to the tree
+      const treeNodeData: SpaceTreeNode = {
+        id: duplicatedPage.id,
+        slugId: duplicatedPage.slugId,
+        name: duplicatedPage.title,
+        position: duplicatedPage.position,
+        spaceId: duplicatedPage.spaceId,
+        parentPageId: duplicatedPage.parentPageId,
+        icon: duplicatedPage.icon,
+        hasChildren: duplicatedPage.hasChildren,
+        canEdit: true,
+        children: [],
+      };
+
+      // Update local tree
+      const simpleTree = new SimpleTree(data);
+      simpleTree.create({
+        parentId,
+        index: newIndex,
+        data: treeNodeData,
+      });
+      setData(simpleTree.data);
+
+      // Emit socket event
+      setTimeout(() => {
+        emit({
+          operation: "addTreeNode",
+          spaceId: spaceId,
+          payload: {
+            parentId,
+            index: newIndex,
+            data: treeNodeData,
+          },
+        });
+      }, 50);
+
+      notifications.show({
+        message: t("Page duplicated successfully"),
+      });
+    } catch (err) {
+      notifications.show({
+        message: err.response?.data.message || "An error occurred",
+        color: "red",
+      });
+    }
+  };
+
+  return (
+    <>
+      <Menu shadow="md" width={200}>
+        <Menu.Target>
+          <ActionIcon
+            variant="transparent"
+            c="gray"
+            aria-label={t("Page menu")}
+            onClick={(e) => {
+              e.preventDefault();
+              e.stopPropagation();
+            }}
+          >
+            <IconDotsVertical
+              style={{ width: rem(20), height: rem(20) }}
+              stroke={2}
+            />
+          </ActionIcon>
+        </Menu.Target>
+
+        <Menu.Dropdown>
+          <Menu.Item
+            leftSection={<IconLink size={16} />}
+            onClick={(e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              handleCopyLink();
+            }}
+          >
+            {t("Copy link")}
+          </Menu.Item>
+
+          <Menu.Item
+            leftSection={isFavorited ? <IconStarFilled size={16} /> : <IconStar size={16} />}
+            onClick={(e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              if (isFavorited) {
+                removeFavorite.mutate({ type: "page", pageId: node.data.id });
+              } else {
+                addFavorite.mutate({ type: "page", pageId: node.data.id });
+              }
+            }}
+          >
+            {isFavorited ? t("Remove from favorites") : t("Add to favorites")}
+          </Menu.Item>
+
+          <Menu.Item
+            leftSection={<IconFileExport size={16} />}
+            onClick={(e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              openExportModal();
+            }}
+          >
+            {t("Export page")}
+          </Menu.Item>
+
+          {treeApi.props.disableEdit !== true &&
+            node.data.canEdit !== false && (
+              <>
+                <Menu.Item
+                  leftSection={<IconCopy size={16} />}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    handleDuplicatePage();
+                  }}
+                >
+                  {t("Duplicate")}
+                </Menu.Item>
+
+                <Menu.Item
+                  leftSection={<IconArrowRight size={16} />}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    openMovePageModal();
+                  }}
+                >
+                  {t("Move")}
+                </Menu.Item>
+
+                <Menu.Item
+                  leftSection={<IconCopy size={16} />}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    openCopyPageModal();
+                  }}
+                >
+                  {t("Copy to space")}
+                </Menu.Item>
+
+                <Menu.Divider />
+                <Menu.Item
+                  c="red"
+                  leftSection={<IconTrash size={16} />}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    openDeleteModal({ onConfirm: () => treeApi?.delete(node) });
+                  }}
+                >
+                  {t("Move to trash")}
+                </Menu.Item>
+              </>
+            )}
+        </Menu.Dropdown>
+      </Menu>
+
+      <MovePageModal
+        pageId={node.id}
+        slugId={node.data.slugId}
+        currentSpaceSlug={spaceSlug}
+        onClose={closeMoveSpaceModal}
+        open={movePageModalOpened}
+      />
+
+      <CopyPageModal
+        pageId={node.id}
+        currentSpaceSlug={spaceSlug}
+        onClose={closeCopySpaceModal}
+        open={copyPageModalOpened}
+      />
+
+      <ExportModal
+        type="page"
+        id={node.id}
+        open={exportOpened}
+        onClose={closeExportModal}
+      />
+    </>
+  );
+}
+
+interface PageArrowProps {
+  node: NodeApi<SpaceTreeNode>;
+  onExpandTree?: () => void;
+}
+
+function PageArrow({ node, onExpandTree }: PageArrowProps) {
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (node.isOpen) {
+      onExpandTree();
+    }
+  }, []);
+
+  return (
+    <ActionIcon
+      size={20}
+      variant="subtle"
+      c="gray"
+      aria-label={node.isOpen ? t("Collapse") : t("Expand")}
+      aria-expanded={node.isInternal ? node.isOpen : undefined}
+      onClick={(e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        node.toggle();
+        onExpandTree();
+      }}
+    >
+      {node.isInternal ? (
+        node.children && (node.children.length > 0 || node.data.hasChildren) ? (
+          node.isOpen ? (
+            <IconChevronDown stroke={2} size={18} />
+          ) : (
+            <IconChevronRight stroke={2} size={18} />
+          )
+        ) : (
+          <IconPointFilled size={8} />
+        )
+      ) : null}
+    </ActionIcon>
+  );
+}

apps/client/src/features/page/tree/hooks/drop-op-to-move-payload.test.ts

@@ -1,100 +0,0 @@
-import { describe, it, expect, vi } from 'vitest';
-import type { SpaceTreeNode } from '@/features/page/tree/types';
-import { dropOpToMovePayload } from './drop-op-to-move-payload';
-
-vi.mock('fractional-indexing-jittered', () => ({
-  generateJitteredKeyBetween: (a: string | null, b: string | null) =>
-    `${a ?? 'START'}|${b ?? 'END'}`,
-}));
-
-const n = (id: string, position: string, children?: SpaceTreeNode[]): SpaceTreeNode =>
-  ({ id, position, children, name: id } as unknown as SpaceTreeNode);
-
-const tree: SpaceTreeNode[] = [
-  n('a', 'A', [n('a1', 'AA'), n('a2', 'AB')]),
-  n('b', 'B'),
-];
-
-describe('dropOpToMovePayload', () => {
-  it('reorder-before computes parentId + position between prev and target', () => {
-    const p = dropOpToMovePayload(tree, 'a2', {
-      kind: 'reorder-before',
-      targetId: 'a1',
-    });
-    expect(p).toEqual({ pageId: 'a2', parentPageId: 'a', position: 'START|AA' });
-  });
-
-  it('reorder-after computes position between target and next', () => {
-    const p = dropOpToMovePayload(tree, 'a1', {
-      kind: 'reorder-after',
-      targetId: 'a2',
-    });
-    expect(p).toEqual({ pageId: 'a1', parentPageId: 'a', position: 'AB|END' });
-  });
-
-  it('make-child appends with position after last child', () => {
-    const p = dropOpToMovePayload(tree, 'b', {
-      kind: 'make-child',
-      targetId: 'a',
-    });
-    expect(p).toEqual({ pageId: 'b', parentPageId: 'a', position: 'AB|END' });
-  });
-
-  it('reorder-before at root: parentPageId is null', () => {
-    const p = dropOpToMovePayload(tree, 'b', {
-      kind: 'reorder-before',
-      targetId: 'a',
-    });
-    expect(p).toEqual({ pageId: 'b', parentPageId: null, position: 'START|A' });
-  });
-
-  // Regression: when source is already adjacent to target, the BEFORE-tree
-  // treats source itself as the target's neighbor and falls back to null,
-  // producing an unbounded fractional key that overshoots other siblings.
-  // The fix uses the AFTER-tree, where source occupies its destination slot
-  // surrounded by its REAL neighbors.
-  it('reorder-after when source is immediately after target uses post-move neighbors', () => {
-    const adjacent: SpaceTreeNode[] = [
-      n('a', 'A'),
-      n('b', 'AB'),
-      n('c', 'B'),
-      n('d', 'BC'),
-    ];
-    const p = dropOpToMovePayload(adjacent, 'b', {
-      kind: 'reorder-after',
-      targetId: 'a',
-    });
-    // After-tree is [a, b, c, d] (no-op shape). Source 'b' at index 1.
-    // prev = 'A', next = 'B'. Old buggy code returned prev='A', next=null.
-    expect(p).toEqual({ pageId: 'b', parentPageId: null, position: 'A|B' });
-  });
-
-  it('reorder-before when source is immediately before target uses post-move neighbors', () => {
-    const adjacent: SpaceTreeNode[] = [
-      n('a', 'A'),
-      n('b', 'AB'),
-      n('c', 'B'),
-      n('d', 'BC'),
-    ];
-    const p = dropOpToMovePayload(adjacent, 'b', {
-      kind: 'reorder-before',
-      targetId: 'c',
-    });
-    // After-tree is [a, b, c, d]. Source 'b' at index 1.
-    // prev = 'A', next = 'B'. Old buggy code returned prev=null, next='B'.
-    expect(p).toEqual({ pageId: 'b', parentPageId: null, position: 'A|B' });
-  });
-
-  it('make-child when source is already last child of target uses post-move neighbors', () => {
-    const t: SpaceTreeNode[] = [
-      n('p', 'P', [n('x', 'X'), n('y', 'Y')]),
-    ];
-    const p = dropOpToMovePayload(t, 'y', {
-      kind: 'make-child',
-      targetId: 'p',
-    });
-    // After-tree: 'y' becomes last child of 'p' → [x, y]. y at index 1.
-    // prev = 'X', next = null. Old buggy: prev=Y (source's own position), next=null.
-    expect(p).toEqual({ pageId: 'y', parentPageId: 'p', position: 'X|END' });
-  });
-});

apps/client/src/features/page/tree/hooks/drop-op-to-move-payload.ts

@@ -1,36 +0,0 @@
-import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
-import type { SpaceTreeNode } from '@/features/page/tree/types';
-import type { IMovePage } from '@/features/page/types/page.types';
-import type { DropOp } from '@/features/page/tree/model/tree-model.types';
-import { treeModel } from '@/features/page/tree/model/tree-model';
-
-export function dropOpToMovePayload(
-  tree: SpaceTreeNode[],
-  sourceId: string,
-  op: DropOp,
-): IMovePage {
-  // Compute the post-move tree so we read source's REAL neighbors at its new
-  // position. Reading from the before-tree would mean treating source itself
-  // as a neighbor of the target — wrong when source is adjacent to target.
-  const { tree: after } = treeModel.move(tree, sourceId, op);
-  const info = treeModel.siblingsOf(after, sourceId);
-  if (!info) {
-    return {
-      pageId: sourceId,
-      parentPageId: null,
-      position: generateJitteredKeyBetween(null, null),
-    };
-  }
-
-  const prev = info.siblings[info.index - 1] as SpaceTreeNode | undefined;
-  const next = info.siblings[info.index + 1] as SpaceTreeNode | undefined;
-
-  return {
-    pageId: sourceId,
-    parentPageId: info.parentId,
-    position: generateJitteredKeyBetween(
-      prev?.position ?? null,
-      next?.position ?? null,
-    ),
-  };
-}

apps/client/src/features/page/tree/hooks/use-tree-mutation.ts

@@ -1,15 +1,16 @@
-import { useCallback } from "react";
-import { useAtom, useStore } from "jotai";
-import { notifications } from "@mantine/notifications";
-import { useTranslation } from "react-i18next";
-import { useNavigate, useParams } from "react-router-dom";
-
+import { useMemo } from "react";
+import {
+  CreateHandler,
+  DeleteHandler,
+  MoveHandler,
+  NodeApi,
+  RenameHandler,
+  SimpleTree,
+} from "react-arborist";
+import { useAtom } from "jotai";
 import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
-import { treeModel } from "@/features/page/tree/model/tree-model";
-import type { DropOp } from "@/features/page/tree/model/tree-model.types";
-import { dropOpToMovePayload } from "./drop-op-to-move-payload";
-import { SpaceTreeNode } from "@/features/page/tree/types.ts";
-import { IPage } from "@/features/page/types/page.types.ts";
+import { IMovePage, IPage } from "@/features/page/types/page.types.ts";
+import { useNavigate, useParams } from "react-router-dom";
 import {
   useCreatePageMutation,
   useRemovePageMutation,
@@ -17,250 +18,258 @@ import {
   useUpdatePageMutation,
   updateCacheOnMovePage,
 } from "@/features/page/queries/page-query.ts";
+import { generateJitteredKeyBetween } from "fractional-indexing-jittered";
+import { SpaceTreeNode } from "@/features/page/tree/types.ts";
 import { buildPageUrl } from "@/features/page/page.utils.ts";
 import { getSpaceUrl } from "@/lib/config.ts";
 import { useQueryEmit } from "@/features/websocket/use-query-emit.ts";
 
-export type UseTreeMutation = {
-  handleMove: (sourceId: string, op: DropOp) => Promise<void>;
-  handleCreate: (parentId: string | null) => Promise<void>;
-  handleRename: (id: string, name: string) => Promise<void>;
-  handleDelete: (id: string) => Promise<void>;
-};
-
-export function useTreeMutation(spaceId: string): UseTreeMutation {
-  const { t } = useTranslation();
-  const [, setData] = useAtom(treeDataAtom);
-  // `store` reads the *current* treeDataAtom imperatively in handlers — avoids
-  // stale-closure issues when the caller updates the tree (e.g. lazy-load
-  // children) and then immediately invokes a handler.
-  const store = useStore();
+export function useTreeMutation<T>(spaceId: string) {
+  const [data, setData] = useAtom(treeDataAtom);
+  const tree = useMemo(() => new SimpleTree<SpaceTreeNode>(data), [data]);
   const createPageMutation = useCreatePageMutation();
   const updatePageMutation = useUpdatePageMutation();
   const removePageMutation = useRemovePageMutation();
   const movePageMutation = useMovePageMutation();
   const navigate = useNavigate();
-  const { spaceSlug, pageSlug } = useParams();
+  const { spaceSlug } = useParams();
+  const { pageSlug } = useParams();
   const emit = useQueryEmit();
 
-  const handleMove = useCallback(
-    async (sourceId: string, op: DropOp) => {
-      const before = store.get(treeDataAtom);
-      const { tree: after, result } = treeModel.move(before, sourceId, op);
-      if (after === before) return;
+  const onCreate: CreateHandler<T> = async ({ parentId, index, type }) => {
+    const payload: { spaceId: string; parentPageId?: string } = {
+      spaceId: spaceId,
+    };
+    if (parentId) {
+      payload.parentPageId = parentId;
+    }
 
-      const payload = dropOpToMovePayload(before, sourceId, op);
-      const source = treeModel.find(before, sourceId) as SpaceTreeNode | null;
-      if (!source) return;
-      const oldParentId = source.parentPageId ?? null;
+    let createdPage: IPage;
+    try {
+      createdPage = await createPageMutation.mutateAsync(payload);
+    } catch (err) {
+      throw new Error("Failed to create page");
+    }
 
-      // optimistic apply with the new position from the payload
-      let optimistic = treeModel.update(after, sourceId, {
-        position: payload.position,
-        parentPageId: payload.parentPageId,
-      } as Partial<SpaceTreeNode>);
+    const data = {
+      id: createdPage.id,
+      slugId: createdPage.slugId,
+      name: "",
+      position: createdPage.position,
+      spaceId: createdPage.spaceId,
+      parentPageId: createdPage.parentPageId,
+      children: [],
+    } as any;
 
-      // If the old parent has no children left, mark hasChildren: false so the
-      // chevron disappears. Without this, the empty parent keeps rendering an
-      // expand toggle that fetches zero rows on click.
-      if (oldParentId) {
-        const oldParent = treeModel.find(optimistic, oldParentId);
-        if (!oldParent?.children?.length) {
-          optimistic = treeModel.update(optimistic, oldParentId, {
-            hasChildren: false,
-          } as Partial<SpaceTreeNode>);
-        }
-      }
+    let lastIndex: number;
+    if (parentId === null) {
+      lastIndex = tree.data.length;
+    } else {
+      lastIndex = tree.find(parentId).children.length;
+    }
+    // to place the newly created node at the bottom
+    index = lastIndex;
 
-      // For make-child onto a previously-childless target: flip hasChildren on
-      // so the new parent shows its chevron.
-      if (op.kind === "make-child") {
-        optimistic = treeModel.update(optimistic, op.targetId, {
-          hasChildren: true,
-        } as Partial<SpaceTreeNode>);
-      }
+    tree.create({ parentId, index, data });
+    setData(tree.data);
 
-      setData(optimistic);
+    setTimeout(() => {
+      emit({
+        operation: "addTreeNode",
+        spaceId: spaceId,
+        payload: {
+          parentId,
+          index,
+          data,
+        },
+      });
+    }, 50);
 
-      try {
-        await movePageMutation.mutateAsync(payload);
-      } catch {
-        setData(before);
-        notifications.show({
-          message: t("Failed to move page"),
-          color: "red",
+    const pageUrl = buildPageUrl(
+      spaceSlug,
+      createdPage.slugId,
+      createdPage.title
+    );
+    navigate(pageUrl);
+    return data;
+  };
+
+  const onMove: MoveHandler<T> = async (args: {
+    dragIds: string[];
+    dragNodes: NodeApi<T>[];
+    parentId: string | null;
+    parentNode: NodeApi<T> | null;
+    index: number;
+  }) => {
+    const draggedNodeId = args.dragIds[0];
+
+    tree.move({
+      id: draggedNodeId,
+      parentId: args.parentId,
+      index: args.index,
+    });
+
+    const newDragIndex = tree.find(draggedNodeId)?.childIndex;
+
+    const currentTreeData = args.parentId
+      ? tree.find(args.parentId).children
+      : tree.data;
+
+    // if there is a parentId, tree.find(args.parentId).children returns a SimpleNode array
+    // we have to access the node differently via currentTreeData[args.index]?.data?.position
+    // this makes it possible to correctly sort children of a parent node that is not the root
+
+    const afterPosition =
+      // @ts-ignore
+      currentTreeData[newDragIndex - 1]?.position ||
+      // @ts-ignore
+      currentTreeData[args.index - 1]?.data?.position ||
+      null;
+
+    const beforePosition =
+      // @ts-ignore
+      currentTreeData[newDragIndex + 1]?.position ||
+      // @ts-ignore
+      currentTreeData[args.index + 1]?.data?.position ||
+      null;
+
+    let newPosition: string;
+
+    if (afterPosition && beforePosition && afterPosition === beforePosition) {
+      // if after is equal to before, put it next to the after node
+      newPosition = generateJitteredKeyBetween(afterPosition, null);
+    } else {
+      // if both are null then, it is the first index
+      newPosition = generateJitteredKeyBetween(afterPosition, beforePosition);
+    }
+
+    // update the node position in tree
+    tree.update({
+      id: draggedNodeId,
+      changes: { position: newPosition } as any,
+    });
+
+    const previousParent = args.dragNodes[0].parent;
+    if (
+      previousParent.id !== args.parentId &&
+      previousParent.id !== "__REACT_ARBORIST_INTERNAL_ROOT__"
+    ) {
+      // if the page was moved to another parent,
+      // check if the previous still has children
+      // if no children left, change 'hasChildren' to false, to make the page toggle arrows work properly
+      const childrenCount = previousParent.children.filter(
+        (child) => child.id !== draggedNodeId
+      ).length;
+      if (childrenCount === 0) {
+        tree.update({
+          id: previousParent.id,
+          changes: { ...previousParent.data, hasChildren: false } as any,
         });
-        return;
       }
+    }
 
-      const pageData: Partial<IPage> = {
-        id: source.id,
-        slugId: source.slugId,
-        title: source.name,
-        icon: source.icon,
-        position: payload.position,
-        spaceId: source.spaceId,
-        parentPageId: payload.parentPageId,
-        hasChildren: source.hasChildren,
-      };
+    setData(tree.data);
 
-      updateCacheOnMovePage(
-        spaceId,
-        sourceId,
-        oldParentId,
-        payload.parentPageId,
-        pageData,
-      );
+    const payload: IMovePage = {
+      pageId: draggedNodeId,
+      position: newPosition,
+      parentPageId: args.parentId,
+    };
+
+    const draggedNode = args.dragNodes[0];
+    const nodeData = draggedNode.data as SpaceTreeNode;
+    const oldParentId = nodeData.parentPageId ?? null;
+    const pageData = {
+      id: nodeData.id,
+      slugId: nodeData.slugId,
+      title: nodeData.name,
+      icon: nodeData.icon,
+      position: newPosition,
+      spaceId: nodeData.spaceId,
+      parentPageId: args.parentId,
+      hasChildren: nodeData.hasChildren,
+    };
+
+    try {
+      await movePageMutation.mutateAsync(payload);
+
+      updateCacheOnMovePage(spaceId, draggedNodeId, oldParentId, args.parentId, pageData);
 
       setTimeout(() => {
         emit({
           operation: "moveTreeNode",
           spaceId: spaceId,
           payload: {
-            id: sourceId,
-            parentId: payload.parentPageId,
+            id: draggedNodeId,
+            parentId: args.parentId,
             oldParentId,
-            index: result.index,
-            position: payload.position,
+            index: args.index,
+            position: newPosition,
             pageData,
           },
         });
       }, 50);
-    },
-    [setData, store, movePageMutation, spaceId, emit, t],
-  );
+    } catch (error) {
+      console.error("Error moving page:", error);
+    }
+  };
 
-  const handleCreate = useCallback(
-    async (parentId: string | null) => {
-      const payload: { spaceId: string; parentPageId?: string } = { spaceId };
-      if (parentId) payload.parentPageId = parentId;
+  const onRename: RenameHandler<T> = ({ name, id }) => {
+    tree.update({ id, changes: { name } as any });
+    setData(tree.data);
 
-      let createdPage: IPage;
-      try {
-        createdPage = await createPageMutation.mutateAsync(payload);
-      } catch {
-        throw new Error("Failed to create page");
-      }
+    try {
+      updatePageMutation.mutateAsync({ pageId: id, title: name });
+    } catch (error) {
+      console.error("Error updating page title:", error);
+    }
+  };
 
-      const newNode: SpaceTreeNode = {
-        id: createdPage.id,
-        slugId: createdPage.slugId,
-        name: "",
-        position: createdPage.position,
-        spaceId: createdPage.spaceId,
-        parentPageId: createdPage.parentPageId,
-        hasChildren: false,
-        children: [],
-      };
-
-      // Read latest tree at call time. Without this, callers that mutate the
-      // tree (e.g. lazy-load children on expand) immediately before calling
-      // handleCreate hit a stale closure and compute lastIndex against the
-      // pre-load tree, requiring a setTimeout-based wait at the call site.
-      const current = store.get(treeDataAtom);
-      let lastIndex: number;
-      if (parentId === null) {
-        lastIndex = current.length;
+  const isPageInNode = (
+    node: { data: SpaceTreeNode; children?: any[] },
+    pageSlug: string
+  ): boolean => {
+    if (node.data.slugId === pageSlug) {
+      return true;
+    }
+    for (const item of node.children) {
+      if (item.data.slugId === pageSlug) {
+        return true;
       } else {
-        const parent = treeModel.find(current, parentId);
-        lastIndex = parent?.children?.length ?? 0;
+        return isPageInNode(item, pageSlug);
+      }
+    }
+    return false;
+  };
+
+  const onDelete: DeleteHandler<T> = async (args: { ids: string[] }) => {
+    try {
+      await removePageMutation.mutateAsync(args.ids[0]);
+
+      const node = tree.find(args.ids[0]);
+      if (!node) {
+        return;
       }
 
-      setData((prev) => treeModel.insert(prev, parentId, newNode, lastIndex));
+      tree.drop({ id: args.ids[0] });
+      setData(tree.data);
+
+      if (pageSlug && isPageInNode(node, pageSlug.split("-")[1])) {
+        navigate(getSpaceUrl(spaceSlug));
+      }
 
       setTimeout(() => {
         emit({
-          operation: "addTreeNode",
-          spaceId,
-          payload: {
-            parentId,
-            index: lastIndex,
-            data: newNode,
-          },
+          operation: "deleteTreeNode",
+          spaceId: spaceId,
+          payload: { node: node.data },
         });
       }, 50);
+    } catch (error) {
+      console.error("Failed to delete page:", error);
+    }
+  };
 
-      const pageUrl = buildPageUrl(
-        spaceSlug,
-        createdPage.slugId,
-        createdPage.title,
-      );
-      navigate(pageUrl);
-    },
-    [spaceId, createPageMutation, setData, store, emit, navigate, spaceSlug],
-  );
-
-  const handleRename = useCallback(
-    async (id: string, name: string) => {
-      setData((prev) =>
-        treeModel.update(prev, id, { name } as Partial<SpaceTreeNode>),
-      );
-      try {
-        await updatePageMutation.mutateAsync({ pageId: id, title: name });
-      } catch (error) {
-        console.error("Error updating page title:", error);
-      }
-    },
-    [updatePageMutation, setData],
-  );
-
-  const handleDelete = useCallback(
-    async (id: string) => {
-      const node = treeModel.find(
-        store.get(treeDataAtom),
-        id,
-      ) as SpaceTreeNode | null;
-      const parentPageId = node?.parentPageId ?? null;
-      try {
-        await removePageMutation.mutateAsync(id);
-        setData((prev) => {
-          let next = treeModel.remove(prev, id);
-          // If the parent has no children left, mark hasChildren: false so the
-          // chevron disappears. Without this, the empty parent keeps rendering an
-          // expand toggle that fetches zero rows on click.
-          if (parentPageId) {
-            const parent = treeModel.find(next, parentPageId);
-            if (!parent?.children?.length) {
-              next = treeModel.update(next, parentPageId, {
-                hasChildren: false,
-              } as Partial<SpaceTreeNode>);
-            }
-          }
-          return next;
-        });
-
-        if (
-          node &&
-          pageSlug &&
-          (node.slugId === pageSlug.split("-")[1] ||
-            isPageInNode(node, pageSlug.split("-")[1]))
-        ) {
-          navigate(getSpaceUrl(spaceSlug));
-        }
-
-        setTimeout(() => {
-          if (!node) return;
-          emit({
-            operation: "deleteTreeNode",
-            spaceId,
-            payload: { node },
-          });
-        }, 50);
-      } catch (error) {
-        console.error("Failed to delete page:", error);
-      }
-    },
-    [removePageMutation, setData, store, pageSlug, navigate, spaceSlug, emit, spaceId],
-  );
-
-  return { handleMove, handleCreate, handleRename, handleDelete };
-}
-
-function isPageInNode(node: SpaceTreeNode, pageSlug: string): boolean {
-  if (node.slugId === pageSlug) return true;
-  if (!node.children) return false;
-  for (const child of node.children) {
-    if (isPageInNode(child, pageSlug)) return true;
-  }
-  return false;
+  const controllers = { onMove, onRename, onCreate, onDelete };
+  return { data, setData, controllers } as const;
 }

apps/client/src/features/page/tree/model/tree-model.test.ts

@@ -1,329 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { treeModel } from './tree-model';
-import type { TreeNode } from './tree-model.types';
-
-type N = TreeNode<{ name: string }>;
-
-const fixture: N[] = [
-  {
-    id: 'a',
-    name: 'A',
-    children: [
-      { id: 'a1', name: 'A1', children: [{ id: 'a1a', name: 'A1a' }] },
-      { id: 'a2', name: 'A2' },
-    ],
-  },
-  { id: 'b', name: 'B' },
-];
-
-describe('treeModel.find', () => {
-  it('finds a root node', () => {
-    expect(treeModel.find(fixture, 'a')?.name).toBe('A');
-  });
-  it('finds a deeply nested node', () => {
-    expect(treeModel.find(fixture, 'a1a')?.name).toBe('A1a');
-  });
-  it('returns null for unknown id', () => {
-    expect(treeModel.find(fixture, 'zzz')).toBeNull();
-  });
-});
-
-describe('treeModel.path', () => {
-  it('returns root-to-leaf path for nested id', () => {
-    const p = treeModel.path(fixture, 'a1a');
-    expect(p?.map((n) => n.id)).toEqual(['a', 'a1', 'a1a']);
-  });
-  it('returns [node] for root-level id', () => {
-    expect(treeModel.path(fixture, 'b')?.map((n) => n.id)).toEqual(['b']);
-  });
-  it('returns null for unknown id', () => {
-    expect(treeModel.path(fixture, 'zzz')).toBeNull();
-  });
-});
-
-describe('treeModel.siblingsOf', () => {
-  it('returns siblings + parent + index for a child', () => {
-    const info = treeModel.siblingsOf(fixture, 'a2');
-    expect(info?.parentId).toBe('a');
-    expect(info?.siblings.map((n) => n.id)).toEqual(['a1', 'a2']);
-    expect(info?.index).toBe(1);
-  });
-  it('returns parentId null + root siblings for a root id', () => {
-    const info = treeModel.siblingsOf(fixture, 'b');
-    expect(info?.parentId).toBeNull();
-    expect(info?.siblings.map((n) => n.id)).toEqual(['a', 'b']);
-    expect(info?.index).toBe(1);
-  });
-  it('returns null for unknown id', () => {
-    expect(treeModel.siblingsOf(fixture, 'zzz')).toBeNull();
-  });
-});
-
-describe('treeModel.isDescendant', () => {
-  it('returns true when descendantId is nested under ancestorId', () => {
-    expect(treeModel.isDescendant(fixture, 'a', 'a1a')).toBe(true);
-  });
-  it('returns false when ids are siblings', () => {
-    expect(treeModel.isDescendant(fixture, 'a1', 'a2')).toBe(false);
-  });
-  it('returns false when ancestorId is the same as descendantId', () => {
-    expect(treeModel.isDescendant(fixture, 'a', 'a')).toBe(false);
-  });
-  it('returns false for unknown ids', () => {
-    expect(treeModel.isDescendant(fixture, 'zzz', 'a')).toBe(false);
-  });
-});
-
-describe('treeModel.visible', () => {
-  it('returns only root nodes when no openIds', () => {
-    const v = treeModel.visible(fixture, new Set());
-    expect(v.map((n) => n.id)).toEqual(['a', 'b']);
-  });
-  it('includes children of open ids in DFS order', () => {
-    const v = treeModel.visible(fixture, new Set(['a']));
-    expect(v.map((n) => n.id)).toEqual(['a', 'a1', 'a2', 'b']);
-  });
-  it('recursively descends through chains of open ids', () => {
-    const v = treeModel.visible(fixture, new Set(['a', 'a1']));
-    expect(v.map((n) => n.id)).toEqual(['a', 'a1', 'a1a', 'a2', 'b']);
-  });
-  it('ignores openIds that are not in the tree', () => {
-    const v = treeModel.visible(fixture, new Set(['ghost']));
-    expect(v.map((n) => n.id)).toEqual(['a', 'b']);
-  });
-});
-
-describe('treeModel.insert', () => {
-  const leaf = (id: string): N => ({ id, name: id.toUpperCase() });
-
-  it('inserts at end when index is undefined', () => {
-    const t = treeModel.insert(fixture, 'a', leaf('a3'));
-    expect(treeModel.siblingsOf(t, 'a3')?.siblings.map((n) => n.id)).toEqual([
-      'a1', 'a2', 'a3',
-    ]);
-  });
-  it('inserts at index 0', () => {
-    const t = treeModel.insert(fixture, 'a', leaf('a0'), 0);
-    expect(treeModel.siblingsOf(t, 'a0')?.siblings.map((n) => n.id)).toEqual([
-      'a0', 'a1', 'a2',
-    ]);
-  });
-  it('inserts in the middle', () => {
-    const t = treeModel.insert(fixture, 'a', leaf('a1half'), 1);
-    expect(
-      treeModel.siblingsOf(t, 'a1half')?.siblings.map((n) => n.id),
-    ).toEqual(['a1', 'a1half', 'a2']);
-  });
-  it('inserts at root when parentId is null', () => {
-    const t = treeModel.insert(fixture, null, leaf('c'));
-    expect(t.map((n) => n.id)).toEqual(['a', 'b', 'c']);
-  });
-  it('returns same array reference for unknown parentId', () => {
-    const t = treeModel.insert(fixture, 'ghost', leaf('zz'));
-    expect(t).toBe(fixture);
-  });
-  it('initializes children array when parent had no children', () => {
-    const t = treeModel.insert(fixture, 'b', leaf('b1'));
-    expect(treeModel.find(t, 'b')?.children?.map((n) => n.id)).toEqual(['b1']);
-  });
-});
-
-describe('treeModel.remove', () => {
-  it('removes a leaf', () => {
-    const t = treeModel.remove(fixture, 'a2');
-    expect(treeModel.find(t, 'a2')).toBeNull();
-  });
-  it('removes a subtree', () => {
-    const t = treeModel.remove(fixture, 'a1');
-    expect(treeModel.find(t, 'a1')).toBeNull();
-    expect(treeModel.find(t, 'a1a')).toBeNull();
-  });
-  it('removes a root node', () => {
-    const t = treeModel.remove(fixture, 'b');
-    expect(t.map((n) => n.id)).toEqual(['a']);
-  });
-  it('returns same array reference for unknown id', () => {
-    expect(treeModel.remove(fixture, 'ghost')).toBe(fixture);
-  });
-});
-
-describe('treeModel.update', () => {
-  it('shallow-merges a patch on the matching node', () => {
-    const t = treeModel.update(fixture, 'a1', { name: 'A1-renamed' });
-    expect(treeModel.find(t, 'a1')?.name).toBe('A1-renamed');
-  });
-  it('returns same array reference for unknown id', () => {
-    expect(treeModel.update(fixture, 'ghost', { name: 'x' })).toBe(fixture);
-  });
-  it("preserves children when patching parent's own fields", () => {
-    const t = treeModel.update(fixture, 'a', { name: 'A-renamed' });
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual([
-      'a1', 'a2',
-    ]);
-  });
-  it('preserves reference identity of unrelated subtrees', () => {
-    const t = treeModel.update(fixture, 'a1', { name: 'X' });
-    expect(t[1]).toBe(fixture[1]);
-  });
-});
-
-describe('treeModel.appendChildren', () => {
-  const kid = (id: string): N => ({ id, name: id });
-
-  it('appends to existing children', () => {
-    const t = treeModel.appendChildren(fixture, 'a', [kid('a3'), kid('a4')]);
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual([
-      'a1', 'a2', 'a3', 'a4',
-    ]);
-  });
-  it('initializes children when parent had none', () => {
-    const t = treeModel.appendChildren(fixture, 'b', [kid('b1')]);
-    expect(treeModel.find(t, 'b')?.children?.map((n) => n.id)).toEqual(['b1']);
-  });
-  it('returns same array reference for unknown parentId', () => {
-    expect(treeModel.appendChildren(fixture, 'ghost', [kid('zz')])).toBe(
-      fixture,
-    );
-  });
-
-  // Regression: lazy-load + auto-expand can race and call appendChildren with
-  // children that overlap what's already there. React then crashes on duplicate
-  // keys. Defensive dedup at the model level.
-  it('dedups against existing children by id', () => {
-    const t1 = treeModel.appendChildren(fixture, 'a', [
-      kid('a3'),
-      kid('a4'),
-    ]);
-    const t2 = treeModel.appendChildren(t1, 'a', [
-      kid('a3'),
-      kid('a4'),
-      kid('a5'),
-    ]);
-    expect(treeModel.find(t2, 'a')?.children?.map((n) => n.id)).toEqual([
-      'a1', 'a2', 'a3', 'a4', 'a5',
-    ]);
-  });
-
-  it('returns same array reference when every child is a duplicate', () => {
-    const t1 = treeModel.appendChildren(fixture, 'a', [kid('a3')]);
-    const t2 = treeModel.appendChildren(t1, 'a', [kid('a3')]);
-    expect(t2).toBe(t1);
-  });
-});
-
-describe('treeModel.place', () => {
-  it('moves a node to a new parent at a given index', () => {
-    const t = treeModel.place(fixture, 'a2', { parentId: 'b', index: 0 });
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual(['a1']);
-    expect(treeModel.find(t, 'b')?.children?.map((n) => n.id)).toEqual(['a2']);
-  });
-  it('moves a node to root', () => {
-    const t = treeModel.place(fixture, 'a1', { parentId: null, index: 0 });
-    expect(t.map((n) => n.id)).toEqual(['a1', 'a', 'b']);
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual(['a2']);
-  });
-  it('reorders within the same parent', () => {
-    const t = treeModel.place(fixture, 'a2', { parentId: 'a', index: 0 });
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual([
-      'a2', 'a1',
-    ]);
-  });
-  it('returns same array reference for unknown source', () => {
-    expect(
-      treeModel.place(fixture, 'ghost', { parentId: 'a', index: 0 }),
-    ).toBe(fixture);
-  });
-  it('returns same array reference for unknown destination parent', () => {
-    expect(
-      treeModel.place(fixture, 'a1', { parentId: 'ghost', index: 0 }),
-    ).toBe(fixture);
-  });
-});
-
-describe('treeModel.move', () => {
-  it('reorder-before within same parent: moves source to target index', () => {
-    const { tree: t, result } = treeModel.move(fixture, 'a2', {
-      kind: 'reorder-before',
-      targetId: 'a1',
-    });
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual([
-      'a2', 'a1',
-    ]);
-    expect(result).toEqual({ parentId: 'a', index: 0 });
-  });
-  it('reorder-after within same parent', () => {
-    const { tree: t, result } = treeModel.move(fixture, 'a1', {
-      kind: 'reorder-after',
-      targetId: 'a2',
-    });
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual([
-      'a2', 'a1',
-    ]);
-    expect(result).toEqual({ parentId: 'a', index: 1 });
-  });
-  it('make-child appends at end of target children', () => {
-    const { tree: t, result } = treeModel.move(fixture, 'b', {
-      kind: 'make-child',
-      targetId: 'a',
-    });
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual([
-      'a1', 'a2', 'b',
-    ]);
-    expect(result).toEqual({ parentId: 'a', index: 2 });
-  });
-  it('make-child initializes children when target had none', () => {
-    const { tree: t, result } = treeModel.move(fixture, 'a2', {
-      kind: 'make-child',
-      targetId: 'b',
-    });
-    expect(treeModel.find(t, 'b')?.children?.map((n) => n.id)).toEqual(['a2']);
-    expect(result).toEqual({ parentId: 'b', index: 0 });
-  });
-  it('reorder-before across parents', () => {
-    const { tree: t, result } = treeModel.move(fixture, 'b', {
-      kind: 'reorder-before',
-      targetId: 'a1',
-    });
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual([
-      'b', 'a1', 'a2',
-    ]);
-    expect(result).toEqual({ parentId: 'a', index: 0 });
-  });
-  it('reorder-after to root', () => {
-    const { tree: t, result } = treeModel.move(fixture, 'a1', {
-      kind: 'reorder-after',
-      targetId: 'a',
-    });
-    expect(t.map((n) => n.id)).toEqual(['a', 'a1', 'b']);
-    expect(treeModel.find(t, 'a')?.children?.map((n) => n.id)).toEqual(['a2']);
-    expect(result).toEqual({ parentId: null, index: 1 });
-  });
-  it('no-op when sourceId === targetId', () => {
-    const out = treeModel.move(fixture, 'a', {
-      kind: 'make-child',
-      targetId: 'a',
-    });
-    expect(out.tree).toBe(fixture);
-  });
-  it('no-op when target is descendant of source', () => {
-    const out = treeModel.move(fixture, 'a', {
-      kind: 'make-child',
-      targetId: 'a1a',
-    });
-    expect(out.tree).toBe(fixture);
-  });
-  it('no-op when source is unknown', () => {
-    const out = treeModel.move(fixture, 'ghost', {
-      kind: 'reorder-before',
-      targetId: 'a',
-    });
-    expect(out.tree).toBe(fixture);
-  });
-  it('no-op when target is unknown', () => {
-    const out = treeModel.move(fixture, 'a1', {
-      kind: 'reorder-before',
-      targetId: 'ghost',
-    });
-    expect(out.tree).toBe(fixture);
-  });
-});

apps/client/src/features/page/tree/model/tree-model.ts

@@ -1,222 +0,0 @@
-import type { TreeNode, SiblingsInfo } from './tree-model.types';
-
-function findInternal<T extends object>(
-  nodes: TreeNode<T>[],
-  id: string,
-): { parents: TreeNode<T>[]; node: TreeNode<T> } | null {
-  for (const node of nodes) {
-    if (node.id === id) return { parents: [], node };
-    if (node.children) {
-      const inner = findInternal(node.children, id);
-      if (inner) return { parents: [node, ...inner.parents], node: inner.node };
-    }
-  }
-  return null;
-}
-
-export const treeModel = {
-  find<T extends object>(tree: TreeNode<T>[], id: string): TreeNode<T> | null {
-    return findInternal(tree, id)?.node ?? null;
-  },
-
-  path<T extends object>(tree: TreeNode<T>[], id: string): TreeNode<T>[] | null {
-    const found = findInternal(tree, id);
-    if (!found) return null;
-    return [...found.parents, found.node];
-  },
-
-  siblingsOf<T extends object>(
-    tree: TreeNode<T>[],
-    id: string,
-  ): SiblingsInfo<T> | null {
-    const found = findInternal(tree, id);
-    if (!found) return null;
-    const parent = found.parents[found.parents.length - 1];
-    const siblings = parent ? parent.children! : tree;
-    return {
-      parentId: parent?.id ?? null,
-      siblings,
-      index: siblings.findIndex((n) => n.id === id),
-    };
-  },
-
-  isDescendant<T extends object>(
-    tree: TreeNode<T>[],
-    ancestorId: string,
-    descendantId: string,
-  ): boolean {
-    if (ancestorId === descendantId) return false;
-    const ancestor = treeModel.find(tree, ancestorId);
-    if (!ancestor?.children) return false;
-    return findInternal(ancestor.children, descendantId) !== null;
-  },
-
-  visible<T extends object>(
-    tree: TreeNode<T>[],
-    openIds: ReadonlySet<string>,
-  ): TreeNode<T>[] {
-    const out: TreeNode<T>[] = [];
-    const walk = (nodes: TreeNode<T>[]) => {
-      for (const node of nodes) {
-        out.push(node);
-        if (openIds.has(node.id) && node.children?.length) walk(node.children);
-      }
-    };
-    walk(tree);
-    return out;
-  },
-
-  insert<T extends object>(
-    tree: TreeNode<T>[],
-    parentId: string | null,
-    node: TreeNode<T>,
-    index?: number,
-  ): TreeNode<T>[] {
-    if (parentId === null) {
-      const idx = index ?? tree.length;
-      return [...tree.slice(0, idx), node, ...tree.slice(idx)];
-    }
-    let touched = false;
-    const walk = (nodes: TreeNode<T>[]): TreeNode<T>[] =>
-      nodes.map((n) => {
-        if (n.id === parentId) {
-          touched = true;
-          const kids = n.children ?? [];
-          const idx = index ?? kids.length;
-          return {
-            ...n,
-            children: [...kids.slice(0, idx), node, ...kids.slice(idx)],
-          };
-        }
-        if (n.children) {
-          const next = walk(n.children);
-          if (next !== n.children) return { ...n, children: next };
-        }
-        return n;
-      });
-    const out = walk(tree);
-    return touched ? out : tree;
-  },
-
-  remove<T extends object>(tree: TreeNode<T>[], id: string): TreeNode<T>[] {
-    let touched = false;
-    const walk = (nodes: TreeNode<T>[]): TreeNode<T>[] => {
-      const filtered = nodes.filter((n) => {
-        if (n.id === id) {
-          touched = true;
-          return false;
-        }
-        return true;
-      });
-      return filtered.map((n) => {
-        if (n.children) {
-          const next = walk(n.children);
-          if (next !== n.children) return { ...n, children: next };
-        }
-        return n;
-      });
-    };
-    const out = walk(tree);
-    return touched ? out : tree;
-  },
-
-  // `patch` excludes `id` (immutable) and `children` (use insert / remove /
-  // appendChildren for structural changes — otherwise referential identity of
-  // unrelated subtrees gets blown away).
-  update<T extends object>(
-    tree: TreeNode<T>[],
-    id: string,
-    patch: Omit<Partial<T>, "id" | "children">,
-  ): TreeNode<T>[] {
-    let touched = false;
-    const walk = (nodes: TreeNode<T>[]): TreeNode<T>[] =>
-      nodes.map((n) => {
-        if (n.id === id) {
-          touched = true;
-          return { ...n, ...patch };
-        }
-        if (n.children) {
-          const next = walk(n.children);
-          if (next !== n.children) return { ...n, children: next };
-        }
-        return n;
-      });
-    const out = walk(tree);
-    return touched ? out : tree;
-  },
-
-  appendChildren<T extends object>(
-    tree: TreeNode<T>[],
-    parentId: string,
-    children: TreeNode<T>[],
-  ): TreeNode<T>[] {
-    let touched = false;
-    const walk = (nodes: TreeNode<T>[]): TreeNode<T>[] =>
-      nodes.map((n) => {
-        if (n.id === parentId) {
-          const existing = n.children ?? [];
-          // Dedup against existing ids — auto-expand + manual toggle can race
-          // and produce overlapping fetches; we don't want React to see two
-          // children with the same key.
-          const existingIds = new Set(existing.map((c) => c.id));
-          const fresh = children.filter((c) => !existingIds.has(c.id));
-          if (fresh.length === 0) return n;
-          touched = true;
-          return { ...n, children: [...existing, ...fresh] };
-        }
-        if (n.children) {
-          const next = walk(n.children);
-          if (next !== n.children) return { ...n, children: next };
-        }
-        return n;
-      });
-    const out = walk(tree);
-    return touched ? out : tree;
-  },
-
-  place<T extends object>(
-    tree: TreeNode<T>[],
-    sourceId: string,
-    to: { parentId: string | null; index: number },
-  ): TreeNode<T>[] {
-    const source = treeModel.find(tree, sourceId);
-    if (!source) return tree;
-    if (to.parentId !== null && !treeModel.find(tree, to.parentId)) return tree;
-    const removed = treeModel.remove(tree, sourceId);
-    return treeModel.insert(removed, to.parentId, source, to.index);
-  },
-
-  move<T extends object>(
-    tree: TreeNode<T>[],
-    sourceId: string,
-    op: import('./tree-model.types').DropOp,
-  ): { tree: TreeNode<T>[]; result: import('./tree-model.types').DropResult } {
-    if (sourceId === op.targetId) return { tree, result: { parentId: null, index: 0 } };
-    if (!treeModel.find(tree, sourceId) || !treeModel.find(tree, op.targetId)) {
-      return { tree, result: { parentId: null, index: 0 } };
-    }
-    if (treeModel.isDescendant(tree, sourceId, op.targetId)) {
-      return { tree, result: { parentId: null, index: 0 } };
-    }
-
-    let parentId: string | null;
-    let index: number;
-
-    if (op.kind === 'make-child') {
-      parentId = op.targetId;
-      const target = treeModel.find(tree, op.targetId)!;
-      index = target.children?.length ?? 0;
-    } else {
-      const info = treeModel.siblingsOf(tree, op.targetId)!;
-      parentId = info.parentId;
-      const sourceInfo = treeModel.siblingsOf(tree, sourceId)!;
-      const sameParent = sourceInfo.parentId === parentId;
-      const adjust =
-        sameParent && sourceInfo.index < info.index ? -1 : 0;
-      index = info.index + adjust + (op.kind === 'reorder-after' ? 1 : 0);
-    }
-
-    const next = treeModel.place(tree, sourceId, { parentId, index });
-    return { tree: next, result: { parentId, index } };
-  },
-};

apps/client/src/features/page/tree/model/tree-model.types.ts

@@ -1,20 +0,0 @@
-export type TreeNode<T extends object = object> = T & {
-  id: string;
-  children?: TreeNode<T>[];
-};
-
-export type DropOp =
-  | { kind: 'reorder-before'; targetId: string }
-  | { kind: 'reorder-after'; targetId: string }
-  | { kind: 'make-child'; targetId: string };
-
-export type DropResult = {
-  parentId: string | null;
-  index: number;
-};
-
-export type SiblingsInfo<T extends object> = {
-  parentId: string | null;
-  siblings: TreeNode<T>[];
-  index: number;
-};

apps/client/src/features/page/tree/styles/tree.module.css

@@ -5,11 +5,10 @@
 .treeContainer {
     height: 100%;
     min-width: 0;
-    /* DocTree renders a vanilla <ul role="tree"> with no internal virtualizer,
-       so the container must own the scroll. Without this the tree grows past
-       its parent and the page scrolls instead. */
-    overflow-y: auto;
-    overflow-x: hidden;
+
+    > div, > div > .tree {
+        height: 100% !important;
+    }
 }
 
 .node {
@@ -18,39 +17,76 @@
     display: flex;
     align-items: center;
     height: 100%;
-    width: 100%;
+    width: 93%; /* not to overlap with scroll bar */
     text-decoration: none;
     color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-0));
 
-    /* Gate hover styles to mouse-capable devices. Touch browsers synthesize
-       :hover on the first tap (sticky hover) and only fire click on the
-       second tap, requiring a double-tap to navigate. */
-    @media (hover: hover) {
-        &:hover {
-            background-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
-        }
+    &:hover {
+        background-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
+        /*background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6));*/
+     }
 
-        &:hover .actions {
-            opacity: 1;
-            pointer-events: auto;
-        }
-    }
 
     .actions {
-        display: inline-flex;
-        flex-shrink: 0;
-        align-items: center;
-        margin-left: 4px;
-        opacity: 0;
-        pointer-events: none;
+        visibility: hidden;
+        position: absolute;
+        height: 100%;
+        top: 0;
+        right: 0;
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+        background-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-6));
     }
 
-    &:focus-within .actions {
-        opacity: 1;
-        pointer-events: auto;
+      &:hover .actions {
+       visibility: visible;
     }
+
 }
 
+.node:global(.willReceiveDrop) {
+    background-color: light-dark(var(--mantine-color-blue-1), var(--mantine-color-gray-7));
+}
+
+.node:global(.isSelected) {
+    border-radius: 0;
+
+    background-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-6));
+/*
+    color: white;
+
+ // background-color: light-dark(
+  //  var(--mantine-color-gray-0),
+   // var(--mantine-color-dark-6)
+  //);
+  //background: rgb(20, 127, 250, 0.5);*/
+}
+
+.node:global(.isSelectedStart.isSelectedEnd) {
+    border-radius: 4px;
+}
+
+.row:focus .node:global(.isSelected) {
+    background-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
+}
+
+.row:focus .node:global(.isFocused) {
+    background-color: light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-5));
+}
+
+.row {
+    white-space: nowrap;
+    cursor: pointer;
+}
+
+.row:focus {
+    outline: none;
+}
+
+.row:focus .node {
+    /** come back to this **/
+   /* background-color: light-dark(var(--mantine-color-red-2), var(--mantine-color-dark-5));*/
+}
 
 .icon {
     margin: 0 rem(10px);
@@ -59,12 +95,8 @@
 
 .text {
     flex: 1;
-    /* min-width: 0 lets a flex child shrink below its content size — required
-       for text-overflow: ellipsis on flex items. */
-    min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;
-    white-space: nowrap;
     font-size: rem(14px);
     font-weight: 500;
 }
@@ -76,113 +108,3 @@
 [role="treeitem"] {
     padding-bottom: 2px;
 }
-
-/* Strip the browser's default <ul> bullet + indent from the DocTree
-   <ul role="tree"> and nested <ul role="group"> nodes. The tree's own indent
-   is driven by paddingLeft on .rowWrapper. */
-[role="tree"],
-[role="tree"] [role="group"] {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
-/* ---- pragmatic-tree additions ---- */
-
-.rowWrapper {
-    position: relative;
-    display: flex;
-    align-items: center;
-    border-radius: 4px;
-}
-
-.node[data-dragging="true"] {
-    opacity: 0.4;
-}
-
-.node:focus-visible {
-    outline: 2px solid light-dark(
-        var(--mantine-color-blue-5),
-        var(--mantine-color-blue-4)
-    );
-    outline-offset: -2px;
-}
-
-.node :focus-visible {
-    outline-offset: -2px;
-}
-
-.node[data-selected="true"] {
-    background-color: light-dark(
-        var(--mantine-color-gray-3),
-        var(--mantine-color-dark-6)
-    );
-}
-
-.node[data-selected="true"] .actions {
-    opacity: 1;
-    pointer-events: auto;
-}
-
-.node[data-receiving-drop="make-child"] {
-    background-color: light-dark(
-        var(--mantine-color-blue-1),
-        rgba(56, 139, 253, 0.15)
-    );
-    outline: 2px solid light-dark(
-        var(--mantine-color-blue-5),
-        var(--mantine-color-blue-7)
-    );
-    outline-offset: -1px;
-}
-
-.node[data-receiving-drop="make-child-blocked"] {
-    outline-color: light-dark(
-        var(--mantine-color-red-5),
-        var(--mantine-color-red-7)
-    );
-}
-
-.dropLine {
-    position: absolute;
-    left: var(--drop-line-indent, 0);
-    right: 8px;
-    height: 2px;
-    background: light-dark(
-        var(--mantine-color-blue-5),
-        var(--mantine-color-blue-4)
-    );
-    pointer-events: none;
-    z-index: 1;
-}
-
-.dropLine::before {
-    content: "";
-    position: absolute;
-    left: -4px;
-    top: -3px;
-    width: 8px;
-    height: 8px;
-    border: 2px solid currentColor;
-    border-radius: 50%;
-    color: light-dark(
-        var(--mantine-color-blue-5),
-        var(--mantine-color-blue-4)
-    );
-    background: var(--mantine-color-body);
-}
-
-.dropLine[data-blocked="true"] {
-    background: light-dark(
-        var(--mantine-color-red-5),
-        var(--mantine-color-red-4)
-    );
-}
-
-.dropLine[data-edge="top"] {
-    top: -1px;
-}
-
-.dropLine[data-edge="bottom"] {
-    bottom: -1px;
-}

apps/client/src/features/search/components/search-spotlight-filters.tsx

@@ -1,9 +1,13 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useMemo, useEffect } from "react";
 import {
   Button,
   Menu,
   Text,
+  TextInput,
+  Divider,
   Badge,
+  ScrollArea,
+  Avatar,
   Group,
   Switch,
   getDefaultZIndex,
@@ -12,11 +16,12 @@ import {
   IconChevronDown,
   IconBuilding,
   IconFileDescription,
+  IconSearch,
   IconCheck,
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
+import { useDebouncedValue } from "@mantine/hooks";
 import { useGetSpacesQuery } from "@/features/space/queries/space-query";
-import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
 import classes from "./search-spotlight-filters.module.css";
@@ -41,13 +46,32 @@ export function SearchSpotlightFilters({
   const [selectedSpaceId, setSelectedSpaceId] = useState<string | null>(
     spaceId || null,
   );
+  const [spaceSearchQuery, setSpaceSearchQuery] = useState("");
+  const [debouncedSpaceQuery] = useDebouncedValue(spaceSearchQuery, 300);
   const [contentType, setContentType] = useState<string | null>("page");
   const [workspace] = useAtom(workspaceAtom);
 
-  const { data: spacesData } = useGetSpacesQuery({ limit: 100 });
-  const selectedSpaceData = selectedSpaceId
-    ? spacesData?.items.find((space) => space.id === selectedSpaceId)
-    : null;
+  const { data: spacesData } = useGetSpacesQuery({
+    limit: 100,
+    query: debouncedSpaceQuery,
+  });
+
+  const selectedSpaceData = useMemo(() => {
+    if (!spacesData?.items || !selectedSpaceId) return null;
+    return spacesData.items.find((space) => space.id === selectedSpaceId);
+  }, [spacesData?.items, selectedSpaceId]);
+
+  const availableSpaces = useMemo(() => {
+    const spaces = spacesData?.items || [];
+    if (!selectedSpaceId) return spaces;
+
+    // Sort to put selected space first
+    return [...spaces].sort((a, b) => {
+      if (a.id === selectedSpaceId) return -1;
+      if (b.id === selectedSpaceId) return 1;
+      return 0;
+    });
+  }, [spacesData?.items, selectedSpaceId]);
 
   useEffect(() => {
     if (onFiltersChange) {
@@ -128,27 +152,86 @@ export function SearchSpotlightFilters({
         </div>
       )}
 
-      <SpaceFilterMenu
-        value={selectedSpaceId}
-        onChange={handleSpaceSelect}
-        position="bottom-start"
+      <Menu
+        shadow="md"
         width={250}
+        position="bottom-start"
         zIndex={getDefaultZIndex("max")}
       >
-        <Button
-          variant="subtle"
-          color="gray"
-          size="sm"
-          rightSection={<IconChevronDown size={14} />}
-          leftSection={<IconBuilding size={16} />}
-          className={classes.filterButton}
-          fw={500}
-        >
-          {selectedSpaceId
-            ? `${t("Space")}: ${selectedSpaceData?.name || t("Unknown")}`
-            : `${t("Space")}: ${t("All spaces")}`}
-        </Button>
-      </SpaceFilterMenu>
+        <Menu.Target>
+          <Button
+            variant="subtle"
+            color="gray"
+            size="sm"
+            rightSection={<IconChevronDown size={14} />}
+            leftSection={<IconBuilding size={16} />}
+            className={classes.filterButton}
+            fw={500}
+          >
+            {selectedSpaceId
+              ? `${t("Space")}: ${selectedSpaceData?.name || t("Unknown")}`
+              : `${t("Space")}: ${t("All spaces")}`}
+          </Button>
+        </Menu.Target>
+        <Menu.Dropdown>
+          <TextInput
+            placeholder={t("Find a space")}
+            data-autofocus
+            autoFocus
+            leftSection={<IconSearch size={16} />}
+            value={spaceSearchQuery}
+            onChange={(e) => setSpaceSearchQuery(e.target.value)}
+            size="sm"
+            variant="filled"
+            radius="sm"
+            styles={{ input: { marginBottom: 8 } }}
+          />
+
+          <ScrollArea.Autosize mah={280}>
+            <Menu.Item onClick={() => handleSpaceSelect(null)}>
+              <Group flex="1" gap="xs">
+                <Avatar
+                  color="initials"
+                  variant="filled"
+                  name={t("All spaces")}
+                  size={20}
+                />
+                <div style={{ flex: 1 }}>
+                  <Text size="sm" fw={500}>
+                    {t("All spaces")}
+                  </Text>
+                  <Text size="xs" c="dimmed">
+                    {t("Search in all your spaces")}
+                  </Text>
+                </div>
+                {!selectedSpaceId && <IconCheck size={20} />}
+              </Group>
+            </Menu.Item>
+
+            <Divider my="xs" />
+
+            {availableSpaces.map((space) => (
+              <Menu.Item
+                key={space.id}
+                onClick={() => handleSpaceSelect(space.id)}
+              >
+                <Group flex="1" gap="xs">
+                  <Avatar
+                    color="initials"
+                    variant="filled"
+                    name={space.name}
+                    size={20}
+                  />
+                  <Text size="sm" fw={500} style={{ flex: 1 }} truncate>
+                    {space.name}
+                  </Text>
+                  {selectedSpaceId === space.id && <IconCheck size={20} />}
+                </Group>
+              </Menu.Item>
+            ))}
+          </ScrollArea.Autosize>
+        </Menu.Dropdown>
+      </Menu>
 
       <Menu
         shadow="md"

apps/client/src/features/share/atoms/open-shared-tree-nodes-atom.ts

@@ -1,3 +0,0 @@
-import { atom } from "jotai";
-
-export const openSharedTreeNodesAtom = atom<Record<string, boolean>>({});

apps/client/src/features/share/components/shared-tree.tsx

@@ -1,11 +1,14 @@
 import { ISharedPageTree } from "@/features/share/types/share.types.ts";
+import { NodeApi, NodeRendererProps, Tree, TreeApi } from "react-arborist";
 import {
   buildSharedPageTree,
   SharedPageTreeNode,
 } from "@/features/share/utils.ts";
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useElementSize, useMergedRef } from "@mantine/hooks";
+import { SpaceTreeNode } from "@/features/page/tree/types.ts";
 import { Link, useParams } from "react-router-dom";
-import { useAtom } from "jotai";
+import { atom, useAtom } from "jotai/index";
 import { useTranslation } from "react-i18next";
 import { buildSharedPageUrl } from "@/features/page/page.utils.ts";
 import clsx from "clsx";
@@ -17,204 +20,176 @@ import {
 } from "@tabler/icons-react";
 import { ActionIcon, Box } from "@mantine/core";
 import { extractPageSlugId } from "@/lib";
+import { OpenMap } from "react-arborist/dist/main/state/open-slice";
 import classes from "@/features/page/tree/styles/tree.module.css";
 import styles from "./share.module.css";
 import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import EmojiPicker from "@/components/ui/emoji-picker.tsx";
-import {
-  DocTree,
-  type DocTreeApi,
-  type RenderRowProps,
-} from "@/features/page/tree/components/doc-tree";
-import { openSharedTreeNodesAtom } from "@/features/share/atoms/open-shared-tree-nodes-atom";
 
-interface SharedTreeProps {
+interface SharedTree {
   sharedPageTree: ISharedPageTree;
 }
 
-export default function SharedTree({ sharedPageTree }: SharedTreeProps) {
-  const { t } = useTranslation();
-  const treeRef = useRef<DocTreeApi | null>(null);
+const openSharedTreeNodesAtom = atom<OpenMap>({});
+
+export default function SharedTree({ sharedPageTree }: SharedTree) {
+  const [tree, setTree] = useState<
+    TreeApi<SharedPageTreeNode> | null | undefined
+  >(null);
+  const rootElement = useRef<HTMLDivElement>();
+  const { ref: sizeRef, width, height } = useElementSize();
+  const mergedRef = useMergedRef(rootElement, sizeRef);
   const { pageSlug } = useParams();
-  const [openTreeNodes, setOpenTreeNodes] = useAtom(openSharedTreeNodesAtom);
+  const [openTreeNodes, setOpenTreeNodes] = useAtom<OpenMap>(
+    openSharedTreeNodesAtom,
+  );
 
   const currentNodeId = extractPageSlugId(pageSlug);
 
   const treeData: SharedPageTreeNode[] = useMemo(() => {
-    if (!sharedPageTree?.pageTree) return [] as SharedPageTreeNode[];
+    if (!sharedPageTree?.pageTree) return;
     return buildSharedPageTree(sharedPageTree.pageTree);
   }, [sharedPageTree?.pageTree]);
 
-  const openIds = useMemo(
-    () =>
-      new Set(
-        Object.keys(openTreeNodes).filter((k) => openTreeNodes[k]),
-      ),
-    [openTreeNodes],
-  );
-
   useEffect(() => {
-    // Auto-open the first level of the shared tree on initial load.
-    const root = treeData?.[0];
-    if (!root) return;
-    setOpenTreeNodes((prev) => {
-      if (prev[root.slugId]) return prev;
-      const next = { ...prev, [root.slugId]: true };
-      for (const child of root.children ?? []) {
-        next[child.slugId] = true;
-      }
-      return next;
-    });
-  }, [treeData, setOpenTreeNodes]);
+    const parentNodeId = treeData?.[0]?.slugId;
 
-  useEffect(() => {
-    if (currentNodeId) {
-      treeRef.current?.select(currentNodeId, { scrollIntoView: true });
+    if (parentNodeId && tree) {
+      const parentNode = tree.get(parentNodeId);
+
+      setTimeout(() => {
+        if (parentNode) {
+          tree.openSiblings(parentNode);
+        }
+      });
+
+      // open direct children of parent node
+      parentNode?.children.forEach((node) => {
+        tree.openSiblings(node);
+      });
     }
-  }, [currentNodeId, treeData]);
+  }, [treeData, tree]);
 
-  // Stable callbacks so memo(DocTreeRow) actually saves work — see I2 in the
-  // post-implementation code review.
-  const handleToggle = useCallback(
-    (id: string, isOpen: boolean) =>
-      setOpenTreeNodes((prev) => ({ ...prev, [id]: isOpen })),
-    [setOpenTreeNodes],
-  );
-  const getDragLabel = useCallback(
-    (n: SharedPageTreeNode) => n.name || "untitled",
-    [],
-  );
+  useEffect(() => {
+    if (currentNodeId && tree) {
+      setTimeout(() => {
+        // focus on node and open all parents
+        tree?.select(currentNodeId, { align: "auto" });
+      }, 200);
+    } else {
+      tree?.deselectAll();
+    }
+  }, [currentNodeId, tree]);
 
   if (!sharedPageTree || !sharedPageTree?.pageTree) {
     return null;
   }
 
   return (
-    <div className={classes.treeContainer}>
-      <DocTree<SharedPageTreeNode>
-        readOnly
-        ref={treeRef}
-        data={treeData}
-        openIds={openIds}
-        selectedId={currentNodeId}
-        renderRow={SharedTreeRow}
-        onMove={noopMove}
-        onToggle={handleToggle}
-        getDragLabel={getDragLabel}
-        aria-label={t("Pages")}
-      />
+    <div ref={mergedRef} className={classes.treeContainer}>
+      {rootElement.current && (
+        <Tree
+          data={treeData}
+          disableDrag={true}
+          disableDrop={true}
+          disableEdit={true}
+          width={width}
+          height={rootElement.current.clientHeight}
+          ref={(t) => setTree(t)}
+          openByDefault={false}
+          disableMultiSelection={true}
+          className={classes.tree}
+          rowClassName={classes.row}
+          rowHeight={30}
+          overscanCount={10}
+          dndRootElement={rootElement.current}
+          onToggle={() => {
+            setOpenTreeNodes(tree?.openState);
+          }}
+          initialOpenState={openTreeNodes}
+          onClick={(e) => {
+            if (tree && tree.focusedNode) {
+              tree.select(tree.focusedNode);
+            }
+          }}
+        >
+          {Node}
+        </Tree>
+      )}
     </div>
   );
 }
 
-// Module-scope noop so it's a stable reference across renders.
-const noopMove = () => {};
-
-function SharedTreeRow({
-  node,
-  isOpen,
-  hasChildren,
-  isSelected,
-  rowRef,
-  tabIndex,
-  treeItemProps,
-  toggleOpen,
-}: RenderRowProps<SharedPageTreeNode>) {
+function Node({ node, style, tree }: NodeRendererProps<any>) {
   const { shareId } = useParams();
   const { t } = useTranslation();
   const [, setMobileSidebarState] = useAtom(mobileSidebarAtom);
 
   const pageUrl = buildSharedPageUrl({
     shareId: shareId,
-    pageSlugId: node.slugId,
-    pageTitle: node.name,
+    pageSlugId: node.data.slugId,
+    pageTitle: node.data.name,
   });
 
   return (
-    <Box
-      ref={rowRef as React.Ref<HTMLAnchorElement>}
-      tabIndex={tabIndex}
-      {...treeItemProps}
-      data-selected={isSelected || undefined}
-      className={clsx(classes.node, styles.treeNode)}
-      component={Link}
-      to={pageUrl}
-      onClick={() => {
-        setMobileSidebarState(false);
-      }}
-    >
-      <SharedPageArrow
-        isOpen={isOpen}
-        hasChildren={hasChildren}
-        onToggle={toggleOpen}
-      />
-      <div style={{ marginRight: "4px" }}>
-        <EmojiPicker
-          onEmojiSelect={() => {}}
-          icon={
-            node.icon ? (
-              node.icon
-            ) : (
-              <IconFileDescription size="18" />
-            )
-          }
-          readOnly={true}
-          removeEmojiAction={() => {}}
-          actionIconProps={{ tabIndex: -1 }}
-        />
-      </div>
-      <span className={classes.text}>{node.name || t("untitled")}</span>
-    </Box>
+    <>
+      <Box
+        style={style}
+        className={clsx(classes.node, node.state, styles.treeNode)}
+        component={Link}
+        to={pageUrl}
+        onClick={() => {
+          setMobileSidebarState(false);
+        }}
+      >
+        <PageArrow node={node} />
+        <div style={{ marginRight: "4px" }}>
+          <EmojiPicker
+            onEmojiSelect={() => {}}
+            icon={
+              node.data.icon ? (
+                node.data.icon
+              ) : (
+                <IconFileDescription size="18" />
+              )
+            }
+            readOnly={true}
+            removeEmojiAction={() => {}}
+          />
+        </div>
+        <span className={classes.text}>{node.data.name || t("untitled")}</span>
+      </Box>
+    </>
   );
 }
 
-interface SharedPageArrowProps {
-  isOpen: boolean;
-  hasChildren: boolean;
-  onToggle: () => void;
+interface PageArrowProps {
+  node: NodeApi<SpaceTreeNode>;
 }
 
-function SharedPageArrow({
-  isOpen,
-  hasChildren,
-  onToggle,
-}: SharedPageArrowProps) {
-  if (!hasChildren) {
-    return (
-      <span
-        aria-hidden
-        style={{
-          width: 20,
-          height: 20,
-          display: "inline-flex",
-          alignItems: "center",
-          justifyContent: "center",
-          color: "var(--mantine-color-gray-6)",
-          flexShrink: 0,
-        }}
-      >
-        <IconPointFilled size={4} />
-      </span>
-    );
-  }
-
+function PageArrow({ node }: PageArrowProps) {
   return (
     <ActionIcon
       size={20}
       variant="subtle"
       c="gray"
-      tabIndex={-1}
       onClick={(e) => {
         e.preventDefault();
         e.stopPropagation();
-        onToggle();
+        node.toggle();
       }}
     >
-      {isOpen ? (
-        <IconChevronDown stroke={2} size={16} />
-      ) : (
-        <IconChevronRight stroke={2} size={16} />
-      )}
+      {node.isInternal ? (
+        node.children && (node.children.length > 0 || node.data.hasChildren) ? (
+          node.isOpen ? (
+            <IconChevronDown stroke={2} size={16} />
+          ) : (
+            <IconChevronRight stroke={2} size={16} />
+          )
+        ) : (
+          <IconPointFilled size={4} />
+        )
+      ) : null}
     </ActionIcon>
   );
 }

apps/client/src/features/space/components/sidebar/space-sidebar.tsx

@@ -28,7 +28,7 @@ import {
 import classes from "./space-sidebar.module.css";
 import React from "react";
 import { useAtom } from "jotai";
-import { useTreeMutation } from "@/features/page/tree/hooks/use-tree-mutation.ts";
+import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
 import { Link, useLocation, useParams } from "react-router-dom";
 import clsx from "clsx";
 import { useDisclosure } from "@mantine/hooks";
@@ -56,6 +56,7 @@ import { searchSpotlight } from "@/features/search/constants";
 
 export function SpaceSidebar() {
   const { t } = useTranslation();
+  const [tree] = useAtom(treeApiAtom);
   const location = useLocation();
   const [opened, { open: openSettings, close: closeSettings }] =
     useDisclosure(false);
@@ -67,14 +68,13 @@ export function SpaceSidebar() {
 
   const spaceRules = space?.membership?.permissions;
   const spaceAbility = useSpaceAbility(spaceRules);
-  const { handleCreate } = useTreeMutation(space?.id ?? "");
 
   if (!space) {
     return <></>;
   }
 
   function handleCreatePage() {
-    handleCreate(null);
+    tree?.create({ parentId: null, type: "internal", index: 0 });
   }
 
   return (

apps/client/src/features/space/components/space-filter-menu.tsx

@@ -1,121 +0,0 @@
-import { ReactNode, useMemo, useState } from "react";
-import {
-  Avatar,
-  Divider,
-  Group,
-  Menu,
-  ScrollArea,
-  Text,
-  TextInput,
-  getDefaultZIndex,
-} from "@mantine/core";
-import { useDebouncedValue } from "@mantine/hooks";
-import { IconCheck, IconSearch } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useGetSpacesQuery } from "@/features/space/queries/space-query";
-
-type SpaceFilterMenuProps = {
-  value: string | null;
-  onChange: (spaceId: string | null) => void;
-  children: ReactNode;
-  width?: number;
-  position?:
-    | "bottom-start"
-    | "bottom-end"
-    | "bottom"
-    | "top-start"
-    | "top-end"
-    | "top";
-  zIndex?: number;
-};
-
-export function SpaceFilterMenu({
-  value,
-  onChange,
-  children,
-  width = 280,
-  position = "bottom-end",
-  zIndex,
-}: SpaceFilterMenuProps) {
-  const { t } = useTranslation();
-  const [searchQuery, setSearchQuery] = useState("");
-  const [debouncedQuery] = useDebouncedValue(searchQuery, 300);
-
-  const { data: spacesData } = useGetSpacesQuery({
-    limit: 100,
-    query: debouncedQuery,
-  });
-  const spaces = spacesData?.items ?? [];
-
-  const orderedSpaces = useMemo(() => {
-    if (!value) return spaces;
-    return [...spaces].sort((a, b) => {
-      if (a.id === value) return -1;
-      if (b.id === value) return 1;
-      return 0;
-    });
-  }, [spaces, value]);
-
-  return (
-    <Menu shadow="md" width={width} position={position} zIndex={zIndex}>
-      <Menu.Target>{children}</Menu.Target>
-      <Menu.Dropdown>
-        <TextInput
-          placeholder={t("Find a space")}
-          data-autofocus
-          autoFocus
-          leftSection={<IconSearch size={16} />}
-          value={searchQuery}
-          onChange={(e) => setSearchQuery(e.target.value)}
-          size="sm"
-          variant="filled"
-          radius="sm"
-          styles={{ input: { marginBottom: 8 } }}
-        />
-
-        <ScrollArea.Autosize mah={280}>
-          <Menu.Item onClick={() => onChange(null)}>
-            <Group flex="1" gap="xs">
-              <Avatar
-                color="initials"
-                variant="filled"
-                name={t("All spaces")}
-                size={20}
-              />
-              <div style={{ flex: 1 }}>
-                <Text size="sm" fw={500}>
-                  {t("All spaces")}
-                </Text>
-                <Text size="xs" c="dimmed">
-                  {t("Search in all your spaces")}
-                </Text>
-              </div>
-              {!value && <IconCheck size={20} />}
-            </Group>
-          </Menu.Item>
-
-          <Divider my="xs" />
-
-          {orderedSpaces.map((space) => (
-            <Menu.Item key={space.id} onClick={() => onChange(space.id)}>
-              <Group flex="1" gap="xs">
-                <Avatar
-                  color="initials"
-                  variant="filled"
-                  name={space.name}
-                  size={20}
-                />
-                <Text size="sm" fw={500} style={{ flex: 1 }} truncate>
-                  {space.name}
-                </Text>
-                {value === space.id && <IconCheck size={20} />}
-              </Group>
-            </Menu.Item>
-          ))}
-        </ScrollArea.Autosize>
-      </Menu.Dropdown>
-    </Menu>
-  );
-}
-
-export const SPACE_FILTER_MENU_MAX_Z = getDefaultZIndex("max");

apps/client/src/features/user/components/fixed-toolbar-pref.tsx

@@ -1,57 +0,0 @@
-import { userAtom } from "@/features/user/atoms/current-user-atom";
-import { updateUser } from "@/features/user/services/user-service";
-import { Badge, Group, Switch, Text } from "@mantine/core";
-import { useAtom } from "jotai";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  ResponsiveSettingsRow,
-  ResponsiveSettingsContent,
-  ResponsiveSettingsControl,
-} from "@/components/ui/responsive-settings-row";
-
-export default function FixedToolbarPref() {
-  const { t } = useTranslation();
-  const [user, setUser] = useAtom(userAtom);
-  const [checked, setChecked] = useState(
-    user.settings?.preferences?.editorToolbar ?? false,
-  );
-
-  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.currentTarget.checked;
-    setChecked(value);
-    try {
-      const updatedUser = await updateUser({ editorToolbar: value });
-      setUser(updatedUser);
-    } catch {
-      setChecked(!value);
-    }
-  };
-
-  return (
-    <ResponsiveSettingsRow>
-      <ResponsiveSettingsContent>
-        <Group gap="xs">
-          <Text size="md">{t("Fixed editor toolbar")}</Text>
-          <Badge size="xs" color="gray" variant="light">
-            {t("Experimental")}
-          </Badge>
-        </Group>
-        <Text size="sm" c="dimmed">
-          {t(
-            "Show a formatting toolbar above the editor with quick access to common actions.",
-          )}
-        </Text>
-      </ResponsiveSettingsContent>
-
-      <ResponsiveSettingsControl>
-        <Switch
-          labelPosition="left"
-          defaultChecked={checked}
-          onChange={handleChange}
-          aria-label={t("Toggle fixed editor toolbar")}
-        />
-      </ResponsiveSettingsControl>
-    </ResponsiveSettingsRow>
-  );
-}

apps/client/src/features/user/types/user.types.ts

@@ -20,7 +20,6 @@ export interface IUser {
   deletedAt: Date;
   fullPageWidth: boolean; // used for update
   pageEditMode: string; // used for update
-  editorToolbar: boolean; // used for update
   notificationPageUpdates: boolean; // used for update
   notificationPageUserMention: boolean; // used for update
   notificationCommentUserMention: boolean; // used for update
@@ -38,7 +37,6 @@ export interface IUserSettings {
   preferences: {
     fullPageWidth: boolean;
     pageEditMode: string;
-    editorToolbar: boolean;
   };
   notifications?: {
     "page.updated"?: boolean;

apps/client/src/features/user/user-provider.tsx

@@ -60,10 +60,6 @@ export function UserProvider({ children }: React.PropsWithChildren) {
     }
   }, [data, isLoading]);
 
-  useEffect(() => {
-    document.documentElement.lang = i18n.resolvedLanguage || i18n.language || "en-US";
-  }, [i18n.language, i18n.resolvedLanguage]);
-
   useEffect(() => {
     if (entitlements) {
       setEntitlements(entitlements);

apps/client/src/features/websocket/use-tree-socket.ts

@@ -1,27 +1,37 @@
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { socketAtom } from "@/features/websocket/atoms/socket-atom.ts";
 import { useAtom } from "jotai";
 import { treeDataAtom } from "@/features/page/tree/atoms/tree-data-atom.ts";
 import { WebSocketEvent } from "@/features/websocket/types";
 import { SpaceTreeNode } from "@/features/page/tree/types.ts";
 import { useQueryClient } from "@tanstack/react-query";
-import { treeModel } from "@/features/page/tree/model/tree-model";
+import { SimpleTree } from "react-arborist";
 import localEmitter from "@/lib/local-emitter.ts";
 
 export const useTreeSocket = () => {
   const [socket] = useAtom(socketAtom);
-  const [, setTreeData] = useAtom(treeDataAtom);
+  const [treeData, setTreeData] = useAtom(treeDataAtom);
   const queryClient = useQueryClient();
+  const initialTreeData = useRef(treeData);
+
+  useEffect(() => {
+    initialTreeData.current = treeData;
+  }, [treeData]);
 
   useEffect(() => {
     const updateNodeName = (event) => {
-      if (event.payload?.title === undefined) return;
-      setTreeData((prev) => {
-        if (!treeModel.find(prev, event?.id)) return prev;
-        return treeModel.update(prev, event.id, {
-          name: event.payload.title,
-        } as Partial<SpaceTreeNode>);
-      });
+      const initialData = initialTreeData.current;
+      const treeApi = new SimpleTree<SpaceTreeNode>(initialData);
+
+      if (treeApi.find(event?.id)) {
+        if (event.payload?.title !== undefined) {
+          treeApi.update({
+            id: event.id,
+            changes: { name: event.payload.title },
+          });
+          setTreeData(treeApi.data);
+        }
+      }
     };
 
     localEmitter.on("message", updateNodeName);
@@ -32,110 +42,70 @@ export const useTreeSocket = () => {
 
   useEffect(() => {
     socket?.on("message", (event: WebSocketEvent) => {
+      const initialData = initialTreeData.current;
+      const treeApi = new SimpleTree<SpaceTreeNode>(initialData);
+
       switch (event.operation) {
         case "updateOne":
           if (event.entity[0] === "pages") {
-            setTreeData((prev) => {
-              if (!treeModel.find(prev, event.id)) return prev;
-              let next = prev;
+            if (treeApi.find(event.id)) {
               if (event.payload?.title !== undefined) {
-                next = treeModel.update(next, event.id, {
-                  name: event.payload.title,
-                } as Partial<SpaceTreeNode>);
+                treeApi.update({
+                  id: event.id,
+                  changes: { name: event.payload.title },
+                });
               }
               if (event.payload?.icon !== undefined) {
-                next = treeModel.update(next, event.id, {
-                  icon: event.payload.icon,
-                } as Partial<SpaceTreeNode>);
+                treeApi.update({
+                  id: event.id,
+                  changes: { icon: event.payload.icon },
+                });
               }
-              return next;
-            });
+              setTreeData(treeApi.data);
+            }
           }
           break;
         case "addTreeNode":
-          setTreeData((prev) => {
-            if (treeModel.find(prev, event.payload.data.id)) return prev;
-            const newParentId = event.payload.parentId as string | null;
-            let next = treeModel.insert(
-              prev,
-              newParentId,
-              event.payload.data,
-              event.payload.index,
-            );
-            // Mirror the emitter: flip new parent's hasChildren to true so
-            // the chevron renders on the receiver.
-            if (newParentId) {
-              next = treeModel.update(next, newParentId, {
-                hasChildren: true,
-              } as Partial<SpaceTreeNode>);
-            }
-            return next;
+          if (treeApi.find(event.payload.data.id)) return;
+
+          treeApi.create({
+            parentId: event.payload.parentId,
+            index: event.payload.index,
+            data: event.payload.data,
           });
+          setTreeData(treeApi.data);
+
           break;
         case "moveTreeNode":
-          setTreeData((prev) => {
-            const sourceBefore = treeModel.find(prev, event.payload.id);
-            if (!sourceBefore) return prev;
-            const oldParentId =
-              (sourceBefore as SpaceTreeNode).parentPageId ?? null;
-            const newParentId = event.payload.parentId as string | null;
-
-            const placed = treeModel.place(prev, event.payload.id, {
-              parentId: newParentId,
+          // move node
+          if (treeApi.find(event.payload.id)) {
+            treeApi.move({
+              id: event.payload.id,
+              parentId: event.payload.parentId,
               index: event.payload.index,
             });
-            // `place` silently returns the same reference if the destination
-            // parent isn't loaded on this client. Falling back to removing the
-            // source keeps the UI consistent (the source will reappear when
-            // the user expands the new parent and lazy-load fetches it).
-            if (placed === prev) {
-              return treeModel.remove(prev, event.payload.id);
-            }
 
-            let next = treeModel.update(placed, event.payload.id, {
-              position: event.payload.position,
-              parentPageId: newParentId,
-            } as Partial<SpaceTreeNode>);
+            // update node position
+            treeApi.update({
+              id: event.payload.id,
+              changes: {
+                position: event.payload.position,
+              },
+            });
 
-            // Mirror the emitter's hasChildren bookkeeping so both clients
-            // converge to the same chevron state.
-            if (oldParentId) {
-              const oldParent = treeModel.find(next, oldParentId);
-              if (!oldParent?.children?.length) {
-                next = treeModel.update(next, oldParentId, {
-                  hasChildren: false,
-                } as Partial<SpaceTreeNode>);
-              }
-            }
-            if (newParentId) {
-              next = treeModel.update(next, newParentId, {
-                hasChildren: true,
-              } as Partial<SpaceTreeNode>);
-            }
+            setTreeData(treeApi.data);
+          }
 
-            return next;
-          });
           break;
         case "deleteTreeNode":
-          setTreeData((prev) => {
-            if (!treeModel.find(prev, event.payload.node.id)) return prev;
+          if (treeApi.find(event.payload.node.id)) {
+            treeApi.drop({ id: event.payload.node.id });
+            setTreeData(treeApi.data);
+
             queryClient.invalidateQueries({
               queryKey: ["pages", event.payload.node.slugId].filter(Boolean),
             });
-            let next = treeModel.remove(prev, event.payload.node.id);
-            // Mirror the emitter's hasChildren bookkeeping so both clients
-            // converge to the same chevron state when the last child is deleted.
-            const parentPageId = event.payload.node.parentPageId;
-            if (parentPageId) {
-              const parent = treeModel.find(next, parentPageId);
-              if (!parent?.children?.length) {
-                next = treeModel.update(next, parentPageId, {
-                  hasChildren: false,
-                } as Partial<SpaceTreeNode>);
-              }
-            }
-            return next;
-          });
+          }
           break;
       }
     });

apps/client/src/pages/label/label-page.tsx

@@ -1,180 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from "react";
-import {
-  Button,
-  Center,
-  Container,
-  Group,
-  Loader,
-  Stack,
-  Text,
-  TextInput,
-  useComputedColorScheme,
-} from "@mantine/core";
-import {
-  IconChevronDown,
-  IconLabel,
-  IconSearch,
-} from "@tabler/icons-react";
-import { Link, useParams } from "react-router-dom";
-import { useTranslation } from "react-i18next";
-import { Helmet } from "react-helmet-async";
-import { useDebouncedValue } from "@mantine/hooks";
-import { getAppName } from "@/lib/config";
-import { useLabelPagesQuery } from "@/features/label/queries/label-query.ts";
-import { useGetSpacesQuery } from "@/features/space/queries/space-query.ts";
-import { getLabelColor } from "@/features/label/utils/label-colors.ts";
-import { LabelPageRow } from "@/features/label/components/label-page-row.tsx";
-import { LabelPageRowSkeleton } from "@/features/label/components/label-page-row-skeleton.tsx";
-import { normalizeLabelName } from "@/features/label/utils/normalize-label.ts";
-import { SpaceFilterMenu } from "@/features/space/components/space-filter-menu.tsx";
-import { EmptyState } from "@/components/ui/empty-state";
-import classes from "@/features/label/label.module.css";
-
-export default function LabelPage() {
-  const { t } = useTranslation();
-  const { labelName: rawName } = useParams<{ labelName: string }>();
-  const labelName = normalizeLabelName(decodeURIComponent(rawName ?? ""));
-  const scheme = useComputedColorScheme("light");
-  const c = getLabelColor(labelName, scheme);
-
-  const [spaceId, setSpaceId] = useState<string | null>(null);
-  const [search, setSearch] = useState("");
-  const [debouncedSearch] = useDebouncedValue(search.trim(), 200);
-
-  const activeSpaceId = spaceId ?? undefined;
-
-  const { data: spacesData } = useGetSpacesQuery({ limit: 100 });
-  const spaces = spacesData?.items ?? [];
-
-  const {
-    data: pagesData,
-    isLoading: pagesLoading,
-    hasNextPage,
-    fetchNextPage,
-    isFetchingNextPage,
-  } = useLabelPagesQuery(labelName, debouncedSearch, activeSpaceId);
-
-  const pages = useMemo(
-    () => pagesData?.pages.flatMap((p) => p.items) ?? [],
-    [pagesData],
-  );
-
-  const sentinelRef = useRef<HTMLDivElement>(null);
-  useEffect(() => {
-    const sentinel = sentinelRef.current;
-    if (!sentinel) return;
-    const observer = new IntersectionObserver(
-      (entries) => {
-        if (entries[0].isIntersecting && hasNextPage && !isFetchingNextPage) {
-          fetchNextPage();
-        }
-      },
-      { rootMargin: "200px 0px" },
-    );
-    observer.observe(sentinel);
-    return () => observer.disconnect();
-  }, [hasNextPage, isFetchingNextPage, fetchNextPage]);
-
-  const selectedSpaceName = useMemo(() => {
-    if (!spaceId) return t("All spaces");
-    return spaces.find((s) => s.id === spaceId)?.name ?? t("All spaces");
-  }, [spaceId, spaces, t]);
-
-  return (
-    <>
-      <Helmet>
-        <title>
-          {labelName} - {getAppName()}
-        </title>
-      </Helmet>
-
-      <Container size={820} py="xl">
-        <Stack gap="lg">
-          <Stack gap="sm">
-            <Text size="sm" c="dimmed">
-              {t("Labels")}
-              {" / "}
-              <Text component="span" c="bright" fw={500}>
-                {labelName}
-              </Text>
-            </Text>
-
-            <Group gap="md" align="center" wrap="nowrap">
-              <Link
-                to={`/labels/${encodeURIComponent(labelName)}`}
-                className={classes.headerChip}
-                style={{ background: c.bg, color: c.fg }}
-              >
-                <span
-                  className={classes.headerDot}
-                  style={{ background: c.dot }}
-                />
-                <span>{labelName}</span>
-              </Link>
-            </Group>
-          </Stack>
-
-          <Group gap="sm" wrap="nowrap" align="center">
-            <TextInput
-              placeholder={t("Search by title")}
-              leftSection={<IconSearch size={16} />}
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-              size="sm"
-              style={{ flex: 1 }}
-            />
-            <SpaceFilterMenu value={spaceId} onChange={setSpaceId}>
-              <Button
-                variant="default"
-                size="sm"
-                rightSection={<IconChevronDown size={14} />}
-              >
-                {selectedSpaceName}
-              </Button>
-            </SpaceFilterMenu>
-          </Group>
-
-          {pagesLoading && pages.length === 0 ? (
-            <div>
-              <LabelPageRowSkeleton titleWidth={260} metaWidth={170} />
-              <LabelPageRowSkeleton titleWidth={180} metaWidth={150} />
-              <LabelPageRowSkeleton titleWidth={220} metaWidth={190} />
-              <LabelPageRowSkeleton titleWidth={140} metaWidth={140} />
-              <LabelPageRowSkeleton titleWidth={240} metaWidth={170} />
-            </div>
-          ) : pages.length > 0 ? (
-            <div>
-              {pages.map((page) => (
-                <LabelPageRow
-                  key={page.id}
-                  page={page}
-                  currentLabelName={labelName}
-                />
-              ))}
-              <div ref={sentinelRef} />
-              {isFetchingNextPage && (
-                <Center py="md">
-                  <Loader size="sm" />
-                </Center>
-              )}
-            </div>
-          ) : (
-            <EmptyState
-              icon={IconLabel}
-              title={
-                debouncedSearch
-                  ? t("No matches")
-                  : t("No pages with this label")
-              }
-              description={
-                debouncedSearch
-                  ? t("No pages match your search.")
-                  : t("Pages tagged with this label will appear here.")
-              }
-            />
-          )}
-        </Stack>
-      </Container>
-    </>
-  );
-}

apps/client/src/pages/settings/account/account-preferences.tsx

@@ -3,7 +3,6 @@ import AccountLanguage from "@/features/user/components/account-language.tsx";
 import AccountTheme from "@/features/user/components/account-theme.tsx";
 import PageWidthPref from "@/features/user/components/page-width-pref.tsx";
 import PageEditPref from "@/features/user/components/page-state-pref";
-import FixedToolbarPref from "@/features/user/components/fixed-toolbar-pref";
 import NotificationPref from "@/features/user/components/notification-pref";
 import { getAppName } from "@/lib/config.ts";
 import { Divider } from "@mantine/core";
@@ -38,10 +37,6 @@ export default function AccountPreferences() {
 
       <Divider my={"md"} />
 
-      <FixedToolbarPref />
-
-      <Divider my={"md"} />
-
       <NotificationPref />
     </>
   );

apps/client/vitest.config.ts

@@ -1,17 +0,0 @@
-import { defineConfig } from 'vitest/config';
-import react from '@vitejs/plugin-react';
-import * as path from 'path';
-
-export default defineConfig({
-  plugins: [react()],
-  resolve: {
-    alias: {
-      '@': path.resolve(__dirname, './src'),
-    },
-  },
-  test: {
-    environment: 'jsdom',
-    globals: true,
-    setupFiles: [],
-  },
-});

apps/server/src/core/core.module.ts

@@ -18,7 +18,6 @@ import { PageAccessModule } from './page/page-access/page-access.module';
 import { DomainMiddleware } from '../common/middlewares/domain.middleware';
 import { AuditContextMiddleware } from '../common/middlewares/audit-context.middleware';
 import { ShareModule } from './share/share.module';
-import { LabelModule } from './label/label.module';
 import { NotificationModule } from './notification/notification.module';
 import { WatcherModule } from './watcher/watcher.module';
 import { FavoriteModule } from './favorite/favorite.module';
@@ -40,7 +39,6 @@ import { ClsMiddleware } from 'nestjs-cls';
     CaslModule,
     PageAccessModule,
     ShareModule,
-    LabelModule,
     NotificationModule,
     WatcherModule,
     SessionModule,

apps/server/src/core/label/dto/label.dto.ts

@@ -1,84 +0,0 @@
-import {
-  ArrayMaxSize,
-  ArrayMinSize,
-  IsArray,
-  IsIn,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-  IsUUID,
-  Matches,
-  MaxLength,
-} from 'class-validator';
-import { Transform } from 'class-transformer';
-import { LabelType } from '@docmost/db/repos/label/label.repo';
-import { PageIdDto } from '../../page/dto/page.dto';
-import { normalizeLabelName } from '../utils';
-
-//TODO: We may support SPACE/TEMPLATE labels in the future
-const SUPPORTED_LABEL_TYPES: LabelType[] = [LabelType.PAGE];
-
-export class AddLabelsDto extends PageIdDto {
-  @IsArray()
-  @ArrayMinSize(1)
-  @ArrayMaxSize(25)
-  @IsString({ each: true })
-  @IsNotEmpty({ each: true })
-  @Transform(({ value }) =>
-    Array.isArray(value) ? value.map(normalizeLabelName) : value,
-  )
-  @MaxLength(100, { each: true })
-  @Matches(/^[a-z0-9_-][a-z0-9_~-]*$/, {
-    each: true,
-    message:
-      'Label names can only contain letters, numbers, hyphens, underscores, and tildes, and cannot start with a tilde',
-  })
-  names: string[];
-}
-
-export class RemoveLabelDto extends PageIdDto {
-  @IsUUID()
-  labelId: string;
-}
-
-export class FindPagesByLabelDto {
-  @IsOptional()
-  @IsUUID()
-  labelId?: string;
-
-  @IsOptional()
-  @IsString()
-  @Transform(({ value }) =>
-    typeof value === 'string' ? normalizeLabelName(value) : value,
-  )
-  @MaxLength(100)
-  name?: string;
-
-  @IsOptional()
-  @IsUUID()
-  spaceId?: string;
-}
-
-export class LabelInfoDto {
-  @IsString()
-  @IsNotEmpty()
-  @Transform(({ value }) =>
-    typeof value === 'string' ? normalizeLabelName(value) : value,
-  )
-  @MaxLength(100)
-  name: string;
-
-  @IsString()
-  @IsIn(SUPPORTED_LABEL_TYPES)
-  type: LabelType;
-
-  @IsOptional()
-  @IsUUID()
-  spaceId?: string;
-}
-
-export class ListLabelsDto {
-  @IsString()
-  @IsIn(SUPPORTED_LABEL_TYPES)
-  type: LabelType;
-}

apps/server/src/core/label/label.controller.ts

@@ -1,122 +0,0 @@
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  ForbiddenException,
-  HttpCode,
-  HttpStatus,
-  NotFoundException,
-  Post,
-  UseGuards,
-} from '@nestjs/common';
-import { LabelService } from './label.service';
-import {
-  FindPagesByLabelDto,
-  LabelInfoDto,
-  ListLabelsDto,
-} from './dto/label.dto';
-import { AuthUser } from '../../common/decorators/auth-user.decorator';
-import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
-import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
-import { User, Workspace } from '@docmost/db/types/entity.types';
-import { LabelRepo, LabelType } from '@docmost/db/repos/label/label.repo';
-import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { emptyCursorPaginationResult } from '@docmost/db/pagination/cursor-pagination';
-import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
-import {
-  SpaceCaslAction,
-  SpaceCaslSubject,
-} from '../casl/interfaces/space-ability.type';
-
-@UseGuards(JwtAuthGuard)
-@Controller('labels')
-export class LabelController {
-  constructor(
-    private readonly labelService: LabelService,
-    private readonly labelRepo: LabelRepo,
-    private readonly spaceAbility: SpaceAbilityFactory,
-  ) {}
-
-  @HttpCode(HttpStatus.OK)
-  @Post('/')
-  async getLabels(
-    @Body() dto: ListLabelsDto,
-    @Body() pagination: PaginationOptions,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    return this.labelService.getLabels(
-      workspace.id,
-      user.id,
-      dto.type,
-      pagination,
-    );
-  }
-
-  @HttpCode(HttpStatus.OK)
-  @Post('pages')
-  async findPagesByLabel(
-    @Body() dto: FindPagesByLabelDto,
-    @Body() pagination: PaginationOptions,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    if (dto.spaceId) {
-      await this.assertCanReadSpace(user, dto.spaceId);
-    }
-
-    let labelId = dto.labelId;
-    if (!labelId) {
-      if (!dto.name) {
-        throw new BadRequestException('labelId or name is required');
-      }
-      const label = await this.labelRepo.findByNameAndWorkspace(
-        dto.name,
-        workspace.id,
-        LabelType.PAGE,
-      );
-      if (!label) {
-        return emptyCursorPaginationResult(pagination.limit);
-      }
-      labelId = label.id;
-    } else {
-      const label = await this.labelRepo.findById(labelId);
-      if (!label) {
-        throw new NotFoundException('Label not found');
-      }
-    }
-
-    return this.labelService.findPagesByLabel(labelId, user.id, {
-      spaceId: dto.spaceId,
-      query: pagination.query,
-      pagination,
-    });
-  }
-
-  // @HttpCode(HttpStatus.OK)
-  // @Post('info')
-  // async getLabelInfo(
-  //   @Body() dto: LabelInfoDto,
-  //   @AuthUser() user: User,
-  //   @AuthWorkspace() workspace: Workspace,
-  // ) {
-  //   if (dto.spaceId) {
-  //     await this.assertCanReadSpace(user, dto.spaceId);
-  //   }
-  //
-  //   return this.labelService.getLabelInfo(
-  //     dto.name,
-  //     dto.type,
-  //     workspace.id,
-  //     user.id,
-  //     dto.spaceId,
-  //   );
-  // }
-
-  private async assertCanReadSpace(user: User, spaceId: string) {
-    const ability = await this.spaceAbility.createForUser(user, spaceId);
-    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
-      throw new ForbiddenException();
-    }
-  }
-}

apps/server/src/core/label/label.module.ts

@@ -1,10 +0,0 @@
-import { Module } from '@nestjs/common';
-import { LabelController } from './label.controller';
-import { LabelService } from './label.service';
-
-@Module({
-  controllers: [LabelController],
-  providers: [LabelService],
-  exports: [LabelService],
-})
-export class LabelModule {}

apps/server/src/core/label/label.service.ts

@@ -1,140 +0,0 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-import { Label } from '@docmost/db/types/entity.types';
-import { LabelRepo, LabelType } from '@docmost/db/repos/label/label.repo';
-import { InjectKysely } from 'nestjs-kysely';
-import { KyselyDB } from '@docmost/db/types/kysely.types';
-import { executeTx } from '@docmost/db/utils';
-import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
-import { normalizeLabelName } from './utils';
-
-@Injectable()
-export class LabelService {
-  constructor(
-    private readonly labelRepo: LabelRepo,
-    private readonly pagePermissionRepo: PagePermissionRepo,
-    @InjectKysely() private readonly db: KyselyDB,
-  ) {}
-
-  async addLabelsToPage(
-    pageId: string,
-    names: string[],
-    workspaceId: string,
-  ): Promise<Label[]> {
-    const attached: Label[] = [];
-    await executeTx(this.db, async (trx) => {
-      for (const name of names) {
-        const label = await this.labelRepo.findOrCreate(
-          name.trim(),
-          workspaceId,
-          LabelType.PAGE,
-          trx,
-        );
-        await this.labelRepo.addLabelToPage(pageId, label.id, trx);
-        attached.push(label);
-      }
-    });
-    return attached;
-  }
-
-  async removeLabelFromPage(
-    pageId: string,
-    labelId: string,
-    workspaceId: string,
-  ): Promise<void> {
-    await executeTx(this.db, async (trx) => {
-      const label = await this.labelRepo.findById(labelId, trx);
-      if (!label || label.workspaceId !== workspaceId) {
-        throw new NotFoundException('Label not found');
-      }
-
-      await this.labelRepo.removeLabelFromPage(
-        pageId,
-        labelId,
-        workspaceId,
-        trx,
-      );
-
-      const count = await this.labelRepo.getLabelPageCount(
-        labelId,
-        workspaceId,
-        trx,
-      );
-      if (count === 0) {
-        await this.labelRepo.deleteLabel(labelId, workspaceId, trx);
-      }
-    });
-  }
-
-  async getPageLabels(pageId: string, pagination: PaginationOptions) {
-    return this.labelRepo.findLabelsByPageId(pageId, pagination);
-  }
-
-  async getLabels(
-    workspaceId: string,
-    userId: string,
-    type: LabelType,
-    pagination: PaginationOptions,
-  ) {
-    return this.labelRepo.findLabels(
-      workspaceId,
-      userId,
-      type,
-      pagination,
-    );
-  }
-
-  async findPagesByLabel(
-    labelId: string,
-    userId: string,
-    opts: {
-      spaceId?: string;
-      query?: string;
-      pagination: PaginationOptions;
-    },
-  ) {
-    const result = await this.labelRepo.findPagesByLabelId(labelId, userId, opts);
-    if (result.items.length === 0) return result;
-
-    const accessibleIds = await this.pagePermissionRepo.filterAccessiblePageIds({
-      pageIds: result.items.map((p) => p.id),
-      userId,
-      spaceId: opts.spaceId,
-    });
-    const accessible = new Set(accessibleIds);
-    return {
-      items: result.items.filter((p) => accessible.has(p.id)),
-      meta: result.meta,
-    };
-  }
-
-  async getLabelInfo(
-    name: string,
-    type: LabelType,
-    workspaceId: string,
-    userId: string,
-    spaceId?: string,
-  ) {
-    const normalized = normalizeLabelName(name);
-    const label = await this.labelRepo.findByNameAndWorkspace(
-      normalized,
-      workspaceId,
-      type,
-    );
-
-    // Uniform response shape.
-    // We don't want to expose whether the label row exists
-    const usageCount = label
-      ? await this.labelRepo.getLabelPageCountForUser(
-          label.id,
-          userId,
-          spaceId,
-        )
-      : 0;
-
-    return {
-      name: normalized,
-      usageCount,
-    };
-  }
-}

apps/server/src/core/label/utils.ts

@@ -1,3 +0,0 @@
-export function normalizeLabelName(name: string): string {
-  return name.trim().replace(/\s+/g, '-').toLowerCase();
-}

apps/server/src/core/page/dto/backlink.dto.ts

@@ -1,11 +0,0 @@
-import { IsIn, IsNotEmpty, IsString } from 'class-validator';
-import { PageIdDto } from './page.dto';
-
-export type BacklinkDirection = 'incoming' | 'outgoing';
-
-export class BacklinksListDto extends PageIdDto {
-  @IsString()
-  @IsNotEmpty()
-  @IsIn(['incoming', 'outgoing'])
-  direction: BacklinkDirection;
-}

apps/server/src/core/page/page.controller.ts

@@ -11,7 +11,6 @@ import {
   UseGuards,
 } from '@nestjs/common';
 import { PageService } from './services/page.service';
-import { BacklinkService } from './services/backlink.service';
 import { PageAccessService } from './page-access/page-access.service';
 import { CreatePageDto } from './dto/create-page.dto';
 import { UpdatePageDto } from './dto/update-page.dto';
@@ -39,9 +38,6 @@ import { RecentPageDto } from './dto/recent-page.dto';
 import { CreatedByUserDto } from './dto/created-by-user.dto';
 import { DuplicatePageDto } from './dto/duplicate-page.dto';
 import { DeletedPageDto } from './dto/deleted-page.dto';
-import { BacklinksListDto } from './dto/backlink.dto';
-import { LabelService } from '../label/label.service';
-import { AddLabelsDto, RemoveLabelDto } from '../label/dto/label.dto';
 import {
   jsonToHtml,
   jsonToMarkdown,
@@ -62,8 +58,6 @@ export class PageController {
     private readonly pageHistoryService: PageHistoryService,
     private readonly spaceAbility: SpaceAbilityFactory,
     private readonly pageAccessService: PageAccessService,
-    private readonly backlinkService: BacklinkService,
-    private readonly labelService: LabelService,
     @Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
   ) {}
 
@@ -102,100 +96,6 @@ export class PageController {
     return { ...page, permissions };
   }
 
-  @HttpCode(HttpStatus.OK)
-  @Post('labels')
-  async getPageLabels(
-    @Body() dto: PageIdDto,
-    @Body() pagination: PaginationOptions,
-    @AuthUser() user: User,
-  ) {
-    const page = await this.pageRepo.findById(dto.pageId);
-    if (!page) {
-      throw new NotFoundException('Page not found');
-    }
-
-    await this.pageAccessService.validateCanView(page, user);
-
-    return this.labelService.getPageLabels(page.id, pagination);
-  }
-
-  @HttpCode(HttpStatus.OK)
-  @Post('labels/add')
-  async addPageLabels(
-    @Body() dto: AddLabelsDto,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    const page = await this.pageRepo.findById(dto.pageId);
-    if (!page || page.deletedAt) {
-      throw new NotFoundException('Page not found');
-    }
-
-    await this.pageAccessService.validateCanEdit(page, user);
-
-    return this.labelService.addLabelsToPage(
-      page.id,
-      dto.names,
-      workspace.id,
-    );
-  }
-
-  @HttpCode(HttpStatus.OK)
-  @Post('labels/remove')
-  async removePageLabel(
-    @Body() dto: RemoveLabelDto,
-    @AuthUser() user: User,
-  ) {
-    const page = await this.pageRepo.findById(dto.pageId);
-    if (!page || page.deletedAt) {
-      throw new NotFoundException('Page not found');
-    }
-
-    await this.pageAccessService.validateCanEdit(page, user);
-
-    await this.labelService.removeLabelFromPage(
-      page.id,
-      dto.labelId,
-      page.workspaceId,
-    );
-  }
-
-  @HttpCode(HttpStatus.OK)
-  @Post('backlinks-count')
-  async getBacklinksCount(
-    @Body() dto: PageIdDto,
-    @AuthUser() user: User,
-  ): Promise<{ incoming: number; outgoing: number }> {
-    const page = await this.pageRepo.findById(dto.pageId);
-    if (!page) {
-      throw new NotFoundException('Page not found');
-    }
-    await this.pageAccessService.validateCanView(page, user);
-
-    return this.backlinkService.countByPageId(page.id, user.id);
-  }
-
-  @HttpCode(HttpStatus.OK)
-  @Post('backlinks')
-  async getBacklinks(
-    @Body() dto: BacklinksListDto,
-    @Body() pagination: PaginationOptions,
-    @AuthUser() user: User,
-  ) {
-    const page = await this.pageRepo.findById(dto.pageId);
-    if (!page) {
-      throw new NotFoundException('Page not found');
-    }
-    await this.pageAccessService.validateCanView(page, user);
-
-    return this.backlinkService.findByPageId(
-      page.id,
-      dto.direction,
-      user.id,
-      pagination,
-    );
-  }
-
   @HttpCode(HttpStatus.OK)
   @Post('create')
   async create(

apps/server/src/core/page/page.module.ts

@@ -3,28 +3,15 @@ import { PageService } from './services/page.service';
 import { PageController } from './page.controller';
 import { PageHistoryService } from './services/page-history.service';
 import { TrashCleanupService } from './services/trash-cleanup.service';
-import { BacklinkService } from './services/backlink.service';
 import { StorageModule } from '../../integrations/storage/storage.module';
 import { CollaborationModule } from '../../collaboration/collaboration.module';
 import { WatcherModule } from '../watcher/watcher.module';
 import { TransclusionModule } from './transclusion/transclusion.module';
-import { LabelModule } from '../label/label.module';
 
 @Module({
   controllers: [PageController],
-  providers: [
-    PageService,
-    PageHistoryService,
-    TrashCleanupService,
-    BacklinkService,
-  ],
+  providers: [PageService, PageHistoryService, TrashCleanupService],
   exports: [PageService, PageHistoryService],
-  imports: [
-    StorageModule,
-    CollaborationModule,
-    WatcherModule,
-    TransclusionModule,
-    LabelModule,
-  ],
+  imports: [StorageModule, CollaborationModule, WatcherModule, TransclusionModule],
 })
 export class PageModule {}

apps/server/src/core/page/services/backlink.service.spec.ts

@@ -1,163 +0,0 @@
-import { Test } from '@nestjs/testing';
-import { BacklinkService } from './backlink.service';
-import { BacklinkRepo } from '@docmost/db/repos/backlink/backlink.repo';
-import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
-
-describe('BacklinkService.countByPageId', () => {
-  let service: BacklinkService;
-  let backlinkRepo: jest.Mocked<BacklinkRepo>;
-  let permissionRepo: jest.Mocked<PagePermissionRepo>;
-
-  const pageId = '00000000-0000-0000-0000-000000000001';
-  const userId = '00000000-0000-0000-0000-000000000099';
-
-  beforeEach(async () => {
-    const backlinkRepoMock: jest.Mocked<Partial<BacklinkRepo>> = {
-      findRelatedPageIds: jest.fn(),
-      findPagesByIdsPaginated: jest.fn(),
-    };
-    const permissionRepoMock: jest.Mocked<Partial<PagePermissionRepo>> = {
-      filterAccessiblePageIds: jest.fn(),
-    };
-
-    const module = await Test.createTestingModule({
-      providers: [
-        BacklinkService,
-        { provide: BacklinkRepo, useValue: backlinkRepoMock },
-        { provide: PagePermissionRepo, useValue: permissionRepoMock },
-      ],
-    }).compile();
-
-    service = module.get(BacklinkService);
-    backlinkRepo = module.get(BacklinkRepo) as jest.Mocked<BacklinkRepo>;
-    permissionRepo = module.get(
-      PagePermissionRepo,
-    ) as jest.Mocked<PagePermissionRepo>;
-  });
-
-  it('returns post-filter counts for both directions', async () => {
-    backlinkRepo.findRelatedPageIds.mockImplementation(async (_id, dir) =>
-      dir === 'incoming' ? ['a', 'b', 'c'] : ['x', 'y'],
-    );
-    permissionRepo.filterAccessiblePageIds.mockImplementation(
-      async ({ pageIds }) =>
-        pageIds.filter((id) => id !== 'b' && id !== 'y'),
-    );
-
-    const result = await service.countByPageId(pageId, userId);
-
-    expect(result).toEqual({ incoming: 2, outgoing: 1 });
-    expect(permissionRepo.filterAccessiblePageIds).toHaveBeenCalledWith({
-      pageIds: ['a', 'b', 'c'],
-      userId,
-    });
-    expect(permissionRepo.filterAccessiblePageIds).toHaveBeenCalledWith({
-      pageIds: ['x', 'y'],
-      userId,
-    });
-  });
-
-  it('skips the permission filter when there are no candidates', async () => {
-    backlinkRepo.findRelatedPageIds.mockResolvedValue([]);
-    permissionRepo.filterAccessiblePageIds.mockResolvedValue([]);
-
-    const result = await service.countByPageId(pageId, userId);
-
-    expect(result).toEqual({ incoming: 0, outgoing: 0 });
-    expect(permissionRepo.filterAccessiblePageIds).not.toHaveBeenCalled();
-  });
-
-  it('passes the userId to findRelatedPageIds so the repo can apply space membership filtering', async () => {
-    backlinkRepo.findRelatedPageIds.mockResolvedValue([]);
-
-    await service.countByPageId(pageId, userId);
-
-    expect(backlinkRepo.findRelatedPageIds).toHaveBeenCalledWith(
-      pageId,
-      'incoming',
-      userId,
-    );
-    expect(backlinkRepo.findRelatedPageIds).toHaveBeenCalledWith(
-      pageId,
-      'outgoing',
-      userId,
-    );
-  });
-});
-
-describe('BacklinkService.findByPageId', () => {
-  let service: BacklinkService;
-  let backlinkRepo: jest.Mocked<BacklinkRepo>;
-  let permissionRepo: jest.Mocked<PagePermissionRepo>;
-
-  const pageId = '00000000-0000-0000-0000-000000000001';
-  const userId = '00000000-0000-0000-0000-000000000099';
-
-  beforeEach(async () => {
-    const backlinkRepoMock: jest.Mocked<Partial<BacklinkRepo>> = {
-      findRelatedPageIds: jest.fn(),
-      findPagesByIdsPaginated: jest.fn(),
-    };
-    const permissionRepoMock: jest.Mocked<Partial<PagePermissionRepo>> = {
-      filterAccessiblePageIds: jest.fn(),
-    };
-
-    const module = await Test.createTestingModule({
-      providers: [
-        BacklinkService,
-        { provide: BacklinkRepo, useValue: backlinkRepoMock },
-        { provide: PagePermissionRepo, useValue: permissionRepoMock },
-      ],
-    }).compile();
-
-    service = module.get(BacklinkService);
-    backlinkRepo = module.get(BacklinkRepo) as jest.Mocked<BacklinkRepo>;
-    permissionRepo = module.get(
-      PagePermissionRepo,
-    ) as jest.Mocked<PagePermissionRepo>;
-  });
-
-  it('passes filtered ids through to the paginated repo call', async () => {
-    backlinkRepo.findRelatedPageIds.mockResolvedValue(['a', 'b']);
-    permissionRepo.filterAccessiblePageIds.mockResolvedValue(['a']);
-    backlinkRepo.findPagesByIdsPaginated.mockResolvedValue({
-      items: [],
-      meta: {
-        limit: 20,
-        hasNextPage: false,
-        hasPrevPage: false,
-        nextCursor: null,
-        prevCursor: null,
-      },
-    } as any);
-
-    await service.findByPageId(pageId, 'incoming', userId, { limit: 20 } as any);
-
-    expect(backlinkRepo.findPagesByIdsPaginated).toHaveBeenCalledWith(
-      ['a'],
-      expect.objectContaining({ limit: 20 }),
-    );
-  });
-
-  it('hands an empty list to the repo when there are no accessible ids', async () => {
-    backlinkRepo.findRelatedPageIds.mockResolvedValue([]);
-    backlinkRepo.findPagesByIdsPaginated.mockResolvedValue({
-      items: [],
-      meta: {
-        limit: 20,
-        hasNextPage: false,
-        hasPrevPage: false,
-        nextCursor: null,
-        prevCursor: null,
-      },
-    } as any);
-
-    await service.findByPageId(pageId, 'incoming', userId, { limit: 20 } as any);
-
-    expect(backlinkRepo.findPagesByIdsPaginated).toHaveBeenCalledWith(
-      [],
-      expect.objectContaining({ limit: 20 }),
-    );
-    expect(permissionRepo.filterAccessiblePageIds).not.toHaveBeenCalled();
-  });
-});

apps/server/src/core/page/services/backlink.service.ts

@@ -1,56 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { BacklinkRepo } from '@docmost/db/repos/backlink/backlink.repo';
-import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
-import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-
-export type BacklinkDirection = 'incoming' | 'outgoing';
-
-@Injectable()
-export class BacklinkService {
-  constructor(
-    private readonly backlinkRepo: BacklinkRepo,
-    private readonly pagePermissionRepo: PagePermissionRepo,
-  ) {}
-
-  async countByPageId(
-    pageId: string,
-    userId: string,
-  ): Promise<{ incoming: number; outgoing: number }> {
-    const [incomingIds, outgoingIds] = await Promise.all([
-      this.accessibleRelatedIds(pageId, 'incoming', userId),
-      this.accessibleRelatedIds(pageId, 'outgoing', userId),
-    ]);
-    return { incoming: incomingIds.length, outgoing: outgoingIds.length };
-  }
-
-  async findByPageId(
-    pageId: string,
-    direction: BacklinkDirection,
-    userId: string,
-    pagination: PaginationOptions,
-  ) {
-    const accessibleIds = await this.accessibleRelatedIds(
-      pageId,
-      direction,
-      userId,
-    );
-    return this.backlinkRepo.findPagesByIdsPaginated(accessibleIds, pagination);
-  }
-
-  private async accessibleRelatedIds(
-    pageId: string,
-    direction: BacklinkDirection,
-    userId: string,
-  ): Promise<string[]> {
-    const candidateIds = await this.backlinkRepo.findRelatedPageIds(
-      pageId,
-      direction,
-      userId,
-    );
-    if (candidateIds.length === 0) return [];
-    return this.pagePermissionRepo.filterAccessiblePageIds({
-      pageIds: candidateIds,
-      userId,
-    });
-  }
-}